Merge branch 'main' into fix_issue_28037

aws · Nov 16, 2023 · 2823c3a · 2823c3a
2 parents 83b4ae6 + 2272fe4
commit 2823c3a
Show file tree

Hide file tree

Showing 14 changed files with 2,103 additions and 5 deletions.
diff --git a/...ws-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.assets.json b/...ws-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.assets.json
diff --git a/...-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.template.json b/...-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.template.json
@@ -0,0 +1,326 @@
+{
+ "Resources": {
+  "MyLogGroupWithLogGroupNameB577EB65": {
+   "Type": "AWS::Logs::LogGroup",
+   "Properties": {
+    "LogGroupName": "customLogGroup",
+    "RetentionInDays": 731
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "LambdaWithLogGroupServiceRoleC5DDB031": {
+   "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"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithLogGroupC3B62A1A": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogGroup": {
+      "Ref": "MyLogGroupWithLogGroupNameB577EB65"
+     }
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithLogGroupServiceRoleC5DDB031",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithLogGroupServiceRoleC5DDB031"
+   ]
+  },
+  "MyLogGroupWithoutLogGroupName385E46B7": {
+   "Type": "AWS::Logs::LogGroup",
+   "Properties": {
+    "RetentionInDays": 731
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87": {
+   "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"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithLogGroupAndNoLogGroupName1F5C7375": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogGroup": {
+      "Ref": "MyLogGroupWithoutLogGroupName385E46B7"
+     }
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87"
+   ]
+  },
+  "LambdaWithTextFormatServiceRoleABCC0E93": {
+   "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"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithTextFormatA0EDE227": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogFormat": "Text"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithTextFormatServiceRoleABCC0E93",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithTextFormatServiceRoleABCC0E93"
+   ]
+  },
+  "LambdaWithJSONFormatServiceRole37FFB486": {
+   "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"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithJSONFormat20E01C00": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "LogFormat": "JSON"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithJSONFormatServiceRole37FFB486",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithJSONFormatServiceRole37FFB486"
+   ]
+  },
+  "LambdaWithLogLevelServiceRole90A45743": {
+   "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"
+       ]
+      ]
+     }
+    ]
+   }
+  },
+  "LambdaWithLogLevelCBBBEFFC": {
+   "Type": "AWS::Lambda::Function",
+   "Properties": {
+    "Code": {
+     "ZipFile": "foo"
+    },
+    "Handler": "index.handler",
+    "LoggingConfig": {
+     "ApplicationLogLevel": "INFO",
+     "LogFormat": "JSON",
+     "SystemLogLevel": "INFO"
+    },
+    "Role": {
+     "Fn::GetAtt": [
+      "LambdaWithLogLevelServiceRole90A45743",
+      "Arn"
+     ]
+    },
+    "Runtime": "nodejs18.x"
+   },
+   "DependsOn": [
+    "LambdaWithLogLevelServiceRole90A45743"
+   ]
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/cdk.out b/...cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/cdk.out
diff --git a/...-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/integ.json b/...-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/integ.json
diff --git a/...logging-config.js.snapshot/lambdaloggingconfigDefaultTestDeployAssert24012B25.assets.json b/...logging-config.js.snapshot/lambdaloggingconfigDefaultTestDeployAssert24012B25.assets.json