@friggframework/admin-scripts 2.0.0-next.103 → 2.0.0-next.105

package/index.js

@@ -16,6 +16,10 @@ const {
     ScriptRunner,
     createScriptRunner,
 } = require('./src/application/script-runner');
+const {
+    ReportRunner,
+    createReportRunner,
+} = require('./src/application/report-runner');
 
 // Infrastructure
 const {
@@ -26,9 +30,15 @@ const {
     app,
     handler: routerHandler,
 } = require('./src/infrastructure/admin-script-router');
+const {
+    handler: reportRouterHandler,
+} = require('./src/infrastructure/report-router');
 const {
     handler: executorHandler,
 } = require('./src/infrastructure/script-executor-handler');
+const {
+    handler: reportExecutorHandler,
+} = require('./src/infrastructure/report-executor-handler');
 
 // Adapters
 const { SchedulerAdapter } = require('./src/adapters/scheduler-adapter');
@@ -48,13 +58,17 @@ module.exports = {
     createAdminScriptContext,
     ScriptRunner,
     createScriptRunner,
+    ReportRunner,
+    createReportRunner,
 
     // Infrastructure layer
     validateAdminApiKey,
     router,
     app,
     routerHandler,
+    reportRouterHandler,
     executorHandler,
+    reportExecutorHandler,
 
     // Adapters
     SchedulerAdapter,

package/package.json

@@ -1,19 +1,19 @@
 {
     "name": "@friggframework/admin-scripts",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0-next.103",
+    "version": "2.0.0-next.105",
     "description": "Admin Script Runner for Frigg - Execute maintenance and operational scripts in hosted environments",
     "dependencies": {
         "@aws-sdk/client-scheduler": "^3.588.0",
-        "@friggframework/core": "2.0.0-next.103",
+        "@friggframework/core": "2.0.0-next.105",
         "@hapi/boom": "^10.0.1",
         "express": "^4.18.2",
         "serverless-http": "^3.2.0"
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0-next.103",
-        "@friggframework/prettier-config": "2.0.0-next.103",
-        "@friggframework/test": "2.0.0-next.103",
+        "@friggframework/eslint-config": "2.0.0-next.105",
+        "@friggframework/prettier-config": "2.0.0-next.105",
+        "@friggframework/test": "2.0.0-next.105",
         "eslint": "^8.22.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
@@ -44,5 +44,5 @@
         "maintenance",
         "operations"
     ],
-    "gitHead": "9fc434b0c6e1323bd16be165d311b6880a23de12"
+    "gitHead": "d200bd6b1385a33736b67f48e3aa5ac3f5e167c8"
 }

package/src/adapters/__tests__/aws-scheduler-adapter.test.js

@@ -422,6 +422,60 @@ describe('AWSSchedulerAdapter', () => {
         });
     });
 
