Skip to content

Commit

Permalink
Merge branch 'aws:main' into fix/custom-resources/not-work-fromSdkCal…
Browse files Browse the repository at this point in the history
…ls-sdk-v3
  • Loading branch information
WinterYukky committed Sep 26, 2023
2 parents 36949b7 + 252d9ba commit 22a2bbc
Show file tree
Hide file tree
Showing 91 changed files with 932 additions and 819 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@
*.jpg binary
*.tgz binary
*.tar.gz binary

# Hide snapshots from GitHub UI, except for the actual templates
**/*.snapshot/** linguist-generated
**/*.snapshot/**/*.template.json -linguist-generated
**/*.snapshot/**/*DeployAssert*.template.json linguist-generated
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@76c4d81a6acd339b55bd7407a016981c853eb702
uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
35 changes: 35 additions & 0 deletions allowed-breaking-changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,38 @@ removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6

# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter.
weakened:aws-cdk-lib.aws_appsync.SourceApi

# Due to https://github.com/aws/aws-cdk/issues/27259, none of these could have worked
# When reimplemented, we can remove this entry entirely
removed:aws-cdk-lib.Schedule
removed:aws-cdk-lib.aws_backup.Schedule
removed:aws-cdk-lib.CronOptions
base-types:aws-cdk-lib.aws_applicationautoscaling.Schedule
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedAt
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedCron
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedExpression
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.protectedRate
removed-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.at
incompatible-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.cron
removed-argument:aws-cdk-lib.aws_applicationautoscaling.Schedule.expression
removed:aws-cdk-lib.aws_applicationautoscaling.Schedule.timeZone
base-types:aws-cdk-lib.aws_autoscaling.Schedule
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedAt
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedCron
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedExpression
removed:aws-cdk-lib.aws_autoscaling.Schedule.protectedRate
incompatible-argument:aws-cdk-lib.aws_autoscaling.Schedule.cron
removed-argument:aws-cdk-lib.aws_autoscaling.Schedule.expression
removed:aws-cdk-lib.aws_autoscaling.Schedule.timeZone
base-types:aws-cdk-lib.aws_events.Schedule
removed:aws-cdk-lib.aws_events.Schedule.protectedAt
removed:aws-cdk-lib.aws_events.Schedule.protectedCron
removed:aws-cdk-lib.aws_events.Schedule.protectedExpression
removed:aws-cdk-lib.aws_events.Schedule.protectedRate
removed:aws-cdk-lib.aws_events.Schedule.timeZone
base-types:aws-cdk-lib.aws_applicationautoscaling.CronOptions
removed:aws-cdk-lib.aws_applicationautoscaling.CronOptions.timeZone
base-types:aws-cdk-lib.aws_autoscaling.CronOptions
removed:aws-cdk-lib.aws_autoscaling.CronOptions.timeZone
removed:aws-cdk-lib.aws_autoscaling.CronOptions.year
removed:aws-cdk-lib.aws_backup.BackupPlanRuleProps.schedule

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
},
"RuleName": "Daily",
"ScheduleExpression": "cron(0 5 * * ? *)",
"ScheduleExpressionTimezone": "Etc/UTC",
"TargetBackupVault": {
"Fn::GetAtt": [
"Vault23237E5B",
Expand All @@ -97,7 +96,6 @@
},
"RuleName": "Weekly",
"ScheduleExpression": "cron(0 5 ? * SAT *)",
"ScheduleExpressionTimezone": "Etc/UTC",
"TargetBackupVault": {
"Fn::GetAtt": [
"Vault23237E5B",
Expand All @@ -112,7 +110,6 @@
},
"RuleName": "Monthly5Year",
"ScheduleExpression": "cron(0 5 1 * ? *)",
"ScheduleExpressionTimezone": "Etc/UTC",
"TargetBackupVault": {
"Fn::GetAtt": [
"Vault23237E5B",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 22a2bbc

Please sign in to comment.