Merge branch 'master' of https://github.com/sakurai-ryo/aws-cdk into …

…feat-scheduler-flex-window

package.json

@@ -20,22 +20,22 @@
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
     "aws-sdk-js-codemod": "^0.28.2",
-    "cdk-generate-synthetic-examples": "^0.1.298",
+    "cdk-generate-synthetic-examples": "^0.1.299",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.11",
     "jest-junit": "^13.2.0",
-    "jsii-diff": "1.92.0",
-    "jsii-pacmak": "1.92.0",
-    "jsii-reflect": "1.92.0",
-    "jsii-rosetta": "~5.2.5",
+    "jsii-diff": "1.93.0",
+    "jsii-pacmak": "1.93.0",
+    "jsii-reflect": "1.93.0",
+    "jsii-rosetta": "~5.2.6",
     "lerna": "^7.4.2",
     "nx": "^16.10.0",
     "patch-package": "^6.5.1",
     "semver": "^7.5.4",
     "standard-version": "^9.5.0",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typescript": "~5.1.6"
   },
   "resolutions": {

packages/@aws-cdk-testing/cli-integ/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
-    "aws-sdk": "^2.1513.0",
+    "aws-sdk": "^2.1517.0",
     "axios": "^1.6.2",
     "fs-extra": "^9.1.0",
     "glob": "^7.2.3",

packages/@aws-cdk-testing/framework-integ/package.json

@@ -41,10 +41,10 @@
     "@aws-cdk/integ-tests-alpha": "0.0.0",
     "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
     "aws-cdk-lib": "0.0.0",
-    "aws-sdk": "^2.1513.0",
+    "aws-sdk": "^2.1517.0",
     "aws-sdk-mock": "5.6.0",
-    "cdk8s": "2.68.15",
-    "cdk8s-plus-27": "2.7.69",
+    "cdk8s": "2.68.18",
+    "cdk8s-plus-27": "2.7.70",
     "constructs": "^10.0.0"
   },
   "repository": {

packages/@aws-cdk/aws-cloud9-alpha/lib/environment.ts

@@ -50,9 +50,19 @@ export enum ImageId {
    */
   AMAZON_LINUX_2 = 'amazonlinux-2-x86_64',
   /**
-   * Create using Ubunut 18.04
+   * Create using Amazon Linux 2023
    */
-  UBUNTU_18_04 = 'ubuntu-18.04-x86_64'
+  AMAZON_LINUX_2023 = 'amazonlinux-2023-x86_64',
+  /**
+   * Create using Ubuntu 18.04
+   *
+   * @deprecated Since Ubuntu 18.04 has ended standard support as of May 31, 2023, we recommend you choose Ubuntu 22.04.
+   */
+  UBUNTU_18_04 = 'ubuntu-18.04-x86_64',
+  /**
+   * Create using Ubuntu 22.04
+   */
+  UBUNTU_22_04 = 'ubuntu-22.04-x86_64',
 }
 /**
  * Properties for Ec2Environment

packages/@aws-cdk/aws-cloud9-alpha/test/cloud9.environment.test.ts

@@ -208,7 +208,9 @@ test.each([
 
 test.each([
   [ImageId.AMAZON_LINUX_2, 'amazonlinux-2-x86_64'],
+  [ImageId.AMAZON_LINUX_2023, 'amazonlinux-2023-x86_64'],
   [ImageId.UBUNTU_18_04, 'ubuntu-18.04-x86_64'],
+  [ImageId.UBUNTU_22_04, 'ubuntu-22.04-x86_64'],
 ])('has image ID property (%s)', (imageId, expected) => {
   new cloud9.Ec2Environment(stack, 'C9Env', {
     vpc,

packages/@aws-cdk/aws-scheduler-alpha/README.md

@@ -138,6 +138,20 @@ new Schedule(this, 'Schedule', {
 });
 ```
 
+### Configuring a start and end time of the Schedule
+
+If you choose a recurring schedule, you can set the start and end time of the Schedule by specifying the `start` and `end`.
+
+```ts
+declare const target: targets.LambdaInvoke;
+
+new Schedule(this, 'Schedule', {
+    schedule: ScheduleExpression.rate(cdk.Duration.hours(12)),
+    target: target,
+    start: new Date('2023-01-01T00:00:00.000Z'),
+    end: new Date('2023-02-01T00:00:00.000Z'),
+});
+```
 
 ## Scheduler Targets
 

packages/@aws-cdk/aws-scheduler-alpha/lib/schedule.ts

@@ -165,6 +165,22 @@ export interface ScheduleProps {
    * @default TimeWindow.off()
    */
   readonly timeWindow?: TimeWindow;
+
+  /**
+   * The date, in UTC, after which the schedule can begin invoking its target.
+   * EventBridge Scheduler ignores start for one-time schedules.
+   *
+   * @default - no value
+   */
+  readonly start?: Date;
+
+  /**
+   * The date, in UTC, before which the schedule can invoke its target.
+   * EventBridge Scheduler ignores end for one-time schedules.
+   *
+   * @default - no value
+   */
+  readonly end?: Date;
 }
 
 /**
@@ -307,6 +323,8 @@ export class Schedule extends Resource implements ISchedule {
 
     const flexibleTimeWindow = props.timeWindow ?? TimeWindow.off();
 
+    this.validateTimeFrame(props.start, props.end);
+
     const resource = new CfnSchedule(this, 'Resource', {
       name: this.physicalName,
       flexibleTimeWindow: {
@@ -332,6 +350,8 @@ export class Schedule extends Resource implements ISchedule {
         sageMakerPipelineParameters: targetConfig.sageMakerPipelineParameters,
         sqsParameters: targetConfig.sqsParameters,
       },
+      startDate: props.start?.toISOString(),
+      endDate: props.end?.toISOString(),
     });
 
     this.scheduleName = this.getResourceNameAttribute(resource.ref);
@@ -362,4 +382,10 @@ export class Schedule extends Resource implements ISchedule {
     const isEmptyPolicy = Object.values(policy).every(value => value === undefined);
     return !isEmptyPolicy ? policy : undefined;
   }
-}
+
+  private validateTimeFrame(start?: Date, end?: Date) {
+    if (start && end && start >= end) {
+      throw new Error(`start must precede end, got start: ${start.toISOString()}, end: ${end.toISOString()}`);
+    }
+  }
+}

packages/@aws-cdk/aws-scheduler-alpha/test/integ.schedule.js.snapshot/aws-cdk-scheduler-schedule.template.json

@@ -379,6 +379,38 @@
      }
     }
    }
+  },
+  "ScheduleWithTimeFrameC1C8BDCC": {
+   "Type": "AWS::Scheduler::Schedule",
+   "Properties": {
+    "EndDate": "2025-10-01T00:00:00.000Z",
+    "FlexibleTimeWindow": {
+     "Mode": "OFF"
+    },
+    "ScheduleExpression": "rate(12 hours)",
+    "ScheduleExpressionTimezone": "Etc/UTC",
+    "StartDate": "2024-04-15T06:30:00.000Z",
+    "State": "ENABLED",
+    "Target": {
+     "Arn": {
+      "Fn::GetAtt": [
+       "Function76856677",
+       "Arn"
+      ]
+     },
+     "Input": "\"Input Text\"",
+     "RetryPolicy": {
+      "MaximumEventAgeInSeconds": 180,
+      "MaximumRetryAttempts": 3
+     },
+     "RoleArn": {
+      "Fn::GetAtt": [
+       "Role1ABCC5F0",
+       "Arn"
+      ]
+     }
+    }
+   }
   }
  },
  "Parameters": {

packages/@aws-cdk/aws-scheduler-alpha/test/integ.schedule.ts

@@ -96,6 +96,14 @@ new scheduler.Schedule(stack, 'UseFlexibleTimeWindow', {
   timeWindow: scheduler.TimeWindow.flexible(cdk.Duration.minutes(10)),
 });
 
+const currentYear = new Date().getFullYear();
+new scheduler.Schedule(stack, 'ScheduleWithTimeFrame', {
+  schedule: expression,
+  target: target,
+  start: new Date(`${currentYear + 1}-04-15T06:30:00.000Z`),
+  end: new Date(`${currentYear + 2}-10-01T00:00:00.000Z`),
+});
+
 new IntegTest(app, 'integtest-schedule', {
   testCases: [stack],
 });

packages/@aws-cdk/aws-scheduler-alpha/test/schedule.test.ts

@@ -129,6 +129,39 @@ describe('Schedule', () => {
     });
   });
 
+  describe('schedule timeFrame', () => {
+    test.each([
+      { StartDate: '2023-04-15T06:20:00.000Z', EndDate: '2023-10-01T00:00:00.000Z' },
+      { StartDate: '2023-04-15T06:25:00.000Z' },
+      { EndDate: '2023-10-01T00:00:00.000Z' },
+    ])('schedule can set start and end', (timeFrame) => {
+      new Schedule(stack, 'TestSchedule', {
+        schedule: expr,
+        target: new SomeLambdaTarget(func, role),
+        start: timeFrame.StartDate ? new Date(timeFrame.StartDate) : undefined,
+        end: timeFrame.EndDate ? new Date(timeFrame.EndDate) : undefined,
+      });
+
+      Template.fromStack(stack).hasResourceProperties('AWS::Scheduler::Schedule', {
+        ...timeFrame,
+      });
+    });
+
+    test.each([
+      { start: '2023-10-01T00:00:00.000Z', end: '2023-10-01T00:00:00.000Z' },
+      { start: '2023-10-01T00:00:00.000Z', end: '2023-09-01T00:00:00.000Z' },
+    ])('throw error when start does not come before end', ({ start, end }) => {
+      expect(() => {
+        new Schedule(stack, 'TestSchedule', {
+          schedule: expr,
+          target: new SomeLambdaTarget(func, role),
+          start: new Date(start),
+          end: new Date(end),
+        });
+      }).toThrow(`start must precede end, got start: ${start}, end: ${end}`);
+    });
+  });
+
   describe('flexibleTimeWindow', () => {
     test('flexibleTimeWindow mode is set to OFF by default', () => {
       // WHEN
@@ -182,4 +215,4 @@ describe('Schedule', () => {
       }).toThrow('The provided duration must be between 1 minute and 1440 minutes, got 0');
     });
   });
-});
+});

packages/@aws-cdk/cli-lib-alpha/package.json

@@ -90,7 +90,7 @@
     "aws-cdk": "0.0.0",
     "constructs": "^10.0.0",
     "jest": "^29.7.0",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.2"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

packages/@aws-cdk/custom-resource-handlers/package.json

@@ -54,15 +54,15 @@
     "sinon": "^9.2.4",
     "nock": "^13.4.0",
     "fs-extra": "^11.2.0",
-    "esbuild": "^0.19.8"
+    "esbuild": "^0.19.9"
   },
   "dependencies": {
     "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1",
     "@aws-sdk/client-lambda": "3.421.0",
     "@aws-sdk/client-synthetics": "3.421.0",
     "@aws-sdk/client-ecr": "3.421.0",
     "@aws-sdk/client-s3": "3.421.0",
-    "aws-sdk": "^2.1513.0"
+    "aws-sdk": "^2.1517.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

packages/@aws-cdk/integ-runner/package.json

@@ -67,7 +67,7 @@
     "constructs": "^10.0.0",
     "mock-fs": "^4.14.0",
     "jest": "^29.7.0",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.2"
   },
   "dependencies": {
     "chokidar": "^3.5.3",