fix(cdk-dasm): prevent duplicate imports (#5293)

Signed-off-by: campionfellin <campionfellin@gmail.com>
aws · Dec 4, 2019 · d4562b7 · d4562b7
1 parent ec83ebb
commit d4562b7
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/packages/cdk-dasm/lib/dasm.ts b/packages/cdk-dasm/lib/dasm.ts
@@ -55,9 +55,9 @@ export async function dasmTypeScript(template: Template, options: DisassemblerOp
 
   code.line(`import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core';`);
 
-  for (const def of definitions) {
-    const importName = `@aws-cdk/aws-${def.namespace}`;
-    code.line(`import ${def.namespace} = require('${importName}');`);
+  for (const ns of getUniqueNamespaces(definitions)) {
+    const importName = `@aws-cdk/aws-${ns}`;
+    code.line(`import ${ns} = require('${importName}');`);
   }
 
   code.line();
@@ -143,6 +143,10 @@ function toCfnClassName(resourceType: string) {
   return { namespace: namespace.toLocaleLowerCase(), className };
 }
 
+function getUniqueNamespaces(definitions: Array<ConstructDefinition>): String[] {
+  return [... new Set(definitions.map(definition => definition.namespace))];
+}
+
 interface Template {
   Resources: { [id: string]: Resource };
 }

diff --git a/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap b/packages/cdk-dasm/test/__snapshots__/dasm.test.js.snap
@@ -97,6 +97,26 @@ export class MyStack extends Stack {
 "
 `;
 
+exports[`multiple of same type 1`] = `
+"// generated by cdk-dasm 
+
+import { Stack, StackProps, Construct, Fn } from '@aws-cdk/core';
+import sns = require('@aws-cdk/aws-sns');
+
+export class MyStack extends Stack {
+    constructor(scope: Construct, id: string, props: StackProps = {}) {
+        super(scope, id, props);
+        new sns.CfnTopic(this, 'MyTopic', {
+            displayName: \\"hello hello\\",
+        });
+        new sns.CfnTopic(this, 'MyTopicDos', {
+            displayName: \\"hello again\\",
+        });
+    }
+}
+"
+`;
+
 exports[`no props 1`] = `
 "// generated by cdk-dasm 
 

diff --git a/packages/cdk-dasm/test/dasm.test.ts b/packages/cdk-dasm/test/dasm.test.ts
@@ -23,6 +23,25 @@ test('no props', async () => {
   })).toMatchSnapshot();
 });
 
+test('multiple of same type', async () => {
+  expect(await dasm({
+    Resources: {
+      MyTopic: {
+        Type: 'AWS::SNS::Topic',
+        Properties: {
+          DisplayName: 'hello hello'
+        }
+      },
+      MyTopicDos: {
+        Type: 'AWS::SNS::Topic',
+        Properties: {
+          DisplayName: 'hello again'
+        }
+      }
+    }
+  })).toMatchSnapshot();
+});
+
 test('bucket-and-key', async () => {
   expect(await dasm(require('./bucket-key.json'))).toMatchSnapshot();
 });