Merge pull request #123 from NHSDigital/DTOSS-9416-postgres-2

[DTOSS-9416] Wait for db migrate to finish

Author: saliceti

.azuredevops/pipelines/deploy.yml

@@ -55,5 +55,4 @@ stages:
                         scriptType: bash
                         scriptLocation: inlineScript
                         addSpnToEnvironment: true
-                        inlineScript: |
-                          az containerapp job start --name manage-breast-screening-dbm-${{ env }} --resource-group rg-manbrs-${{ env }}-uks
+                        inlineScript: ./scripts/bash/db_migrate.sh ${{ env }}

scripts/bash/db_migrate.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+ENV=$1
+JOB_NAME=manage-breast-screening-dbm-${ENV}
+RG_NAME=rg-manbrs-${ENV}-uks
+TIMEOUT=300
+WAIT=5
+count=0
+
+get_job_status() {
+    az containerapp job execution show --job-execution-name "$execution_name" -n "$JOB_NAME" -g "$RG_NAME" | jq -r '.properties.status'
+}
+
+echo Starting job "$JOB_NAME"...
+execution_name=$(az containerapp job start --name "$JOB_NAME" --resource-group "$RG_NAME" | jq -r '.id|split("/")[-1]')
+
+while [[ $(get_job_status) = "Running" ]]; do
+    echo The job "$execution_name" is still running...
+    ((count*WAIT > TIMEOUT)) && break
+    ((count+=1))
+    sleep $WAIT
+done
+
+if ((count*WAIT > TIMEOUT)); then
+    echo "The job \"$execution_name\" timed out (${TIMEOUT}s)"
+    exit 1
+fi
+
+status=$(get_job_status)
+if [[ $status = "Succeeded" ]]; then
+    echo The job "$execution_name" completed successfully
+else
+    echo The job "$execution_name" has not completed successfully. Status: "$status"
+    exit 2
+fi

scripts/docker/docker.lib.sh

@@ -49,7 +49,7 @@ function docker-build() {
 
   # Tag the image with all the stated versions, see the documentation for more details
   for version in $(_get-all-effective-versions) latest; do
-    if [ ! -z "$version" ]; then
+    if [ -n "$version" ]; then
       docker tag "${tag}" "${DOCKER_IMAGE}:${version}"
     fi
   done
@@ -312,7 +312,7 @@ function _get-effective-tag() {
 
   local tag=$DOCKER_IMAGE
   version=$(_get-effective-version)
-  if [ ! -z "$version" ]; then
+  if [ -n "$version" ]; then
     tag="${tag}:${version}"
   fi
   echo "$tag"

scripts/shared.mk

@@ -59,8 +59,13 @@ HELP_SCRIPT = \
 		} \
 	}
 
+shellscript-lint-all: # Lint all shell scripts in the scripts directory, do not fail on error, just print the error messages @Quality
+	for file in $$(find scripts -type f -name "*.sh"); do \
+		file=$${file} scripts/shellscript-linter.sh ||: ; \
+	done
+
 .PHONY: _install-tool _install-tools
 .ONESHELL:
 MAKEFLAGS := --no-print-directory
 SHELL := /bin/bash
-SHELLFLAGS := -cex
+SHELLFLAGS := -cex