From 729de4d37343d5a6dce1b36e8bd61bafcf7d7ac9 Mon Sep 17 00:00:00 2001
From: Marco Dinis <marco.dinis@goteleport.com>
Date: Wed, 16 Aug 2023 09:09:06 +0100
Subject: [PATCH] Discover RDS: remove aurora engine

'aurora' was an engine identifier for the first version of the Amazon
Aurora offering.

It reached end of life in 28th Februray 2023
https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/Aurora.MySQL56.EOL.html

We must remove it from the list of available engines, otherwise AWS will
return an error "unrecognized engine: aurora".

The backend has an equivalent PR that handles this error and queries the
remaining engines instead.
---
 .../EnrollRdsDatabase/EnrollRdsDatabase.story.tsx      |  2 +-
 .../src/services/integrations/integrations.test.ts     | 10 +++++-----
 .../teleport/src/services/integrations/integrations.ts |  2 +-
 .../teleport/src/services/integrations/types.ts        |  1 -
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
index dae7750031f50..4dfc262bc1be2 100644
--- a/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
+++ b/web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/EnrollRdsDatabase.story.tsx
@@ -107,7 +107,7 @@ const fixtures: CheckedAwsRdsDatabase[] = [
   },
   {
     name: 'alpaca',
-    engine: 'aurora',
+    engine: 'aurora-mysql',
     uri: '',
     labels: [
       { name: 'env', value: 'prod' },
diff --git a/web/packages/teleport/src/services/integrations/integrations.test.ts b/web/packages/teleport/src/services/integrations/integrations.test.ts
index f889056065685..b8ada4547cf57 100644
--- a/web/packages/teleport/src/services/integrations/integrations.test.ts
+++ b/web/packages/teleport/src/services/integrations/integrations.test.ts
@@ -157,11 +157,11 @@ test('fetchAwsDatabases response', async () => {
 
 describe('fetchAwsDatabases() request body formatting', () => {
   test.each`
-    protocol             | expectedEngines               | expectedRdsType
-    ${'mysql'}           | ${['mysql', 'mariadb']}       | ${'instance'}
-    ${'postgres'}        | ${['postgres']}               | ${'instance'}
-    ${'aurora-mysql'}    | ${['aurora', 'aurora-mysql']} | ${'cluster'}
-    ${'aurora-postgres'} | ${['aurora-postgresql']}      | ${'cluster'}
+    protocol             | expectedEngines          | expectedRdsType
+    ${'mysql'}           | ${['mysql', 'mariadb']}  | ${'instance'}
+    ${'postgres'}        | ${['postgres']}          | ${'instance'}
+    ${'aurora-mysql'}    | ${['aurora-mysql']}      | ${'cluster'}
+    ${'aurora-postgres'} | ${['aurora-postgresql']} | ${'cluster'}
   `(
     'format protocol $protocol',
     async ({ protocol, expectedEngines, expectedRdsType }) => {
diff --git a/web/packages/teleport/src/services/integrations/integrations.ts b/web/packages/teleport/src/services/integrations/integrations.ts
index ff2bda30f9361..82ceedd45b3ae 100644
--- a/web/packages/teleport/src/services/integrations/integrations.ts
+++ b/web/packages/teleport/src/services/integrations/integrations.ts
@@ -93,7 +93,7 @@ export const integrationService = {
         body = {
           ...req,
           rdsType: 'cluster',
-          engines: ['aurora', 'aurora-mysql'],
+          engines: ['aurora-mysql'],
         };
         break;
       case 'aurora-postgres':
diff --git a/web/packages/teleport/src/services/integrations/types.ts b/web/packages/teleport/src/services/integrations/types.ts
index 246b5a29b5ad4..f66b2123c8c04 100644
--- a/web/packages/teleport/src/services/integrations/types.ts
+++ b/web/packages/teleport/src/services/integrations/types.ts
@@ -158,7 +158,6 @@ export type Regions = keyof typeof awsRegionMap;
 // used when requesting lists of rds databases of the
 // specified engine.
 export type RdsEngine =
-  | 'aurora' // (for MySQL 5.6-compatible Aurora)
   | 'aurora-mysql' // (for MySQL 5.7-compatible and MySQL 8.0-compatible Aurora)
   | 'aurora-postgresql'
   | 'mariadb'