Give scheduler schedules distinct logical ids from event bus schedules

Author: danmactough

lib/deploy/events/schedule/compileScheduledEvents.js

@@ -121,8 +121,9 @@ module.exports = {
 
             const stateMachineLogicalId = this
               .getStateMachineLogicalId(stateMachineName, stateMachineObj);
-            const scheduleLogicalId = this
-              .getScheduleLogicalId(stateMachineName, scheduleNumberInFunction);
+            const scheduleLogicalId = method !== METHOD_SCHEDULER ? this
+              .getScheduleLogicalId(stateMachineName, scheduleNumberInFunction) : this
+              .getSchedulerScheduleLogicalId(stateMachineName, scheduleNumberInFunction);
             const scheduleIamRoleLogicalId = this
               .getScheduleToStepFunctionsIamRoleLogicalId(stateMachineName);
             const scheduleId = this.getScheduleId(stateMachineName);

lib/naming.js

@@ -63,6 +63,12 @@ module.exports = {
       .getNormalizedFunctionName(stateMachineName)}StepFunctionsEventsRuleSchedule${scheduleIndex}`;
   },
 
+  getSchedulerScheduleLogicalId(stateMachineName, scheduleIndex) {
+      return `${this.provider.naming.getNormalizedFunctionName(
+        stateMachineName
+      )}StepFunctionsSchedulerSchedule${scheduleIndex}`;
+  },
+
   getScheduleToStepFunctionsIamRoleLogicalId(stateMachineName) {
     return `${this.provider.naming.getNormalizedFunctionName(
       stateMachineName,