Merge branch 'feature/PI-585-ci_in_dev' into release/2024-11-05

Author: jaklinger

.github/workflows/pull-requests.yml

@@ -9,7 +9,8 @@ permissions:
 
 env:
   BASE_CACHE_SUFFIX: base
-  BASE_BRANCH_NAME: ${{ github.event.pull_request.base.ref }}
+  #BASE_BRANCH_NAME: ${{ github.event.pull_request.base.ref }}
+  BASE_BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
   BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
   CI_ROLE_NAME: ${{ secrets.CI_ROLE_NAME }}
   BRANCH_GITHUB_SHA_SHORT: $(echo ${{ github.event.pull_request.head.sha }} | cut -c 1-7)

scripts/infrastructure/terraform/terraform-commands.sh

@@ -19,7 +19,7 @@ function _terraform() {
     local terraform_role_name="NHSDeploymentRole"
     lowercase_string=$(echo "$TERRAFORM_WORKSPACE" | tr '[:upper:]' '[:lower:]')
 
-    account=$(_get_account_name "$AWS_ACCOUNT" "$lowercase_string") || return 1
+    account=$(_get_account_name "$AWS_ACCOUNT") || return 1
     workspace=$(_get_workspace_name "$account" "$lowercase_string") || return 1
     aws_account_id=$(_get_aws_account_id "$account" "$PROFILE_PREFIX" "$VERSION") || return 1
 

scripts/infrastructure/terraform/terraform-utils.sh

@@ -5,15 +5,9 @@ source ./scripts/infrastructure/terraform/terraform-constants.sh
 
 function _get_account_name() {
   local account=$1
-  local workspace=$2
 
-  # if account not specified then infer it
   if [[ -z "$account" ]]; then
-    if [[ "$workspace" = "ci-"* ]]; then
-      echo "ref" # ci builds go here
-    else
-      echo "dev" # personal builds co here
-    fi
+      echo "dev"
   else
     echo "$account"
   fi