Merge pull request #6 from DNXLabs/feature/redeploy

Add redeploy feature

README.md

@@ -20,7 +20,7 @@ Once deployment to the blue environment is successful, and code review and code
  The blue environment starts serving the live traffic again, and the container terminates the temporarily created green environment. Not having to continuously run parallel environments, saving costs.
 
 ### Execution Diagram of `docker-beanstalk-bluegreen`
-![](_docs/assets/BlueGreen.png)
+![](_docs/assets/BlueGreen-v2.png)
 
 All the steps are done using python:
 1. The first stage clones the blue environment, which results in a green environment.
@@ -55,6 +55,7 @@ S3_ARTIFACTS_OBJECT
 RELEASE_HEALTH_CHECKING_PATH
 AUTH_METHOD
 SSO_PROFILE
+VERSION_LABEL
 ```
 
 

src/deploy_release.py

@@ -3,7 +3,7 @@
 import os
 import swap_environment
 
-def main(BUCKET_KEY, S3_ARTIFACTS_BUCKET, BLUE_ENV_NAME, BEANSTALK_APP_NAME, boto_authenticated_client):
+def release_deployment(BUCKET_KEY, S3_ARTIFACTS_BUCKET, BLUE_ENV_NAME, BEANSTALK_APP_NAME, boto_authenticated_client, create_app_version = True):
     VERSION_LABEL = strftime("%Y%m%d%H%M%S")
 
     if "VERSION_LABEL" in os.environ:
@@ -15,11 +15,13 @@ def main(BUCKET_KEY, S3_ARTIFACTS_BUCKET, BLUE_ENV_NAME, BEANSTALK_APP_NAME, bot
         print("Failed to create boto3 beanstalk client.\n" + str(err))
         return False
 
-    if not create_new_version(beanstalkclient, VERSION_LABEL, BUCKET_KEY, S3_ARTIFACTS_BUCKET, BEANSTALK_APP_NAME):
-        raise Exception("Failed to create beanstalk release.")
+    if create_app_version:
+        if not create_new_version(beanstalkclient, VERSION_LABEL, BUCKET_KEY, S3_ARTIFACTS_BUCKET, BEANSTALK_APP_NAME):
+            raise Exception("Failed to create beanstalk release.")
 
-    wait_until_env_be_ready(beanstalkclient, BLUE_ENV_NAME)
     # Wait for the new version to be consistent before deploying
+    wait_until_env_be_ready(beanstalkclient, BLUE_ENV_NAME)
+
     if not deploy_new_version(beanstalkclient, BEANSTALK_APP_NAME, BLUE_ENV_NAME, VERSION_LABEL):
         raise Exception("Failed to deploy new version.")
 

src/main.py

@@ -1,6 +1,8 @@
+
 import os
 import traceback
 import sys
+
 import clone_blue_environment
 import swap_environment
 import deploy_release
@@ -27,11 +29,8 @@ def main():
     print(f"S3_ARTIFACTS_BUCKET = {S3_ARTIFACTS_BUCKET}\n")
     print(f"S3_ARTIFACTS_OBJECT {S3_ARTIFACTS_OBJECT}\n")
 
-    current_release_bucket=""
-    current_release_key=""
-
-    available_execution_types = ["deploy", "cutover", "full", "rollback"]
-    execution_type = str(sys.argv[1])
+    available_execution_types = ["deploy", "cutover", "full", "rollback", "redeploy"]
+    execution_type: str = str(sys.argv[1])
 
     if execution_type not in available_execution_types:
         print("Not valid execution type argument: " + execution_type)
@@ -47,8 +46,6 @@ def main():
     print(f"\n Execution Type: {execution_type}\n")
     print("Initiating blue green deployment process")
 
-
-
     if execution_type == "deploy" or execution_type == "full":
         print("\n\n\n ------------------ Stating Deployment Step 1 --------------------- \n")
         print("------------------ Creating Green Env --------------------- \n\n\n")
@@ -57,7 +54,7 @@ def main():
         try:
             print("Clonning the blue environment...")
             start_1 = time.time()
-            previous_release_bucket, previous_release_key = clone_blue_environment.main(
+            clone_blue_environment.main(
                 BLUE_ENV_NAME, GREEN_ENV_NAME, BEANSTALK_APP_NAME, S3_ARTIFACTS_BUCKET, boto_authenticated_client)
             print(f"Clonning the blue environment has finished successfully!\n\
                   \tIt took: {time.time() - start_1} seconds\n")
@@ -104,8 +101,8 @@ def main():
         try:
             print("New release deployment initiated.")
             start_3 = time.time()
-            deploy_release.main(S3_ARTIFACTS_OBJECT, S3_ARTIFACTS_BUCKET,
-                                BLUE_ENV_NAME, BEANSTALK_APP_NAME, boto_authenticated_client)
+            deploy_release.release_deployment(S3_ARTIFACTS_OBJECT, S3_ARTIFACTS_BUCKET, BLUE_ENV_NAME,
+                                              BEANSTALK_APP_NAME, boto_authenticated_client)
             print(f"New release deployment has finished successfully!\n\
                     \tIt took: {time.time() - start_3} seconds\n")
         except Exception as err:
@@ -133,7 +130,8 @@ def main():
 
         # Step 5: Re-swapping the URL's and terminating the green environment.
         print("\n\n\n ------------------ Stating Cutover --------------------- \n")
-        print("------------------ Re-swapping the Domains && Killing the green environment --------------------- \n\n\n")
+        print(
+            "------------------ Re-swapping the Domains && Killing the green environment --------------------- \n\n\n")
         boto_authenticated_client = aws_authentication.get_boto_client()
         try:
             print("Re-swapping the URL's and terminating the green environment.")
@@ -190,7 +188,25 @@ def main():
             traceback.print_exc()
             sys.exit(1)
         print("Rollback has finished successfully!")
+
+    # Start redeploy phase
+    if execution_type == "redeploy":
+        try:
+            print("Initiating Re-Deployment of the previous version.")
+            deploy_release.release_deployment(S3_ARTIFACTS_OBJECT, S3_ARTIFACTS_BUCKET, BLUE_ENV_NAME,
+                                              BEANSTALK_APP_NAME, boto_authenticated_client, create_app_version=False)
+        except Exception as err:
+            print("Re-Deployment of the previous version has failed!")
+            print(("Error: " + str(err)))
+            e = sys.exc_info()[0]
+            print(e)
+            traceback.print_exc()
+            sys.exit(1)
+
     print("Deployment has finished successfully!")
+    print(f"The process took: {round((time.time() - starting_time), 2)} seconds")
+
+
 
 if __name__ == "__main__":
     try:
@@ -218,7 +234,6 @@ def main():
         if "S3_ARTIFACTS_OBJECT" not in os.environ:
             raise Exception(
                 "The environment variable S3_ARTIFACTS_OBJECT wasn't exposed to the container")
-        print("Successfully validated environment variables")
     except Exception as e:
         print("Failed to get environment variable")
         print(str(e))