Skip to content

Commit acc02c4

Browse files
authored
Merge branch 'main' into mrgrain/mixins-preview-package
2 parents c4b876f + e07b341 commit acc02c4

38 files changed

+2050
-385
lines changed

.mergify.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ queue_rules:
2222
- check-success=validate-pr
2323
- check-success=build
2424
- or:
25-
- "label~=pr/needs-integration-tests-deployment"
25+
- "-label~=pr/needs-integration-tests-deployment"
2626
- "check-success=integration_test_deployment"
2727
commit_message_template: |-
2828
{{ title }} (#{{ number }})
@@ -47,7 +47,7 @@ queue_rules:
4747
- check-success=validate-pr
4848
- check-success=build
4949
- or:
50-
- "label~=pr/needs-integration-tests-deployment"
50+
- "-label~=pr/needs-integration-tests-deployment"
5151
- "check-success=integration_test_deployment"
5252
commit_message_template: |-
5353
{{ title }} (#{{ number }})
@@ -71,7 +71,7 @@ queue_rules:
7171
- check-success=validate-pr
7272
- check-success=build
7373
- or:
74-
- "label~=pr/needs-integration-tests-deployment"
74+
- "-label~=pr/needs-integration-tests-deployment"
7575
- "check-success=integration_test_deployment"
7676
commit_message_template: |-
7777
{{ title }} (#{{ number }})
@@ -106,7 +106,7 @@ pull_request_rules:
106106
- check-success=validate-pr
107107
- check-success=build
108108
- or:
109-
- "label~=pr/needs-integration-tests-deployment"
109+
- "-label~=pr/needs-integration-tests-deployment"
110110
- "check-success=integration_test_deployment"
111111
- name: automatic priority merge
112112
actions:
@@ -130,7 +130,7 @@ pull_request_rules:
130130
- check-success=validate-pr
131131
- check-success=build
132132
- or:
133-
- "label~=pr/needs-integration-tests-deployment"
133+
- "-label~=pr/needs-integration-tests-deployment"
134134
- "check-success=integration_test_deployment"
135135
- name: automatic merge (2+ approvers)
136136
actions:
@@ -154,7 +154,7 @@ pull_request_rules:
154154
- check-success=validate-pr
155155
- check-success=build
156156
- or:
157-
- "label~=pr/needs-integration-tests-deployment"
157+
- "-label~=pr/needs-integration-tests-deployment"
158158
- "check-success=integration_test_deployment"
159159
- name: automatic merge (no-squash)
160160
actions:
@@ -178,7 +178,7 @@ pull_request_rules:
178178
- check-success=validate-pr
179179
- check-success=build
180180
- or:
181-
- "label~=pr/needs-integration-tests-deployment"
181+
- "-label~=pr/needs-integration-tests-deployment"
182182
- "check-success=integration_test_deployment"
183183
- name: remove stale reviews
184184
actions:
@@ -221,7 +221,7 @@ pull_request_rules:
221221
- check-success=validate-pr
222222
- check-success=build
223223
- or:
224-
- "label~=pr/needs-integration-tests-deployment"
224+
- "-label~=pr/needs-integration-tests-deployment"
225225
- "check-success=integration_test_deployment"
226226
priority_rules:
227227
- name: priority for queue `default-merge`

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront-origins/test/integ.function-url-origin.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
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-cloudfront-origins/test/integ.function-url-origin.js.snapshot/integ-cloudfront-function-url-origin.assets.json

Lines changed: 5 additions & 4 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-cloudfront-origins/test/integ.function-url-origin.js.snapshot/integ-cloudfront-function-url-origin.template.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,20 @@
7676
"Principal": "*"
7777
}
7878
},
79+
"MyFunctioninvokefunction98962B85": {
80+
"Type": "AWS::Lambda::Permission",
81+
"Properties": {
82+
"Action": "lambda:InvokeFunction",
83+
"FunctionName": {
84+
"Fn::GetAtt": [
85+
"MyFunction3BAA72D1",
86+
"Arn"
87+
]
88+
},
89+
"InvokedViaFunctionUrl": true,
90+
"Principal": "*"
91+
}
92+
},
7993
"Distribution830FAC52": {
8094
"Type": "AWS::CloudFront::Distribution",
8195
"Properties": {

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront-origins/test/integ.function-url-origin.js.snapshot/integ.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)