RavenDB-23163 UI for Amazon SQS ETL

djordjedjukic · Dec 5, 2024 · 28fd92c · 28fd92c
1 parent 79949f7
commit 28fd92c
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 31 deletions.
diff --git a/...typescript/components/pages/database/settings/connectionStrings/connectionStringsTypes.ts b/...typescript/components/pages/database/settings/connectionStrings/connectionStringsTypes.ts
@@ -103,7 +103,6 @@ export interface AmazonSqsConnection extends ConnectionBase {
             regionName?: string;
             secretKey?: string;
         };
-        emulator?: boolean;
         passwordless?: boolean;
     };
 }

diff --git a/...ponents/pages/database/settings/connectionStrings/editForms/AmazonSqsConnectionString.tsx b/...ponents/pages/database/settings/connectionStrings/editForms/AmazonSqsConnectionString.tsx
@@ -212,7 +212,6 @@ const schema = yupObjectSchema<FormData>({
             regionName: getStringRequiredSchema("basic"),
         }),
         passwordless: yup.boolean(),
-        emulator: yup.boolean(),
     }),
 });
 
@@ -226,7 +225,6 @@ function getDefaultValues(initialConnection: AmazonSqsConnection, isForNewConnec
                     secretKey: null,
                     regionName: null,
                 },
-                emulator: false,
                 passwordless: false,
             },
         };

diff --git a/...omponents/pages/database/settings/connectionStrings/store/connectionStringsMapsFromDto.ts b/...omponents/pages/database/settings/connectionStrings/store/connectionStringsMapsFromDto.ts
@@ -303,7 +303,6 @@ export function mapAmazonSqsConnectionsFromDto(
                     name: connection.Name,
                     authType: getAmazonSqsAuthType(connection),
                     settings: {
-                        emulator: connection.AmazonSqsConnectionSettings.UseEmulator,
                         passwordless: connection.AmazonSqsConnectionSettings.Passwordless,
                         basic: {
                             accessKey: connection.AmazonSqsConnectionSettings.Basic?.AccessKey,
@@ -320,9 +319,6 @@ function getAmazonSqsAuthType(dto: QueueConnectionStringDto): AmazonSqsAuthentic
     if (dto.AmazonSqsConnectionSettings.Passwordless) {
         return "passwordless";
     }
-    if (dto.AmazonSqsConnectionSettings.UseEmulator) {
-        return "emulator";
-    }
     if (dto.AmazonSqsConnectionSettings.Basic) {
         return "basic";
     }

diff --git a/.../components/pages/database/settings/connectionStrings/store/connectionStringsMapsToDto.ts b/.../components/pages/database/settings/connectionStrings/store/connectionStringsMapsToDto.ts
@@ -168,22 +168,13 @@ export function mapAmazonSqsConnectionStringSettingsToDto(
                     AccessKey: connection.settings.basic.accessKey,
                     RegionName: connection.settings.basic.regionName,
                 },
-                UseEmulator: false,
                 Passwordless: false,
             };
         }
         case "passwordless": {
             return {
                 Basic: null,
                 Passwordless: true,
-                UseEmulator: false,
-            };
-        }
-        case "emulator": {
-            return {
-                Basic: null,
-                Passwordless: false,
-                UseEmulator: true,
             };
         }
         default:

diff --git a/src/Raven.Studio/typescript/models/database/settings/connectionStringAmazonSqsModel.ts b/src/Raven.Studio/typescript/models/database/settings/connectionStringAmazonSqsModel.ts
@@ -42,7 +42,6 @@ class AmazonSqsBasicModel {
                 RegionName: this.regionName(),
                 SecretKey: this.secretKey()
             },
-            UseEmulator: false,
             Passwordless: false
         }
     }
@@ -83,8 +82,6 @@ class connectionStringAmazonSqsModel extends connectionStringModel {
         switch (authenticationType) {
             case "basic":
                 return "Basic";
-            case "emulator":
-                return "Emulator";
             case "passwordless":
                 return "Passwordless";
             default:
@@ -103,8 +100,6 @@ class connectionStringAmazonSqsModel extends connectionStringModel {
         const settings = dto.AmazonSqsConnectionSettings;
         if (settings.Passwordless) {
             this.authenticationType("passwordless");
-        } else if (settings.UseEmulator) {
-            this.authenticationType("emulator");
         } else if (settings.Basic) {
             this.authenticationType("basic");
             this.basicModel.update(settings.Basic);
@@ -139,7 +134,6 @@ class connectionStringAmazonSqsModel extends connectionStringModel {
                     RegionName: ""
                 },
                 Passwordless: false,
-                UseEmulator: false
             }
         }, true, []);
     }
@@ -149,17 +143,10 @@ class connectionStringAmazonSqsModel extends connectionStringModel {
         switch (authenticationType) {
             case "basic":
                 return this.basicModel.toDto();
-            case "emulator":
-                return {
-                    Basic: null,
-                    Passwordless: false,
-                    UseEmulator: true
-                }
             case "passwordless":
                 return {
                     Basic: null,
                     Passwordless: true,
-                    UseEmulator: false
                 }
             default:
                 assertUnreachable(authenticationType);

diff --git a/src/Raven.Studio/typescript/test/stubs/DatabasesStubs.ts b/src/Raven.Studio/typescript/test/stubs/DatabasesStubs.ts
@@ -565,7 +565,6 @@ export class DatabasesStubs {
                             RegionName: "us-west-2",
                         },
                         Passwordless: false,
-                        UseEmulator: false,
                     },
                 },
             },

diff --git a/src/Raven.Studio/typings/_studio/dto.d.ts b/src/Raven.Studio/typings/_studio/dto.d.ts
@@ -1057,4 +1057,4 @@ type GetConnectionStringsResult = Omit<Raven.Client.Documents.Operations.Connect
 }
 
 type AzureQueueStorageAuthenticationType = "connectionString" | "entraId" | "passwordless";
-type AmazonSqsAuthenticationType = "basic" | "emulator" | "passwordless";
+type AmazonSqsAuthenticationType = "basic" | "passwordless";
-Original file line number
+Diff line change
@@ Expand Up / @@ -565,7 +565,6 @@ export class DatabasesStubs { @@
                                 RegionName: "us-west-2",
                             },
                             Passwordless: false,
-                            UseEmulator: false,
                         },
                     },
                 },
@@ Expand Down @@