feat(appsync) remove nested construction of awsIamConfig in HttpDataS…

…ource
aws · Aug 28, 2020 · e6250b2 · e6250b2
1 parent 26fe550
commit e6250b2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/packages/@aws-cdk/aws-appsync/lib/data-source.ts b/packages/@aws-cdk/aws-appsync/lib/data-source.ts
@@ -212,24 +212,14 @@ export interface AwsIamConfig {
    */
   readonly authorizationType: 'AWS_IAM';
   /**
-   * The IAM signing configuration required by the HTTP endpoint
+   * The signing region for AWS IAM authorization
    */
-  readonly awsIamConfig: AwsIamConfigSigning; 
-}
+  readonly signingRegion: string;
 
-/**
- * The IAM signing config in case the HTTP endpoint requires authorization
- */
-export interface AwsIamConfigSigning {
-    /**
-     * The signing region for AWS IAM authorization
-     */
-    readonly signingRegion: string;
-
-    /**
-     * The signing service name for AWS IAM authorization
-     */
-    readonly signingServiceName: string;  
+  /**
+   * The signing service name for AWS IAM authorization
+   */
+  readonly signingServiceName: string;
 }
 
 /**
@@ -248,13 +238,30 @@ export interface HttpDataSourceProps extends BaseDataSourceProps {
  */
 export class HttpDataSource extends BaseDataSource {
   constructor(scope: Construct, id: string, props: HttpDataSourceProps) {
-    super(scope, id, props, {
-      httpConfig: {
-        endpoint: props.endpoint,
-        authorizationConfig: props.authorizationConfig
-      },
-      type: 'HTTP',
-    });
+    if (!props.authorizationConfig) {
+      super(scope, id, props, {
+        httpConfig: {
+          endpoint: props.endpoint
+        },
+        type: 'HTTP',        
+      })
+    } else {
+      const authConfig = props.authorizationConfig
+      super(scope, id, props, {
+        httpConfig: {
+          endpoint: props.endpoint,
+          authorizationConfig: {
+            authorizationType: authConfig.authorizationType,
+            awsIamConfig: {
+              signingRegion: authConfig.signingRegion,
+              signingServiceName: authConfig.signingServiceName
+            } 
+
+          }
+        },
+        type: 'HTTP',        
+      })
+    }
   }
 }
 

diff --git a/packages/@aws-cdk/aws-appsync/lib/graphqlapi-base.ts b/packages/@aws-cdk/aws-appsync/lib/graphqlapi-base.ts
@@ -86,7 +86,7 @@ export interface IGraphqlApi extends IResource {
    * @param lambdaFunction The Lambda function to call to interact with this data source
    * @param options The optional configuration for this data source
    */
-  addLambdaDataSource(id: string, lambdaFunction: IFunction, options?: DataSourceOptions): LambdaDataSource;
+  addLambdaDataSource(id: string, lambdaFunction: IFunction, options?: HttpDataSourceOptions): LambdaDataSource;
 
   /**
    * Add schema dependency if not imported

diff --git a/packages/@aws-cdk/aws-appsync/test/appsync-http.test.ts b/packages/@aws-cdk/aws-appsync/test/appsync-http.test.ts
@@ -64,10 +64,8 @@ describe('Http Data Source configuration', () => {
       description: 'custom description',
       authorizationConfig: {
         authorizationType: 'AWS_IAM',
-        awsIamConfig: {
-          signingRegion: 'us-east-1',
-          signingServiceName: 'states'
-        }
+        signingRegion: 'us-east-1',
+        signingServiceName: 'states'
       }
     });