Merge branch 'master' into iss-13418-ecr-scan-on-push

Author: mergify[bot]

packages/@aws-cdk/aws-apigatewayv2-integrations/lib/http/lambda.ts

@@ -41,7 +41,7 @@ export class LambdaProxyIntegration implements IHttpRouteIntegration {
       principal: new ServicePrincipal('apigateway.amazonaws.com'),
       sourceArn: Stack.of(route).formatArn({
         service: 'execute-api',
-        resource: route.httpApi.httpApiId,
+        resource: route.httpApi.apiId,
         resourceName: `*/*${route.path ?? ''}`, // empty string in the case of the catch-all route $default
       }),
     });

packages/@aws-cdk/aws-apigatewayv2/lib/http/authorizer.ts

@@ -112,7 +112,7 @@ export class HttpAuthorizer extends Resource implements IHttpAuthorizer {
 
     const resource = new CfnAuthorizer(this, 'Resource', {
       name: props.authorizerName ?? id,
-      apiId: props.httpApi.httpApiId,
+      apiId: props.httpApi.apiId,
       authorizerType: props.type,
       identitySource: props.identitySource,
       jwtConfiguration: undefinedIfNoKeys({

packages/@aws-cdk/aws-apigatewayv2/lib/http/integration.ts

@@ -134,7 +134,7 @@ export class HttpIntegration extends Resource implements IHttpIntegration {
   constructor(scope: Construct, id: string, props: HttpIntegrationProps) {
     super(scope, id);
     const integ = new CfnIntegration(this, 'Resource', {
-      apiId: props.httpApi.httpApiId,
+      apiId: props.httpApi.apiId,
       integrationType: props.integrationType,
       integrationUri: props.integrationUri,
       integrationMethod: props.method,

packages/@aws-cdk/aws-apigatewayv2/lib/http/route.ts

@@ -157,7 +157,7 @@ export class HttpRoute extends Resource implements IHttpRoute {
     }
 
     const routeProps: CfnRouteProps = {
-      apiId: props.httpApi.httpApiId,
+      apiId: props.httpApi.apiId,
       routeKey: props.routeKey.key,
       target: `integrations/${integration.integrationId}`,
       authorizerId: authBindResult?.authorizerId,

packages/@aws-cdk/aws-apigatewayv2/test/http/authorizer.test.ts

@@ -18,7 +18,7 @@ describe('HttpAuthorizer', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Authorizer', {
-      ApiId: stack.resolve(httpApi.httpApiId),
+      ApiId: stack.resolve(httpApi.apiId),
       Name: 'HttpAuthorizer',
       AuthorizerType: 'JWT',
       IdentitySource: ['identitysource.1', 'identitysource.2'],

packages/@aws-cdk/aws-apigatewayv2/test/http/route.test.ts

@@ -17,7 +17,7 @@ describe('HttpRoute', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Route', {
-      ApiId: stack.resolve(httpApi.httpApiId),
+      ApiId: stack.resolve(httpApi.apiId),
       RouteKey: 'GET /books',
       Target: {
         'Fn::Join': [
@@ -33,7 +33,7 @@ describe('HttpRoute', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Integration', {
-      ApiId: stack.resolve(httpApi.httpApiId),
+      ApiId: stack.resolve(httpApi.apiId),
     });
   });
 
@@ -48,7 +48,7 @@ describe('HttpRoute', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Integration', {
-      ApiId: stack.resolve(httpApi.httpApiId),
+      ApiId: stack.resolve(httpApi.apiId),
       IntegrationType: 'HTTP_PROXY',
       PayloadFormatVersion: '2.0',
       IntegrationUri: 'some-uri',
@@ -209,7 +209,7 @@ describe('HttpRoute', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Integration', {
-      ApiId: stack.resolve(httpApi.httpApiId),
+      ApiId: stack.resolve(httpApi.apiId),
       IntegrationType: 'HTTP_PROXY',
       PayloadFormatVersion: '2.0',
       IntegrationUri: 'some-uri',

packages/@aws-cdk/aws-apigatewayv2/test/http/stage.test.ts

@@ -16,7 +16,7 @@ describe('HttpStage', () => {
     });
 
     expect(stack).toHaveResource('AWS::ApiGatewayV2::Stage', {
-      ApiId: stack.resolve(api.httpApiId),
+      ApiId: stack.resolve(api.apiId),
       StageName: '$default',
     });
   });
@@ -69,7 +69,7 @@ describe('HttpStage', () => {
     });
     const metricName = '4xxError';
     const statistic = 'Sum';
-    const apiId = api.httpApiId;
+    const apiId = api.apiId;
 
     // WHEN
     const countMetric = stage.metric(metricName, { statistic });
@@ -94,7 +94,7 @@ describe('HttpStage', () => {
       httpApi: api,
     });
     const color = '#00ff00';
-    const apiId = api.httpApiId;
+    const apiId = api.apiId;
 
     // WHEN
     const metrics = new Array<Metric>();