Merge branch 'master' into njlynch/edge-func-account

mergify[bot] · web-flow · commit 183e507de6fb · 2021-02-15T15:51:40.000Z
diff --git a/packages/@aws-cdk/aws-apigateway/lib/access-log.ts b/packages/@aws-cdk/aws-apigateway/lib/access-log.ts
@@ -411,7 +411,7 @@ export class AccessLogField {
    * not from the backend Lambda function.
    */
   public static contextIntegrationStatus() {
-    return '$context.integrationStatus.';
+    return '$context.integrationStatus';
   }
 
   /**
diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.expected.json b/packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.expected.json
@@ -72,14 +72,14 @@
             [
               "integrations/",
               {
-                "Ref": "MyHttpApiHttpIntegration6f095b8469365f72e33fa33d9711b140C45F3B26"
+                "Ref": "MyHttpApiGETHttpIntegration6f095b8469365f72e33fa33d9711b140516EBE31"
               }
             ]
           ]
         }
       }
     },
-    "MyHttpApiHttpIntegration6f095b8469365f72e33fa33d9711b140C45F3B26": {
+    "MyHttpApiGETHttpIntegration6f095b8469365f72e33fa33d9711b140516EBE31": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.expected.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.alb.expected.json
@@ -622,7 +622,7 @@
             [
               "integrations/",
               {
-                "Ref": "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0"
+                "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B"
               }
             ]
           ]
@@ -647,7 +647,7 @@
         "SecurityGroupIds": []
       }
     },
-    "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0": {
+    "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.http-proxy.expected.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.http-proxy.expected.json
@@ -108,14 +108,14 @@
             [
               "integrations/",
               {
-                "Ref": "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4"
+                "Ref": "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA"
               }
             ]
           ]
         }
       }
     },
-    "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4": {
+    "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
@@ -162,14 +162,14 @@
             [
               "integrations/",
               {
-                "Ref": "HttpProxyApiHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a4F32A389A"
+                "Ref": "HttpProxyApiDefaultRouteHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a41921AB82"
               }
             ]
           ]
         }
       }
     },
-    "HttpProxyApiHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a4F32A389A": {
+    "HttpProxyApiDefaultRouteHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a41921AB82": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.expected.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.lambda-proxy.expected.json
@@ -108,14 +108,14 @@
             [
               "integrations/",
               {
-                "Ref": "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4"
+                "Ref": "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA"
               }
             ]
           ]
         }
       }
     },
-    "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4": {
+    "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.nlb.expected.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.nlb.expected.json
@@ -587,7 +587,7 @@
             [
               "integrations/",
               {
-                "Ref": "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0"
+                "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B"
               }
             ]
           ]
@@ -612,7 +612,7 @@
         "SecurityGroupIds": []
       }
     },
-    "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0": {
+    "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.service-discovery.expected.json b/packages/@aws-cdk/aws-apigatewayv2-integrations/test/http/integ.service-discovery.expected.json
@@ -588,14 +588,14 @@
             [
               "integrations/",
               {
-                "Ref": "HttpProxyPrivateApiHttpIntegrationa5ec5390ca688d567e9449daf58afc6fB75CE02B"
+                "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegrationa5ec5390ca688d567e9449daf58afc6f6DEAA8A8"
               }
             ]
           ]
         }
       }
     },
-    "HttpProxyPrivateApiHttpIntegrationa5ec5390ca688d567e9449daf58afc6fB75CE02B": {
+    "HttpProxyPrivateApiDefaultRouteHttpIntegrationa5ec5390ca688d567e9449daf58afc6f6DEAA8A8": {
       "Type": "AWS::ApiGatewayV2::Integration",
       "Properties": {
         "ApiId": {
diff --git a/packages/@aws-cdk/aws-apigatewayv2/lib/http/api.ts b/packages/@aws-cdk/aws-apigatewayv2/lib/http/api.ts
@@ -92,7 +92,7 @@ export interface IHttpApi extends IResource {
    * Add a http integration
    * @internal
    */
-  _addIntegration(config: HttpRouteIntegrationConfig): HttpIntegration;
+  _addIntegration(scope: Construct, config: HttpRouteIntegrationConfig): HttpIntegration;
 }
 
 /**
@@ -274,15 +274,15 @@ abstract class HttpApiBase extends Resource implements IHttpApi { // note that t
   /**
    * @internal
    */
