Skip to content

Commit 22a2bbc

Browse files
authored
Merge branch 'aws:main' into fix/custom-resources/not-work-fromSdkCalls-sdk-v3
2 parents 36949b7 + 252d9ba commit 22a2bbc

File tree

91 files changed

+932
-819
lines changed

Some content is hidden

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

91 files changed

+932
-819
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@
1111
*.jpg binary
1212
*.tgz binary
1313
*.tar.gz binary
14+
15+
# Hide snapshots from GitHub UI, except for the actual templates
16+
**/*.snapshot/** linguist-generated
17+
**/*.snapshot/**/*.template.json -linguist-generated
18+
**/*.snapshot/**/*DeployAssert*.template.json linguist-generated

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@76c4d81a6acd339b55bd7407a016981c853eb702
22+
uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

allowed-breaking-changes.txt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,3 +191,38 @@ removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6
191191

192192
# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter.
193193
weakened:aws-cdk-lib.aws_appsync.SourceApi
194+
195+
# Due to https://github.com/aws/aws-cdk/issues/27259, none of these could have worked
196+
# When reimplemented, we can remove this entry entirely
197+
removed:aws-cdk-lib.Schedule
198+
removed:aws-cdk-lib.aws_backup.Schedule
199+
removed:aws-cdk-lib.CronOptions
200+
base-types:aws-cdk-lib.aws_applicationautoscaling.Schedule
201+
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedAt
202+
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedCron
203+
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedExpression
204+
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedRate
205+
removed-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.at
206+
incompatible-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.cron
207+
removed-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.expression
208+
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.timeZone
209+
base-types:aws-cdk-lib.aws_autoscaling.Schedule
210+
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedAt
211+
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedCron
212+
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedExpression
213+
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedRate
214+
incompatible-argument:aws-cdk-lib.aws_autoscaling.Schedule.cron
215+
removed-argument:aws-cdk-lib.aws_autoscaling.Schedule.expression
216+
removed:aws-cdk-lib.aws_autoscaling.Schedule.timeZone
217+
base-types:aws-cdk-lib.aws_events.Schedule
218+
removed:aws-cdk-lib.aws_events.Schedule.protectedAt
219+
removed:aws-cdk-lib.aws_events.Schedule.protectedCron
220+
removed:aws-cdk-lib.aws_events.Schedule.protectedExpression
221+
removed:aws-cdk-lib.aws_events.Schedule.protectedRate
222+
removed:aws-cdk-lib.aws_events.Schedule.timeZone
223+
base-types:aws-cdk-lib.aws_applicationautoscaling.CronOptions
224+
removed:aws-cdk-lib.aws_applicationautoscaling.CronOptions.timeZone
225+
base-types:aws-cdk-lib.aws_autoscaling.CronOptions
226+
removed:aws-cdk-lib.aws_autoscaling.CronOptions.timeZone
227+
removed:aws-cdk-lib.aws_autoscaling.CronOptions.year
228+
removed:aws-cdk-lib.aws_backup.BackupPlanRuleProps.schedule

packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json

Lines changed: 3 additions & 3 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-backup/test/integ.backup.js.snapshot/cdk-backup.template.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
},
8484
"RuleName": "Daily",
8585
"ScheduleExpression": "cron(0 5 * * ? *)",
86-
"ScheduleExpressionTimezone": "Etc/UTC",
8786
"TargetBackupVault": {
8887
"Fn::GetAtt": [
8988
"Vault23237E5B",
@@ -97,7 +96,6 @@
9796
},
9897
"RuleName": "Weekly",
9998
"ScheduleExpression": "cron(0 5 ? * SAT *)",
100-
"ScheduleExpressionTimezone": "Etc/UTC",
10199
"TargetBackupVault": {
102100
"Fn::GetAtt": [
103101
"Vault23237E5B",
@@ -112,7 +110,6 @@
112110
},
113111
"RuleName": "Monthly5Year",
114112
"ScheduleExpression": "cron(0 5 1 * ? *)",
115-
"ScheduleExpressionTimezone": "Etc/UTC",
116113
"TargetBackupVault": {
117114
"Fn::GetAtt": [
118115
"Vault23237E5B",

packages/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.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-backup/test/integ.backup.js.snapshot/integ.json

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-backup/test/integ.backup.js.snapshot/manifest.json

Lines changed: 2 additions & 3 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-backup/test/integ.backup.js.snapshot/tree.json

Lines changed: 45 additions & 48 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-dynamodb/test/integ.autoscaling.lit.js.snapshot/aws-cdk-dynamodb.assets.json

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

0 commit comments

Comments
 (0)