Merge pull request silinternational#141 from kakakakakku/support-forc…

…e-new-deployment Supported "--force-new-deployment" option
Healint · Jul 24, 2018 · 8dbb19c · 8dbb19c
2 parents 2a4f775 + 9f2984d
commit 8dbb19c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@ Usage
                                             Max definitions causes all task revisions not matching criteria to be deregistered, even if they're created manually.
                                             Script will only perform deregistration if deployment succeeds.
         --enable-rollback             Rollback task definition if new version is not running before TIMEOUT
+        --force-new-deployment        Force a new deployment of the service. Default is false.
         -v | --verbose                Verbose output
              --version                Display the version
 

diff --git a/ecs-deploy b/ecs-deploy
@@ -17,6 +17,7 @@ TAGONLY=""
 ENABLE_ROLLBACK=false
 AWS_CLI=$(which aws)
 AWS_ECS="$AWS_CLI --output json ecs"
+FORCE_NEW_DEPLOYMENT=false
 
 function usage() {
     cat <<EOM
@@ -38,7 +39,7 @@ Required arguments:
                                  Format: [domain][:port][/repo][/][image][:tag]
                                  Examples: mariadb, mariadb:latest, silintl/mariadb,
                                            silintl/mariadb:latest, private.registry.com:8000/repo/image:tag
-    --aws-instance-profile  Use the IAM role associated with this instance
+    --aws-instance-profile       Use the IAM role associated with this instance
 
 Optional arguments:
     -a | --assume-role      ARN for AWS Role to assume for ecs-deploy operations.
@@ -50,6 +51,7 @@ Optional arguments:
     -to | --tag-only        New tag to apply to all images defined in the task (multi-container task). If provided this will override value specified in image name argument.
     --max-definitions       Number of Task Definition Revisions to persist before deregistering oldest revisions.
     --enable-rollback       Rollback task definition if new version is not running before TIMEOUT
+    --force-new-deployment  Force a new deployment of the service. Default is false.
     -v | --verbose          Verbose output
          --version          Display the version
 
@@ -145,7 +147,7 @@ function assertRequiredArgumentsSet() {
         echo "CLUSTER is required. You can pass the value using -c or --cluster"
         exit 7
     fi
-    if [ $IMAGE == false ]; then
+    if [ $IMAGE == false ] && [ $FORCE_NEW_DEPLOYMENT == false ]; then
         echo "IMAGE is required. You can pass the value using -i or --image"
         exit 8
     fi
@@ -328,6 +330,11 @@ function rollback() {
     $AWS_ECS update-service --cluster $CLUSTER --service $SERVICE --task-definition $TASK_DEFINITION_ARN > /dev/null
 }
 
+function updateServiceForceNewDeployment() {
+    echo 'Force a new deployment of the service'
+    $AWS_ECS update-service --cluster $CLUSTER --service $SERVICE --force-new-deployment > /dev/null
+}
+
 function updateService() {
     UPDATE_SERVICE_SUCCESS="false"
     DEPLOYMENT_CONFIG=""
@@ -533,6 +540,9 @@ if [ "$BASH_SOURCE" == "$0" ]; then
             --enable-rollback)
                 ENABLE_ROLLBACK=true
                 ;;
+            --force-new-deployment)
+                FORCE_NEW_DEPLOYMENT=true
+                ;;
             -v|--verbose)
                 VERBOSE=true
                 ;;
@@ -552,14 +562,19 @@ if [ "$BASH_SOURCE" == "$0" ]; then
         set -x
     fi
 
-
     # Check that required arguments are provided
     assertRequiredArgumentsSet
 
     if [[ "$AWS_ASSUME_ROLE" != false ]]; then
         assumeRole
     fi
 
+    # Not required creation of new a task definition
+    if [ $FORCE_NEW_DEPLOYMENT == true ]; then
+        updateServiceForceNewDeployment
+        waitForGreenDeployment
+        exit 0
+    fi
 
     # Determine image name
     parseImageName
@@ -589,7 +604,6 @@ if [ "$BASH_SOURCE" == "$0" ]; then
         assumeRoleClean
     fi
 
-
     exit 0
 
 fi

diff --git a/test.bats b/test.bats
@@ -44,6 +44,7 @@ setup() {
   SERVICE=true
   CLUSTER=true
   IMAGE=false
+  FORCE_NEW_DEPLOYMENT=false
   run assertRequiredArgumentsSet
   [ $status -eq 8 ]
 }