Skip to content

fix: force resource name change on scheduled functions since resource type was changed #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filmaj merged 1 commit into from
Feb 21, 2026
+21 −21
Merged

fix: force resource name change on scheduled functions since resource type was changed #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/visitors/scheduled/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ module.exports = function visitScheduled (inventory, template) {
rule = `${rate ? 'rate' : 'cron'}(${rule.expression})`

let name = toLogicalID(schedule.name)
let scheduleLambda = `${name}ScheduledLambda`
let scheduleEvent = `${name}ScheduledEvent`
let scheduleLambda = `${name}ScheduleLambda`
let scheduleEvent = `${name}ScheduleEvent`

// Create the Lambda
template.Resources[scheduleLambda] = createLambda({
Expand Down
38 changes: 19 additions & 19 deletions test/unit/visitors/scheduled/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ daily-task rate(1 day)
let cfn = pkg(inv)

// Check the schedule resource exists and has correct type
assert.ok(cfn.Resources.DailyTaskScheduledEvent, 'schedule event resource exists')
assert.strictEqual(cfn.Resources.DailyTaskScheduledEvent.Type, 'AWS::Scheduler::Schedule', 'uses AWS::Scheduler::Schedule type')
assert.ok(cfn.Resources.DailyTaskScheduleEvent, 'schedule event resource exists')
assert.strictEqual(cfn.Resources.DailyTaskScheduleEvent.Type, 'AWS::Scheduler::Schedule', 'uses AWS::Scheduler::Schedule type')
})

test('Scheduled visitor creates AWS::Scheduler::Schedule resource for cron expression', async () => {
Expand All @@ -36,9 +36,9 @@ hourly-job cron(0 * * * ? *)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

assert.ok(cfn.Resources.HourlyJobScheduledEvent, 'schedule event resource exists')
assert.strictEqual(cfn.Resources.HourlyJobScheduledEvent.Type, 'AWS::Scheduler::Schedule', 'uses AWS::Scheduler::Schedule type')
assert.ok(cfn.Resources.HourlyJobScheduledEvent.Properties.ScheduleExpression.startsWith('cron('), 'schedule expression is a cron expression')
assert.ok(cfn.Resources.HourlyJobScheduleEvent, 'schedule event resource exists')
assert.strictEqual(cfn.Resources.HourlyJobScheduleEvent.Type, 'AWS::Scheduler::Schedule', 'uses AWS::Scheduler::Schedule type')
assert.ok(cfn.Resources.HourlyJobScheduleEvent.Properties.ScheduleExpression.startsWith('cron('), 'schedule expression is a cron expression')
})

test('Scheduled visitor creates Lambda function resource', async () => {
Expand All @@ -48,8 +48,8 @@ my-task rate(5 minutes)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

assert.ok(cfn.Resources.MyTaskScheduledLambda, 'Lambda resource exists')
assert.strictEqual(cfn.Resources.MyTaskScheduledLambda.Type, 'AWS::Serverless::Function', 'Lambda has correct type')
assert.ok(cfn.Resources.MyTaskScheduleLambda, 'Lambda resource exists')
assert.strictEqual(cfn.Resources.MyTaskScheduleLambda.Type, 'AWS::Serverless::Function', 'Lambda has correct type')
})

test('Scheduled visitor creates shared IAM role for EventBridge Scheduler', async () => {
Expand Down Expand Up @@ -83,7 +83,7 @@ my-task rate(1 hour)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

let flexWindow = cfn.Resources.MyTaskScheduledEvent.Properties.FlexibleTimeWindow
let flexWindow = cfn.Resources.MyTaskScheduleEvent.Properties.FlexibleTimeWindow
assert.ok(flexWindow, 'FlexibleTimeWindow exists')
assert.strictEqual(flexWindow.Mode, 'OFF', 'FlexibleTimeWindow mode is OFF')
})
Expand All @@ -95,13 +95,13 @@ my-task rate(1 hour)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

