@friggframework/admin-scripts 2.0.0--canary.517.179491e.0 → 2.0.0--canary.517.1687d70.0

package/package.json

@@ -1,18 +1,18 @@
 {
     "name": "@friggframework/admin-scripts",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.517.179491e.0",
+    "version": "2.0.0--canary.517.1687d70.0",
     "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--canary.517.179491e.0",
+        "@friggframework/core": "2.0.0--canary.517.1687d70.0",
         "express": "^4.18.2",
         "serverless-http": "^3.2.0"
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.517.179491e.0",
-        "@friggframework/prettier-config": "2.0.0--canary.517.179491e.0",
-        "@friggframework/test": "2.0.0--canary.517.179491e.0",
+        "@friggframework/eslint-config": "2.0.0--canary.517.1687d70.0",
+        "@friggframework/prettier-config": "2.0.0--canary.517.1687d70.0",
+        "@friggframework/test": "2.0.0--canary.517.1687d70.0",
         "eslint": "^8.22.0",
         "jest": "^29.7.0",
         "prettier": "^2.7.1",
@@ -43,5 +43,5 @@
         "maintenance",
         "operations"
     ],
-    "gitHead": "179491ee820576004873fdfdbe0e8e10a807098d"
+    "gitHead": "1687d704a5eed1b0de52275200a579399722813d"
 }

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

@@ -206,6 +206,43 @@ describe('AWSSchedulerAdapter', () => {
             const command = mockSend.mock.calls[0][0];
             expect(command.params.FlexibleTimeWindow).toEqual({ Mode: 'OFF' });
         });
