Merge pull request #2 from AdRoll/add-no-wait-feature

Add a flag not to wait until the service is ready

README.md

@@ -21,12 +21,14 @@ USAGE:
    ecs-deploy [options] <cluster> <service>
 
 VERSION:
-   1.0.0
+   1.1.0
 
 GLOBAL OPTIONS:
    --updates FILE, -u FILE          Use an input FILE to describe service updates (default: stdin)
    --timeout DURATION, -t DURATION  Wait this DURATION for the service to be correctly updated (default: 5m0s)
    --no-color, -n                   Disable colored output (default: false)
+   --no-wait, -w                    Disable waiting for updates to be completed. (default: false)
+   --dry, -d                        Don't deploy just show what would change in the remote service (default: false)
    --help, -h                       show help (default: false)
    --version, -v                    print the version (default: false)
 ```

action/ecs-deploy.go

@@ -26,7 +26,7 @@ type ECSDeployTaskConfig interface {
 }
 
 // ECSDeploy deploy an ecs service
-func ECSDeploy(clusterName string, serviceName string, client ECSDeployClient, timeout time.Duration, config ECSDeployTaskConfig, dryRun bool) error {
+func ECSDeploy(clusterName string, serviceName string, client ECSDeployClient, timeout time.Duration, config ECSDeployTaskConfig, dryRun bool, noWait bool) error {
 	if len(clusterName) == 0 {
 		return errors.New("cluster was not provided")
 	}
@@ -92,6 +92,11 @@ func ECSDeploy(clusterName string, serviceName string, client ECSDeployClient, t
 		return err
 	}
 
+	if noWait {
+		log.Println("Not waiting for your service to reflect changes, check the console please :D")
+		return nil
+	}
+
 	log.Println("Waiting for the service to reflect the new changes...")
 	if originalErr := client.WaitUntilGood(newService, &timeout); originalErr != nil {
 		log.Println(color.RedString("There was an error updating the service :", originalErr.Error()))

action/ecs-deploy_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func Test_ECSDeploy_NoArgs(t *testing.T) {
-	err := ECSDeploy("", "", nil, time.Nanosecond, nil, false)
+	err := ECSDeploy("", "", nil, time.Nanosecond, nil, false, false)
 	assert.Error(t, err)
 }
 
@@ -61,7 +61,53 @@ func Test_ECSDeploy_TruePath(t *testing.T) {
 
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, false)
+	require.NoError(t, err)
+}
+
+func Test_ECSDeploy_NoWait(t *testing.T) {
+	const clusterName = "clusterA"
+	const serviceName = "serviceA"
+
+	family := "test-family"
+	serviceTaskArn := "test-family:0"
+	taskArn := "test-family:1"
+	timeout := time.Nanosecond
+	service := &ecssdk.Service{
+		TaskDefinition: &serviceTaskArn,
+	}
+	oldTask := &ecssdk.TaskDefinition{}
+	taskCopy := &ecssdk.RegisterTaskDefinitionInput{}
+	newTask := &ecssdk.RegisterTaskDefinitionInput{
+		ContainerDefinitions: make([]*ecssdk.ContainerDefinition, 0),
+		Family:               &family,
+	}
+	newTaskDefinition := &ecssdk.TaskDefinition{
+		TaskDefinitionArn: &taskArn,
+	}
+	newService := &ecssdk.Service{}
+	diff := &ecs.TaskConfigDiff{}
+	oldCpu := "1"
+	newCpu := "10"
+	diff.ChangeCPU(&oldCpu, &newCpu)
+
+	//#region mock
+	c := gomock.NewController(t)
+
+	client := mock.NewMockECSDeployClient(c)
+	client.EXPECT().GetService(clusterName, serviceName).Return(service, nil).Times(1)
+	client.EXPECT().LooksGood(service).Return(true, nil).Times(1)
+	client.EXPECT().CopyTaskDefinition(service).Return(taskCopy, oldTask, nil).Times(1)
+	client.EXPECT().RegisterTaskDefinition(newTask).Return(newTaskDefinition, nil).Times(1)
+	client.EXPECT().UpdateTaskDefinition(service, newTaskDefinition).Return(newService, nil).Times(1)
+	client.EXPECT().WaitUntilGood(newService, &timeout).Return(nil).Times(0)
+
+	cfg := mock.NewMockECSDeployTaskConfig(c)
+	cfg.EXPECT().ApplyTo(taskCopy).Return(newTask, diff).Times(1)
+
+	//#endregion
+
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, true)
 	require.NoError(t, err)
 }
 
@@ -99,7 +145,7 @@ func Test_ECSDeploy_DryRunPath(t *testing.T) {
 
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, true)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, true, false)
 	require.NoError(t, err)
 }
 
@@ -136,7 +182,7 @@ func Test_ECSDeploy_RollbackPath(t *testing.T) {
 
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, false)
 	require.NoError(t, err)
 }
 
@@ -157,7 +203,7 @@ func Test_ECSDeploy_GetServiceError(t *testing.T) {
 	cfg := mock.NewMockECSDeployTaskConfig(c)
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, false)
 	require.Equal(t, expectedError, err)
 }
 
@@ -179,7 +225,7 @@ func Test_ECSDeploy_LooksGoodError(t *testing.T) {
 	cfg := mock.NewMockECSDeployTaskConfig(c)
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, false)
 	require.Equal(t, expectedError, err)
 }
 
@@ -202,6 +248,6 @@ func Test_ECSDeploy_CopyTaskDefinitionError(t *testing.T) {
 	cfg := mock.NewMockECSDeployTaskConfig(c)
 	//#endregion
 
-	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false)
+	err := ECSDeploy(clusterName, serviceName, client, timeout, cfg, false, false)
 	require.Equal(t, expectedError, err)
 }

main.go

@@ -19,7 +19,7 @@ func main() {
 	app := &cli.App{
 		Name:                   "ecs-ship",
 		Usage:                  "Deploy your aws ecs services.",
-		Version:                "1.0.0",
+		Version:                "1.1.0",
 		UseShortOptionHandling: true,
 		ArgsUsage:              "<cluster> <service>",
 		UsageText:              "ecs-deploy [options] <cluster> <service>",
@@ -45,6 +45,12 @@ func main() {
 				Usage:    "Disable colored output",
 				Required: false,
 			},
+			&cli.BoolFlag{
+				Name:     "no-wait",
+				Aliases:  []string{"w"},
+				Usage:    "Disable waiting for updates to be completed.",
+				Required: false,
+			},
 			&cli.BoolFlag{
 				Name:     "dry",
 				Aliases:  []string{"d"},
@@ -78,7 +84,7 @@ func main() {
 			}
 
 			client := ecs.BuildDefaultClient()
-			return action.ECSDeploy(cluster, service, client, ctx.Duration("timeout"), &cfg, ctx.Bool("dry"))
+			return action.ECSDeploy(cluster, service, client, ctx.Duration("timeout"), &cfg, ctx.Bool("dry"), ctx.Bool("no-wait"))
 		},
 	}