short git sha character length in project config

systemaccounting · May 4, 2024 · 2949dc1 · 2949dc1
1 parent 48c5e63
commit 2949dc1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/project.yaml b/project.yaml
@@ -319,6 +319,9 @@ scripts:
       SERVICES_ZIP:
         ssm: null
         default: mxfactorial.zip
+      SHORT_GIT_SHA_LENGTH:
+        ssm: null
+        default: 7
 services:
   env_var:
     set:

diff --git a/scripts/build-image.sh b/scripts/build-image.sh
@@ -26,7 +26,9 @@ while [[ "$#" -gt 0 ]]; do
 	shift
 done
 
-HASH=$(git rev-parse --short=7 HEAD)
+PROJECT_CONF=project.yaml
+SHORT_GIT_SHA_LENGTH=$(yq '.scripts.env_var.set.SHORT_GIT_SHA_LENGTH.default' $PROJECT_CONF)
+HASH=$(git rev-parse --short=$SHORT_GIT_SHA_LENGTH HEAD)
 IMAGE_TAG="$APP_NAME:$HASH"
 DOCKERFILE_PATH=./docker/$APP_NAME.Dockerfile
 

diff --git a/scripts/print-image-tag.sh b/scripts/print-image-tag.sh
@@ -34,8 +34,11 @@ while [[ "$#" -gt 0 ]]; do
 	shift
 done
 
+PROJECT_CONF=project.yaml
+SHORT_GIT_SHA_LENGTH=$(yq '.scripts.env_var.set.SHORT_GIT_SHA_LENGTH.default' $PROJECT_CONF)
+
 if [[ -z $HASH ]]; then
-	HASH=$(git rev-parse --short=7 HEAD)
+	HASH=$(git rev-parse --short=$SHORT_GIT_SHA_LENGTH HEAD)
 fi
 
 REPO=$(source scripts/print-ecr-repo-uri.sh --app-name $APP_NAME --env $ENV --env-id $ENV_ID)

diff --git a/scripts/push-prod-image.sh b/scripts/push-prod-image.sh
@@ -36,8 +36,9 @@ ID_ENV_PREFIX="$ENV_ID/$ENV"
 REGION=$(yq '.infrastructure.terraform.aws.modules.environment.env_var.set.REGION.default' $PROJECT_CONF)
 REPO_NAME="$ID_ENV_PREFIX/$APP_NAME"
 PROD_ENV_ID=$(yq '.infrastructure.terraform.env-id.prod.env_var.set.PROD_ENV_ID.default' $PROJECT_CONF)
+SHORT_GIT_SHA_LENGTH=$(yq '.scripts.env_var.set.SHORT_GIT_SHA_LENGTH.default' $PROJECT_CONF)
 
-MERGE_COMMIT_HASH=$(git rev-parse --short=7 HEAD)
+MERGE_COMMIT_HASH=$(git rev-parse --short=$SHORT_GIT_SHA_LENGTH HEAD)
 
 TAG_COUNT=$(aws ecr batch-get-image \
 	--repository-name=$REPO_NAME \

diff --git a/scripts/tag-dev-image.sh b/scripts/tag-dev-image.sh
@@ -22,11 +22,12 @@ while [[ "$#" -gt 0 ]]; do
 	shift
 done
 
-HASH=$(git rev-parse --short=7 HEAD)
+PROJECT_CONF=project.yaml
+SHORT_GIT_SHA_LENGTH=$(yq '.scripts.env_var.set.SHORT_GIT_SHA_LENGTH.default' $PROJECT_CONF)
+HASH=$(git rev-parse --short=$SHORT_GIT_SHA_LENGTH HEAD)
 LOCAL_IMAGE_TAG="$APP_NAME:$HASH"
 
 ENV=dev
-PROJECT_CONF=project.yaml
 ENV_ID=$(source scripts/print-env-id.sh)
 
 DEV_REPO=$(source scripts/print-ecr-repo-uri.sh --app-name $APP_NAME --env dev --env-id $ENV_ID)

diff --git a/scripts/tag-merge-commit.sh b/scripts/tag-merge-commit.sh
@@ -34,6 +34,7 @@ PROJECT_CONF=project.yaml
 ID_ENV="$ENV_ID-$ENV"
 ID_ENV_PREFIX="$ENV_ID/$ENV"
 REGION=$(yq '.infrastructure.terraform.aws.modules.environment.env_var.set.REGION.default' $PROJECT_CONF)
+SHORT_GIT_SHA_LENGTH=$(yq '.scripts.env_var.set.SHORT_GIT_SHA_LENGTH.default' $PROJECT_CONF)
 
 IMAGE_NAME="$ID_ENV_PREFIX/$APP_NAME"
 LAMBDA_NAME="$APP_NAME-$ID_ENV"
@@ -54,7 +55,7 @@ fi
 LATEST_ECR_IMAGE_TAG_VERSIONS=($(aws ecr describe-images --repository-name $IMAGE_NAME --output text --query 'sort_by(imageDetails,& imagePushedAt)[-1].imageTags' | xargs))
 
 # get the commit hash after merge
-MERGE_COMMIT_HASH=$(git rev-parse --short=7 HEAD)
+MERGE_COMMIT_HASH=$(git rev-parse --short=$SHORT_GIT_SHA_LENGTH HEAD)
 
 for TAG_VERSION in "${LATEST_ECR_IMAGE_TAG_VERSIONS[@]}"; do
 	if [[ "$TAG_VERSION" == "$DEPLOYED_IMAGE_TAG_VERSION" ]]; then