Use v3 client name when input code does not use local name (#594)

aws · Oct 16, 2023 · c1c8016 · c1c8016
1 parent f4819ac
commit c1c8016
Show file tree

Hide file tree

Showing 22 changed files with 112 additions and 94 deletions.
diff --git a/.changeset/nervous-gorillas-rhyme.md b/.changeset/nervous-gorillas-rhyme.md
@@ -0,0 +1,5 @@
+---
+"aws-sdk-js-codemod": minor
+---
+
+Use v3 client name when input code does not use local name
diff --git a/scripts/generateNewClientTests/getV3ClientsNewExpressionCode.ts b/scripts/generateNewClientTests/getV3ClientsNewExpressionCode.ts
@@ -1,7 +1,10 @@
+import { CLIENT_NAMES_MAP } from "../../src/transforms/v2-to-v3/config";
+
 export const getV3ClientsNewExpressionCode = (clientsToTest: string[]) => {
   let content = ``;
   for (const clientName of clientsToTest) {
-    content += `new ${clientName}();\n`;
+    const clientConstructorName = CLIENT_NAMES_MAP[clientName] ?? clientName;
+    content += `new ${clientConstructorName}();\n`;
   }
   return content;
 };
diff --git a/scripts/generateNewClientTests/getV3PackageImportEqualsCode.ts b/scripts/generateNewClientTests/getV3PackageImportEqualsCode.ts
@@ -28,7 +28,8 @@ export const getV3PackageImportEqualsCode = (
       : v2ClientName;
 
     const v3ObjectPattern =
-      v3ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName}: ${v2ClientLocalName}`;
+      v2ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName}: ${v2ClientLocalName}`;
+
     content +=
       `const {\n` + `  ${v3ObjectPattern}\n` + `} = ${getDefaultLocalName(v2ClientName)};\n\n`;
   }

diff --git a/scripts/generateNewClientTests/getV3PackageImportsCode.ts b/scripts/generateNewClientTests/getV3PackageImportsCode.ts
@@ -24,7 +24,7 @@ export const getV3PackageImportsCode = (
       : v2ClientName;
 
     const v3ImportSpecifier =
-      v3ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName} as ${v2ClientLocalName}`;
+      v2ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName} as ${v2ClientLocalName}`;
 
     content += `import { ${v3ImportSpecifier} } from "${v3ClientPackageName}";\n`;
   }

diff --git a/scripts/generateNewClientTests/getV3PackageRequiresCode.ts b/scripts/generateNewClientTests/getV3PackageRequiresCode.ts
@@ -29,7 +29,7 @@ export const getV3PackageRequiresCode = (
       : v2ClientName;
 
     const v3RequireKeyValuePair =
-      v3ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName}: ${v2ClientLocalName}`;
+      v2ClientName === v2ClientLocalName ? v3ClientName : `${v3ClientName}: ${v2ClientLocalName}`;
     content += declarationPerClient
       ? `const {\n  ${v3RequireKeyValuePair}\n} = require("${v3ClientPackageName}");\n`
       : `{\n        ${v3RequireKeyValuePair}\n      } = require("${v3ClientPackageName}"),\n      `;

diff --git a/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/global.output.js b/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/global.output.js
@@ -1,11 +1,11 @@
 const {
-        ApplicationDiscoveryService: Discovery
+        ApplicationDiscoveryService
       } = require("@aws-sdk/client-application-discovery-service"),
       {
         DynamoDB
       } = require("@aws-sdk/client-dynamodb"),
       ddbClient = new DynamoDB(),
-      discoveryClient = new Discovery();
+      discoveryClient = new ApplicationDiscoveryService();
 
 const ddbResponse = await ddbClient.listTables();
 const discoveryResponse = await discoveryClient.describeAgents();
diff --git a/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/service-named.output.js b/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/service-named.output.js
@@ -1,11 +1,11 @@
 const {
-        ApplicationDiscoveryService: Discovery
+        ApplicationDiscoveryService
       } = require("@aws-sdk/client-application-discovery-service"),
       {
         DynamoDB
       } = require("@aws-sdk/client-dynamodb"),
       ddbClient = new DynamoDB(),
-      discoveryClient = new Discovery();
+      discoveryClient = new ApplicationDiscoveryService();
 
 const ddbResponse = await ddbClient.listTables();
 const discoveryResponse = await discoveryClient.describeAgents();
diff --git a/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/service.output.js b/src/transforms/v2-to-v3/__fixtures__/multiple-declarators/service.output.js
@@ -2,10 +2,10 @@ const {
   DynamoDB
 } = require("@aws-sdk/client-dynamodb"),
   {
-    ApplicationDiscoveryService: Discovery
+    ApplicationDiscoveryService
   } = require("@aws-sdk/client-application-discovery-service"),
   ddbClient = new DynamoDB(),
-  discoveryClient = new Discovery();
+  discoveryClient = new ApplicationDiscoveryService();
 
 const ddbResponse = await ddbClient.listTables();
 const discoveryResponse = await discoveryClient.describeAgents();
diff --git a/src/transforms/v2-to-v3/__fixtures__/new-client/global-import-equals.output.ts b/src/transforms/v2-to-v3/__fixtures__/new-client/global-import-equals.output.ts
@@ -17,9 +17,9 @@ const {
 import AWS_Discovery = require("@aws-sdk/client-application-discovery-service");
 
 const {
-  ApplicationDiscoveryService: Discovery
+  ApplicationDiscoveryService
 } = AWS_Discovery;
 
 new ACM();
 new AccessAnalyzer();
-new Discovery();
+new ApplicationDiscoveryService();
diff --git a/src/transforms/v2-to-v3/__fixtures__/new-client/global-import-star.output.js b/src/transforms/v2-to-v3/__fixtures__/new-client/global-import-star.output.js
@@ -4,8 +4,8 @@
 
 import { AccessAnalyzer } from "@aws-sdk/client-accessanalyzer";
 import { ACM } from "@aws-sdk/client-acm";
-import { ApplicationDiscoveryService as Discovery } from "@aws-sdk/client-application-discovery-service";
+import { ApplicationDiscoveryService } from "@aws-sdk/client-application-discovery-service";
 
 new ACM();
 new AccessAnalyzer();
-new Discovery();
+new ApplicationDiscoveryService();