Merge branch 'main' into merge-back/2.126.0

Author: mergify[bot]

CONTRIBUTORS.md

@@ -11,22 +11,22 @@ Shout out to our top contributors!
 - [corymhall](https://github.com/corymhall)
 - [shivlaks](https://github.com/shivlaks)
 - [otaviomacedo](https://github.com/otaviomacedo)
-- [madeline-k](https://github.com/madeline-k)
 - [mrgrain](https://github.com/mrgrain)
+- [madeline-k](https://github.com/madeline-k)
 - [NetaNir](https://github.com/NetaNir)
 - [comcalvi](https://github.com/comcalvi)
 - [robertd](https://github.com/robertd)
-- [pahud](https://github.com/pahud)
 - [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
-- [peterwoodworth](https://github.com/peterwoodworth)
+- [pahud](https://github.com/pahud)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
+- [peterwoodworth](https://github.com/peterwoodworth)
 - [lpizzinidev](https://github.com/lpizzinidev)
-- [colifran](https://github.com/colifran)
 - [go-to-k](https://github.com/go-to-k)
+- [colifran](https://github.com/colifran)
 - [nija-at](https://github.com/nija-at)
 - [hoegertn](https://github.com/hoegertn)
 - [watany-dev](https://github.com/watany-dev)
 - [jumic](https://github.com/jumic)
 
 
-_Last updated: Mon, 01 Jan 24 00:09:50 +0000_
+_Last updated: Thu, 01 Feb 24 00:09:34 +0000_

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/aws-cdk-codepipeline-elastic-beanstalk-deploy.template.json

@@ -441,7 +441,7 @@
       "Value": "AWSServiceRoleForElasticBeanstalkManagedUpdates"
      }
     ],
-    "SolutionStackName": "64bit Amazon Linux 2023 v6.0.2 running Node.js 18"
+    "SolutionStackName": "64bit Amazon Linux 2023 v6.0.4 running Node.js 18"
    },
    "DependsOn": [
     "beastalkapp",

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/manifest.json

@@ -79,7 +79,7 @@ const beanstalkEnv = new elasticbeanstalk.CfnEnvironment(stack, 'beanstlk-env',
   applicationName: beanstalkApp.applicationName!,
   environmentName: 'codepipeline-test-env',
   // see https://docs.aws.amazon.com/elasticbeanstalk/latest/platforms/platforms-supported.html#platforms-supported.nodejs
-  solutionStackName: '64bit Amazon Linux 2023 v6.0.2 running Node.js 18',
+  solutionStackName: '64bit Amazon Linux 2023 v6.0.4 running Node.js 18',
   optionSettings: [
     {
       namespace: 'aws:autoscaling:launchconfiguration',

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.js.snapshot/tree.json

@@ -233,6 +233,112 @@
     "LambdaWithJSONFormatServiceRole37FFB486"
    ]
   },
+  "LambdaWithTextLoggingFormatServiceRole3ADC91E1": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Join": [
+       "",
+       [
+        "arn:",
+        {
+         "Ref": "AWS::Partition"
+        },
+        ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithTextLoggingFormatD614C37E": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogFormat": "Text"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithTextLoggingFormatServiceRole3ADC91E1",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithTextLoggingFormatServiceRole3ADC91E1"
+   ]
+  },
+  "LambdaWithJSONLoggingFormatServiceRole0B3D5672": {
+   "Type": "AWS::IAM::Role",
+   "Properties": {
+    "AssumeRolePolicyDocument": {
+     "Statement": [
+      {
+       "Action": "sts:AssumeRole",
+       "Effect": "Allow",
+       "Principal": {
+        "Service": "lambda.amazonaws.com"
+       }
+      }
+     ],
+     "Version": "2012-10-17"
+    },
+    "ManagedPolicyArns": [
+     {
+      "Fn::Join": [
+       "",
+       [
+        "arn:",
+        {
+         "Ref": "AWS::Partition"
+        },
+        ":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithJSONLoggingFormatFA0D6903": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogFormat": "JSON"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithJSONLoggingFormatServiceRole0B3D5672",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithJSONLoggingFormatServiceRole0B3D5672"
+   ]
+  },
   "LambdaWithLogLevelServiceRole90A45743": {
    "Type": "AWS::IAM::Role",
    "Properties": {