[NDR-318] NDRI Directory override

Author: jameslinnell

Makefile

@@ -68,14 +68,15 @@ check-packages:
 	./lambdas/venv/bin/pip-audit -r $(REPORTS_REQUIREMENTS)
 	./lambdas/venv/bin/pip-audit -r $(ALERTING_REQUIREMENTS)
 
-build-and-deploy-sandbox: ## Build a sandbox and deploy code. If no SANDBOX_NAME is provided it will use your current branch as the name. All options are optional. It will default to building and deploying using 'main', You can skip building infrastructure by BUILD_INFRA=false. Usage: make build-and-deploy-sandbox SANDBOX_NAME=<sandbox_name> NDRI_WORKFLOW_BRANCH=<branch> NDRI_BRANCH=<branch> NDR_WORKFLOW_BRANCH=<branch> NDR_BRANCH=<branch> BUILD_INFRA=<true|false>
+build-and-deploy-sandbox: ## Build a sandbox and deploy code. If no SANDBOX_NAME is provided it will use your current branch as the name. It will default to building and deploying using 'main', You can skip building infrastructure by BUILD_INFRA=false. Usage: make build-and-deploy-sandbox SANDBOX_NAME=<sandbox_name> NDRI_WORKFLOW_BRANCH=<branch> NDRI_BRANCH=<branch> NDR_WORKFLOW_BRANCH=<branch> NDR_BRANCH=<branch> BUILD_INFRA=<true|false> NDRI_DIR_LOC_OVERRIDE=<dir_location>
 	@./scripts/build_and_deploy_sandbox.sh \
 		$(if $(NDRI_WORKFLOW_BRANCH),--ndri_workflow_branch=$(NDRI_WORKFLOW_BRANCH)) \
 		$(if $(NDRI_BRANCH),--ndri_branch=$(NDRI_BRANCH)) \
 		$(if $(NDR_WORKFLOW_BRANCH),--ndr_workflow_branch=$(NDR_WORKFLOW_BRANCH)) \
 		$(if $(NDR_BRANCH),--ndr_branch=$(NDR_BRANCH)) \
 		$(if $(SANDBOX_NAME),--sandbox_name=$(SANDBOX_NAME)) \
-		$(if $(BUILD_INFRA),--build_infra=$(BUILD_INFRA))
+		$(if $(BUILD_INFRA),--build_infra=$(BUILD_INFRA)) \
+		$(if $(NDRI_DIR_LOC_OVERRIDE),--ndri_dir_loc_override=$(NDRI_DIR_LOC_OVERRIDE))
 
 download-api-certs: ## Downloads mTLS certificates (use with dev envs only). Usage: make download-api-certs WORKSPACE=<workspace>
 	rm -rf ./lambdas/mtls_env_certs/$(WORKSPACE)

scripts/build_and_deploy_sandbox.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 set -euo pipefail
 
-NDR_DIRECTORY="$HOME/Documents/national-document-repository"
-NDRI_DIRECTORY="$HOME/Documents/national-document-repository-infrastructure"
-
-CONFIG_FILE="$HOME/.ndr_config"
-if [[ -f "$CONFIG_FILE" ]]; then
-  source "$CONFIG_FILE"
-fi
-
 # Initialize variables to track options
+NDR_DIRECTORY="$(pwd)"
+PARENT_DIR="$(dirname "$NDR_DIRECTORY")"
+NDRI_DIRECTORY="$PARENT_DIR/national-document-repository-infrastructure"
 BUILD_INFRA=true
 NDRI_BRANCH="main"
 NDRI_WORKFLOW_BRANCH="main"
@@ -47,9 +42,12 @@ for arg in "$@"; do
   --build_infra=*)
     BUILD_INFRA="${arg#*=}"
     ;;
+  --ndri_dir_loc_override=*)
+    NDRI_DIRECTORY="${arg#*=}"
+    ;;
   *)
     echo "Unknown argument: $arg"
-    echo "Usage: $0 [--ndri_workflow_branch=<branch>] [--ndri_branch=<branch>] [--ndr_branch=<branch>] [--ndr_workflow_branch=<branch>] [--sandbox_name=<sandbox_name>] [--build_infra=<boolean>]"
+    echo "Usage: $0 [--ndri_workflow_branch=<branch>] [--ndri_branch=<branch>] [--ndr_branch=<branch>] [--ndr_workflow_branch=<branch>] [--sandbox_name=<sandbox_name>] [--build_infra=<true|false>]  [--ndri_dir_loc_override=<absolute_path>]"
     exit 1
     ;;
   esac