Skip to content

Commit c1c1cfe

Browse files
xazhaoxazhao
authored
Merge branch 'main' into nlb-fargate-sg
2 parents 3d53c27 + 77189be commit c1c1cfe

File tree

23 files changed

+2083
-178
lines changed

23 files changed

+2083
-178
lines changed

‎.github/workflows/repo-metrics.yml‎ renamed to ‎.github/workflows/repo-metrics-monthly.yml‎

File renamed without changes.

‎.github/workflows/repo-metrics-weekly.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Weekly repo metrics
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 9 * * MON'
6+
7+
permissions:
8+
issues: write
9+
pull-requests: read
10+
11+
jobs:
12+
build:
13+
# this workflow will always fail in forks; bail if this isn't running in the upstream
14+
if: github.repository == 'aws/aws-cdk'
15+
name: metrics
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Get dates for last week
20+
shell: bash
21+
run: |
22+
# Calculate the date of the previous Monday
23+
PREVIOUS_MONDAY=$(date -d "7 days ago" "+%Y-%m-%d")
24+
25+
# Calculate the date of the current Sunday
26+
CURRENT_SUNDAY=$(date -d "1 day ago" "+%Y-%m-%d")
27+
28+
# Set an environment variable with the date range
29+
echo "$PREVIOUS_MONDAY..$CURRENT_SUNDAY"
30+
echo "last_week=$PREVIOUS_MONDAY..$CURRENT_SUNDAY" >> "$GITHUB_ENV"
31+
32+
- name: Report on issues
33+
uses: github/issue-metrics@v2
34+
env:
35+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
SEARCH_QUERY: 'repo:aws/aws-cdk is:issue created:${{ env.last_week }} -reason:"not planned"'
37+
38+
- name: Create report for issues
39+
uses: peter-evans/create-issue-from-file@v5
40+
with:
41+
title: Weekly issue metrics report
42+
token: ${{ secrets.GITHUB_TOKEN }}
43+
content-filepath: ./issue_metrics.md
44+
assignees: paulhcsun
45+
46+
- name: Report on PRs
47+
uses: github/issue-metrics@v2
48+
env:
49+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
SEARCH_QUERY: 'repo:aws/aws-cdk is:pr created:${{ env.last_week }} -is:draft'
51+
52+
- name: Create report for PRs
53+
uses: peter-evans/create-issue-from-file@v5
54+
with:
55+
title: Weekly PR metrics report
56+
token: ${{ secrets.GITHUB_TOKEN }}
57+
content-filepath: ./issue_metrics.md
58+
assignees: paulhcsun

