fix: scheduledTasks should also respect config updateStrategy (#43)

TouchBistro · Jul 23, 2021 · f91d4ba · f91d4ba
1 parent 3f177a5
commit f91d4ba
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/awsecs/awsevent.go b/awsecs/awsevent.go
@@ -50,7 +50,7 @@ func UpdateScheduledTask(args UpdateScheduledTaskArgs) error {
 		// or if this is even allowed by ECS
 		// Passing an empty array as the containers to update means gehen will update all
 		// containers within this task definition to the new sha.
-		updateTaskDefRes, err := updateTaskDef(taskDefARN, task.Gitsha, config.UpdateStrategyCurrent, []string{}, args.ECSClient)
+		updateTaskDefRes, err := updateTaskDef(taskDefARN, task.Gitsha, task.UpdateStrategy, []string{}, args.ECSClient)
 		if err != nil {
 			return errors.Wrapf(err, "failed to update task def for scheduled task: %s", task.Name)
 		}

diff --git a/config/config.go b/config/config.go
@@ -56,6 +56,7 @@ type Service struct {
 type ScheduledTask struct {
 	Name                      string
 	Gitsha                    string
+	UpdateStrategy            string
 	PreviousGitsha            string
 	TaskDefinitionARN         string
 	PreviousTaskDefinitionARN string
@@ -115,8 +116,9 @@ func Read(configPath, gitsha string) (ParsedConfig, error) {
 	var scheduledTasks []*ScheduledTask
 	for name := range config.ScheduledTasks {
 		task := ScheduledTask{
-			Name:   name,
-			Gitsha: gitsha,
+			Name:           name,
+			Gitsha:         gitsha,
+			UpdateStrategy: updateStrategy,
 		}
 		scheduledTasks = append(scheduledTasks, &task)
 	}

diff --git a/config/config_test.go b/config/config_test.go
@@ -28,12 +28,14 @@ func TestReadServicesWithRole(t *testing.T) {
 	}
 	expectedScheduledTasks := []*config.ScheduledTask{
 		{
-			Name:   "weekly-job",
-			Gitsha: gitsha,
+			Name:           "weekly-job",
+			Gitsha:         gitsha,
+			UpdateStrategy: config.UpdateStrategyLatest,
 		},
 		{
-			Name:   "monthly-job",
-			Gitsha: gitsha,
+			Name:           "monthly-job",
+			Gitsha:         gitsha,
+			UpdateStrategy: config.UpdateStrategyLatest,
 		},
 	}
 
@@ -70,12 +72,14 @@ func TestReadServicesWithoutRole(t *testing.T) {
 	}
 	expectedScheduledTasks := []*config.ScheduledTask{
 		{
-			Name:   "weekly-job",
-			Gitsha: gitsha,
+			Name:           "weekly-job",
+			Gitsha:         gitsha,
+			UpdateStrategy: config.UpdateStrategyCurrent,
 		},
 		{
-			Name:   "monthly-job",
-			Gitsha: gitsha,
+			Name:           "monthly-job",
+			Gitsha:         gitsha,
+			UpdateStrategy: config.UpdateStrategyCurrent,
 		},
 	}