Skip to content

Commit

Permalink
Merge branch 'main' into 24243
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 22, 2023
2 parents 906a1b0 + 0b822b3 commit 7d24e35
Show file tree
Hide file tree
Showing 115 changed files with 3,153 additions and 1,685 deletions.
682 changes: 665 additions & 17 deletions packages/@aws-cdk/aws-config/lib/rule.ts

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"version": "21.0.0",
"version": "30.0.0",
"files": {
"99b272ad5d23fb805d1e06b58a04179d8720a36f6aa8cf035eff419db2e87432": {
"source": {
"path": "aws-cdk-config-rule-integ.template.json",
"path": "aws-cdk-config-custompolicy.template.json",
"packaging": "file"
},
"destinations": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "30.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
"path": "awscdkconfigruleintegDefaultTestDeployAssert37C5819B.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"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."
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"version":"30.0.0"}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "30.0.0",
"testCases": {
"aws-cdk-config-rule-integ/DefaultTest": {
"stacks": [
"aws-cdk-config-custompolicy"
],
"assertionStack": "aws-cdk-config-rule-integ/DefaultTest/DeployAssert",
"assertionStackName": "awscdkconfigruleintegDefaultTestDeployAssert37C5819B"
}
}
}
159 changes: 159 additions & 0 deletions packages/@aws-cdk/aws-config/test/integ.rule.js.snapshot/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
{
"version": "30.0.0",
"artifacts": {
"aws-cdk-config-custompolicy.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "aws-cdk-config-custompolicy.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"aws-cdk-config-custompolicy": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "aws-cdk-config-custompolicy.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}/99b272ad5d23fb805d1e06b58a04179d8720a36f6aa8cf035eff419db2e87432.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"aws-cdk-config-custompolicy.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"aws-cdk-config-custompolicy.assets"
],
"metadata": {
"/aws-cdk-config-custompolicy/CustomFunction/ServiceRole/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "CustomFunctionServiceRoleD3F73B79"
}
],
"/aws-cdk-config-custompolicy/CustomFunction/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "CustomFunctionBADD59E7"
}
],
"/aws-cdk-config-custompolicy/CustomFunction/CustomRulePermissionbM1jVaicvRO9SDCiAbsQcYrOlESEtMwrrF9ZQQRvd5Q=": [
{
"type": "aws:cdk:logicalId",
"data": "CustomFunctionCustomRulePermissionbM1jVaicvRO9SDCiAbsQcYrOlESEtMwrrF9ZQQRvd5QED54A3F8"
}
],
"/aws-cdk-config-custompolicy/Custom/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "Custom8166710A"
}
],
"/aws-cdk-config-custompolicy/Drift/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "Drift34D3210F"
}
],
"/aws-cdk-config-custompolicy/Drift/Role/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "DriftRole8A5FB833"
}
],
"/aws-cdk-config-custompolicy/Drift/ComplianceChange/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "DriftComplianceChange4C0F2B82"
}
],
"/aws-cdk-config-custompolicy/ComplianceTopic/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ComplianceTopic0229448B"
}
],
"/aws-cdk-config-custompolicy/ComplianceTopic/Policy/Resource": [
{
"type": "aws:cdk:logicalId",
"data": "ComplianceTopicPolicyF8BC46F0"
}
],
"/aws-cdk-config-custompolicy/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/aws-cdk-config-custompolicy/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "aws-cdk-config-custompolicy"
},
"awscdkconfigruleintegDefaultTestDeployAssert37C5819B.assets": {
"type": "cdk:asset-manifest",
"properties": {
"file": "awscdkconfigruleintegDefaultTestDeployAssert37C5819B.assets.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"awscdkconfigruleintegDefaultTestDeployAssert37C5819B": {
"type": "aws:cloudformation:stack",
"environment": "aws://unknown-account/unknown-region",
"properties": {
"templateFile": "awscdkconfigruleintegDefaultTestDeployAssert37C5819B.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}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
"awscdkconfigruleintegDefaultTestDeployAssert37C5819B.assets"
],
"lookupRole": {
"arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
"requiresBootstrapStackVersion": 8,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
}
},
"dependencies": [
"awscdkconfigruleintegDefaultTestDeployAssert37C5819B.assets"
],
"metadata": {
"/aws-cdk-config-rule-integ/DefaultTest/DeployAssert/BootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "BootstrapVersion"
}
],
"/aws-cdk-config-rule-integ/DefaultTest/DeployAssert/CheckBootstrapVersion": [
{
"type": "aws:cdk:logicalId",
"data": "CheckBootstrapVersion"
}
]
},
"displayName": "aws-cdk-config-rule-integ/DefaultTest/DeployAssert"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
Loading

0 comments on commit 7d24e35

Please sign in to comment.