terraform->instance

Author: JamesW1-NHS

.github/dependabot.yml

@@ -74,7 +74,7 @@ updates:
     directories:
       - "/infrastructure/grafana/non-prod/terraform"
       - "/infrastructure/account"
-      - "/infrastructure/terraform"
+      - "/infrastructure/instance"
       - "/infrastructure/terraform_aws_backup/**"
     schedule:
       interval: "daily"

.gitignore

@@ -17,7 +17,7 @@ __pycache__/
 .envrc
 smoketest-report.xml
 lambda_typescript/**/*.js
-terraform/zips
+instance/zips
 .dir-locals.el
 *.pyc
 .python-version

Makefile

@@ -37,7 +37,7 @@ build-proxy:
 
 #Files to loop over in release
 # VED-811: remove everything except for proxy related files as we move to Github Actions for backend deployment
-_dist_include="poetry.toml Makefile build/. specification sandbox infrastructure/terraform utilities/scripts"
+_dist_include="poetry.toml Makefile build/. specification sandbox infrastructure/instance utilities/scripts"
 
 #Create /dist/ sub-directory and copy files into directory
 #Ensure full dir structure is preserved for Lambdas

README.md

@@ -53,7 +53,7 @@ steps:
         echo Apigee environment: $APIGEE_ENVIRONMENT
         echo pr_no: $pr_no
 
-        cd terraform
+        cd instance
         make init environment=${{ parameters.aws_account_type }} sub_environment=$workspace
         make apply environment=${{ parameters.aws_account_type }} sub_environment=$workspace
 

azure/templates/post-deploy.yml

@@ -18,7 +18,7 @@ steps:
   - bash: |
       pwd
       ls -la
-      cd terraform
+      cd instance
     displayName: "Check Directory and Navigate to Terraform for AWS Deployment"
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)"
 
@@ -35,7 +35,7 @@ steps:
         echo workspace: $workspace
         echo AWS environment: $APIGEE_ENVIRONMENT
 
-          cd terraform
+        cd instance
 
         make init environment=${{ parameters.aws_account_type }} sub_environment=$workspace
         make apply environment=${{ parameters.aws_account_type }} sub_environment=$workspace

azure/templates/post-prod-deploy.yml

@@ -56,13 +56,13 @@ destroy: workspace
 output:
 	$(tf_cmd) output -raw $(name)
 
-#Make lambda zip file in /terraform/zips directory. Whenever code gets changed in lamdba_typescript directory , new zip file gets uploaded to s3. For local,you can you this make target
+#Make lambda zip file in /infrastructure/instance/zips directory. Whenever code gets changed in lamdba_typescript directory , new zip file gets uploaded to s3. For local,you can you this make target
 lambda-zip:
 	cd ../lambda_typescript && \
 	chmod +x ./deploy.sh && \
 	./deploy.sh
 
-#Make catch-all-lambda zip file in /terraform/zips directory. Whenever code gets changed in lamdba_typescript directory , new zip file gets uploaded to s3. For local,you can you this make target
+#Make catch-all-lambda zip file in /infrastructure/instance/zips directory. Whenever code gets changed in lamdba_typescript directory , new zip file gets uploaded to s3. For local,you can you this make target
 catch-all-zip:
 	cd ../catch_all_lambda && \
 	chmod +x ./deploy.sh && \