Skip to content

Commit 27da5b2

Browse files
AbogicalAbogical
authored
Merge branch 'main' into fix-agentcore-policy
2 parents 41fd1ac + 94d7e34 commit 27da5b2

File tree

143 files changed

+68832
-1508
lines changed

Some content is hidden

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

143 files changed

+68832
-1508
lines changed

‎.github/workflows/pr-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
sudo sysctl -w vm.max_map_count=2251954
6666
6767
- name: Build
68-
run: /bin/bash ./build.sh --ci
68+
run: /bin/bash ./build.sh --ci --concurrency=10
6969

7070
- name: Run Rosetta
7171
run: /bin/bash ./scripts/run-rosetta.sh

‎.mergify.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ queue_rules:
2525
- check-success=build
2626
- or:
2727
- "-label~=pr/needs-integration-tests-deployment"
28-
- "check-success=integration_test_deployment"
28+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
2929
commit_message_template: |-
3030
{{ title }} (#{{ number }})
3131
{{ body }}
@@ -50,7 +50,7 @@ queue_rules:
5050
- check-success=build
5151
- or:
5252
- "-label~=pr/needs-integration-tests-deployment"
53-
- "check-success=integration_test_deployment"
53+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
5454
commit_message_template: |-
5555
{{ title }} (#{{ number }})
5656
{{ body }}
@@ -74,7 +74,7 @@ queue_rules:
7474
- check-success=build
7575
- or:
7676
- "-label~=pr/needs-integration-tests-deployment"
77-
- "check-success=integration_test_deployment"
77+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
7878
commit_message_template: |-
7979
{{ title }} (#{{ number }})
8080
{{ body }}
@@ -109,7 +109,7 @@ pull_request_rules:
109109
- check-success=build
110110
- or:
111111
- "-label~=pr/needs-integration-tests-deployment"
112-
- "check-success=integration_test_deployment"
112+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
113113
- name: automatic priority merge
114114
actions:
115115
comment:
@@ -133,7 +133,7 @@ pull_request_rules:
133133
- check-success=build
134134
- or:
135135
- "-label~=pr/needs-integration-tests-deployment"
136-
- "check-success=integration_test_deployment"
136+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
137137
- name: automatic merge (2+ approvers)
138138
actions:
139139
comment:
@@ -157,7 +157,7 @@ pull_request_rules:
157157
- check-success=build
158158
- or:
159159
- "-label~=pr/needs-integration-tests-deployment"
160-
- "check-success=integration_test_deployment"
160+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
161161
- name: automatic merge (no-squash)
162162
actions:
163163
comment:
@@ -181,7 +181,7 @@ pull_request_rules:
181181
- check-success=build
182182
- or:
183183
- "-label~=pr/needs-integration-tests-deployment"
184-
- "check-success=integration_test_deployment"
184+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
185185
- name: remove stale reviews
186186
actions:
187187
dismiss_reviews:
@@ -224,7 +224,7 @@ pull_request_rules:
224224
- check-success=build
225225
- or:
226226
- "-label~=pr/needs-integration-tests-deployment"
227-
- "check-success=integration_test_deployment"
227+
- "check-success=Deploy integration test snapshots (requires `pr/needs-integration-tests-deployment` label)"
228228
priority_rules:
229229
- name: priority for queue `default-merge`
230230
conditions:

‎allowed-breaking-changes.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,3 +966,6 @@ removed:aws-cdk-lib.lambda_layer_kubectl.KubectlLayer
966966
# Fixing the JsonSchema interface to be consistent with JSON Schema spec
967967
changed-type:aws-cdk-lib.aws_apigateway.JsonSchema.additionalItems
968968
strengthened:aws-cdk-lib.aws_apigateway.JsonSchema
969+
970+
# Revert a failing change
971+
strengthened:aws-cdk-lib.aws_stepfunctions.StateMachineProps

‎packages/@aws-cdk-testing/framework-integ/temp.json‎

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
{
2+
"ETag": "EEP8XQBTEOUC5",
3+
"DistributionConfig": {
4+
"CallerReference": "edcbed72-d836-106d-4b2a-dd5bf066eb55",
5+
"Aliases": {
6+
"Quantity": 0
7+
},
8+
"DefaultRootObject": "",
9+
"Origins": {
10+
"Quantity": 3,
11+
"Items": [
12+
{
13+
"Id": "cloudfronts3bucketoriginmixedDistributionOrigin3B1C9781D",
14+
"DomainName": "cloudfront-s3-bucket-origin-mixe-bucketoaib14a7c52-k5rjuqhpdrvh.s3.us-east-1.amazonaws.com",
15+
"OriginPath": "",
16+
"CustomHeaders": {
17+
"Quantity": 0
18+
},
19+
"S3OriginConfig": {
20+
"OriginAccessIdentity": "origin-access-identity/cloudfront/E1HQYMXWT4GBQK",
21+
"OriginReadTimeout": 60
22+
},
23+
"ConnectionAttempts": 3,
24+
"ConnectionTimeout": 10,
25+
"OriginShield": {
26+
"Enabled": false
27+
},
28+
"OriginAccessControlId": ""
29+
},
30+
{
31+
"Id": "cloudfronts3bucketoriginmixedDistributionOrigin239CEEA9F",
32+
"DomainName": "cloudfront-s3-bucket-origin-mixe-bucketoaccfc6baf0-wn9u4ekstwq4.s3.us-east-1.amazonaws.com",
33+
"OriginPath": "",
34+
"CustomHeaders": {
35+
"Quantity": 0
36+
},
37+
"S3OriginConfig": {
38+
"OriginAccessIdentity": "",
39+
"OriginReadTimeout": 45
40+
},
41+
"ConnectionAttempts": 3,
42+
"ConnectionTimeout": 10,
43+
"OriginShield": {
44+
"Enabled": false
45+
},
46+
"OriginAccessControlId": "E1EOOZXFTVRY63"
47+
},
48+
{
49+
"Id": "cloudfronts3bucketoriginmixedDistributionOrigin1AB885D6E",
50+
"DomainName": "cloudfront-s3-bucket-origin--bucketdefaultb1516e6d-zgwppexae9pl.s3.us-east-1.amazonaws.com",
51+
"OriginPath": "",
52+
"CustomHeaders": {
53+
"Quantity": 0
54+
},
55+
"S3OriginConfig": {
56+
"OriginAccessIdentity": "",
57+
"OriginReadTimeout": 30
58+
},
59+
"ConnectionAttempts": 3,
60+
"ConnectionTimeout": 10,
61+
"OriginShield": {
62+
"Enabled": false
63+
},
64+
"OriginAccessControlId": ""
65+
}
66+
]
67+
},
68+
"OriginGroups": {
69+
"Quantity": 0
70+
},
71+
"DefaultCacheBehavior": {
72+
"TargetOriginId": "cloudfronts3bucketoriginmixedDistributionOrigin1AB885D6E",
73+
"TrustedSigners": {
74+
"Enabled": false,
75+
"Quantity": 0
76+
},
77+
"TrustedKeyGroups": {
78+
"Enabled": false,
79+
"Quantity": 0
80+
},
81+
"ViewerProtocolPolicy": "allow-all",
82+
"AllowedMethods": {
83+
"Quantity": 2,
84+
"Items": [
85+
"HEAD",
86+
"GET"
87+
],
88+
"CachedMethods": {
89+
"Quantity": 2,
90+
"Items": [
91+
"HEAD",
92+
"GET"
93+
]
94+
}
95+
},
96+
"SmoothStreaming": false,
97+
"Compress": true,
98+
"LambdaFunctionAssociations": {
99+
"Quantity": 0
100+
},
101+
"FunctionAssociations": {
102+
"Quantity": 0
103+
},
104+
"FieldLevelEncryptionId": "",
105+
"CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
106+
"GrpcConfig": {
107+
"Enabled": false
108+
}
109+
},
110+
"CacheBehaviors": {
111+
"Quantity": 2,
112+
"Items": [
113+
{
114+
"PathPattern": "/oac/*",
115+
"TargetOriginId": "cloudfronts3bucketoriginmixedDistributionOrigin239CEEA9F",
116+
"TrustedSigners": {
117+
"Enabled": false,
118+
"Quantity": 0
119+
},
120+
"TrustedKeyGroups": {
121+
"Enabled": false,
122+
"Quantity": 0
123+
},
124+
"ViewerProtocolPolicy": "allow-all",
125+
"AllowedMethods": {
126+
"Quantity": 2,
127+
"Items": [
128+
"HEAD",
129+
"GET"
130+
],
131+
"CachedMethods": {
132+
"Quantity": 2,
133+
"Items": [
134+
"HEAD",
135+
"GET"
136+
]
137+
}
138+
},
139+
"SmoothStreaming": false,
140+
"Compress": true,
141+
"LambdaFunctionAssociations": {
142+
"Quantity": 0
143+
},
144+
"FunctionAssociations": {
145+
"Quantity": 0
146+
},
147+
"FieldLevelEncryptionId": "",
148+
"CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
149+
"GrpcConfig": {
150+
"Enabled": false
151+
}
152+
},
153+
{
154+
"PathPattern": "/oai/*",
155+
"TargetOriginId": "cloudfronts3bucketoriginmixedDistributionOrigin3B1C9781D",
156+
"TrustedSigners": {
157+
"Enabled": false,
158+
"Quantity": 0
159+
},
160+
"TrustedKeyGroups": {
161+
"Enabled": false,
162+
"Quantity": 0
163+
},
164+
"ViewerProtocolPolicy": "allow-all",
165+
"AllowedMethods": {
166+
"Quantity": 2,
167+
"Items": [
168+
"HEAD",
169+
"GET"
170+
],
171+
"CachedMethods": {
172+
"Quantity": 2,
173+
"Items": [
174+
"HEAD",
175+
"GET"
176+
]
177+
}
178+
},
179+
"SmoothStreaming": false,
180+
"Compress": true,
181+
"LambdaFunctionAssociations": {
182+
"Quantity": 0
183+
},
184+
"FunctionAssociations": {
185+
"Quantity": 0
186+
},
187+
"FieldLevelEncryptionId": "",
188+
"CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
189+
"GrpcConfig": {
190+
"Enabled": false
191+
}
192+
}
193+
]
194+
},
195+
"CustomErrorResponses": {
196+
"Quantity": 0
197+
},
198+
"Comment": "",
199+
"Logging": {
200+
"Enabled": false,
201+
"IncludeCookies": false,
202+
"Bucket": "",
203+
"Prefix": ""
204+
},
205+
"PriceClass": "PriceClass_All",
206+
"Enabled": true,
207+
"ViewerCertificate": {
208+
"CloudFrontDefaultCertificate": true,
209+
"SSLSupportMethod": "vip",
210+
"MinimumProtocolVersion": "TLSv1",
211+
"CertificateSource": "cloudfront"
212+
},
213+
"Restrictions": {
214+
"GeoRestriction": {
215+
"RestrictionType": "none",
216+
"Quantity": 0
217+
}
218+
},
219+
"WebACLId": "",
220+
"HttpVersion": "http2",
221+
"IsIPV6Enabled": true,
222+
"ContinuousDeploymentPolicyId": "",
223+
"Staging": false
224+
}
225+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-elastic-beanstalk-deploy.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
55
import { IManagedPolicy, ManagedPolicyReference } from 'aws-cdk-lib/aws-iam';
66
import * as s3 from 'aws-cdk-lib/aws-s3';
77
import * as deploy from 'aws-cdk-lib/aws-s3-deployment';
8-
import { App, Fn, RemovalPolicy, Stack, UnscopedValidationError } from 'aws-cdk-lib';
8+
import { App, Fn, RemovalPolicy, ResourceEnvironment, Stack, UnscopedValidationError } from 'aws-cdk-lib';
99
import * as integ from '@aws-cdk/integ-tests-alpha';
1010
import * as cpactions from 'aws-cdk-lib/aws-codepipeline-actions';
1111
import { Node } from 'constructs';
@@ -56,6 +56,9 @@ function makePolicy(arn: string): IManagedPolicy {
5656
get node(): Node {
5757
throw new UnscopedValidationError('The result of fromAwsManagedPolicyName can not be used in this API');
5858
},
59+
get env(): ResourceEnvironment {
60+
throw new UnscopedValidationError('The result of fromAwsManagedPolicyName can not be used in this API');
61+
},
5962
};
6063
}
6164

‎packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.dynamodb.add-to-resource-policy.js.snapshot/add-to-resource-policy-test-stack.assets.json‎

Lines changed: 20 additions & 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)