Zero landing page [zero-222] (#23)

* strict match for CloudFront dist id

* require approval for production deployment

* add CIRCLECI_API_KEY var to available build env vars

Author: dtoki

Makefile

@@ -10,6 +10,7 @@ run:
 	@echo "Set CIRCLECI environment variables\n"
 	export AWS_ACCESS_KEY_ID=$(shell aws secretsmanager get-secret-value --region ${region} --secret-id=ci-user-aws-keys${randomSeed} | jq -r '.SecretString'| jq -r .access_key_id)
 	export AWS_SECRET_ACCESS_KEY=$(shell aws secretsmanager get-secret-value --region ${region} --secret-id=ci-user-aws-keys${randomSeed} | jq -r '.SecretString'| jq -r .secret_key)
+	curl -X POST --header "Content-Type: application/json" -d '{"name":"CIRCLECI_API_KEY", "value":"${CIRCLECI_API_KEY}"}' https://circleci.com/api/v1.1/project/github/${GITHUB_ORG}/${GITHUB_REPO}/envvar?circle-token=${CIRCLECI_API_KEY}
 	curl -X POST --header "Content-Type: application/json" -d '{"name":"AWS_ACCESS_KEY_ID", "value":"${AWS_ACCESS_KEY_ID}"}' https://circleci.com/api/v1.1/project/github/${GITHUB_ORG}/${GITHUB_REPO}/envvar?circle-token=${CIRCLECI_API_KEY}
 	curl -X POST --header "Content-Type: application/json" -d '{"name":"AWS_SECRET_ACCESS_KEY", "value":"${AWS_SECRET_ACCESS_KEY}"}' https://circleci.com/api/v1.1/project/github/${GITHUB_ORG}/${GITHUB_REPO}/envvar?circle-token=${CIRCLECI_API_KEY}
 	@echo "\nFollow CIRCLECI project"
@@ -22,4 +23,3 @@ summary:
 	@echo "- Deployment Pipeline URL: https://app.circleci.com/pipelines/github/${GITHUB_ORG}/${GITHUB_REPO}"
 	@echo $(shell echo ${ENVIRONMENT} | grep prod > /dev/null && echo "- Production Landing Page: ${productionFrontendSubdomain}${productionHostRoot}")
 	@echo $(shell echo ${ENVIRONMENT} | grep stage > /dev/null && echo "- Staging Landing Page: ${stagingFrontendSubdomain}${stagingHostRoot}")
-

templates/.circleci/config.yml

@@ -2,6 +2,7 @@
 version: 2.1
 orbs:
   aws-s3: circleci/aws-s3@1.0.15
+  queue: eddiewebb/queue@1.3.0
 
 variables:
   - &workspace /home/circleci/project
@@ -182,7 +183,7 @@ jobs:
       - run:
           name: Invalidate Cloudfront
           command: |
-            export DIST_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Aliases.Items[?contains(@, '<< parameters.bucket >>')]].Id | [0]" | tr -d '"')
+            export DIST_ID=$(aws cloudfront list-distributions --query "DistributionList.Items[?Aliases.Items[?@=='<< parameters.bucket >>']].Id | [0]" | tr -d '"')
             aws cloudfront create-invalidation --distribution-id ${DIST_ID} --paths "/*"
 
 workflows:
@@ -220,12 +221,23 @@ workflows:
             #   branches:
             #     only:  # only branches matching the below regex filters will run
             #       - /^master$/
+        
+        - wait_for_approval:
+            type: approval
+            requires:
+              - deploy_staging
 
+        - queue/block_workflow:
+            time: '30' # hold for 30 mins then abort
+            requires:
+              - wait_for_approval
+        
         - deploy:
             name: deploy_production
             requires:
               - unit_test
               - build_production
+              - queue/block_workflow
             bucket: "<% index .Params `productionFrontendSubdomain` %><% index .Params `productionHostRoot` %>"
             region: "<% index .Params `region` %>"
             filters: