Merge pull request #214 from awslabs/bugfix-error-git-branch

Fix CodeBuild environment variable name in app.py

Author: dlpzx

deploy/app.py

@@ -23,14 +23,15 @@
     'CDK_DEFAULT_ACCOUNT'
 )
 
-if not os.environ.get("CODEBUILD_SOURCE_VERSION", None):
+if not os.environ.get("DATAALL_REPO_BRANCH", None):
+    # Configuration of the branch in first deployment
     git_branch = (
         subprocess.Popen(['git', 'branch', '--show-current'], stdout=subprocess.PIPE)
         .stdout.read().decode('utf-8').rstrip('\n')
     )
 else:
-    codebuild_source = os.environ.get("CODEBUILD_SOURCE_VERSION")
-    git_branch = codebuild_source.replace("arn:aws:s3:::dataall-","").split("-cicd")[0]
+    # Configuration of the branch in subsequent deployments
+    git_branch = os.environ.get("DATAALL_REPO_BRANCH")
 
 git_branch = git_branch if git_branch != "" else "main"
 
@@ -50,7 +51,7 @@
         logger.error(err)
 
     app = App()
-    logger.info("Loaded context from file")
+    logger.info("Loaded context from cdk.json file in repository")
 
 cdk_pipeline_region = app.node.try_get_context('tooling_region') or os.getenv('CDK_DEFAULT_REGION')