Skip to content

Commit

Permalink
Fix build one more time
Browse files Browse the repository at this point in the history
  • Loading branch information
@zdf1230
Dongfang Zhao authored and zdf1230 committed May 13, 2023
1 parent 55212ec commit 81c9ce6
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 89 deletions.
6 changes: 3 additions & 3 deletions ...ws-cdk-s3-access-logs-sse-kms.assets.json → ...s3-server-access-logs-sse-kms.assets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
}
}
},
"6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744": {
"a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199": {
"source": {
"path": "aws-cdk-s3-access-logs-sse-kms.template.json",
"path": "aws-cdk-s3-server-access-logs-sse-kms.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json",
"objectKey": "a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...-cdk-s3-access-logs-sse-kms.template.json → ...-server-access-logs-sse-kms.template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
],
"Version": "2012-10-17"
},
"Description": "Created by aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket"
"Description": "Created by aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket"
},
"UpdateReplacePolicy": "Retain",
"DeletionPolicy": "Retain"
Expand Down
2 changes: 1 addition & 1 deletion ...ork-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/integ.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"testCases": {
"ServerAccessLogsSseKmsTest/DefaultTest": {
"stacks": [
"aws-cdk-s3-access-logs-sse-kms"
"aws-cdk-s3-server-access-logs-sse-kms"
],
"assertionStack": "ServerAccessLogsSseKmsTest/DefaultTest/DeployAssert",
"assertionStackName": "ServerAccessLogsSseKmsTestDefaultTestDeployAssertB937C102"
Expand Down
81 changes: 18 additions & 63 deletions ...-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"version": "31.0.0",
"artifacts": {
"aws-cdk-s3-access-logs-sse-kms.assets": {
"aws-cdk-s3-server-access-logs-sse-kms.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "aws-cdk-s3-access-logs-sse-kms.assets.json",
"file": "aws-cdk-s3-server-access-logs-sse-kms.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"aws-cdk-s3-access-logs-sse-kms": {
"aws-cdk-s3-server-access-logs-sse-kms": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "aws-cdk-s3-access-logs-sse-kms.template.json",
"templateFile": "aws-cdk-s3-server-access-logs-sse-kms.template.json",
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/6cf12853990a376c07242d1380b7da2ff8d34d67a8ba1fe663df850017aad744.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/a2b5b863d9f5b680816a4fb9864f0f6813798b7bbdd9fe1fcf001e106175a199.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"aws-cdk-s3-access-logs-sse-kms.assets"
"aws-cdk-s3-server-access-logs-sse-kms.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
Expand All @@ -30,116 +30,71 @@
}
},
"dependencies": [
"aws-cdk-s3-access-logs-sse-kms.assets"
"aws-cdk-s3-server-access-logs-sse-kms.assets"
],
"metadata": {
"/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource": [
"/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ServerAccessLogsBucketKey95B7E326"
}
],
"/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Resource": [
"/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ServerAccessLogsBucket05F29982"
}
],
"/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource": [
"/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ServerAccessLogsBucketPolicy947BE3EE"
}
],
"/aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [
"/aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default": [
{
"type": "aws:cdk:logicalId",
"data": "ServerAccessLogsBucketAutoDeleteObjectsCustomResourceDA32BBFB"
}
],
"/aws-cdk-s3-access-logs-sse-kms/DefaultCrNodeVersionMap": [
"/aws-cdk-s3-server-access-logs-sse-kms/DefaultCrNodeVersionMap": [
{
"type": "aws:cdk:logicalId",
"data": "DefaultCrNodeVersionMap"
}
],
"/aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [
"/aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role": [
{
"type": "aws:cdk:logicalId",
"data": "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
}
],
"/aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [
"/aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler": [
{
"type": "aws:cdk:logicalId",
"data": "CustomS3AutoDeleteObjectsCustomResourceProviderHandler9D90184F"
}
],
"/aws-cdk-s3-access-logs-sse-kms/Bucket/Resource": [
"/aws-cdk-s3-server-access-logs-sse-kms/Bucket/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "Bucket83908E77"
}
],
"/aws-cdk-s3-access-logs-sse-kms/BootstrapVersion": [
"/aws-cdk-s3-server-access-logs-sse-kms/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/aws-cdk-s3-access-logs-sse-kms/CheckBootstrapVersion": [
"/aws-cdk-s3-server-access-logs-sse-kms/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
],
"MyAccessLogsBucketKeyBAFD8B1E": [
{
"type": "aws:cdk:logicalId",
"data": "MyAccessLogsBucketKeyBAFD8B1E",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
],
"MyAccessLogsBucketF7FE6635": [
{
"type": "aws:cdk:logicalId",
"data": "MyAccessLogsBucketF7FE6635",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
],
"MyAccessLogsBucketPolicyEA9AB063": [
{
"type": "aws:cdk:logicalId",
"data": "MyAccessLogsBucketPolicyEA9AB063",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
],
"MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E": [
{
"type": "aws:cdk:logicalId",
"data": "MyAccessLogsBucketAutoDeleteObjectsCustomResourceF7F9093E",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
],
"MyBucketF68F3FF0": [
{
"type": "aws:cdk:logicalId",
"data": "MyBucketF68F3FF0",
"trace": [
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
]
}
]
},
"displayName": "aws-cdk-s3-access-logs-sse-kms"
"displayName": "aws-cdk-s3-server-access-logs-sse-kms"
},
"ServerAccessLogsSseKmsTestDefaultTestDeployAssertB937C102.assets": {
"type": "cdk:asset-manifest",
Expand Down
42 changes: 21 additions & 21 deletions ...work-integ/test/aws-s3/test/integ.bucket-server-access-logs-sse-kms.js.snapshot/tree.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"id": "App",
"path": "",
"children": {
"aws-cdk-s3-access-logs-sse-kms": {
"id": "aws-cdk-s3-access-logs-sse-kms",
"path": "aws-cdk-s3-access-logs-sse-kms",
"aws-cdk-s3-server-access-logs-sse-kms": {
"id": "aws-cdk-s3-server-access-logs-sse-kms",
"path": "aws-cdk-s3-server-access-logs-sse-kms",
"children": {
"ServerAccessLogsBucket": {
"id": "ServerAccessLogsBucket",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket",
"children": {
"Key": {
"id": "Key",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Key/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::KMS::Key",
"aws:cdk:cloudformation:props": {
Expand Down Expand Up @@ -63,7 +63,7 @@
],
"Version": "2012-10-17"
},
"description": "Created by aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket"
"description": "Created by aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket"
}
},
"constructInfo": {
Expand All @@ -79,7 +79,7 @@
},
"Resource": {
"id": "Resource",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Resource",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::S3::Bucket",
"aws:cdk:cloudformation:props": {
Expand Down Expand Up @@ -113,11 +113,11 @@
},
"Policy": {
"id": "Policy",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/Policy/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::S3::BucketPolicy",
"aws:cdk:cloudformation:props": {
Expand Down Expand Up @@ -218,11 +218,11 @@
},
"AutoDeleteObjectsCustomResource": {
"id": "AutoDeleteObjectsCustomResource",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource",
"children": {
"Default": {
"id": "Default",
"path": "aws-cdk-s3-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default",
"path": "aws-cdk-s3-server-access-logs-sse-kms/ServerAccessLogsBucket/AutoDeleteObjectsCustomResource/Default",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnResource",
"version": "0.0.0"
Expand All @@ -242,35 +242,35 @@
},
"DefaultCrNodeVersionMap": {
"id": "DefaultCrNodeVersionMap",
"path": "aws-cdk-s3-access-logs-sse-kms/DefaultCrNodeVersionMap",
"path": "aws-cdk-s3-server-access-logs-sse-kms/DefaultCrNodeVersionMap",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnMapping",
"version": "0.0.0"
}
},
"Custom::S3AutoDeleteObjectsCustomResourceProvider": {
"id": "Custom::S3AutoDeleteObjectsCustomResourceProvider",
"path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider",
"children": {
"Staging": {
"id": "Staging",
"path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Staging",
"constructInfo": {
"fqn": "aws-cdk-lib.AssetStaging",
"version": "0.0.0"
}
},
"Role": {
"id": "Role",
"path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Role",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnResource",
"version": "0.0.0"
}
},
"Handler": {
"id": "Handler",
"path": "aws-cdk-s3-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Custom::S3AutoDeleteObjectsCustomResourceProvider/Handler",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnResource",
"version": "0.0.0"
Expand All @@ -284,11 +284,11 @@
},
"Bucket": {
"id": "Bucket",
"path": "aws-cdk-s3-access-logs-sse-kms/Bucket",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Bucket",
"children": {
"Resource": {
"id": "Resource",
"path": "aws-cdk-s3-access-logs-sse-kms/Bucket/Resource",
"path": "aws-cdk-s3-server-access-logs-sse-kms/Bucket/Resource",
"attributes": {
"aws:cdk:cloudformation:type": "AWS::S3::Bucket",
"aws:cdk:cloudformation:props": {
Expand All @@ -313,15 +313,15 @@
},
"BootstrapVersion": {
"id": "BootstrapVersion",
"path": "aws-cdk-s3-access-logs-sse-kms/BootstrapVersion",
"path": "aws-cdk-s3-server-access-logs-sse-kms/BootstrapVersion",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnParameter",
"version": "0.0.0"
}
},
"CheckBootstrapVersion": {
"id": "CheckBootstrapVersion",
"path": "aws-cdk-s3-access-logs-sse-kms/CheckBootstrapVersion",
"path": "aws-cdk-s3-server-access-logs-sse-kms/CheckBootstrapVersion",
"constructInfo": {
"fqn": "aws-cdk-lib.CfnRule",
"version": "0.0.0"
Expand Down

0 comments on commit 81c9ce6

Please sign in to comment.