+    describe('report parameterization (namePrefix + buildInput)', () => {
+        const reportParams = {
+            targetLambdaArn:
+                'arn:aws:lambda:us-east-1:123456789012:function:report-executor',
+            scheduleGroupName: 'frigg-admin-scripts',
+            roleArn: 'arn:aws:iam::123456789012:role/test-role',
+            namePrefix: 'frigg-report-',
+            buildInput: ({ input }) => ({
+                reportName: 'integrations',
+                mode: 'snapshot',
+                trigger: 'SCHEDULED',
+                params: input || {},
+            }),
+        };
+
+        it('targets the report executor and emits a report-shaped message', async () => {
+            const reportAdapter = new AWSSchedulerAdapter({ ...reportParams });
+            mockSend.mockResolvedValue({
+                ScheduleArn:
+                    'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-report-integrations',
+            });
+
+            const result = await reportAdapter.createSchedule({
+                scriptName: 'integrations',
+                cronExpression: 'cron(0 6 * * ? *)',
+            });
+
+            expect(result.scheduleName).toBe('frigg-report-integrations');
+
+            const command = mockSend.mock.calls[0][0];
+            expect(command.params.Name).toBe('frigg-report-integrations');
+            expect(command.params.Target.Arn).toBe(
+                'arn:aws:lambda:us-east-1:123456789012:function:report-executor'
+            );
+            expect(JSON.parse(command.params.Target.Input)).toEqual({
+                reportName: 'integrations',
+                mode: 'snapshot',
+                trigger: 'SCHEDULED',
+                params: {},
+            });
+        });
+
+        it('deletes the report schedule by its prefixed name', async () => {
+            const reportAdapter = new AWSSchedulerAdapter({ ...reportParams });
+            mockSend.mockResolvedValue({});
+
+            await reportAdapter.deleteSchedule('integrations');
+
+            const command = mockSend.mock.calls[0][0];
+            expect(command._type).toBe('DeleteScheduleCommand');
+            expect(command.params.Name).toBe('frigg-report-integrations');
+        });
+    });
+
     describe('Lazy SDK loading', () => {
         it('should load AWS SDK on first client access', () => {
             const newAdapter = new AWSSchedulerAdapter({ ...defaultParams });

package/src/adapters/__tests__/scheduler-adapter-factory.test.js

@@ -1,6 +1,7 @@
 const {
     createSchedulerAdapter,
     createSchedulerAdapterFromEnv,
+    createReportSchedulerAdapterFromEnv,
 } = require('../scheduler-adapter-factory');
 const { AWSSchedulerAdapter } = require('../aws-scheduler-adapter');
 const { LocalSchedulerAdapter } = require('../local-scheduler-adapter');
@@ -185,4 +186,52 @@ describe('Scheduler Adapter Factory', () => {
             expect(adapter.roleArn).toBe(awsAdapterParams.roleArn);
         });
     });
+
+    describe('createReportSchedulerAdapterFromEnv()', () => {
+        it('builds an AWS adapter targeting the report executor with a report-shaped message', () => {
+            process.env.SCHEDULER_PROVIDER = 'aws';
+            process.env.REPORT_EXECUTOR_LAMBDA_ARN =
+                'arn:aws:lambda:us-east-1:123456789012:function:report-executor';
+            process.env.REPORT_SCHEDULE_GROUP = 'frigg-admin-scripts';
+            process.env.SCHEDULER_ROLE_ARN = awsAdapterParams.roleArn;
+
+            const adapter = createReportSchedulerAdapterFromEnv({
+                reportName: 'integrations',
+                mode: 'snapshot',
+            });
+
+            expect(adapter).toBeInstanceOf(AWSSchedulerAdapter);
+            expect(adapter.targetLambdaArn).toBe(
+                'arn:aws:lambda:us-east-1:123456789012:function:report-executor'
+            );
+            expect(adapter.scheduleNameFor('integrations')).toBe(
+                'frigg-report-integrations'
+            );
+            expect(adapter.buildInput({ input: { a: 1 } })).toEqual({
+                reportName: 'integrations',
+                mode: 'snapshot',
+                trigger: 'SCHEDULED',
+                params: { a: 1 },
+            });
+        });
+
+        it('throws 503 when SCHEDULER_PROVIDER is unset in a deployed Lambda', () => {
+            delete process.env.SCHEDULER_PROVIDER;
+            process.env.AWS_LAMBDA_FUNCTION_NAME = 'report-router';
+
+            let error;
+            try {
+                createReportSchedulerAdapterFromEnv({
+                    reportName: 'x',
+                    mode: 'snapshot',
+                });
+            } catch (e) {
+                error = e;
+            }
+
+            expect(error).toBeDefined();
+            expect(error.isBoom).toBe(true);
+            expect(error.output.statusCode).toBe(503);
+        });
+    });
 });

package/src/adapters/aws-scheduler-adapter.js

