From 3d4c27080c2364ae61ab3489425615ea4d2a2980 Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Thu, 6 Nov 2025 16:51:46 -0700 Subject: [PATCH 1/4] chore: update underlying dependencies --- aqua.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aqua.yaml b/aqua.yaml index 7637986..01a9de8 100644 --- a/aqua.yaml +++ b/aqua.yaml @@ -1,11 +1,11 @@ --- registries: - type: standard - ref: v4.78.0 # renovate: depName=aquaproj/aqua-registry + ref: v4.433.0 # renovate: depName=aquaproj/aqua-registry packages: - - name: go-task/task@v3.31.0 - - name: TomWright/dasel@v2.4.1 - - name: stedolan/jq@jq-1.7.1 + - name: go-task/task@v3.45.4 + - name: TomWright/dasel@v2.8.1 + - name: stedolan/jq@jq-1.8.1 tags: [cursor] - - name: cli/cli@v2.74.2 + - name: cli/cli@v2.83.0 tags: [gh] From 1a506d4bcca3cc2901da1e8fd851ed36e04e199e Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Thu, 6 Nov 2025 16:52:18 -0700 Subject: [PATCH 2/4] feat: rename the folder, terraform -> tf --- Taskfile.yaml | 5 ++--- lib/{terraform => tf}/Taskfile.yml | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename lib/{terraform => tf}/Taskfile.yml (100%) diff --git a/Taskfile.yaml b/Taskfile.yaml index b9aad4a..895a492 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -8,9 +8,8 @@ includes: mixins: lib/mixins os: lib/os-modules snaplet: lib/snaplet - terraform: - taskfile: lib/terraform - aliases: [tf] + tf: + taskfile: lib/tf toolbox: lib/toolbox tasks: {} diff --git a/lib/terraform/Taskfile.yml b/lib/tf/Taskfile.yml similarity index 100% rename from lib/terraform/Taskfile.yml rename to lib/tf/Taskfile.yml From b971ea55fe7876497b32f902377650e93dfd3968 Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Thu, 6 Nov 2025 17:07:44 -0700 Subject: [PATCH 3/4] feat: allow users to use opentofu or terraform --- lib/tf/Taskfile.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/tf/Taskfile.yml b/lib/tf/Taskfile.yml index 3f59b00..115986b 100644 --- a/lib/tf/Taskfile.yml +++ b/lib/tf/Taskfile.yml @@ -24,6 +24,8 @@ tasks: sh: echo "{{.BACKEND_CONFIG_PATH}}/{{.ENV}}.backend.tf" TFVARS_FILE: sh: echo "{{.TFVARS_PATH}}/{{.ENV}}.tfvars" + TF_CMD: + sh: '[ "${USE_TERRAFORM}" = "true" ] && echo "terraform" || echo "tofu"' init: desc: Initialize Terraform working directory with a backend configuration file. @@ -39,7 +41,7 @@ tasks: - sh: test -f {{.BACKEND_CONFIG_FILE}} msg: "Backend configuration file does not exist: {{.BACKEND_CONFIG_FILE}}" cmds: - - terraform init -backend-config {{.BACKEND_CONFIG_FILE}} {{.TF_ARGS}} + - "{{.TF_CMD}} init -backend-config {{.BACKEND_CONFIG_FILE}} {{.TF_ARGS}}" plan: desc: Generate a Terraform execution plan Terraform loading variable values from the given file. @@ -56,7 +58,7 @@ tasks: - sh: test -f {{.TFVARS_FILE}} msg: "Variables file does not exist: {{.TFVARS_FILE}}" cmds: - - terraform plan -var-file {{.TFVARS_FILE}} {{.TF_ARGS}} + - "{{.TF_CMD}} plan -var-file {{.TFVARS_FILE}} {{.TF_ARGS}}" apply: desc: Create or update infrastructure according to Terraform configuration files in the current directory. @@ -73,7 +75,7 @@ tasks: - sh: test -f {{.TFVARS_FILE}} msg: "Variables file does not exist: {{.TFVARS_FILE}}" cmds: - - terraform apply -var-file {{.TFVARS_FILE}} {{.TF_ARGS}} + - "{{.TF_CMD}} apply -var-file {{.TFVARS_FILE}} {{.TF_ARGS}}" refresh: desc: Refresh the Terraform state to match the real-world infrastructure (safer via apply -refresh-only). @@ -90,4 +92,4 @@ tasks: - sh: test -f {{.TFVARS_FILE}} msg: "Variables file does not exist: {{.TFVARS_FILE}}" cmds: - - terraform apply -refresh-only -var-file {{.TFVARS_FILE}} {{.TF_ARGS}} + - "{{.TF_CMD}} apply -refresh-only -var-file {{.TFVARS_FILE}} {{.TF_ARGS}}" From ed45202e0fdd73b7327697365a97dc9c0a73dbd7 Mon Sep 17 00:00:00 2001 From: Weston Platter Date: Thu, 6 Nov 2025 17:39:12 -0700 Subject: [PATCH 4/4] fix: remove cursor after we removed the directory --- Taskfile.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Taskfile.yaml b/Taskfile.yaml index 895a492..4c600c7 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -4,7 +4,6 @@ includes: aqua: lib/aqua aws: lib/aws components: lib/components - cursor: lib/cursor mixins: lib/mixins os: lib/os-modules snaplet: lib/snaplet