let target = cfn.Resources.MyTaskScheduledEvent.Properties.Target
let target = cfn.Resources.MyTaskScheduleEvent.Properties.Target
assert.ok(target, 'Target exists')
assert.ok(target.Arn, 'Target has Arn')
assert.ok(target.RoleArn, 'Target has RoleArn')

// Verify the Arn references the Lambda
assert.deepStrictEqual(target.Arn, { 'Fn::GetAtt': [ 'MyTaskScheduledLambda', 'Arn' ] }, 'Target Arn references Lambda')
assert.deepStrictEqual(target.Arn, { 'Fn::GetAtt': [ 'MyTaskScheduleLambda', 'Arn' ] }, 'Target Arn references Lambda')

// Verify the RoleArn references the shared scheduler role
assert.deepStrictEqual(target.RoleArn, { 'Fn::GetAtt': [ 'SchedulerRole', 'Arn' ] }, 'Target RoleArn references shared scheduler role')
Expand All @@ -116,8 +116,8 @@ my-task
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

assert.ok(cfn.Resources.MyTaskScheduledEvent.Properties.ScheduleExpressionTimezone, 'timezone property exists')
assert.strictEqual(cfn.Resources.MyTaskScheduledEvent.Properties.ScheduleExpressionTimezone, 'America/New_York', 'timezone is set correctly')
assert.ok(cfn.Resources.MyTaskScheduleEvent.Properties.ScheduleExpressionTimezone, 'timezone property exists')
assert.strictEqual(cfn.Resources.MyTaskScheduleEvent.Properties.ScheduleExpressionTimezone, 'America/New_York', 'timezone is set correctly')
})

test('Scheduled visitor does not add timezone when not specified', async () => {
Expand All @@ -127,7 +127,7 @@ my-task rate(1 hour)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

assert.strictEqual(cfn.Resources.MyTaskScheduledEvent.Properties.ScheduleExpressionTimezone, undefined, 'timezone property is not set')
assert.strictEqual(cfn.Resources.MyTaskScheduleEvent.Properties.ScheduleExpressionTimezone, undefined, 'timezone property is not set')
})

test('Scheduled visitor creates resources for multiple scheduled functions with shared role', async () => {
Expand All @@ -139,11 +139,11 @@ task-two rate(1 day)
let cfn = pkg(inv)

// Check both Lambdas and schedule events exist
assert.ok(cfn.Resources.TaskOneScheduledLambda, 'first Lambda exists')
assert.ok(cfn.Resources.TaskOneScheduledEvent, 'first schedule event exists')
assert.ok(cfn.Resources.TaskOneScheduleLambda, 'first Lambda exists')
assert.ok(cfn.Resources.TaskOneScheduleEvent, 'first schedule event exists')

assert.ok(cfn.Resources.TaskTwoScheduledLambda, 'second Lambda exists')
assert.ok(cfn.Resources.TaskTwoScheduledEvent, 'second schedule event exists')
assert.ok(cfn.Resources.TaskTwoScheduleLambda, 'second Lambda exists')
assert.ok(cfn.Resources.TaskTwoScheduleEvent, 'second schedule event exists')

// Check there is only one shared scheduler role
assert.ok(cfn.Resources.SchedulerRole, 'shared scheduler role exists')
Expand Down Expand Up @@ -176,8 +176,8 @@ my-hyphenated-task rate(1 hour)
let inv = await inventory({ rawArc, deployStage })
let cfn = pkg(inv)

assert.ok(cfn.Resources.MyHyphenatedTaskScheduledLambda, 'Lambda with hyphenated name exists')
assert.ok(cfn.Resources.MyHyphenatedTaskScheduledEvent, 'schedule event with hyphenated name exists')
assert.ok(cfn.Resources.MyHyphenatedTaskScheduleLambda, 'Lambda with hyphenated name exists')
assert.ok(cfn.Resources.MyHyphenatedTaskScheduleEvent, 'schedule event with hyphenated name exists')
assert.ok(cfn.Resources.SchedulerRole, 'shared scheduler role exists')

// Check the policy name uses the logical ID
Expand Down