Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export function CreateDatabaseDialog({
// success
content = (
<>
<Text mb={5} style={{ display: 'flex' }}>
<Text mb={5}>
<Icons.Check size="small" ml={1} mr={2} color="success" />
Database "{dbName}" successfully registered
</Text>
Expand All @@ -103,7 +103,7 @@ export function CreateDatabaseDialog({
}

return (
<Dialog disableEscapeKeyDown={false} open={true}>
<Dialog open={true}>
<DialogContent
width="460px"
alignItems="center"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,12 @@ export function useCreateDatabase() {
// Skips the deploy database service step.
return nextStep(2);
}

const meta = agentMeta as DbMeta;
if (meta.autoDiscovery && meta.serviceDeployedMethod === 'skipped') {
// IAM policy setup is not required for auto discover.
return nextStep(3);
}
nextStep(); // Goes to deploy database service step.
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,24 @@
*/

import React from 'react';
import { MemoryRouter } from 'react-router';
import { initialize, mswLoader } from 'msw-storybook-addon';
import { rest } from 'msw';

import { Context as TeleportContext, ContextProvider } from 'teleport';
import cfg from 'teleport/config';

import { ResourceKind } from 'teleport/Discover/Shared';
import { PingTeleportProvider } from 'teleport/Discover/Shared/PingTeleportContext';
import { getUserContext } from 'teleport/mocks/contexts';
import { FeaturesContextProvider } from 'teleport/FeaturesContext';

import {
ComponentWrapper,
getDbMeta,
getDbResourceSpec,
} from 'teleport/Discover/Fixtures/databases';

import { TeleportProvider } from 'teleport/Discover/Fixtures/fixtures';
import {
DatabaseEngine,
DatabaseLocation,
} from 'teleport/Discover/SelectResource';
import {
DiscoverProvider,
DiscoverContextState,
DbMeta,
} from 'teleport/Discover/useDiscover';
import { IntegrationStatusCode } from 'teleport/services/integrations';

import { AutoDeploy } from './AutoDeploy';

Expand All @@ -47,9 +45,9 @@ initialize();

export const Init = () => {
return (
<Provider>
<ComponentWrapper>
<AutoDeploy />
</Provider>
</ComponentWrapper>
);
};

Expand All @@ -65,18 +63,65 @@ Init.parameters = {
},
};

export const InitWithAutoEnroll = () => {
return (
<TeleportProvider
resourceKind={ResourceKind.Database}
agentMeta={{
...getDbMeta(),
autoDiscovery: {
config: { name: '', discoveryGroup: '', aws: [] },
requiredVpcsAndSubnets: {},
},
}}
resourceSpec={getDbResourceSpec(
DatabaseEngine.Postgres,
DatabaseLocation.Aws
)}
>
<AutoDeploy />
</TeleportProvider>
);
};
InitWithAutoEnroll.parameters = {
msw: {
handlers: [
rest.post(
cfg.getListSecurityGroupsUrl('test-integration'),
(req, res, ctx) =>
res(ctx.json({ securityGroups: securityGroupsResponse }))
),
rest.post(
cfg.getAwsRdsDbsDeployServicesUrl('test-integration'),
(req, res, ctx) =>
res(
ctx.json({
clusterDashboardUrl: 'some-cluster-dashboard-url',
})
)
),
],
},
};

export const InitWithLabels = () => {
return (
<Provider
<TeleportProvider
resourceKind={ResourceKind.Database}
resourceSpec={getDbResourceSpec(
DatabaseEngine.Postgres,
DatabaseLocation.Aws
)}
agentMeta={{
...getDbMeta(),
agentMatcherLabels: [
{ name: 'env', value: 'staging' },
{ name: 'os', value: 'windows' },
],
}}
>
<AutoDeploy />
</Provider>
</TeleportProvider>
);
};

Expand All @@ -94,9 +139,9 @@ InitWithLabels.parameters = {

export const InitSecurityGroupsLoadingFailed = () => {
return (
<Provider>
<ComponentWrapper>
<AutoDeploy />
</Provider>
</ComponentWrapper>
);
};

Expand All @@ -119,9 +164,9 @@ InitSecurityGroupsLoadingFailed.parameters = {

export const InitSecurityGroupsLoading = () => {
return (
<Provider>
<ComponentWrapper>
<AutoDeploy />
</Provider>
</ComponentWrapper>
);
};

Expand All @@ -136,84 +181,6 @@ InitSecurityGroupsLoading.parameters = {
},
};

const Provider = props => {
const ctx = createTeleportContext();
const discoverCtx: DiscoverContextState = {
agentMeta: {
resourceName: 'db-name',
awsRegion: 'us-east-1',
agentMatcherLabels: [],
db: {
aws: {
rds: {
region: 'us-east-1',
vpcId: 'test-vpc',
},
},
},
selectedAwsRdsDb: { region: 'us-east-1' } as any,
awsIntegration: {
kind: 'aws-oidc',
name: 'test-integration',
resourceType: 'integration',
spec: {
roleArn: 'arn-123',
},
statusCode: IntegrationStatusCode.Running,
},
...props.agentMeta,
} as DbMeta,
currentStep: 0,
nextStep: () => null,
prevStep: () => null,
onSelectResource: () => null,
resourceSpec: {
dbMeta: {
location: DatabaseLocation.Aws,
engine: DatabaseEngine.AuroraMysql,
},
} as any,
exitFlow: () => null,
viewConfig: null,
indexedViews: [],
setResourceSpec: () => null,
updateAgentMeta: () => null,
emitErrorEvent: () => null,
emitEvent: () => null,
eventState: null,
};

return (
<MemoryRouter
initialEntries={[
{ pathname: cfg.routes.discover, state: { entity: 'database' } },
]}
>
<ContextProvider ctx={ctx}>
<FeaturesContextProvider value={[]}>
<DiscoverProvider mockCtx={discoverCtx}>
<PingTeleportProvider
interval={props.interval || 100000}
resourceKind={ResourceKind.Database}
>
{props.children}
</PingTeleportProvider>
</DiscoverProvider>
</FeaturesContextProvider>
</ContextProvider>
</MemoryRouter>
);
};

function createTeleportContext() {
const ctx = new TeleportContext();

ctx.isEnterprise = false;
ctx.storeUser.setState(getUserContext());

return ctx;
}

const securityGroupsResponse = [
{
name: 'security-group-1',
Expand Down
Loading