Web: Improve RDS flow 2 #45179

kimlisa · 2024-08-06T23:30:25Z

resolves #44368
resolves #44366

🛑 requires #45180

EKS flow now defaults to single enrollment (ec2 was also touched, but we currently don't use it in our flow atm)
Allows user to proceed to deploy step if querying for a database server times out (likely b/c database service shut down but is not expired yet from the back)
Allows user to re-deploy database on auto deploy step (this helps single enrollment flows being stuck on the pending state and re-deploying allows them to change their security group and subnet selections)
Also as discussed in discover meeting, removed custom label definer for auto deployment
Improve pending state hint message
Allows user to completely overwrite an existing database
Emit "create discovery config" event for other parts of flow (eks and ec2)

no change log because it's an extension of #44671 (it'll be backported together)

github-actions · 2024-08-06T23:30:55Z

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

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

web/packages/teleport/src/Discover/Database/CreateDatabase/const.ts

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

GavinFrazar · 2024-08-09T03:11:22Z

web/packages/teleport/src/Discover/Database/CreateDatabase/const.ts

@@ -20,4 +20,4 @@ export const timeoutErrorMsg =
  'Teleport could not detect your new database in time. Please try again.';

 export const dbWithoutDbServerExistsErrorMsg =
-  'already exists but there are no database servers for it';
+  'already exists but there are no Teleport agents proxying for it';


Suggested change

'already exists but there are no Teleport agents proxying for it';

'already exists but there are no Teleport agents proxying it';

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

ravicious · 2024-08-09T13:45:00Z

web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx

+export const AllowOverwrite = () => (
+  <CreateDatabaseDialog
+    {...props}
+    attempt={{ status: 'failed', statusText: dbWithoutDbServerExistsErrorMsg }}
+  />
+);


Is it supposed to look like this? It seems like there's some kind of identifier missing at the start of the error message.

oh that's just a story example, the actual looks like this:

I think it'd be good to update the example then so that it's closer to the real thing.

web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx

web/packages/teleport/src/services/integrations/types.ts

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

ravicious

Thanks for addressing that nit about SuccessContent!

ravicious · 2024-08-12T13:31:47Z

web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.story.tsx

+export const AllowOverwrite = () => (
+  <CreateDatabaseDialog
+    {...props}
+    attempt={{ status: 'failed', statusText: dbWithoutDbServerExistsErrorMsg }}
+  />
+);


I think it'd be good to update the example then so that it's closer to the real thing.

ravicious · 2024-08-12T13:36:44Z

web/packages/teleport/src/Discover/Database/CreateDatabase/CreateDatabaseDialog.tsx

+     * Most likely cause of timeout is when we found a matching db_service
+     * but no db_server heartbeats. Most likely cause is because db_service
+     * has been stopped but is not removed from teleport yet (there is some
+     * minutes delay on expiry)


What's missing for me from this comment is an explanation why we show a success message even though there was a timeout. The comment explains what's the most likely cause of a timeout, but as someone who doesn't know much about the problem matter here, I don't quite understand why the user is allowed to proceed anyway.

kimlisa · 2024-08-20T23:26:20Z

PTAL? @rudream 🙏

…ollment

public-teleport-github-review-bot · 2024-08-22T06:15:15Z

@kimlisa See the table below for backport results.

Branch	Result
branch/v16	Failed

* Don't default to auto discover * Allow redpeploy when auto deploying and improve pending deploy hints * Allow overwrite existing dbs and skip on heartbeat timeout during enrollment * Remove allowing custom labels * Emit rest of discovery config event

