Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(logs): LogRetention Custom Resource does not use Node18 #26609

Merged
merged 21 commits into from
Aug 3, 2023
Merged

fix(logs): LogRetention Custom Resource does not use Node18 #26609

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7f47465
fix(logs): LogRetention Custom Resource does not use Node18
mrgrain Aug 2, 2023
c225918
fixup runtime
mrgrain Aug 3, 2023
eae5a7a
fix some test
mrgrain Aug 3, 2023
184f29f
lambda integ test
mrgrain Aug 3, 2023
a7ea060
update logs integ test
mrgrain Aug 3, 2023
11bbece
fix unit test
mrgrain Aug 3, 2023
73fd091
fix nock
mrgrain Aug 3, 2023
8abcb17
region test
mrgrain Aug 3, 2023
e62f3af
fix log retention test
mrgrain Aug 3, 2023
dfc966c
update snapshots
mrgrain Aug 3, 2023
5e49036
update unrelated change
mrgrain Aug 3, 2023
5e612b6
neptune
mrgrain Aug 3, 2023
358576f
add exponential backoff
mrgrain Aug 3, 2023
84ee531
use different backoff values
mrgrain Aug 3, 2023
a9de130
Merge branch 'main' into mrgrain/fix/log-retention-v3
mrgrain Aug 3, 2023
9506f04
use full jitter implementation as per: https://aws.amazon.com/blogs/a…
mrgrain Aug 3, 2023
b4bc2d0
rollback neptune
mrgrain Aug 3, 2023
46a7504
update integ resolvers
mrgrain Aug 3, 2023
2900b95
final missing snap
mrgrain Aug 3, 2023
adfa321
revert some snaps
mrgrain Aug 3, 2023
4c02b96
final final
mrgrain Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ...r.js.snapshot/.cache/c8a056b7b029cede879af4833f48bcc456748b2f8456f85ba76393466c08693a.zip
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions ...est/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"version": "31.0.0",
"version": "33.0.0",
"files": {
"0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed": {
"2634e41ffbfed260b1049b081f0f568b46f60f03bf59422220562d71c9eb720e": {
"source": {
"path": "asset.0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed",
"path": "asset.2634e41ffbfed260b1049b081f0f568b46f60f03bf59422220562d71c9eb720e",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip",
"objectKey": "2634e41ffbfed260b1049b081f0f568b46f60f03bf59422220562d71c9eb720e.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"31561653caea1d2f262ce95fa36f6972d62db501dd5e9e7854b702cf4561d954": {
"e7c04bfd0ba12d51c13f271474996399d040fed6d6791d65ac6b25ee347d7448": {
"source": {
"path": "AppSyncIntegLogRetention.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "31561653caea1d2f262ce95fa36f6972d62db501dd5e9e7854b702cf4561d954.json",
"objectKey": "e7c04bfd0ba12d51c13f271474996399d040fed6d6791d65ac6b25ee347d7448.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
119 changes: 4 additions & 115 deletions ...t/aws-appsync/test/integ.log-retention.js.snapshot/AppSyncIntegLogRetention.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"Type": "AWS::AppSync::GraphQLApi",
"Properties": {
"AuthenticationType": "API_KEY",
"Name": "IntegLogRetention",
"LogConfig": {
"CloudWatchLogsRoleArn": {
"Fn::GetAtt": [
Expand All @@ -44,7 +43,8 @@
]
},
"FieldLogLevel": "NONE"
}
},
"Name": "IntegLogRetention"
}
},
"GraphqlApiSchema1B71CE4F": {
Expand Down Expand Up @@ -158,20 +158,12 @@
"Type": "AWS::Lambda::Function",
"Properties": {
"Handler": "index.handler",
"Runtime": {
"Fn::FindInMap": [
"DefaultCrNodeVersionMap",
{
"Ref": "AWS::Region"
},
"value"
]
},
"Runtime": "nodejs18.x",
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed.zip"
"S3Key": "2634e41ffbfed260b1049b081f0f568b46f60f03bf59422220562d71c9eb720e.zip"
},
"Role": {
"Fn::GetAtt": [
Expand All @@ -186,109 +178,6 @@
]
}
},
"Mappings": {
"DefaultCrNodeVersionMap": {
"af-south-1": {
"value": "nodejs16.x"
},
"ap-east-1": {
"value": "nodejs16.x"
},
"ap-northeast-1": {
"value": "nodejs16.x"
},
"ap-northeast-2": {
"value": "nodejs16.x"
},
"ap-northeast-3": {
"value": "nodejs16.x"
},
"ap-south-1": {
"value": "nodejs16.x"
},
"ap-south-2": {
"value": "nodejs16.x"
},
"ap-southeast-1": {
"value": "nodejs16.x"
},
"ap-southeast-2": {
"value": "nodejs16.x"
},
"ap-southeast-3": {
"value": "nodejs16.x"
},
"ca-central-1": {
"value": "nodejs16.x"
},
"cn-north-1": {
"value": "nodejs16.x"
},
"cn-northwest-1": {
"value": "nodejs16.x"
},
"eu-central-1": {
"value": "nodejs16.x"
},
"eu-central-2": {
"value": "nodejs16.x"
},
"eu-north-1": {
"value": "nodejs16.x"
},
"eu-south-1": {
"value": "nodejs16.x"
},
"eu-south-2": {
"value": "nodejs16.x"
},
"eu-west-1": {
"value": "nodejs16.x"
},
"eu-west-2": {
"value": "nodejs16.x"
},
"eu-west-3": {
"value": "nodejs16.x"
},
"me-central-1": {
"value": "nodejs16.x"
},
"me-south-1": {
"value": "nodejs16.x"
},
"sa-east-1": {
"value": "nodejs16.x"
},
"us-east-1": {
"value": "nodejs16.x"
},
"us-east-2": {
"value": "nodejs16.x"
},
"us-gov-east-1": {
"value": "nodejs16.x"
},
"us-gov-west-1": {
"value": "nodejs16.x"
},
"us-iso-east-1": {
"value": "nodejs14.x"
},
"us-iso-west-1": {
"value": "nodejs14.x"
},
"us-isob-east-1": {
"value": "nodejs14.x"
},
"us-west-1": {
"value": "nodejs16.x"
},
"us-west-2": {
"value": "nodejs16.x"
}
}
},
"Outputs": {
"ExportsOutputFnGetAttGraphqlApi1B6CF24CApiIdE34D50AD": {
"Value": {
Expand Down
12 changes: 6 additions & 6 deletions ...ync/test/integ.log-retention.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"version": "31.0.0",
"version": "33.0.0",
"files": {
"ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3": {
"18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f": {
"source": {
"path": "asset.ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.bundle",
"path": "asset.18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f.bundle",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip",
"objectKey": "18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"6c856d5de6cebd51b571207f798390c60f1f0b805aabeb61e35e6958ca4a94d1": {
"869a65672181c0e31d21022d453c80206a69580b01601b1985f5e4350eedf4d3": {
"source": {
"path": "IntegDefaultTestDeployAssert4E6713E1.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "6c856d5de6cebd51b571207f798390c60f1f0b805aabeb61e35e6958ca4a94d1.json",
"objectKey": "869a65672181c0e31d21022d453c80206a69580b01601b1985f5e4350eedf4d3.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
17 changes: 9 additions & 8 deletions ...c/test/integ.log-retention.js.snapshot/IntegDefaultTestDeployAssert4E6713E1.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Resources": {
"AwsApiCallCloudWatchLogsdescribeLogGroups": {
"AwsApiCallCloudWatchLogsdescribeLogGroupsb47bd431584c5dacce67df7a7092125e": {
"Type": "Custom::DeployAssert@SdkCallCloudWatchLogsdescribeLogGroups",
"Properties": {
"ServiceToken": {
Expand Down Expand Up @@ -28,16 +28,17 @@
"Fn::Join": [
"",
[
"/aws/appsync/apis/",
"\"/aws/appsync/apis/",
{
"Fn::ImportValue": "AppSyncIntegLogRetention:ExportsOutputFnGetAttGraphqlApi1B6CF24CApiIdE34D50AD"
}
},
"\""
]
]
}
},
"flattenResponse": "false",
"salt": "1682378119177"
"salt": "1691069905434"
},
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
Expand Down Expand Up @@ -86,12 +87,12 @@
"SingletonFunction1488541a7b23466481b69b4408076b81HandlerCD40AE9F": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Runtime": "nodejs14.x",
"Runtime": "nodejs18.x",
"Code": {
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "ae370e1010629b78f494346f49ceef3ab2875718f20e6c808114e6aa770c7bf3.zip"
"S3Key": "18f77fb224555ccad15f9c2e0f71ae6930fc011792c4f74ec74daaa2bbd9a33f.zip"
},
"Timeout": 120,
"Handler": "index.handler",
Expand All @@ -105,10 +106,10 @@
}
},
"Outputs": {
"AssertionResultsAwsApiCallCloudWatchLogsdescribeLogGroups": {
"AssertionResultsAwsApiCallCloudWatchLogsdescribeLogGroupsb47bd431584c5dacce67df7a7092125e": {
"Value": {
"Fn::GetAtt": [
"AwsApiCallCloudWatchLogsdescribeLogGroups",
"AwsApiCallCloudWatchLogsdescribeLogGroupsb47bd431584c5dacce67df7a7092125e",
"assertion"
]
}
Expand Down
1 change: 0 additions & 1 deletion ...napshot/asset.0f8a80f5f2310ea7e3295258fdbb79c43a1e8c0a11e863e63dc82832599412ed/index.d.ts
View file
Open in desktop

This file was deleted.

Loading