Merge pull request #42 from geoadmin/develop

New Release v2.2.1 - #patch

Author: ltshb

.env.default

@@ -4,3 +4,4 @@ AWS_ENDPOINT_URL=http://localhost:8080
 AWS_DEFAULT_REGION=eu-central-1
 AWS_DYNAMODB_TABLE_NAME=test-db
 ALLOWED_DOMAINS=.*localhost,.*admin\.ch,.*bgdi\.ch
+STAGING=local

.env.testing

@@ -6,4 +6,6 @@ AWS_SESSION_TOKEN=testing
 # for some reason currently mocking the DynamoDB only works with a real region.
 # Fake regions will cause a crash when mocking.
 AWS_DEFAULT_REGION=us-east-1
-AWS_DYNAMODB_TABLE_NAME=test-db
+AWS_DYNAMODB_TABLE_NAME=test-db
+
+STAGING=test

app/helpers/urls.py

@@ -8,6 +8,7 @@
 from flask import abort
 
 from app.helpers.checks import check_and_get_shortlinks_id
+from app.settings import STAGING
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +47,7 @@ def create_url(table, url):
                 'shortlinks_id': shortened_url,
                 'url': url,
                 'timestamp': time.strftime('%Y-%m-%d %X', now),
-                'epoch': str(time.gmtime())
+                'staging': STAGING
             }
         )
         logger.info("Exit create_url function with shortened url --> %s", shortened_url)

app/settings.py

@@ -22,3 +22,5 @@
 
 CACHE_CONTROL = os.getenv('CACHE_CONTROL', 'public, max-age=31536000')
 CACHE_CONTROL_4XX = os.getenv('CACHE_CONTROL_4XX', 'public, max-age=3600')
+
+STAGING = os.environ['STAGING']

buildspec.yml

@@ -1,6 +1,7 @@
 version: 0.2
 
 env:
+  shell: bash
   variables:
     IMAGE_BASE_NAME: 'service-shortlink'
     REGISTRY: '974517877189.dkr.ecr.eu-central-1.amazonaws.com'
@@ -22,14 +23,8 @@ phases:
   pre_build:
     commands:
       - echo "export of the image tag for build and push purposes"
-      # Reading git branch (the utility in the deploy script is unable to read it automatically on CodeBuild)
-      # see https://stackoverflow.com/questions/47657423/get-github-git-branch-for-aws-codebuild
-      - export GITHUB_BRANCH="$(git symbolic-ref HEAD --short 2>/dev/null)"
-      - |
-        if [ "${GITHUB_BRANCH}" = "" ] ; then
-          GITHUB_BRANCH="$(git branch -a --contains HEAD | sed -n 2p | awk '{ printf $1 }')";
-          export GITHUB_BRANCH=${GITHUB_BRANCH#remotes/origin/};
-        fi
+      - echo "CODEBUILD_WEBHOOK_HEAD_REF=${CODEBUILD_WEBHOOK_HEAD_REF} CODEBUILD_WEBHOOK_BASE_REF=${CODEBUILD_WEBHOOK_BASE_REF}"
+      - export GITHUB_BRANCH="${CODEBUILD_WEBHOOK_HEAD_REF#refs/heads/}"
       - export GITHUB_COMMIT=$(echo $CODEBUILD_RESOLVED_SOURCE_VERSION | cut -c 1-7)
       - export GITHUB_TAG="$(git describe --tags 2>/dev/null)"
       - echo "GITHUB_BRANCH=${GITHUB_BRANCH} GITHUB_COMMIT=${GITHUB_COMMIT} GITHUB_TAG=${GITHUB_TAG} DOCKER_IMG_TAG=${DOCKER_IMG_TAG}"
@@ -39,10 +34,10 @@ phases:
     commands:
       - echo Build started on $(date)
       - export DOCKER_IMG_TAG=${REGISTRY}/${IMAGE_BASE_NAME}:${GITHUB_TAG}
-      - export DOCKER_IMG_TAG_LATEST=${REGISTRY}/${IMAGE_BASE_NAME}:${GITHUB_BRANCH}.latest
+      - export DOCKER_IMG_TAG_LATEST=${REGISTRY}/${IMAGE_BASE_NAME}:${GITHUB_BRANCH//\//_}.latest
       - |-
         if [ "${GITHUB_TAG}" = "" ] ; then
-          export DOCKER_IMG_TAG=${REGISTRY}/${IMAGE_BASE_NAME}:${GITHUB_BRANCH}.${GITHUB_COMMIT}
+          export DOCKER_IMG_TAG=${REGISTRY}/${IMAGE_BASE_NAME}:${GITHUB_BRANCH//\//_}.${GITHUB_COMMIT}
           export GITHUB_TAG=${GITHUB_COMMIT}
         fi
       - echo "Building docker image with tags ${DOCKER_IMG_TAG} and ${DOCKER_IMG_TAG_LATEST}"