Skip to content

Commit e2fc724

Browse files
kaizencckaizencc
committed
revert: "feat(core): Schedule class" (#27284)
Reverts #27105 This fixes #27259 by reverting the offending commit.
1 parent d7cf3be commit e2fc724

Some content is hidden

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

52 files changed

+1225
-622
lines changed

‎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
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "34.0.0",
2+
"version": "32.0.0",
33
"files": {
4-
"7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976": {
4+
"0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5": {
55
"source": {
66
"path": "cdk-backup.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976.json",
12+
"objectKey": "0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎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
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"34.0.0"}
1+
{"version":"32.0.0"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "34.0.0",
2+
"version": "33.0.0",
33
"testCases": {
44
"integ.backup": {
55
"stacks": [

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "34.0.0",
2+
"version": "33.0.0",
33
"artifacts": {
44
"cdk-backup.assets": {
55
"type": "cdk:asset-manifest",
@@ -14,11 +14,10 @@
1414
"environment": "aws://unknown-account/unknown-region",
1515
"properties": {
1616
"templateFile": "cdk-backup.template.json",
17-
"terminationProtection": false,
1817
"validateOnSynth": false,
1918
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
2019
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
21-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7617f116cb014747232d2ebeb42fb3e22242c4b0987526daf7a033aba236d976.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0c52c355c71ac95690274d7987110017ff9cd1a1bc79fa4206fda2f55d6b62d5.json",
2221
"requiresBootstrapStackVersion": 6,
2322
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2423
"additionalDependencies": [

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

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,22 @@
3737
}
3838
},
3939
"constructInfo": {
40-
"fqn": "aws-cdk-lib.aws_dynamodb.CfnTable",
41-
"version": "0.0.0"
40+
"fqn": "constructs.Construct",
41+
"version": "10.2.69"
4242
}
4343
},
4444
"ScalingRole": {
4545
"id": "ScalingRole",
4646
"path": "cdk-backup/Table/ScalingRole",
4747
"constructInfo": {
48-
"fqn": "aws-cdk-lib.Resource",
49-
"version": "0.0.0"
48+
"fqn": "constructs.Construct",
49+
"version": "10.2.69"
5050
}
5151
}
5252
},
5353
"constructInfo": {
54-
"fqn": "aws-cdk-lib.aws_dynamodb.Table",
55-
"version": "0.0.0"
54+
"fqn": "constructs.Construct",
55+
"version": "10.2.69"
5656
}
5757
},
5858
"FileSystem": {
@@ -63,8 +63,8 @@
6363
"aws:cdk:cloudformation:props": {}
6464
},
6565
"constructInfo": {
66-
"fqn": "aws-cdk-lib.aws_efs.CfnFileSystem",
67-
"version": "0.0.0"
66+
"fqn": "constructs.Construct",
67+
"version": "10.2.69"
6868
}
6969
},
7070
"Vault": {
@@ -84,14 +84,14 @@
8484
}
8585
},
8686
"constructInfo": {
87-
"fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
88-
"version": "0.0.0"
87+
"fqn": "constructs.Construct",
88+
"version": "10.2.69"
8989
}
9090
}
9191
},
9292
"constructInfo": {
93-
"fqn": "aws-cdk-lib.aws_backup.BackupVault",
94-
"version": "0.0.0"
93+
"fqn": "constructs.Construct",
94+
"version": "10.2.69"
9595
}
9696
},
9797
"SecondaryVault": {
@@ -111,22 +111,22 @@
111111
}
112112
},
113113
"constructInfo": {
114-
"fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
115-
"version": "0.0.0"
114+
"fqn": "constructs.Construct",
115+
"version": "10.2.69"
116116
}
117117
}
118118
},
119119
"constructInfo": {
120-
"fqn": "aws-cdk-lib.aws_backup.BackupVault",
121-
"version": "0.0.0"
120+
"fqn": "constructs.Construct",
121+
"version": "10.2.69"
122122
}
123123
},
124124
"Env": {
125125
"id": "Env",
126126
"path": "cdk-backup/Env",
127127
"constructInfo": {
128-
"fqn": "aws-cdk-lib.CfnParameter",
129-
"version": "0.0.0"
128+
"fqn": "constructs.Construct",
129+
"version": "10.2.69"
130130
}
131131
},
132132
"ThirdVault": {
@@ -156,14 +156,14 @@
156156
}
157157
},
158158
"constructInfo": {
159-
"fqn": "aws-cdk-lib.aws_backup.CfnBackupVault",
160-
"version": "0.0.0"
159+
"fqn": "constructs.Construct",
160+
"version": "10.2.69"
161161
}
162162
}
163163
},
164164
"constructInfo": {
165-
"fqn": "aws-cdk-lib.aws_backup.BackupVault",
166-
"version": "0.0.0"
165+
"fqn": "constructs.Construct",
166+
"version": "10.2.69"
167167
}
168168
},
169169
"Plan": {
@@ -185,7 +185,6 @@
185185
},
186186
"ruleName": "Daily",
187187
"scheduleExpression": "cron(0 5 * * ? *)",
188-
"scheduleExpressionTimezone": "Etc/UTC",
189188
"targetBackupVault": {
190189
"Fn::GetAtt": [
191190
"Vault23237E5B",
@@ -199,7 +198,6 @@
199198
},
200199
"ruleName": "Weekly",
201200
"scheduleExpression": "cron(0 5 ? * SAT *)",
202-
"scheduleExpressionTimezone": "Etc/UTC",
203201
"targetBackupVault": {
204202
"Fn::GetAtt": [
205203
"Vault23237E5B",
@@ -214,7 +212,6 @@
214212
},
215213
"ruleName": "Monthly5Year",
216214
"scheduleExpression": "cron(0 5 1 * ? *)",
217-
"scheduleExpressionTimezone": "Etc/UTC",
218215
"targetBackupVault": {
219216
"Fn::GetAtt": [
220217
"Vault23237E5B",
@@ -253,8 +250,8 @@
253250
}
254251
},
255252
"constructInfo": {
256-
"fqn": "aws-cdk-lib.aws_backup.CfnBackupPlan",
257-
"version": "0.0.0"
253+
"fqn": "constructs.Construct",
254+
"version": "10.2.69"
258255
}
259256
},
260257
"Selection": {
@@ -269,8 +266,8 @@
269266
"id": "ImportRole",
270267
"path": "cdk-backup/Plan/Selection/Role/ImportRole",
271268
"constructInfo": {
272-
"fqn": "aws-cdk-lib.Resource",
273-
"version": "0.0.0"
269+
"fqn": "constructs.Construct",
270+
"version": "10.2.69"
274271
}
275272
},
276273
"Resource": {
@@ -308,14 +305,14 @@
308305
}
309306
},
310307
"constructInfo": {
311-
"fqn": "aws-cdk-lib.aws_iam.CfnRole",
312-
"version": "0.0.0"
308+
"fqn": "constructs.Construct",
309+
"version": "10.2.69"
313310
}
314311
}
315312
},
316313
"constructInfo": {
317-
"fqn": "aws-cdk-lib.aws_iam.Role",
318-
"version": "0.0.0"
314+
"fqn": "constructs.Construct",
315+
"version": "10.2.69"
319316
}
320317
},
321318
"Resource": {
@@ -397,56 +394,56 @@
397394
}
398395
},
399396
"constructInfo": {
400-
"fqn": "aws-cdk-lib.aws_backup.CfnBackupSelection",
401-
"version": "0.0.0"
397+
"fqn": "constructs.Construct",
398+
"version": "10.2.69"
402399
}
403400
}
404401
},
405402
"constructInfo": {
406-
"fqn": "aws-cdk-lib.aws_backup.BackupSelection",
407-
"version": "0.0.0"
403+
"fqn": "constructs.Construct",
404+
"version": "10.2.69"
408405
}
409406
}
410407
},
411408
"constructInfo": {
412-
"fqn": "aws-cdk-lib.aws_backup.BackupPlan",
413-
"version": "0.0.0"
409+
"fqn": "constructs.Construct",
410+
"version": "10.2.69"
414411
}
415412
},
416413
"BootstrapVersion": {
417414
"id": "BootstrapVersion",
418415
"path": "cdk-backup/BootstrapVersion",
419416
"constructInfo": {
420-
"fqn": "aws-cdk-lib.CfnParameter",
421-
"version": "0.0.0"
417+
"fqn": "constructs.Construct",
418+
"version": "10.2.69"
422419
}
423420
},
424421
"CheckBootstrapVersion": {
425422
"id": "CheckBootstrapVersion",
426423
"path": "cdk-backup/CheckBootstrapVersion",
427424
"constructInfo": {
428-
"fqn": "aws-cdk-lib.CfnRule",
429-
"version": "0.0.0"
425+
"fqn": "constructs.Construct",
426+
"version": "10.2.69"
430427
}
431428
}
432429
},
433430
"constructInfo": {
434-
"fqn": "aws-cdk-lib.Stack",
435-
"version": "0.0.0"
431+
"fqn": "constructs.Construct",
432+
"version": "10.2.69"
436433
}
437434
},
438435
"Tree": {
439436
"id": "Tree",
440437
"path": "Tree",
441438
"constructInfo": {
442439
"fqn": "constructs.Construct",
443-
"version": "10.2.70"
440+
"version": "10.2.69"
444441
}
445442
}
446443
},
447444
"constructInfo": {
448-
"fqn": "aws-cdk-lib.App",
449-
"version": "0.0.0"
445+
"fqn": "constructs.Construct",
446+
"version": "10.2.69"
450447
}
451448
}
452449
}

‎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
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"version": "34.0.0",
2+
"version": "20.0.0",
33
"files": {
4-
"865151155140d0ba599d3522f659db77ada497ea1a763cf11c3fb58d017a3082": {
4+
"619c64c0f19a7d78d759641bfba47f06ebbd7ffb42aae71ec695a6777a534d01": {
55
"source": {
66
"path": "aws-cdk-dynamodb.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "865151155140d0ba599d3522f659db77ada497ea1a763cf11c3fb58d017a3082.json",
12+
"objectKey": "619c64c0f19a7d78d759641bfba47f06ebbd7ffb42aae71ec695a6777a534d01.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

0 commit comments

Comments
 (0)