Skip to content

VED-720: Apply the exact plan generated in the Terraform plan step. #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mfjarvis merged 4 commits into from
Oct 3, 2025
Merged

VED-720: Apply the exact plan generated in the Terraform plan step. #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78afbd3
VED-720: Apply the exact plan generated in the Terraform plan step.
mfjarvis Oct 2, 2025
c613e32
VED-720: Add auto-approve back in for the Azure DevOps pipelines.
mfjarvis Oct 2, 2025
160230f
Merge branch 'master' into VED-720-save-tfplan
mfjarvis Oct 3, 2025
4a7b371
Merge branch 'master' into VED-720-save-tfplan
mfjarvis Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions .github/workflows/deploy-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ jobs:

- name: Terraform Plan
working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
run: make plan apigee_environment=$APIGEE_ENVIRONMENT environment=$BACKEND_ENVIRONMENT sub_environment=$BACKEND_SUB_ENVIRONMENT
run: make plan-ci apigee_environment=$APIGEE_ENVIRONMENT environment=$BACKEND_ENVIRONMENT sub_environment=$BACKEND_SUB_ENVIRONMENT

- name: Save Terraform Plan
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
with:
name: tfplan
path: ${{ vars.TERRAFORM_DIR_PATH }}/tfplan

terraform-apply:
needs: terraform-plan
Expand Down Expand Up @@ -106,14 +112,20 @@ jobs:
with:
terraform_version: "1.12.2"

- name: Retrieve Terraform Plan
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
with:
name: tfplan
path: ${{ vars.TERRAFORM_DIR_PATH }}

- name: Terraform Init
working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
run: make init apigee_environment=$APIGEE_ENVIRONMENT environment=$BACKEND_ENVIRONMENT sub_environment=$BACKEND_SUB_ENVIRONMENT

- name: Terraform Apply
working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
run: |
make apply apigee_environment=$APIGEE_ENVIRONMENT environment=$BACKEND_ENVIRONMENT sub_environment=$BACKEND_SUB_ENVIRONMENT
make apply-ci apigee_environment=$APIGEE_ENVIRONMENT environment=$BACKEND_ENVIRONMENT sub_environment=$BACKEND_SUB_ENVIRONMENT
echo "ID_SYNC_QUEUE_ARN=$(make -s output name=id_sync_queue_arn)" >> $GITHUB_ENV

- name: Install poetry
Expand Down
9 changes: 8 additions & 1 deletion terraform/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,18 @@ init-reconfigure:
plan: workspace
$(tf_cmd) plan $(tf_vars)

plan-ci: workspace
$(tf_cmd) plan $(tf_vars) -out=tfplan -input=false

plan-changes: workspace
$(tf_cmd) plan $(tf_vars) -out=plan && $(tf_cmd) show -no-color -json plan | jq -r '.resource_changes[] | select(.change.actions[0]=="update" or .change.actions[0]=="create" or .change.actions[0]=="add") | .address'

# TODO - remove --auto-approve once we've switched to the new deployment pipeline in GitHub Actions
apply: workspace
$(tf_cmd) apply $(tf_vars) -auto-approve
$(tf_cmd) apply $(tf_vars) --auto-approve

apply-ci: workspace
$(tf_cmd) apply $(tf_vars) -input=false tfplan

clean:
rm -rf build .terraform upload-key
Expand Down
Loading