Merge branch 'main' into SankyRed/addCanaryResource

aws · Jan 29, 2023 · b157557 · b157557
2 parents 6b5a6f1 + 0b25265
commit b157557
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/@aws-cdk/aws-appsync/lib/data-source.ts b/packages/@aws-cdk/aws-appsync/lib/data-source.ts
@@ -125,7 +125,7 @@ export abstract class BaseDataSource extends Construct {
       serviceRoleArn: this.serviceRole?.roleArn,
       ...extended,
     });
-    this.name = name;
+    this.name = supportedName;
     this.api = props.api;
   }
 

diff --git a/packages/@aws-cdk/aws-appsync/test/appsync-none.test.ts b/packages/@aws-cdk/aws-appsync/test/appsync-none.test.ts
@@ -54,6 +54,20 @@ describe('None Data Source configuration', () => {
     });
   });
 
+  test('appsync data source exports sanitised name', () => {
+    // WHEN
+    const ds = api.addNoneDataSource('ds', {
+      name: 'Produce-Custom',
+    });
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties('AWS::AppSync::DataSource', {
+      Type: 'NONE',
+      Name: 'ProduceCustom',
+    });
+    expect(ds.name).toBe('ProduceCustom');
+  });
+
   test('appsync configures name and description correctly', () => {
     // WHEN
     api.addNoneDataSource('ds', {
@@ -116,5 +130,3 @@ describe('adding none data source from imported api', () => {
     });
   });
 });
-
-