Skip to content

Commit 0ae7867

Browse files
kaizencckaizencc
authored
Merge branch 'main' into main_add_contributor
2 parents 1144b40 + 2272fe4 commit 0ae7867

File tree

22 files changed

+2128
-23
lines changed

22 files changed

+2128
-23
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.assets.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/aws-cdk-lambda-logging-config.template.json

Lines changed: 326 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,326 @@
1+
{
2+
"Resources": {
3+
"MyLogGroupWithLogGroupNameB577EB65": {
4+
"Type": "AWS::Logs::LogGroup",
5+
"Properties": {
6+
"LogGroupName": "customLogGroup",
7+
"RetentionInDays": 731
8+
},
9+
"UpdateReplacePolicy": "Retain",
10+
"DeletionPolicy": "Retain"
11+
},
12+
"LambdaWithLogGroupServiceRoleC5DDB031": {
13+
"Type": "AWS::IAM::Role",
14+
"Properties": {
15+
"AssumeRolePolicyDocument": {
16+
"Statement": [
17+
{
18+
"Action": "sts:AssumeRole",
19+
"Effect": "Allow",
20+
"Principal": {
21+
"Service": "lambda.amazonaws.com"
22+
}
23+
}
24+
],
25+
"Version": "2012-10-17"
26+
},
27+
"ManagedPolicyArns": [
28+
{
29+
"Fn::Join": [
30+
"",
31+
[
32+
"arn:",
33+
{
34+
"Ref": "AWS::Partition"
35+
},
36+
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
37+
]
38+
]
39+
}
40+
]
41+
}
42+
},
43+
"LambdaWithLogGroupC3B62A1A": {
44+
"Type": "AWS::Lambda::Function",
45+
"Properties": {
46+
"Code": {
47+
"ZipFile": "foo"
48+
},
49+
"Handler": "index.handler",
50+
"LoggingConfig": {
51+
"LogGroup": {
52+
"Ref": "MyLogGroupWithLogGroupNameB577EB65"
53+
}
54+
},
55+
"Role": {
56+
"Fn::GetAtt": [
57+
"LambdaWithLogGroupServiceRoleC5DDB031",
58+
"Arn"
59+
]
60+
},
61+
"Runtime": "nodejs18.x"
62+
},
63+
"DependsOn": [
64+
"LambdaWithLogGroupServiceRoleC5DDB031"
65+
]
66+
},
67+
"MyLogGroupWithoutLogGroupName385E46B7": {
68+
"Type": "AWS::Logs::LogGroup",
69+
"Properties": {
70+
"RetentionInDays": 731
71+
},
72+
"UpdateReplacePolicy": "Retain",
73+
"DeletionPolicy": "Retain"
74+
},
75+
"LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87": {
76+
"Type": "AWS::IAM::Role",
77+
"Properties": {
78+
"AssumeRolePolicyDocument": {
79+
"Statement": [
80+
{
81+
"Action": "sts:AssumeRole",
82+
"Effect": "Allow",
83+
"Principal": {
84+
"Service": "lambda.amazonaws.com"
85+
}
86+
}
87+
],
88+
"Version": "2012-10-17"
89+
},
90+
"ManagedPolicyArns": [
91+
{
92+
"Fn::Join": [
93+
"",
94+
[
95+
"arn:",
96+
{
97+
"Ref": "AWS::Partition"
98+
},
99+
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
100+
]
101+
]
102+
}
103+
]
104+
}
105+
},
106+
"LambdaWithLogGroupAndNoLogGroupName1F5C7375": {
107+
"Type": "AWS::Lambda::Function",
108+
"Properties": {
109+
"Code": {
110+
"ZipFile": "foo"
111+
},
112+
"Handler": "index.handler",
113+
"LoggingConfig": {
114+
"LogGroup": {
115+
"Ref": "MyLogGroupWithoutLogGroupName385E46B7"
116+
}
117+
},
118+
"Role": {
119+
"Fn::GetAtt": [
120+
"LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87",
121+
"Arn"
122+
]
123+
},
124+
"Runtime": "nodejs18.x"
125+
},
126+
"DependsOn": [
127+
"LambdaWithLogGroupAndNoLogGroupNameServiceRoleFEE6AF87"
128+
]
129+
},
130+
"LambdaWithTextFormatServiceRoleABCC0E93": {
131+
"Type": "AWS::IAM::Role",
132+
"Properties": {
133+
"AssumeRolePolicyDocument": {
134+
"Statement": [
135+
{
136+
"Action": "sts:AssumeRole",
137+
"Effect": "Allow",
138+
"Principal": {
139+
"Service": "lambda.amazonaws.com"
140+
}
141+
}
142+
],
143+
"Version": "2012-10-17"
144+
},
145+
"ManagedPolicyArns": [
146+
{
147+
"Fn::Join": [
148+
"",
149+
[
150+
"arn:",
151+
{
152+
"Ref": "AWS::Partition"
153+
},
154+
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
155+
]
156+
]
157+
}
158+
]
159+
}
160+
},
161+
"LambdaWithTextFormatA0EDE227": {
162+
"Type": "AWS::Lambda::Function",
163+
"Properties": {
164+
"Code": {
165+
"ZipFile": "foo"
166+
},
167+
"Handler": "index.handler",
168+
"LoggingConfig": {
169+
"LogFormat": "Text"
170+
},
171+
"Role": {
172+
"Fn::GetAtt": [
173+
"LambdaWithTextFormatServiceRoleABCC0E93",
174+
"Arn"
175+
]
176+
},
177+
"Runtime": "nodejs18.x"
178+
},
179+
"DependsOn": [
180+
"LambdaWithTextFormatServiceRoleABCC0E93"
181+
]
182+
},
183+
"LambdaWithJSONFormatServiceRole37FFB486": {
184+
"Type": "AWS::IAM::Role",
185+
"Properties": {
186+
"AssumeRolePolicyDocument": {
187+
"Statement": [
188+
{
189+
"Action": "sts:AssumeRole",
190+
"Effect": "Allow",
191+
"Principal": {
192+
"Service": "lambda.amazonaws.com"
193+
}
194+
}
195+
],
196+
"Version": "2012-10-17"
197+
},
198+
"ManagedPolicyArns": [
199+
{
200+
"Fn::Join": [
201+
"",
202+
[
203+
"arn:",
204+
{
205+
"Ref": "AWS::Partition"
206+
},
207+
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
208+
]
209+
]
210+
}
211+
]
212+
}
213+
},
214+
"LambdaWithJSONFormat20E01C00": {
215+
"Type": "AWS::Lambda::Function",
216+
"Properties": {
217+
"Code": {
218+
"ZipFile": "foo"
219+
},
220+
"Handler": "index.handler",
221+
"LoggingConfig": {
222+
"LogFormat": "JSON"
223+
},
224+
"Role": {
225+
"Fn::GetAtt": [
226+
"LambdaWithJSONFormatServiceRole37FFB486",
227+
"Arn"
228+
]
229+
},
230+
"Runtime": "nodejs18.x"
231+
},
232+
"DependsOn": [
233+
"LambdaWithJSONFormatServiceRole37FFB486"
234+
]
235+
},
236+
"LambdaWithLogLevelServiceRole90A45743": {
237+
"Type": "AWS::IAM::Role",
238+
"Properties": {
239+
"AssumeRolePolicyDocument": {
240+
"Statement": [
241+
{
242+
"Action": "sts:AssumeRole",
243+
"Effect": "Allow",
244+
"Principal": {
245+
"Service": "lambda.amazonaws.com"
246+
}
247+
}
248+
],
249+
"Version": "2012-10-17"
250+
},
251+
"ManagedPolicyArns": [
252+
{
253+
"Fn::Join": [
254+
"",
255+
[
256+
"arn:",
257+
{
258+
"Ref": "AWS::Partition"
259+
},
260+
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
261+
]
262+
]
263+
}
264+
]
265+
}
266+
},
267+
"LambdaWithLogLevelCBBBEFFC": {
268+
"Type": "AWS::Lambda::Function",
269+
"Properties": {
270+
"Code": {
271+
"ZipFile": "foo"
272+
},
273+
"Handler": "index.handler",
274+
"LoggingConfig": {
275+
"ApplicationLogLevel": "INFO",
276+
"LogFormat": "JSON",
277+
"SystemLogLevel": "INFO"
278+
},
279+
"Role": {
280+
"Fn::GetAtt": [
281+
"LambdaWithLogLevelServiceRole90A45743",
282+
"Arn"
283+
]
284+
},
285+
"Runtime": "nodejs18.x"
286+
},
287+
"DependsOn": [
288+
"LambdaWithLogLevelServiceRole90A45743"
289+
]
290+
}
291+
},
292+
"Parameters": {
293+
"BootstrapVersion": {
294+
"Type": "AWS::SSM::Parameter::Value<String>",
295+
"Default": "/cdk-bootstrap/hnb659fds/version",
296+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
297+
}
298+
},
299+
"Rules": {
300+
"CheckBootstrapVersion": {
301+
"Assertions": [
302+
{
303+
"Assert": {
304+
"Fn::Not": [
305+
{
306+
"Fn::Contains": [
307+
[
308+
"1",
309+
"2",
310+
"3",
311+
"4",
312+
"5"
313+
],
314+
{
315+
"Ref": "BootstrapVersion"
316+
}
317+
]
318+
}
319+
]
320+
},
321+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
322+
}
323+
]
324+
}
325+
}
326+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/cdk.out

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/integ.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda/test/integ.logging-config.js.snapshot/lambdaloggingconfigDefaultTestDeployAssert24012B25.assets.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)