From ee3dc510016b6d3a5c50a229ad722d7b8cd0aaec Mon Sep 17 00:00:00 2001 From: dupontz Date: Wed, 11 Oct 2023 15:15:52 -0700 Subject: [PATCH 1/2] updating string interpolation --- ecs-runtask.cfndsl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs-runtask.cfndsl.rb b/ecs-runtask.cfndsl.rb index d91bd71..ea57414 100644 --- a/ecs-runtask.cfndsl.rb +++ b/ecs-runtask.cfndsl.rb @@ -88,12 +88,12 @@ end Events_Rule(:Schedule) do Name FnSub("${EnvironmentName}-#{component_name}-eventrule") - Description FnSub("{EnvironmentName} #{component_name} eventrule") + Description FnSub("${EnvironmentName} #{component_name} eventrule") ScheduleExpression schedule unless schedule.nil? EventPattern FnSub(event_pattern) unless event_pattern.nil? Targets [{ Arn: Ref(:StateMachine), - Id: FnSub("{EnvironmentName}-#{component_name}-target"), + Id: FnSub("${EnvironmentName}-#{component_name}-target"), RoleArn: FnGetAtt('EventBridgeInvokeRole', 'Arn') }] end From 65726c333314c4458522d7056ff8cf2f1d1c1412 Mon Sep 17 00:00:00 2001 From: dupontz Date: Thu, 12 Oct 2023 15:28:23 -0700 Subject: [PATCH 2/2] updating tests --- spec/event_pattern_spec.rb | 4 ++-- spec/schedule_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/event_pattern_spec.rb b/spec/event_pattern_spec.rb index 645d20d..d89c2c9 100644 --- a/spec/event_pattern_spec.rb +++ b/spec/event_pattern_spec.rb @@ -105,7 +105,7 @@ end it "to have property Description" do - expect(resource["Properties"]["Description"]).to eq({"Fn::Sub"=>"{EnvironmentName} ecs-runtask eventrule"}) + expect(resource["Properties"]["Description"]).to eq({"Fn::Sub"=>"${EnvironmentName} ecs-runtask eventrule"}) end it "to have property EventPattern" do @@ -113,7 +113,7 @@ end it "to have property Targets" do - expect(resource["Properties"]["Targets"]).to eq([{"Arn"=>{"Ref"=>"StateMachine"}, "Id"=>{"Fn::Sub"=>"{EnvironmentName}-ecs-runtask-target"}, "RoleArn"=>{"Fn::GetAtt"=>["EventBridgeInvokeRole", "Arn"]}}]) + expect(resource["Properties"]["Targets"]).to eq([{"Arn"=>{"Ref"=>"StateMachine"}, "Id"=>{"Fn::Sub"=>"${EnvironmentName}-ecs-runtask-target"}, "RoleArn"=>{"Fn::GetAtt"=>["EventBridgeInvokeRole", "Arn"]}}]) end end diff --git a/spec/schedule_spec.rb b/spec/schedule_spec.rb index acc3c57..5bd042f 100644 --- a/spec/schedule_spec.rb +++ b/spec/schedule_spec.rb @@ -105,7 +105,7 @@ end it "to have property Description" do - expect(resource["Properties"]["Description"]).to eq({"Fn::Sub"=>"{EnvironmentName} ecs-runtask eventrule"}) + expect(resource["Properties"]["Description"]).to eq({"Fn::Sub"=>"${EnvironmentName} ecs-runtask eventrule"}) end it "to have property ScheduleExpression" do @@ -113,7 +113,7 @@ end it "to have property Targets" do - expect(resource["Properties"]["Targets"]).to eq([{"Arn"=>{"Ref"=>"StateMachine"}, "Id"=>{"Fn::Sub"=>"{EnvironmentName}-ecs-runtask-target"}, "RoleArn"=>{"Fn::GetAtt"=>["EventBridgeInvokeRole", "Arn"]}}]) + expect(resource["Properties"]["Targets"]).to eq([{"Arn"=>{"Ref"=>"StateMachine"}, "Id"=>{"Fn::Sub"=>"${EnvironmentName}-ecs-runtask-target"}, "RoleArn"=>{"Fn::GetAtt"=>["EventBridgeInvokeRole", "Arn"]}}]) end end