@@ -28,12 +28,22 @@ function loadSchedulerSDK() {
  * Implements scheduling using AWS EventBridge Scheduler.
  * Supports cron expressions, timezone configuration, and Lambda invocation.
  */
+// Prefix and input builder are parameterized so one adapter can target either the script or report executor.
+const DEFAULT_NAME_PREFIX = 'frigg-script-';
+const defaultBuildInput = ({ scriptName, input }) => ({
+    scriptName,
+    trigger: 'SCHEDULED',
+    params: input || {},
+});
+
 class AWSSchedulerAdapter extends SchedulerAdapter {
     constructor({
         credentials,
         targetLambdaArn,
         scheduleGroupName,
         roleArn,
+        namePrefix,
+        buildInput,
     } = {}) {
         super();
         if (!targetLambdaArn)
@@ -52,9 +62,15 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
         this.targetLambdaArn = targetLambdaArn;
         this.scheduleGroupName = scheduleGroupName;
         this.roleArn = roleArn;
+        this.namePrefix = namePrefix || DEFAULT_NAME_PREFIX;
+        this.buildInput = buildInput || defaultBuildInput;
         this.scheduler = null;
     }
 
+    scheduleNameFor(scriptName) {
+        return `${this.namePrefix}${scriptName}`;
+    }
+
     getSchedulerClient() {
         if (!this.scheduler) {
             loadSchedulerSDK();
@@ -72,7 +88,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
 
     async createSchedule({ scriptName, cronExpression, timezone, input }) {
         const client = this.getSchedulerClient();
-        const scheduleName = `frigg-script-${scriptName}`;
+        const scheduleName = this.scheduleNameFor(scriptName);
 
         const scheduleParams = {
             Name: scheduleName,
@@ -83,11 +99,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
             Target: {
                 Arn: this.targetLambdaArn,
                 RoleArn: this.roleArn,
-                Input: JSON.stringify({
-                    scriptName,
-                    trigger: 'SCHEDULED',
-                    params: input || {},
-                }),
+                Input: JSON.stringify(this.buildInput({ scriptName, input })),
             },
             State: 'ENABLED',
         };
@@ -116,7 +128,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
 
     async deleteSchedule(scriptName) {
         const client = this.getSchedulerClient();
-        const scheduleName = `frigg-script-${scriptName}`;
+        const scheduleName = this.scheduleNameFor(scriptName);
 
         await client.send(
             new DeleteScheduleCommand({
@@ -128,7 +140,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
 
     async setScheduleEnabled(scriptName, enabled) {
         const client = this.getSchedulerClient();
-        const scheduleName = `frigg-script-${scriptName}`;
+        const scheduleName = this.scheduleNameFor(scriptName);
 
         // Get the current schedule first to preserve all settings
         const getCommand = new GetScheduleCommand({
@@ -167,7 +179,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
 
     async getSchedule(scriptName) {
         const client = this.getSchedulerClient();
-        const scheduleName = `frigg-script-${scriptName}`;
+        const scheduleName = this.scheduleNameFor(scriptName);
 
         const response = await client.send(
             new GetScheduleCommand({

package/src/adapters/scheduler-adapter-factory.js

@@ -39,6 +39,8 @@ function createSchedulerAdapter(options = {}) {
                 targetLambdaArn: options.targetLambdaArn,
                 scheduleGroupName: options.scheduleGroupName,
                 roleArn: options.roleArn,
+                namePrefix: options.namePrefix,
+                buildInput: options.buildInput,
             });
 
         case 'local':
@@ -79,7 +81,45 @@ function createSchedulerAdapterFromEnv() {
     });
 }
 
+/**
+ * Resolve and build a scheduler adapter that targets the report executor Lambda.
+ *
+ * A distinct name prefix keeps report schedules from colliding with script
+ * schedules in the shared EventBridge group.
+ *
+ * @param {Object} params
+ * @param {string} params.reportName - Registered report name (also the ScriptSchedule key).
+ * @param {string} params.mode - Run mode for the scheduled invocation (e.g. 'snapshot').
+ * @returns {SchedulerAdapter}
+ * @throws {Boom.Boom} 503 when SCHEDULER_PROVIDER is unset in a deployed Lambda.
+ */
+function createReportSchedulerAdapterFromEnv({ reportName, mode }) {
+    const type =
+        process.env.SCHEDULER_PROVIDER ||
+        (process.env.AWS_LAMBDA_FUNCTION_NAME ? null : 'local');
+    if (!type) {
+        throw Boom.serverUnavailable(
+            'SCHEDULER_PROVIDER is not configured. Set it (e.g. "aws") via appDefinition.admin.enableScheduling.'
+        );
+    }
+
+    return createSchedulerAdapter({
+        type,
+        targetLambdaArn: process.env.REPORT_EXECUTOR_LAMBDA_ARN,
+        scheduleGroupName: process.env.REPORT_SCHEDULE_GROUP,
+        roleArn: process.env.SCHEDULER_ROLE_ARN,
+        namePrefix: 'frigg-report-',
+        buildInput: ({ input }) => ({
+            reportName,
+            mode,
+            trigger: 'SCHEDULED',
+            params: input || {},
+        }),
+    });
+}
+
 module.exports = {
     createSchedulerAdapter,
     createSchedulerAdapterFromEnv,
+    createReportSchedulerAdapterFromEnv,
 };