@lafken/schedule 0.11.19 → 0.12.0

package/lib/main/schedule/schedule.types.d.ts

@@ -1,11 +1,11 @@
 import type { LambdaMetadata, ResourceOutputType, ScheduleReferenceNames } from '@lafken/common';
 type ScheduleExpressions = number | '*' | '?' | (string & {});
 /**
- * Attributes that can be exported from an EventBridge schedule rule resource.
+ * Attributes that can be exported from an EventBridge Scheduler resource.
  *
- * Based on Terraform `aws_cloudwatch_event_rule` attribute reference:
- * - `arn`: The Amazon Resource Name (ARN) of the rule.
- * - `id`: The name of the rule.
+ * Based on Terraform `aws_scheduler_schedule` attribute reference:
+ * - `arn`: The Amazon Resource Name (ARN) of the schedule.
+ * - `id`: The name of the schedule.
  */
 export type ScheduleOutputAttributes = 'arn' | 'id';
 export interface ScheduleTime {
@@ -45,12 +45,12 @@ export interface EventCronProps {
      */
     schedule: string | ScheduleTime;
     /**
-     * Defines which EventBridge schedule rule attributes should be exported.
+     * Defines which EventBridge Scheduler attributes should be exported.
      *
-     * Supported attributes are based on Terraform `aws_cloudwatch_event_rule`
+     * Supported attributes are based on Terraform `aws_scheduler_schedule`
      * attribute reference:
-     * - `arn`: The Amazon Resource Name (ARN) of the rule.
-     * - `id`: The name of the rule.
+     * - `arn`: The Amazon Resource Name (ARN) of the schedule.
+     * - `id`: The name of the schedule.
      *
      * Each selected attribute can be exported through SSM Parameter Store (`type: 'ssm'`)
      * or Terraform outputs (`type: 'output'`).

package/lib/resolver/cron/cron.d.ts

@@ -1,4 +1,4 @@
-import { CloudwatchEventRule } from '@cdktn/provider-aws/lib/cloudwatch-event-rule';
+import { SchedulerSchedule } from '@cdktn/provider-aws/lib/scheduler-schedule';
 import { type AppModule } from '@lafken/resolver';
 import type { CronProps } from './cron.types';
 declare const Cron_base: (new (...args: any[]) => {
@@ -7,11 +7,9 @@ declare const Cron_base: (new (...args: any[]) => {
     readonly node: import("constructs").Node;
     with(...mixins: import("constructs").IMixin[]): import("constructs").IConstruct;
     toString(): string;
-}) & typeof CloudwatchEventRule;
+}) & typeof SchedulerSchedule;
 export declare class Cron extends Cron_base {
-    private props;
     constructor(scope: AppModule, id: string, props: CronProps);
-    addEventTarget(id: string): void;
     private static buildScheduleExpression;
 }
 export {};

package/lib/resolver/cron/cron.js

@@ -1,44 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cron = void 0;
-const cloudwatch_event_rule_1 = require("@cdktn/provider-aws/lib/cloudwatch-event-rule");
-const cloudwatch_event_target_1 = require("@cdktn/provider-aws/lib/cloudwatch-event-target");
+const scheduler_schedule_1 = require("@cdktn/provider-aws/lib/scheduler-schedule");
 const resolver_1 = require("@lafken/resolver");
-class Cron extends resolver_1.lafkenResource.make(cloudwatch_event_rule_1.CloudwatchEventRule) {
-    props;
+class Cron extends resolver_1.lafkenResource.make(scheduler_schedule_1.SchedulerSchedule) {
     constructor(scope, id, props) {
-        const { handler } = props;
-        super(scope, `${handler.name}-cron`, {
-            name: handler.name,
-            scheduleExpression: Cron.buildScheduleExpression(handler.schedule),
-        });
-        this.props = props;
-        if (props.handler.ref) {
-            this.register('schedule', props.handler.ref);
-        }
-        this.addEventTarget(id);
-        new resolver_1.ResourceOutput(this, handler.outputs);
-    }
-    addEventTarget(id) {
-        const { handler, resourceMetadata } = this.props;
-        const lambdaHandler = new resolver_1.LambdaHandler(this, `${handler.name}-${resourceMetadata.name}`, {
+        const { handler, resourceMetadata } = props;
+        const lambdaHandler = new resolver_1.LambdaHandler(scope, id, {
             ...handler,
             originalName: resourceMetadata.originalName,
             filename: resourceMetadata.filename,
             foldername: resourceMetadata.foldername,
             suffix: 'event',
-            principal: 'events.amazonaws.com',
-            sourceArn: this.arn,
+            principal: 'scheduler.amazonaws.com',
         });
-        new cloudwatch_event_target_1.CloudwatchEventTarget(this, `${id}-event-target`, {
-            rule: this.name,
-            arn: lambdaHandler.arn,
-            retryPolicy: {
-                maximumRetryAttempts: handler.retryAttempts,
-                maximumEventAgeInSeconds: handler.maxEventAge,
+        const schedulerRole = new resolver_1.Role(scope, `${handler.name}-scheduler-role`, {
+            name: `${handler.name}-scheduler`,
+            principal: 'scheduler.amazonaws.com',
+            services: ['lambda'],
+        });
+        super(scope, `${handler.name}-cron`, {
+            name: handler.name,
+            scheduleExpression: Cron.buildScheduleExpression(handler.schedule),
+            flexibleTimeWindow: { mode: 'OFF' },
+            target: {
+                arn: lambdaHandler.arn,
+                roleArn: schedulerRole.arn,
+                retryPolicy: {
+                    maximumRetryAttempts: handler.retryAttempts,
+                    maximumEventAgeInSeconds: handler.maxEventAge,
+                },
             },
-            dependsOn: [lambdaHandler],
         });
+        if (handler.ref) {
+            this.register('schedule', handler.ref);
+        }
+        new resolver_1.ResourceOutput(this, handler.outputs);
     }
     static buildScheduleExpression(schedule) {
         if (typeof schedule === 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lafken/schedule",
-  "version": "0.11.19",
+  "version": "0.12.0",
   "private": false,
   "description": "Define EventBridge scheduled rules and cron jobs using TypeScript decorators with Lafken",
   "keywords": [
@@ -50,20 +50,20 @@
   ],
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "@lafken/resolver": "0.11.19"
+    "@lafken/resolver": "0.12.0"
   },
   "devDependencies": {
-    "@cdktn/provider-aws": "^23.9.0",
-    "@swc/core": "^1.15.30",
+    "@cdktn/provider-aws": "^24.0.0",
+    "@swc/core": "^1.15.33",
     "@swc/helpers": "^0.5.21",
     "@vitest/runner": "^4.1.5",
-    "cdktn": "^0.22.1",
+    "cdktn": "^0.23.0",
     "cdktn-vitest": "^1.0.0",
     "constructs": "^10.6.0",
     "typescript": "6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.5",
-    "@lafken/common": "0.11.19"
+    "@lafken/common": "0.12.0"
   },
   "peerDependencies": {
     "@cdktn/provider-aws": ">=23.0.0",