Merge branch 'main' into 21197-simplify-openidconnect-provider

Author: mergify[bot]

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,18 +10,19 @@ Closes #<issue number here>.
 
 <!--
 What code changes did you make? 
-Have you made any important design decisions?
-What AWS use cases does this change enable? To enable the use cases, which AWS service features are utilized?
+Why do these changes address the issue?
+What alternatives did you consider and reject?
+What design decisions have you made?
 -->
 
 ### Describe any new or updated permissions being added
 
-<!-- What new or updated IAM permissions are needed to support the changes being introduced ? -->
+<!-- What new or updated IAM permissions are needed to support the changes being introduced? -->
 
 
 ### Description of how you validated changes
 
-<!--Have you added any unit tests and/or integration tests?-->
+<!-- Have you added any unit tests and/or integration tests? Did you test by hand? -->
 
 ### Checklist
 - [ ] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

packages/@aws-cdk-testing/framework-integ/package.json

@@ -47,7 +47,7 @@
     "@aws-cdk/lambda-layer-kubectl-v31": "^2.1.0",
     "@aws-cdk/lambda-layer-kubectl-v32": "^2.1.0",
     "aws-cdk-lib": "0.0.0",
-    "cdk8s": "2.69.70",
+    "cdk8s": "2.69.71",
     "cdk8s-plus-27": "2.9.5",
     "constructs": "^10.0.0"
   },

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.api-with-authorizer-and-proxy.ts

@@ -10,7 +10,11 @@ import * as lambda from 'aws-cdk-lib/aws-lambda';
  * * `curl -i <CFN output PetsURL>` should return HTTP code 200
  */
 
-const app = new cdk.App();
+const app = new cdk.App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const stack = new cdk.Stack(app, 'integtest-restapi-with-authorizer-and-proxy');
 
 // create a cognito user pool

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.request-authorizer.lit.ts

@@ -9,7 +9,11 @@ import { STANDARD_NODEJS_RUNTIME } from '../../../config';
 // `curl -s -o /dev/null -w "%{http_code}" -H 'Authorization: deny' <url>?allow=yes` should return 403
 // `curl -s -o /dev/null -w "%{http_code}" -H 'Authorization: allow' <url>?allow=yes` should return 200
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const stack = new Stack(app, 'RequestAuthorizerInteg');
 
 const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.ts

@@ -13,7 +13,11 @@ import { STANDARD_NODEJS_RUNTIME } from '../../../config';
  * * `curl -s -o /dev/null -w "%{http_code}" -H 'Authorization: allow' <url>` should return 200
  */
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const stack = new Stack(app, 'TokenAuthorizerIAMRoleInteg');
 
 const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.ts

@@ -5,7 +5,11 @@ import { IntegTest, ExpectedResult, Match } from '@aws-cdk/integ-tests-alpha';
 import { MockIntegration, PassthroughBehavior, RestApi, TokenAuthorizer, Cors } from 'aws-cdk-lib/aws-apigateway';
 import { STANDARD_NODEJS_RUNTIME } from '../../../config';
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const stack = new Stack(app, 'TokenAuthorizerInteg');
 
 const authorizerFn = new lambda.Function(stack, 'MyAuthorizerFunction', {

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.cors-allow-multiple-origins.ts

@@ -4,7 +4,11 @@ import { App, Stack } from 'aws-cdk-lib';
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as apigw from 'aws-cdk-lib/aws-apigateway';
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const stack = new Stack(app, 'stack-cors-allow-multiple-origins');
 
 const api = new apigw.RestApi(stack, 'cors-api-test', {

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.cors.ts

@@ -30,7 +30,11 @@ class TestStack extends Stack {
   }
 }
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const testCase = new TestStack(app, 'cors-twitch-test');
 new IntegTest(app, 'cors', {
   testCases: [testCase],

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.lambda-api-nonproxy.ts

@@ -34,7 +34,11 @@ class LambdaApiIntegrationOptionsNonProxyIntegrationStack extends Stack {
   }
 }
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const testCase = new LambdaApiIntegrationOptionsNonProxyIntegrationStack(app);
 new IntegTest(app, 'lambda-non-proxy-integration', {
   testCases: [testCase],

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.lambda-api.latebound-deploymentstage.ts

@@ -29,7 +29,11 @@ class LateBoundDeploymentStageStack extends Stack {
   }
 }
 
-const app = new App();
+const app = new App({
+  postCliContext: {
+    '@aws-cdk/aws-lambda:useCdkManagedLogGroup': false,
+  },
+});
 const testCase = new LateBoundDeploymentStageStack(app);
 new IntegTest(app, 'lambda-api-latebound-deploymentstage', {
   testCases: [testCase],