Skip to content

Commit 383db47

Browse files
kimlisaravicious
andauthored
[v17] WebDiscover: add clarifying diagram on deploying ecs step for RDS (#48918)
* WebDiscover: add clarifying diagram on deploying ecs step for RDS * Run svgs through ImageOptim * Address CRs --------- Co-authored-by: Rafał Cieślak <rafal.cieslak@goteleport.com>
1 parent b3379e2 commit 383db47

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
import React, { useState, useEffect } from 'react';
20-
import styled from 'styled-components';
20+
import styled, { useTheme } from 'styled-components';
2121
import {
2222
Box,
2323
ButtonSecondary,
@@ -62,6 +62,9 @@ import {
6262
Header,
6363
AlternateInstructionButton,
6464
} from '../../../Shared';
65+
import awsEcsLight from '../../aws-ecs-light.svg';
66+
import awsEcsDark from '../../aws-ecs-dark.svg';
67+
import awsEcsBblp from '../../aws-ecs-bblp.svg';
6568

6669
import { DeployServiceProp } from '../DeployService';
6770

@@ -343,6 +346,11 @@ const Heading = ({
343346
region: string;
344347
wantAutoDiscover: boolean;
345348
}) => {
349+
const theme = useTheme();
350+
let img = theme.type === 'light' ? awsEcsLight : awsEcsDark;
351+
if (theme.isCustomTheme && theme.name === 'bblp') {
352+
img = awsEcsBblp;
353+
}
346354
return (
347355
<>
348356
<Header>Automatically Deploy a Database Service</Header>
@@ -352,19 +360,23 @@ const Heading = ({
352360
ECS Fargate container (2vCPU, 4GB memory) in your Amazon account with
353361
the ability to access databases in this region (<Mark>{region}</Mark>).
354362
You will only need to do this once per geographical region.
363+
</HeaderSubtitle>
364+
<Box mb={5} mt={-3}>
365+
<Box minWidth="500px" maxWidth="998px">
366+
<img src={img} width="100%" />
367+
</Box>
355368
{!wantAutoDiscover && (
356369
<>
357370
<br />
358-
<br />
359-
Want to deploy a database service manually from one of your existing
360-
servers?{' '}
371+
Do you want to deploy a database service manually from one of your
372+
existing servers?{' '}
361373
<AlternateInstructionButton
362374
onClick={toggleDeployMethod}
363375
disabled={togglerDisabled}
364376
/>
365377
</>
366378
)}
367-
</HeaderSubtitle>
379+
</Box>
368380
</>
369381
);
370382
};

web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSecurityGroups.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ export const SelectSecurityGroups = ({
125125
return (
126126
<>
127127
<Flex alignItems="center" gap={1} mb={2}>
128-
<Subtitle3>Select Security Groups</Subtitle3>
128+
<Subtitle3>Select ECS Security Groups</Subtitle3>
129129
<ToolTipInfo>
130130
<Text>
131-
Select security group(s) based on the following requirements:
131+
Select ECS security group(s) based on the following requirements:
132132
<ul>
133133
<li>
134134
The selected security group(s) must allow all outbound traffic
@@ -145,7 +145,7 @@ export const SelectSecurityGroups = ({
145145
</Flex>
146146

147147
<P mb={2}>
148-
Select security groups to assign to the Fargate service that will be
148+
Select ECS security groups to assign to the Fargate service that will be
149149
running the Teleport Database Service. If you don't select any security
150150
groups, the default one for the VPC will be used.
151151
</P>

web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/SelectSubnetIds.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export function SelectSubnetIds({
120120
return (
121121
<>
122122
<Flex alignItems="center" gap={1} mb={2}>
123-
<Subtitle3>Select Subnets</Subtitle3>
123+
<Subtitle3>Select ECS Subnets</Subtitle3>
124124
<ToolTipInfo>
125125
<Text>
126126
A subnet has an outbound internet route if it has a route to an
@@ -130,9 +130,9 @@ export function SelectSubnetIds({
130130
</Flex>
131131

132132
<Text mb={2}>
133-
Select subnets to assign to the Fargate service that will be running the
134-
Teleport Database Service. All of the subnets you select must have an
135-
outbound internet route and a local route to the database subnets.
133+
Select ECS subnets to assign to the Fargate service that will be running
134+
the Teleport Database Service. All of the subnets you select must have
135+
an outbound internet route and a local route to the database subnets.
136136
</Text>
137137
{attempt.status === 'failed' && (
138138
<>

web/packages/teleport/src/Discover/Database/aws-ecs-bblp.svg

Lines changed: 1 addition & 0 deletions
Loading

web/packages/teleport/src/Discover/Database/aws-ecs-dark.svg

Lines changed: 1 addition & 0 deletions
Loading

web/packages/teleport/src/Discover/Database/aws-ecs-light.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)