* Web: Improve RDS enrollment flow (#44671) - user selects a vpc to see RDS's - restrict deploying service to user selected vpc - allow and require selecting subnets and security groups - refactor EnrollRdsDatabase.tsx into SingleEnrollment and AutoEnrollment - for self hosted, move configuring discovery config into own step - fixes a query bug where not all db servers were returning because possible duplicates were not accounted for (fixed by removing limit, default limit is 1k which should be plenty) * Web: Improve RDS flow 2 (#45179) * Don't default to auto discover * Allow redpeploy when auto deploying and improve pending deploy hints * Allow overwrite existing dbs and skip on heartbeat timeout during enrollment * Remove allowing custom labels * Emit rest of discovery config event * Remove blocking if db_service exists for a vpc Previously intended to determine if user already auto enrolled, but now that single and auto enrollment sets the same kind of labels for db_service, there is no distinction and can let user be blocked incorrectly.

github-actions bot added size/md ui labels Aug 6, 2024

github-actions bot requested review from ravicious and rudream August 6, 2024 23:30

kimlisa added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v16 labels Aug 6, 2024

kimlisa mentioned this pull request Aug 6, 2024

Use default labels when deploying service into ECS and allow overwriting existing DB (web) #45180

Merged

kimlisa force-pushed the lisa/improve-rds-flow-2 branch from 7694b5a to 0380d1b Compare August 6, 2024 23:55

kimlisa commented Aug 8, 2024

View reviewed changes

web/packages/teleport/src/Discover/Database/DeployService/AutoDeploy/AutoDeploy.tsx Outdated Show resolved Hide resolved

GavinFrazar reviewed Aug 9, 2024

View reviewed changes

kimlisa force-pushed the lisa/improve-rds-flow-2 branch from b6a393d to ad6e13c Compare August 9, 2024 04:23

ravicious reviewed Aug 9, 2024

View reviewed changes

kimlisa requested a review from ravicious August 9, 2024 15:56

kimlisa force-pushed the lisa/improve-rds-flow-2 branch from f315cb5 to 518a22b Compare August 9, 2024 15:59

ravicious approved these changes Aug 12, 2024

View reviewed changes

ravicious reviewed Aug 12, 2024

View reviewed changes

kimlisa force-pushed the lisa/improve-rds-flow-2 branch from 518a22b to 897e29b Compare August 20, 2024 23:22

rudream approved these changes Aug 22, 2024

View reviewed changes

kimlisa added 9 commits August 21, 2024 22:57

Don't default to auto discover

ec5a4b4

Allow redpeploy when auto deploying and improve pending deploy hints

0f3bbdb

Allow overwrite existing dbs and skip on heartbeat timeout during enr…

b0cce84

…ollment

Remove allowing custom labels

7a9968a

Update test

c06d025

Emit rest of discovery config event

16b95fc

Improve copy

86d935b

Address CRs

c3116f0

Address CRs

500a5b3

kimlisa force-pushed the lisa/improve-rds-flow-2 branch from 897e29b to 500a5b3 Compare August 22, 2024 05:58

kimlisa enabled auto-merge August 22, 2024 06:02

kimlisa added this pull request to the merge queue Aug 22, 2024

Merged via the queue into master with commit 5ed1222 Aug 22, 2024
39 checks passed

kimlisa deleted the lisa/improve-rds-flow-2 branch August 22, 2024 06:14

kimlisa mentioned this pull request Aug 22, 2024

[v16] WebDiscover: Improve RDS enrollment flow #45688

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Web: Improve RDS flow 2 #45179

Web: Improve RDS flow 2 #45179

kimlisa commented Aug 6, 2024 •

edited

Loading

github-actions bot commented Aug 6, 2024

GavinFrazar Aug 9, 2024

ravicious Aug 9, 2024

kimlisa Aug 9, 2024

ravicious Aug 12, 2024

ravicious left a comment

ravicious Aug 12, 2024

ravicious Aug 12, 2024

kimlisa commented Aug 20, 2024

public-teleport-github-review-bot bot commented Aug 22, 2024

	'already exists but there are no Teleport agents proxying for it';
	'already exists but there are no Teleport agents proxying it';

Web: Improve RDS flow 2 #45179

Web: Improve RDS flow 2 #45179

Conversation

kimlisa commented Aug 6, 2024 • edited Loading

github-actions bot commented Aug 6, 2024

GavinFrazar Aug 9, 2024

Choose a reason for hiding this comment

ravicious Aug 9, 2024

Choose a reason for hiding this comment

kimlisa Aug 9, 2024

Choose a reason for hiding this comment

ravicious Aug 12, 2024

Choose a reason for hiding this comment

ravicious left a comment

Choose a reason for hiding this comment

ravicious Aug 12, 2024

Choose a reason for hiding this comment

ravicious Aug 12, 2024

Choose a reason for hiding this comment

kimlisa commented Aug 20, 2024

public-teleport-github-review-bot bot commented Aug 22, 2024

kimlisa commented Aug 6, 2024 •

edited

Loading