@friggframework/devtools 2.0.0--canary.531.eb2e0bb.0 → 2.0.0--canary.531.5b60782.0

package/infrastructure/domains/scheduler/scheduler-builder.js

@@ -14,8 +14,6 @@
 
 const { InfrastructureBuilder, ValidationResult } = require('../shared/base-builder');
 
-const SCHEDULE_GROUP_NAME = 'frigg-integration-schedules';
-
 class SchedulerBuilder extends InfrastructureBuilder {
     constructor() {
         super();
@@ -80,16 +78,19 @@ class SchedulerBuilder extends InfrastructureBuilder {
 
     /**
      * Create EventBridge Scheduler ScheduleGroup
+     * Uses stage-specific naming to allow multiple deployments in same AWS account
      */
     createScheduleGroup(result) {
+        const scheduleGroupName = '${self:service}-${self:provider.stage}-schedules';
+
         result.resources.FriggScheduleGroup = {
             Type: 'AWS::Scheduler::ScheduleGroup',
             Properties: {
-                Name: SCHEDULE_GROUP_NAME,
+                Name: scheduleGroupName,
             },
         };
 
-        console.log(`  ✓ Created ScheduleGroup: ${SCHEDULE_GROUP_NAME}`);
+        console.log(`  ✓ Created ScheduleGroup: ${scheduleGroupName}`);
     }
 
     /**
@@ -171,7 +172,10 @@ class SchedulerBuilder extends InfrastructureBuilder {
                     'scheduler:GetSchedule',
                 ],
                 Resource: {
-                    'Fn::Sub': `arn:aws:scheduler:\${AWS::Region}:\${AWS::AccountId}:schedule/${SCHEDULE_GROUP_NAME}/*`,
+                    'Fn::Sub': [
+                        'arn:aws:scheduler:${AWS::Region}:${AWS::AccountId}:schedule/${GroupName}/*',
+                        { GroupName: { Ref: 'FriggScheduleGroup' } },
+                    ],
                 },
             },
             {
@@ -196,9 +200,12 @@ class SchedulerBuilder extends InfrastructureBuilder {
         result.environment.SCHEDULER_ROLE_ARN = {
             'Fn::GetAtt': ['SchedulerExecutionRole', 'Arn'],
         };
+        result.environment.SCHEDULE_GROUP_NAME = {
+            Ref: 'FriggScheduleGroup',
+        };
 
         console.log('  ✓ Added scheduler environment variables');
     }
 }
 
-module.exports = { SchedulerBuilder, SCHEDULE_GROUP_NAME };
+module.exports = { SchedulerBuilder };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/devtools",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.531.eb2e0bb.0",
+  "version": "2.0.0--canary.531.5b60782.0",
   "bin": {
     "frigg": "./frigg-cli/index.js"
   },
@@ -25,9 +25,9 @@
     "@babel/eslint-parser": "^7.18.9",
     "@babel/parser": "^7.25.3",
     "@babel/traverse": "^7.25.3",
-    "@friggframework/core": "2.0.0--canary.531.eb2e0bb.0",
-    "@friggframework/schemas": "2.0.0--canary.531.eb2e0bb.0",
-    "@friggframework/test": "2.0.0--canary.531.eb2e0bb.0",
+    "@friggframework/core": "2.0.0--canary.531.5b60782.0",
+    "@friggframework/schemas": "2.0.0--canary.531.5b60782.0",
+    "@friggframework/test": "2.0.0--canary.531.5b60782.0",
     "@hapi/boom": "^10.0.1",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.7.2",
@@ -55,8 +55,8 @@
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.531.eb2e0bb.0",
-    "@friggframework/prettier-config": "2.0.0--canary.531.eb2e0bb.0",
+    "@friggframework/eslint-config": "2.0.0--canary.531.5b60782.0",
+    "@friggframework/prettier-config": "2.0.0--canary.531.5b60782.0",
     "aws-sdk-client-mock": "^4.1.0",
     "aws-sdk-client-mock-jest": "^4.1.0",
     "jest": "^30.1.3",
@@ -88,5 +88,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb2e0bb683bc39772b4f30b25ad871a2ef729075"
+  "gitHead": "5b607824c46df14b9597c489f4d2a9fbd5f0c8a7"
 }