+
+        it('should fall back to UpdateScheduleCommand on ConflictException', async () => {
+            const conflictError = new Error('Schedule already exists');
+            conflictError.name = 'ConflictException';
+
+            mockSend
+                .mockRejectedValueOnce(conflictError)
+                .mockResolvedValueOnce({
+                    ScheduleArn: 'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-script-test-script',
+                });
+
+            const result = await adapter.createSchedule({
+                scriptName: 'test-script',
+                cronExpression: 'cron(0 0 * * ? *)',
+            });
+
+            expect(result).toEqual({
+                scheduleArn: 'arn:aws:scheduler:us-east-1:123456789012:schedule/frigg-admin-scripts/frigg-script-test-script',
+                scheduleName: 'frigg-script-test-script',
+            });
+
+            expect(mockSend).toHaveBeenCalledTimes(2);
+            expect(mockSend.mock.calls[0][0]._type).toBe('CreateScheduleCommand');
+            expect(mockSend.mock.calls[1][0]._type).toBe('UpdateScheduleCommand');
+        });
+
+        it('should rethrow non-conflict errors', async () => {
+            const otherError = new Error('Access denied');
+            otherError.name = 'AccessDeniedException';
+
+            mockSend.mockRejectedValue(otherError);
+
+            await expect(adapter.createSchedule({
+                scriptName: 'test-script',
+                cronExpression: 'cron(0 0 * * ? *)',
+            })).rejects.toThrow('Access denied');
+        });
     });
 
     describe('deleteSchedule()', () => {

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

@@ -210,12 +210,12 @@ describe('LocalSchedulerAdapter', () => {
             const schedules = await adapter.listSchedules();
 
             expect(schedules).toHaveLength(3);
-            expect(schedules.map((s) => s.scriptName)).toContain('script-1');
-            expect(schedules.map((s) => s.scriptName)).toContain('script-2');
-            expect(schedules.map((s) => s.scriptName)).toContain('script-3');
+            expect(schedules.map((s) => s.Name)).toContain('frigg-script-script-1');
+            expect(schedules.map((s) => s.Name)).toContain('frigg-script-script-2');
+            expect(schedules.map((s) => s.Name)).toContain('frigg-script-script-3');
         });
 
-        it('should include all schedule properties', async () => {
+        it('should include all schedule properties in normalized format', async () => {
             await adapter.createSchedule({
                 scriptName: 'test-script',
                 cronExpression: '0 0 * * *',
@@ -226,14 +226,11 @@ describe('LocalSchedulerAdapter', () => {
             const schedules = await adapter.listSchedules();
 
             expect(schedules[0]).toMatchObject({
-                scriptName: 'test-script',
-                cronExpression: '0 0 * * *',
-                timezone: 'America/New_York',
-                input: { key: 'value' },
-                enabled: true,
+                Name: 'frigg-script-test-script',
+                State: 'ENABLED',
+                ScheduleExpression: '0 0 * * *',
+                ScheduleExpressionTimezone: 'America/New_York',
             });
-            expect(schedules[0]).toHaveProperty('createdAt');
-            expect(schedules[0]).toHaveProperty('updatedAt');
         });
     });
 

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

@@ -60,7 +60,7 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
         const client = this.getSchedulerClient();
         const scheduleName = `frigg-script-${scriptName}`;
 
-        const command = new CreateScheduleCommand({
+        const scheduleParams = {
             Name: scheduleName,
             GroupName: this.scheduleGroupName,
             ScheduleExpression: cronExpression,
@@ -76,13 +76,24 @@ class AWSSchedulerAdapter extends SchedulerAdapter {
                 }),
             },
             State: 'ENABLED',
-        });
-
-        const response = await client.send(command);
-        return {
-            scheduleArn: response.ScheduleArn,
-            scheduleName: scheduleName,
         };
+
+        try {
+            const response = await client.send(new CreateScheduleCommand(scheduleParams));
+            return {
+                scheduleArn: response.ScheduleArn,
+                scheduleName: scheduleName,
+            };
+        } catch (error) {
+            if (error.name === 'ConflictException') {
+                const response = await client.send(new UpdateScheduleCommand(scheduleParams));
+                return {
+                    scheduleArn: response.ScheduleArn,
+                    scheduleName: scheduleName,
+                };
+            }
+            throw error;
+        }
     }
 
     async deleteSchedule(scriptName) {

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

@@ -57,7 +57,12 @@ class LocalSchedulerAdapter extends SchedulerAdapter {
     }
 
     async listSchedules() {
-        return Array.from(this.schedules.values());
+        return Array.from(this.schedules.values()).map((schedule) => ({
+            Name: `frigg-script-${schedule.scriptName}`,
+            State: schedule.enabled ? 'ENABLED' : 'DISABLED',
+            ScheduleExpression: schedule.cronExpression,
+            ScheduleExpressionTimezone: schedule.timezone,
+        }));
     }
 
     async getSchedule(scriptName) {

package/src/infrastructure/script-executor-handler.js

@@ -1,4 +1,5 @@
 const { createScriptRunner } = require('../application/script-runner');
+const { createAdminScriptCommands } = require('@friggframework/core/application/commands/admin-script-commands');
 
 /**
  * SQS Queue Worker Lambda Handler
@@ -12,11 +13,12 @@ async function handler(event) {
 
     for (const record of event.Records) {
         let scriptName;
+        let executionId;
 
         try {
             const message = JSON.parse(record.body);
-            ({ scriptName } = message);
-            const { executionId, trigger, params } = message;
+            ({ scriptName, executionId } = message);
+            const { trigger, params } = message;
 
             if (!scriptName || !executionId) {
                 throw new Error(`Invalid SQS message: missing scriptName or executionId`);
@@ -41,6 +43,25 @@ async function handler(event) {
             // Only reaches here for unexpected failures (message parse errors, runner construction).
             // Script execution errors are handled by ScriptRunner and returned as { status: 'FAILED' }.
             console.error(`Unexpected error processing record:`, error);
+
+            // If we have an executionId, mark the admin process as FAILED
+            // so the record doesn't stay stuck in a non-terminal state.
+            if (executionId) {
+                try {
+                    const commands = createAdminScriptCommands();
+                    await commands.completeAdminProcess(executionId, {
+                        state: 'FAILED',
+                        error: {
+                            name: error.name,
+                            message: error.message,
+                            stack: error.stack,
+                        },
+                    });
+                } catch (updateError) {
+                    console.error(`Failed to update execution ${executionId} state:`, updateError);
+                }
+            }
+
             results.push({
                 scriptName: scriptName || 'unknown',
                 status: 'FAILED',