revert: "feat(core): Schedule class" (#27284)

Reverts #27105 This fixes #27259 by reverting the offending commit.
aws · Sep 25, 2023 · e2fc724 · e2fc724
1 parent d7cf3be
commit e2fc724
Show file tree

Hide file tree

Showing 52 changed files with 1,225 additions and 622 deletions.
diff --git a/allowed-breaking-changes.txt b/allowed-breaking-changes.txt
@@ -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
diff --git a/...ting/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json b/...ting/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.assets.json
@@ -1,15 +1,15 @@
 {
- "version": "34.0.0",
+ "version": "32.0.0",
  "files": {
- "7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976": {
+ "0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5": {
  "source": {
  "path": "cdk-backup.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976.json",
+ "objectKey": "0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }

diff --git a/...ng/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.template.json b/...ng/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk-backup.template.json
@@ -83,7 +83,6 @@
  },
  "RuleName": "Daily",
  "ScheduleExpression": "cron(0 5 * * ? *)",
- "ScheduleExpressionTimezone": "Etc/UTC",
  "TargetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",
@@ -97,7 +96,6 @@
  },
  "RuleName": "Weekly",
  "ScheduleExpression": "cron(0 5 ? * SAT *)",
- "ScheduleExpressionTimezone": "Etc/UTC",
  "TargetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",
@@ -112,7 +110,6 @@
  },
  "RuleName": "Monthly5Year",
  "ScheduleExpression": "cron(0 5 1 * ? *)",
- "ScheduleExpressionTimezone": "Etc/UTC",
  "TargetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",

diff --git a/...es/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk.out b/...es/@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/cdk.out
@@ -1 +1 @@
-{"version":"34.0.0"}
+{"version":"32.0.0"}
diff --git a/...@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/integ.json b/...@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/integ.json
@@ -1,5 +1,5 @@
 {
- "version": "34.0.0",
+ "version": "33.0.0",
  "testCases": {
  "integ.backup": {
  "stacks": [

diff --git a/...s-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/manifest.json b/...s-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/manifest.json
@@ -1,5 +1,5 @@
 {
- "version": "34.0.0",
+ "version": "33.0.0",
  "artifacts": {
  "cdk-backup.assets": {
  "type": "cdk:asset-manifest",
@@ -14,11 +14,10 @@
  "environment": "aws://unknown-account/unknown-region",
  "properties": {
  "templateFile": "cdk-backup.template.json",
- "terminationProtection": false,
  "validateOnSynth": false,
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
  "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
- "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976.json",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
  "requiresBootstrapStackVersion": 6,
  "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
  "additionalDependencies": [

diff --git a/.../@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/tree.json b/.../@aws-cdk-testing/framework-integ/test/aws-backup/test/integ.backup.js.snapshot/tree.json
@@ -37,22 +37,22 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_dynamodb.CfnTable",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "ScalingRole": {
  "id": "ScalingRole",
  "path": "cdk-backup/Table/ScalingRole",
  "constructInfo": {
- "fqn": "aws-cdk-lib.Resource",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_dynamodb.Table",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "FileSystem": {
@@ -63,8 +63,8 @@
  "aws:cdk:cloudformation:props": {}
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_efs.CfnFileSystem",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Vault": {
@@ -84,14 +84,14 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.BackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "SecondaryVault": {
@@ -111,22 +111,22 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.BackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Env": {
  "id": "Env",
  "path": "cdk-backup/Env",
  "constructInfo": {
- "fqn": "aws-cdk-lib.CfnParameter",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "ThirdVault": {
@@ -156,14 +156,14 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.BackupVault",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Plan": {
@@ -185,7 +185,6 @@
  },
  "ruleName": "Daily",
  "scheduleExpression": "cron(0 5 * * ? *)",
- "scheduleExpressionTimezone": "Etc/UTC",
  "targetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",
@@ -199,7 +198,6 @@
  },
  "ruleName": "Weekly",
  "scheduleExpression": "cron(0 5 ? * SAT *)",
- "scheduleExpressionTimezone": "Etc/UTC",
  "targetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",
@@ -214,7 +212,6 @@
  },
  "ruleName": "Monthly5Year",
  "scheduleExpression": "cron(0 5 1 * ? *)",
- "scheduleExpressionTimezone": "Etc/UTC",
  "targetBackupVault": {
  "Fn::GetAtt": [
  "Vault23237E5B",
@@ -253,8 +250,8 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.CfnBackupPlan",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Selection": {
@@ -269,8 +266,8 @@
  "id": "ImportRole",
  "path": "cdk-backup/Plan/Selection/Role/ImportRole",
  "constructInfo": {
- "fqn": "aws-cdk-lib.Resource",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Resource": {
@@ -308,14 +305,14 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_iam.CfnRole",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_iam.Role",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Resource": {
@@ -397,56 +394,56 @@
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.CfnBackupSelection",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.BackupSelection",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.aws_backup.BackupPlan",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "BootstrapVersion": {
  "id": "BootstrapVersion",
  "path": "cdk-backup/BootstrapVersion",
  "constructInfo": {
- "fqn": "aws-cdk-lib.CfnParameter",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "CheckBootstrapVersion": {
  "id": "CheckBootstrapVersion",
  "path": "cdk-backup/CheckBootstrapVersion",
  "constructInfo": {
- "fqn": "aws-cdk-lib.CfnRule",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.Stack",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  },
  "Tree": {
  "id": "Tree",
  "path": "Tree",
  "constructInfo": {
  "fqn": "constructs.Construct",
- "version": "10.2.70"
+ "version": "10.2.69"
  }
  }
  },
  "constructInfo": {
- "fqn": "aws-cdk-lib.App",
- "version": "0.0.0"
+ "fqn": "constructs.Construct",
+ "version": "10.2.69"
  }
  }
 }
diff --git a/...teg/test/aws-dynamodb/test/integ.autoscaling.lit.js.snapshot/aws-cdk-dynamodb.assets.json b/...teg/test/aws-dynamodb/test/integ.autoscaling.lit.js.snapshot/aws-cdk-dynamodb.assets.json
@@ -1,15 +1,15 @@
 {
- "version": "34.0.0",
+ "version": "20.0.0",
  "files": {
- "865151155140d0ba599d3522f659db77ada497ea1a763cf11c3fb58d017a3082": {
+ "619c64c0f19a7d78d759641bfba47f06ebbd7ffb42aae71ec695a6777a534d01": {
  "source": {
  "path": "aws-cdk-dynamodb.template.json",
  "packaging": "file"
  },
  "destinations": {
  "current_account-current_region": {
  "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
- "objectKey": "865151155140d0ba599d3522f659db77ada497ea1a763cf11c3fb58d017a3082.json",
+ "objectKey": "619c64c0f19a7d78d759641bfba47f06ebbd7ffb42aae71ec695a6777a534d01.json",
  "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
  }
  }