Skip to content

Commit 54e64c7

Browse files
mrgrainmrgrain
authored
fix(logs): LogRetention Custom Resource does not use Node18 (#26609)
Migrate the LogRetention Custom Resource to AWS SDK v3. Part of a fix for #26461 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 03c6f6f commit 54e64c7

File tree

233 files changed

+72890
-14090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+72890
-14090
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.assets.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "31.0.0",
2+
"version": "33.0.0",
33
"files": {
4-
"0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed": {
4+
"4763e20569cc1d6f7ae496bbfb0b3e9bc205a1811c78c9a6bc18d949d737c2a9": {
55
"source": {
6-
"path": "asset.0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed",
6+
"path": "asset.4763e20569cc1d6f7ae496bbfb0b3e9bc205a1811c78c9a6bc18d949d737c2a9",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip",
12+
"objectKey": "4763e20569cc1d6f7ae496bbfb0b3e9bc205a1811c78c9a6bc18d949d737c2a9.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
@@ -53,15 +53,15 @@
5353
}
5454
}
5555
},
56-
"adfc8884e4696d3a232b75a5ab048eabde442e5d8423bfdce883546a8b969111": {
56+
"39bbb561d1400a68adab4e3b7ca0a4b5af2936645d1bd8ce29d72a4e7985c830": {
5757
"source": {
5858
"path": "AppSyncJsResolverTestStack.template.json",
5959
"packaging": "file"
6060
},
6161
"destinations": {
6262
"current_account-current_region": {
6363
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
64-
"objectKey": "adfc8884e4696d3a232b75a5ab048eabde442e5d8423bfdce883546a8b969111.json",
64+
"objectKey": "39bbb561d1400a68adab4e3b7ca0a4b5af2936645d1bd8ce29d72a4e7985c830.json",
6565
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
6666
}
6767
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/AppSyncJsResolverTestStack.template.json‎

Lines changed: 17 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"Type": "AWS::AppSync::GraphQLApi",
3636
"Properties": {
3737
"AuthenticationType": "API_KEY",
38-
"Name": "JsResolverApi",
3938
"LogConfig": {
4039
"CloudWatchLogsRoleArn": {
4140
"Fn::GetAtt": [
@@ -44,7 +43,8 @@
4443
]
4544
},
4645
"FieldLogLevel": "NONE"
47-
}
46+
},
47+
"Name": "JsResolverApi"
4848
}
4949
},
5050
"JsResolverApiSchema1CF261C1": {
@@ -169,8 +169,6 @@
169169
"ApiId"
170170
]
171171
},
172-
"Name": "DynamoDataSource",
173-
"Type": "AMAZON_DYNAMODB",
174172
"DynamoDBConfig": {
175173
"AwsRegion": {
176174
"Ref": "AWS::Region"
@@ -179,12 +177,14 @@
179177
"Ref": "DynamoTableB2B22E15"
180178
}
181179
},
180+
"Name": "DynamoDataSource",
182181
"ServiceRoleArn": {
183182
"Fn::GetAtt": [
184183
"JsResolverApiDynamoDataSourceServiceRole6406F7E8",
185184
"Arn"
186185
]
187-
}
186+
},
187+
"Type": "AMAZON_DYNAMODB"
188188
}
189189
},
190190
"JsResolverApiAddTestFunction76B4557F": {
@@ -196,12 +196,12 @@
196196
"ApiId"
197197
]
198198
},
199-
"DataSourceName": "DynamoDataSource",
200-
"Name": "addTestFunc",
201199
"CodeS3Location": {
202200
"Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/64f136fd66d0a20e8574eddfe2e50aa10168344ebac0f3ca03e5ae0b4b7475ec.js"
203201
},
202+
"DataSourceName": "DynamoDataSource",
204203
"FunctionVersion": "2018-05-29",
204+
"Name": "addTestFunc",
205205
"Runtime": {
206206
"Name": "APPSYNC_JS",
207207
"RuntimeVersion": "1.0.0"
@@ -271,20 +271,12 @@
271271
"Type": "AWS::Lambda::Function",
272272
"Properties": {
273273
"Handler": "index.handler",
274-
"Runtime": {
275-
"Fn::FindInMap": [
276-
"DefaultCrNodeVersionMap",
277-
{
278-
"Ref": "AWS::Region"
279-
},
280-
"value"
281-
]
282-
},
274+
"Runtime": "nodejs18.x",
283275
"Code": {
284276
"S3Bucket": {
285277
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
286278
},
287-
"S3Key": "0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip"
279+
"S3Key": "4763e20569cc1d6f7ae496bbfb0b3e9bc205a1811c78c9a6bc18d949d737c2a9.zip"
288280
},
289281
"Role": {
290282
"Fn::GetAtt": [
@@ -301,16 +293,16 @@
301293
"DynamoTableB2B22E15": {
302294
"Type": "AWS::DynamoDB::Table",
303295
"Properties": {
304-
"KeySchema": [
296+
"AttributeDefinitions": [
305297
{
306298
"AttributeName": "id",
307-
"KeyType": "HASH"
299+
"AttributeType": "S"
308300
}
309301
],
310-
"AttributeDefinitions": [
302+
"KeySchema": [
311303
{
312304
"AttributeName": "id",
313-
"AttributeType": "S"
305+
"KeyType": "HASH"
314306
}
315307
],
316308
"ProvisionedThroughput": {
@@ -330,11 +322,10 @@
330322
"ApiId"
331323
]
332324
},
333-
"FieldName": "addTest",
334-
"TypeName": "Mutation",
335325
"CodeS3Location": {
336326
"Fn::Sub": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/922ddc9d9563ca9402e283efe80ad2b4e00c8ddf6fbbbc2ae2b9dc6fe7107061.js"
337327
},
328+
"FieldName": "addTest",
338329
"Kind": "PIPELINE",
339330
"PipelineConfig": {
340331
"Functions": [
@@ -349,7 +340,8 @@
349340
"Runtime": {
350341
"Name": "APPSYNC_JS",
351342
"RuntimeVersion": "1.0.0"
352-
}
343+
},
344+
"TypeName": "Mutation"
353345
},
354346
"DependsOn": [
355347
"JsResolverApiSchema1CF261C1"
@@ -395,123 +387,20 @@
395387
},
396388
"S3Key": "c8a056b7b029cede879af4833f48bcc456748b2f8456f85ba76393466c08693a.zip"
397389
},
390+
"Handler": "index.handler",
398391
"Role": {
399392
"Fn::GetAtt": [
400393
"InvokeApiServiceRoleFB17CD97",
401394
"Arn"
402395
]
403396
},
404-
"Handler": "index.handler",
405397
"Runtime": "nodejs18.x"
406398
},
407399
"DependsOn": [
408400
"InvokeApiServiceRoleFB17CD97"
409401
]
410402
}
411403
},
412-
"Mappings": {
413-
"DefaultCrNodeVersionMap": {
414-
"af-south-1": {
415-
"value": "nodejs16.x"
416-
},
417-
"ap-east-1": {
418-
"value": "nodejs16.x"
419-
},
420-
"ap-northeast-1": {
421-
"value": "nodejs16.x"
422-
},
423-
"ap-northeast-2": {
424-
"value": "nodejs16.x"
425-
},
426-
"ap-northeast-3": {
427-
"value": "nodejs16.x"
428-
},
429-
"ap-south-1": {
430-
"value": "nodejs16.x"
431-
},
432-
"ap-south-2": {
433-
"value": "nodejs16.x"
434-
},
435-
"ap-southeast-1": {
436-
"value": "nodejs16.x"
437-
},
438-
"ap-southeast-2": {
439-
"value": "nodejs16.x"
440-
},
441-
"ap-southeast-3": {
442-
"value": "nodejs16.x"
443-
},
444-
"ca-central-1": {
445-
"value": "nodejs16.x"
446-
},
447-
"cn-north-1": {
448-
"value": "nodejs16.x"
449-
},
450-
"cn-northwest-1": {
451-
"value": "nodejs16.x"
452-
},
453-
"eu-central-1": {
454-
"value": "nodejs16.x"
455-
},
456-
"eu-central-2": {
457-
"value": "nodejs16.x"
458-
},
459-
"eu-north-1": {
460-
"value": "nodejs16.x"
461-
},
462-
"eu-south-1": {
463-
"value": "nodejs16.x"
464-
},
465-
"eu-south-2": {
466-
"value": "nodejs16.x"
467-
},
468-
"eu-west-1": {
469-
"value": "nodejs16.x"
470-
},
471-
"eu-west-2": {
472-
"value": "nodejs16.x"
473-
},
474-
"eu-west-3": {
475-
"value": "nodejs16.x"
476-
},
477-
"me-central-1": {
478-
"value": "nodejs16.x"
479-
},
480-
"me-south-1": {
481-
"value": "nodejs16.x"
482-
},
483-
"sa-east-1": {
484-
"value": "nodejs16.x"
485-
},
486-
"us-east-1": {
487-
"value": "nodejs16.x"
488-
},
489-
"us-east-2": {
490-
"value": "nodejs16.x"
491-
},
492-
"us-gov-east-1": {
493-
"value": "nodejs16.x"
494-
},
495-
"us-gov-west-1": {
496-
"value": "nodejs16.x"
497-
},
498-
"us-iso-east-1": {
499-
"value": "nodejs14.x"
500-
},
501-
"us-iso-west-1": {
502-
"value": "nodejs14.x"
503-
},
504-
"us-isob-east-1": {
505-
"value": "nodejs14.x"
506-
},
507-
"us-west-1": {
508-
"value": "nodejs16.x"
509-
},
510-
"us-west-2": {
511-
"value": "nodejs16.x"
512-
}
513-
}
514-
},
515404
"Outputs": {
516405
"ExportsOutputRefInvokeApi313C8B4949AC2AFC": {
517406
"Value": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.js-resolver.js.snapshot/JsResolverIntegTestDefaultTestDeployAssert57AD8D20.assets.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
2-
"version": "31.0.0",
2+
"version": "33.0.0",
33
"files": {
4-
"ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3": {
4+
"18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f": {
55
"source": {
6-
"path": "asset.ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.bundle",
6+
"path": "asset.18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f.bundle",
77
"packaging": "zip"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip",
12+
"objectKey": "18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f.zip",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}
1616
},
17-
"daf12686caaab929a8b80cea94594eae0b51e35083cbf2fb72fd74197b9afd81": {
17+
"9b28bfafd748e7836cc59ca3e1167ed0048cf831b6df7efa11648ffa3c43e10e": {
1818
"source": {
1919
"path": "JsResolverIntegTestDefaultTestDeployAssert57AD8D20.template.json",
2020
"packaging": "file"
2121
},
2222
"destinations": {
2323
"current_account-current_region": {
2424
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25-
"objectKey": "daf12686caaab929a8b80cea94594eae0b51e35083cbf2fb72fd74197b9afd81.json",
25+
"objectKey": "9b28bfafd748e7836cc59ca3e1167ed0048cf831b6df7efa11648ffa3c43e10e.json",
2626
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
2727
}
2828
}

0 commit comments

Comments
 (0)