resolve defect with exec commands with args in service

stelligent · Jul 28, 2017 · df8dac7 · df8dac7
1 parent dd5636a
commit df8dac7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/cli/services.go b/cli/services.go
@@ -208,7 +208,7 @@ func newTask(c *cli.Context) (*common.Task, error) {
 		return nil, err
 	}
 	environmentName := c.Args().First()
-	command := strings.Join(c.Args()[ExeArgsCmdIndex:], Space)
+	command := c.Args()[ExeArgsCmdIndex:]
 	return &common.Task{
 		Environment:    environmentName,
 		Command:        command,

diff --git a/common/types.go b/common/types.go
@@ -242,7 +242,7 @@ type Task struct {
 	Service        string
 	TaskDefinition string
 	Cluster        string
-	Command        string
+	Command        []string
 	Containers     []Container
 }
 

diff --git a/provider/aws/task.go b/provider/aws/task.go
@@ -49,17 +49,20 @@ func (taskMgr *ecsTaskManager) getTaskRunInput(task common.Task) (*ecs.RunTaskIn
 	ecsServiceName := ecsStack.Parameters[ECSServiceNameParameterKey]
 	log.Debugf(ExecuteECSInputParameterLog, task.Environment, ecsServiceName, ecsCluster, ecsTaskDefinition)
 
+	command := make([]*string, len(task.Command))
+	for i, commandPart := range task.Command {
+		command[i] = aws.String(strings.TrimSpace(commandPart))
+	}
+
 	ecsRunTaskInput := &ecs.RunTaskInput{
 		Cluster:        aws.String(ecsCluster),
 		TaskDefinition: aws.String(ecsTaskDefinition),
 		Count:          aws.Int64(1),
 		Overrides: &ecs.TaskOverride{
 			ContainerOverrides: []*ecs.ContainerOverride{
 				{
-					Name: aws.String(ecsServiceName),
-					Command: []*string{
-						aws.String(strings.TrimSpace(task.Command)),
-					},
+					Name:    aws.String(ecsServiceName),
+					Command: command,
 				},
 			},
 		},

diff --git a/provider/aws/task_test.go b/provider/aws/task_test.go
@@ -184,6 +184,6 @@ func getTestTask() common.Task {
 	return common.Task{
 		Environment: TestEnv,
 		Service:     TestSvc,
-		Command:     TestCmd,
+		Command:     []string{TestCmd},
 	}
 }
diff --git a/workflows/service_executor_test.go b/workflows/service_executor_test.go
@@ -44,7 +44,7 @@ func TestNewServiceExecutorFail(t *testing.T) {
 	task := common.Task{
 		Environment: TestEnv,
 		Service:     TestSvc,
-		Command:     TestCmd,
+		Command:     []string{TestCmd},
 	}
 	executor := newServiceExecutor(taskManagerMock, task)
 	assertion.NotNil(executor)
@@ -60,7 +60,7 @@ func TestNewServiceExecutor(t *testing.T) {
 	task := common.Task{
 		Environment: TestEnv,
 		Service:     TestSvc,
-		Command:     TestCmd,
+		Command:     []string{TestCmd},
 	}
 	executor := newServiceExecutor(taskManagerMock, task)
 	assertion.NotNil(executor)