-  public _addIntegration(config: HttpRouteIntegrationConfig): HttpIntegration {
-    const stringifiedConfig = JSON.stringify(Stack.of(this).resolve(config));
+  public _addIntegration(scope: Construct, config: HttpRouteIntegrationConfig): HttpIntegration {
+    const stringifiedConfig = JSON.stringify(Stack.of(scope).resolve(config));
     const configHash = crypto.createHash('md5').update(stringifiedConfig).digest('hex');
 
     if (configHash in this.httpIntegrations) {
       return this.httpIntegrations[configHash];
     }
 
-    const integration = new HttpIntegration(this, `HttpIntegration-${configHash}`, {
+    const integration = new HttpIntegration(scope, `HttpIntegration-${configHash}`, {
       httpApi: this,
       integrationType: config.type,
       integrationUri: config.uri,
diff --git a/packages/@aws-cdk/aws-apigatewayv2/lib/http/route.ts b/packages/@aws-cdk/aws-apigatewayv2/lib/http/route.ts
@@ -140,7 +140,7 @@ export class HttpRoute extends Resource implements IHttpRoute {
       scope: this,
     });
 
-    const integration = props.httpApi._addIntegration(config);
+    const integration = props.httpApi._addIntegration(this, config);
 
     const authBindResult = props.authorizer ? props.authorizer.bind({
       route: this,
diff --git a/packages/@aws-cdk/aws-apigatewayv2/test/http/route.test.ts b/packages/@aws-cdk/aws-apigatewayv2/test/http/route.test.ts
@@ -1,5 +1,5 @@
 import '@aws-cdk/assert/jest';
-import { Stack } from '@aws-cdk/core';
+import { Stack, App } from '@aws-cdk/core';
 import {
   HttpApi, HttpAuthorizer, HttpAuthorizerType, HttpConnectionType, HttpIntegrationType, HttpMethod, HttpRoute, HttpRouteAuthorizerBindOptions,
   HttpRouteAuthorizerConfig, HttpRouteIntegrationConfig, HttpRouteKey, IHttpRouteAuthorizer, IHttpRouteIntegration, PayloadFormatVersion,
@@ -25,7 +25,7 @@ describe('HttpRoute', () => {
           [
             'integrations/',
             {
-              Ref: 'HttpApiHttpIntegrationcff2618c192d3bd8581dd2a4093464f6CDB667B8',
+              Ref: 'HttpRouteHttpIntegrationcff2618c192d3bd8581dd2a4093464f6FB1097D0',
             },
           ],
         ],
@@ -115,6 +115,27 @@ describe('HttpRoute', () => {
     expect(stack2).toCountResources('AWS::ApiGatewayV2::Integration', 1);
   });
 
+  test('route defined in a separate stack does not create cycles', () => {
+    // GIVEN
+    const integration = new DummyIntegration();
+
+    // WHEN
+    const app = new App();
+    const stack1 = new Stack(app, 'ApiStack');
+    const httpApi = new HttpApi(stack1, 'HttpApi');
+
+    const stack2 = new Stack(app, 'RouteStack');
+    new HttpRoute(stack2, 'HttpRoute1', {
+      httpApi,
+      integration,
+      routeKey: HttpRouteKey.with('/books', HttpMethod.GET),
+    });
+
+    // THEN
+    expect(stack1).toCountResources('AWS::ApiGatewayV2::Integration', 0);
+    expect(stack2).toCountResources('AWS::ApiGatewayV2::Integration', 1);
+  });
+
   test('throws when path not start with /', () => {
     const stack = new Stack();
     const httpApi = new HttpApi(stack, 'HttpApi');
@@ -253,4 +274,4 @@ class DummyAuthorizer implements IHttpRouteAuthorizer {
       authorizationType: HttpAuthorizerType.JWT,
     };
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ export class AccessLogField {`
`411`	`411`	`* not from the backend Lambda function.`
`412`	`412`	`*/`
`413`	`413`	`public static contextIntegrationStatus() {`
`414`		`- return '$context.integrationStatus.';`
	`414`	`+ return '$context.integrationStatus';`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@`
`72`	`72`	`[`
`73`	`73`	`"integrations/",`
`74`	`74`	`{`
`75`		`- "Ref": "MyHttpApiHttpIntegration6f095b8469365f72e33fa33d9711b140C45F3B26"`
	`75`	`+ "Ref": "MyHttpApiGETHttpIntegration6f095b8469365f72e33fa33d9711b140516EBE31"`
`76`	`76`	`}`
`77`	`77`	`]`
`78`	`78`	`]`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`},`
`82`		`- "MyHttpApiHttpIntegration6f095b8469365f72e33fa33d9711b140C45F3B26": {`
	`82`	`+ "MyHttpApiGETHttpIntegration6f095b8469365f72e33fa33d9711b140516EBE31": {`
`83`	`83`	`"Type": "AWS::ApiGatewayV2::Integration",`
`84`	`84`	`"Properties": {`
`85`	`85`	`"ApiId": {`
Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@`
`622`	`622`	`[`
`623`	`623`	`"integrations/",`
`624`	`624`	`{`
`625`		`- "Ref": "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0"`
	`625`	`+ "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B"`
`626`	`626`	`}`
`627`	`627`	`]`
`628`	`628`	`]`
`@@ -647,7 +647,7 @@`
`647`	`647`	`"SecurityGroupIds": []`
`648`	`648`	`}`
`649`	`649`	`},`
`650`		`- "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0": {`
	`650`	`+ "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B": {`
`651`	`651`	`"Type": "AWS::ApiGatewayV2::Integration",`
`652`	`652`	`"Properties": {`
`653`	`653`	`"ApiId": {`
Original file line number	Diff line number	Diff line change
`@@ -108,14 +108,14 @@`
`108`	`108`	`[`
`109`	`109`	`"integrations/",`
`110`	`110`	`{`
`111`		`- "Ref": "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4"`
	`111`	`+ "Ref": "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA"`
`112`	`112`	`}`
`113`	`113`	`]`
`114`	`114`	`]`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`},`
`118`		`- "LambdaProxyApiHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24467606A4": {`
	`118`	`+ "LambdaProxyApiDefaultRouteHttpIntegration70df0ec52c3e3b6bbc96e64ce3a05f24EE575CBA": {`
`119`	`119`	`"Type": "AWS::ApiGatewayV2::Integration",`
`120`	`120`	`"Properties": {`
`121`	`121`	`"ApiId": {`
`@@ -162,14 +162,14 @@`
`162`	`162`	`[`
`163`	`163`	`"integrations/",`
`164`	`164`	`{`
`165`		`- "Ref": "HttpProxyApiHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a4F32A389A"`
	`165`	`+ "Ref": "HttpProxyApiDefaultRouteHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a41921AB82"`
`166`	`166`	`}`
`167`	`167`	`]`
`168`	`168`	`]`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`	`},`
`172`		`- "HttpProxyApiHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a4F32A389A": {`
	`172`	`+ "HttpProxyApiDefaultRouteHttpIntegration8eeecf9ecdb91f31bebf6bd54fb711a41921AB82": {`
`173`	`173`	`"Type": "AWS::ApiGatewayV2::Integration",`
`174`	`174`	`"Properties": {`
`175`	`175`	`"ApiId": {`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@`
`587`	`587`	`[`
`588`	`588`	`"integrations/",`
`589`	`589`	`{`
`590`		`- "Ref": "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0"`
	`590`	`+ "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B"`
`591`	`591`	`}`
`592`	`592`	`]`
`593`	`593`	`]`
`@@ -612,7 +612,7 @@`
`612`	`612`	`"SecurityGroupIds": []`
`613`	`613`	`}`
`614`	`614`	`},`
`615`		`- "HttpProxyPrivateApiHttpIntegration1a580b19954e4317026ffbce1f7d5ade82925DF0": {`
	`615`	`+ "HttpProxyPrivateApiDefaultRouteHttpIntegration1a580b19954e4317026ffbce1f7d5ade7A32685B": {`
`616`	`616`	`"Type": "AWS::ApiGatewayV2::Integration",`
`617`	`617`	`"Properties": {`
`618`	`618`	`"ApiId": {`
Original file line number	Diff line number	Diff line change
`@@ -588,14 +588,14 @@`
`588`	`588`	`[`
`589`	`589`	`"integrations/",`
`590`	`590`	`{`
`591`		`- "Ref": "HttpProxyPrivateApiHttpIntegrationa5ec5390ca688d567e9449daf58afc6fB75CE02B"`
	`591`	`+ "Ref": "HttpProxyPrivateApiDefaultRouteHttpIntegrationa5ec5390ca688d567e9449daf58afc6f6DEAA8A8"`
`592`	`592`	`}`
`593`	`593`	`]`
`594`	`594`	`]`
`595`	`595`	`}`
`596`	`596`	`}`
`597`	`597`	`},`
`598`		`- "HttpProxyPrivateApiHttpIntegrationa5ec5390ca688d567e9449daf58afc6fB75CE02B": {`
	`598`	`+ "HttpProxyPrivateApiDefaultRouteHttpIntegrationa5ec5390ca688d567e9449daf58afc6f6DEAA8A8": {`
`599`	`599`	`"Type": "AWS::ApiGatewayV2::Integration",`
`600`	`600`	`"Properties": {`
`601`	`601`	`"ApiId": {`