Skip to content

Commit 5e8bcec

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into merge-back/2.163.1
2 parents c14a1ff + 2122461 commit 5e8bcec

Some content is hidden

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

41 files changed

+2547
-70
lines changed

‎.github/workflows/request-cli-integ-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
:arrow_right: **PR build request submitted to `test-main-pipeline`** :arrow_left:
6161
6262
A maintainer must now check the pipeline and add the `pr-linter/cli-integ-tested` label once the pipeline succeeds.
63-
comment_tag: request-cli-integ-test
63+
comment-tag: request-cli-integ-test
6464
mode: recreate
6565
# Post as our automation user
66-
GITHUB_TOKEN: ${{ secrets.PROJEN_GITHUB_TOKEN }}
66+
github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}

‎packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdk-table-with-customized-role.assets.json

+19
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-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdk-table-with-customized-role.template.json

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"Resources": {
3+
"TableCD117FA1": {
4+
"Type": "AWS::DynamoDB::Table",
5+
"Properties": {
6+
"AttributeDefinitions": [
7+
{
8+
"AttributeName": "pk",
9+
"AttributeType": "S"
10+
},
11+
{
12+
"AttributeName": "gsi-pk",
13+
"AttributeType": "S"
14+
}
15+
],
16+
"GlobalSecondaryIndexes": [
17+
{
18+
"IndexName": "gsi",
19+
"KeySchema": [
20+
{
21+
"AttributeName": "gsi-pk",
22+
"KeyType": "HASH"
23+
}
24+
],
25+
"Projection": {
26+
"ProjectionType": "ALL"
27+
},
28+
"ProvisionedThroughput": {
29+
"ReadCapacityUnits": 5,
30+
"WriteCapacityUnits": 5
31+
}
32+
}
33+
],
34+
"KeySchema": [
35+
{
36+
"AttributeName": "pk",
37+
"KeyType": "HASH"
38+
}
39+
],
40+
"ProvisionedThroughput": {
41+
"ReadCapacityUnits": 5,
42+
"WriteCapacityUnits": 5
43+
}
44+
},
45+
"UpdateReplacePolicy": "Retain",
46+
"DeletionPolicy": "Retain"
47+
}
48+
},
49+
"Parameters": {
50+
"BootstrapVersion": {
51+
"Type": "AWS::SSM::Parameter::Value<String>",
52+
"Default": "/cdk-bootstrap/hnb659fds/version",
53+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
54+
}
55+
},
56+
"Rules": {
57+
"CheckBootstrapVersion": {
58+
"Assertions": [
59+
{
60+
"Assert": {
61+
"Fn::Not": [
62+
{
63+
"Fn::Contains": [
64+
[
65+
"1",
66+
"2",
67+
"3",
68+
"4",
69+
"5"
70+
],
71+
{
72+
"Ref": "BootstrapVersion"
73+
}
74+
]
75+
}
76+
]
77+
},
78+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
79+
}
80+
]
81+
}
82+
}
83+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdk-table-with-customized-role2.assets.json

+19
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-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdk-table-with-customized-role2.template.json

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"Resources": {
3+
"TableCD117FA1": {
4+
"Type": "AWS::DynamoDB::Table",
5+
"Properties": {
6+
"AttributeDefinitions": [
7+
{
8+
"AttributeName": "pk",
9+
"AttributeType": "S"
10+
}
11+
],
12+
"KeySchema": [
13+
{
14+
"AttributeName": "pk",
15+
"KeyType": "HASH"
16+
}
17+
],
18+
"ProvisionedThroughput": {
19+
"ReadCapacityUnits": 5,
20+
"WriteCapacityUnits": 5
21+
}
22+
},
23+
"UpdateReplacePolicy": "Retain",
24+
"DeletionPolicy": "Retain"
25+
}
26+
},
27+
"Parameters": {
28+
"BootstrapVersion": {
29+
"Type": "AWS::SSM::Parameter::Value<String>",
30+
"Default": "/cdk-bootstrap/hnb659fds/version",
31+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
32+
}
33+
},
34+
"Rules": {
35+
"CheckBootstrapVersion": {
36+
"Assertions": [
37+
{
38+
"Assert": {
39+
"Fn::Not": [
40+
{
41+
"Fn::Contains": [
42+
[
43+
"1",
44+
"2",
45+
"3",
46+
"4",
47+
"5"
48+
],
49+
{
50+
"Ref": "BootstrapVersion"
51+
}
52+
]
53+
}
54+
]
55+
},
56+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
57+
}
58+
]
59+
}
60+
}
61+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdk.out

+1
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-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdkdynamodbcustomizedroleintegDefaultTestDeployAssertD6C925FC.assets.json

+19
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-dynamodb/test/integ.table-with-customized-role.js.snapshot/cdkdynamodbcustomizedroleintegDefaultTestDeployAssertD6C925FC.template.json

+36
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-dynamodb/test/integ.table-with-customized-role.js.snapshot/iam-policy-report.json

+90
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)