Skip to content

Commit 7b38956

Browse files
committed
refactor: save terraform.tf* files into infra/terraform directory instead of its subdirectory
infra/terraform/terraform-data/terraform.tfstate => infra/terraform/terraform.tfstate infra/terraform/terraform-data/terraform.tfvars => infra/terraform/terraform.tfvars infra/terraform/terraform-data/terraform.tfplan => infra/terraform/terraform.tfplan [skip ci]
1 parent ffd3b87 commit 7b38956

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/provision-by-terraform.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
echo "Decrypting ${FILENAME}.enc to $FILENAME"
8585
ansible-vault decrypt \
8686
--vault-password-file vault-pass.txt \
87-
--output "terraform-data/$FILENAME" \
87+
--output "$FILENAME" \
8888
"terraform-data/${FILENAME}.enc"
8989
done
9090
@@ -103,16 +103,16 @@ jobs:
103103
run: >-
104104
terraform plan \
105105
-detailed-exitcode \
106-
-var-file terraform-data/terraform.tfvars \
107-
-state terraform-data/terraform.tfstate \
108-
-out terraform-data/terraform.tfplan
106+
-var-file terraform.tfvars \
107+
-state terraform.tfstate \
108+
-out terraform.tfplan
109109
110110
111111
- name: Cleanup
112112
if: always()
113113
working-directory: infra/terraform
114114
run: |
115-
for FILE in vault-pass.txt terraform-data/terraform.tfplan terraform-data/terraform.tfstate terraform-data/terraform.tfstate.backup terraform-data/terraform.tfvars; do
115+
for FILE in vault-pass.txt terraform.tfplan terraform.tfstate terraform.tfstate.backup terraform.tfvars; do
116116
[ ! -f "$FILE" ] || rm -fv "$FILE"
117117
done
118118
[ ! -d terraform-data ] || git worktree remove terraform-data

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ infra/ansible/roles/mystamps-nginx/files/prod/my-stamps.ru.crt
2727

2828
# Terraform related files
2929
infra/terraform/.terraform/
30+
infra/terraform/terraform.tfplan
31+
infra/terraform/terraform.tfvars
32+
infra/terraform/terraform.tfstate
33+
infra/terraform/terraform.tfstate.backup
3034

3135
# used by infra/docker/prod.yml
3236
infra/docker/application-prod.properties

0 commit comments

Comments
 (0)