‎packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/NOTES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This patch brings the [fix](https://github.com/aws/aws-cdk/issues/29420) into the regression suite.

‎packages/@aws-cdk-testing/cli-integ/resources/cli-regression-patches/v2.132.0/skip-tests.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Skipping the test to fix issue https://github.com/aws/aws-cdk/issues/29420.
2+
# cli-integ tests failing for the old tests with the new cli changes for list stacks.
3+
4+
cdk ls --show-dependencies --json

‎packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,10 @@ integTest('cdk ls --show-dependencies --json', withDefaultFixture(async (fixture
886886
id: 'list-stacks',
887887
dependencies: [
888888
{
889-
id: 'liststacksDependentStack',
889+
id: 'list-stacks/DependentStack',
890890
dependencies: [
891891
{
892-
id: 'liststacksDependentStackInnerDependentStack',
892+
id: 'list-stacks/DependentStack/InnerDependentStack',
893893
dependencies: [],
894894
},
895895
],
@@ -900,11 +900,11 @@ integTest('cdk ls --show-dependencies --json', withDefaultFixture(async (fixture
900900
id: 'list-multiple-dependent-stacks',
901901
dependencies: [
902902
{
903-
id: 'listmultipledependentstacksDependentStack1',
903+
id: 'list-multiple-dependent-stacks/DependentStack1',
904904
dependencies: [],
905905
},
906906
{
907-
id: 'listmultipledependentstacksDependentStack2',
907+
id: 'list-multiple-dependent-stacks/DependentStack2',
908908
dependencies: [],
909909
},
910910
],

‎packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-start-crawler.js.snapshot/EcsDeploymentConfigTestDefaultTestDeployAssertA6573788.assets.json‎

Lines changed: 19 additions & 0 deletions
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-stepfunctions-tasks/test/glue/integ.glue-start-crawler.js.snapshot/EcsDeploymentConfigTestDefaultTestDeployAssertA6573788.template.json‎

Lines changed: 36 additions & 0 deletions
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-stepfunctions-tasks/test/glue/integ.glue-start-crawler.js.snapshot/aws-cdk-glue-crawler.assets.json‎

Lines changed: 19 additions & 0 deletions
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-stepfunctions-tasks/test/glue/integ.glue-start-crawler.js.snapshot/aws-cdk-glue-crawler.template.json‎

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
{
2+
"Resources": {
3+
"Bucket83908E77": {
4+
"Type": "AWS::S3::Bucket",
5+
"UpdateReplacePolicy": "Delete",
6+
"DeletionPolicy": "Delete"
7+
},
8+
"GluecrawlwerRole4E24839F": {
9+
"Type": "AWS::IAM::Role",
10+
"Properties": {
11+
"AssumeRolePolicyDocument": {
12+
"Statement": [
13+
{
14+
"Action": "sts:AssumeRole",
15+
"Effect": "Allow",
16+
"Principal": {
17+
"Service": "glue.amazonaws.com"
18+
}
19+
}
20+
],
21+
"Version": "2012-10-17"
22+
},
23+
"ManagedPolicyArns": [
24+
{
25+
"Fn::Join": [
26+
"",
27+
[
28+
"arn:",
29+
{
30+
"Ref": "AWS::Partition"
31+
},
32+
":iam::aws:policy/service-role/AWSGlueServiceRole"
33+
]
34+
]
35+
}
36+
]
37+
}
38+
},
39+
"Database": {
40+
"Type": "AWS::Glue::Database",
41+
"Properties": {
42+
"CatalogId": {
43+
"Ref": "AWS::AccountId"
44+
},
45+
"DatabaseInput": {
46+
"Description": "My database",
47+
"Name": "my-database"
48+
}
49+
}
50+
},
51+
"Crawler": {
52+
"Type": "AWS::Glue::Crawler",
53+
"Properties": {
54+
"DatabaseName": {
55+
"Ref": "Database"
56+
},
57+
"Role": {
58+
"Fn::GetAtt": [
59+
"GluecrawlwerRole4E24839F",
60+
"Arn"
61+
]
62+
},
63+
"Targets": {
64+
"S3Targets": [
65+
{
66+
"Path": {
67+
"Fn::Join": [
68+
"",
69+
[
70+
"s3://",
71+
{
72+
"Ref": "Bucket83908E77"
73+
},
74+
"/"
75+
]
76+
]
77+
}
78+
}
79+
]
80+
}
81+
}
82+
},
83+
"StateMachineRole543B9670": {
84+
"Type": "AWS::IAM::Role",
85+
"Properties": {
86+
"AssumeRolePolicyDocument": {
87+
"Statement": [
88+
{
89+
"Action": "sts:AssumeRole",
90+
"Effect": "Allow",
91+
"Principal": {
92+
"Service": "states.amazonaws.com"
93+
}
94+
}
95+
],
96+
"Version": "2012-10-17"
97+
}
98+
}
99+
},
100+
"StateMachineRoleDefaultPolicyDA5F7DA8": {
101+
"Type": "AWS::IAM::Policy",
102+
"Properties": {
103+
"PolicyDocument": {
104+
"Statement": [
105+
{
106+
"Action": [
107+
"glue:GetCrawler",
108+
"glue:StartCrawler"
109+
],
110+
"Effect": "Allow",
111+
"Resource": {
112+
"Fn::Join": [
113+
"",
114+
[
115+
"arn:",
116+
{
117+
"Ref": "AWS::Partition"
118+
},
119+
":glue:",
120+
{
121+
"Ref": "AWS::Region"
122+
},
123+
":",
124+
{
125+
"Ref": "AWS::AccountId"
126+
},
127+
":crawler/",
128+
{
129+
"Ref": "Crawler"
130+
}
131+
]
132+
]
133+
}
134+
}
135+
],
136+
"Version": "2012-10-17"
137+
},
138+
"PolicyName": "StateMachineRoleDefaultPolicyDA5F7DA8",
139+
"Roles": [
140+
{
141+
"Ref": "StateMachineRole543B9670"
142+
}
143+
]
144+
}
145+
},
146+
"StateMachine81935E76": {
147+
"Type": "AWS::StepFunctions::StateMachine",
148+
"Properties": {
149+
"DefinitionString": {
150+
"Fn::Join": [
151+
"",
152+
[
153+
"{\"StartAt\":\"Start Task\",\"States\":{\"Start Task\":{\"Type\":\"Pass\",\"Next\":\"Glue Crawler Task\"},\"Glue Crawler Task\":{\"Next\":\"End Task\",\"Type\":\"Task\",\"Resource\":\"arn:",
154+
{
155+
"Ref": "AWS::Partition"
156+
},
157+
":states:::aws-sdk:glue:startCrawler\",\"Parameters\":{\"Name\":\"",
158+
{
159+
"Ref": "Crawler"
160+
},
161+
"\"}},\"End Task\":{\"Type\":\"Pass\",\"End\":true}}}"
162+
]
163+
]
164+
},
165+
"RoleArn": {
166+
"Fn::GetAtt": [
167+
"StateMachineRole543B9670",
168+
"Arn"
169+
]
170+
}
171+
},
172+
"DependsOn": [
173+
"StateMachineRoleDefaultPolicyDA5F7DA8",
174+
"StateMachineRole543B9670"
175+
],
176+
"UpdateReplacePolicy": "Delete",
177+
"DeletionPolicy": "Delete"
178+
}
179+
},
180+
"Parameters": {
181+
"BootstrapVersion": {
182+
"Type": "AWS::SSM::Parameter::Value<String>",
183+
"Default": "/cdk-bootstrap/hnb659fds/version",
184+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
185+
}
186+
},
187+
"Rules": {
188+
"CheckBootstrapVersion": {
189+
"Assertions": [
190+
{
191+
"Assert": {
192+
"Fn::Not": [
193+
{
194+
"Fn::Contains": [
195+
[
196+
"1",
197+
"2",
198+
"3",
199+
"4",
200+
"5"
201+
],
202+
{
203+
"Ref": "BootstrapVersion"
204+
}
205+
]
206+
}
207+
]
208+
},
209+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
210+
}
211+
]
212+
}
213+
}
214+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-stepfunctions-tasks/test/glue/integ.glue-start-crawler.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)