better file organization

.woodpecker.yml

@@ -12,7 +12,7 @@ pipeline:
     image: registry.monotremata.xyz/terraform
     pull: true
     commands:
-      - terraform init -backend-config="conn_str=$BACKEND_CONN_STR"
+      - terraform -chdir=tf init -backend-config="conn_str=$BACKEND_CONN_STR"
     secrets:
       [backend_conn_str]
 
@@ -20,8 +20,8 @@ pipeline:
     image: registry.monotremata.xyz/terraform
     pull: true
     commands:
-      - terraform plan -out=tfplan
+      - terraform -chdir=tf plan -out=tfplan
-      - terraform show -json tfplan
+      - terraform -chdir=tf show -json tfplan
     environment:
       - HTTP_PROXY=caladan:8888
       - HTTPS_PROXY=caladan:8888
@@ -34,7 +34,7 @@ pipeline:
     image: registry.monotremata.xyz/terraform
     pull: true
     commands:
-      - terraform apply tfplan
+      - terraform -chdir=tf apply tfplan
     environment:
       - HTTP_PROXY=caladan:8888
       - HTTPS_PROXY=caladan:8888

README.md

@@ -27,13 +27,14 @@ create resources manually and import them later to terraform.
 
 ## Wrapper scripts
 
-I run Terrafrom through two wrapper scripts: `init.sh` and `run_terraform`.
+I run Terrafrom through two wrapper scripts: `scripts/init.sh` and
+`scripts/run_terraform`.
 
-`init.sh` is used just to run `terraform init`. It fetches the PostgreSQL
+`scripts/init.sh` is used just to run `terraform init`. It fetches the
-phssword (from `pass`) and it passes the connection string manually to the
+PostgreSQL phssword (from `pass`) and it passes the connection string manually
-partially-configured pg backend.
+to the partially-configured pg backend.
 
-`run_terraform` is used to run other terraform commands. It sets up the
+`scripts/run_terraform` is used to run other terraform commands. It sets up the
 `HTTP_PROXY` and `HTTPS_PROXY` variables to use `caladan` as a proxy. It also
 fetches the secrets (from `pass`) and exports the variables for api keys and
 tokens needed by the different providers.

scripts/run_terraform

@@ -11,4 +11,4 @@ export NAMECHEAP_API_KEY
 export LINODE_TOKEN
 export VULTR_API_KEY
 
-terraform "$@"
+terraform -chdir=./tf "$@"