Improve handling of optional variables (#2)

Co-authored-by: vosscodes <[email protected]>

.github/terraform/main.tf

@@ -14,6 +14,16 @@ variable "image" {
   type = string
 }
 
+variable "optional" {
+  type    = string
+  default = null
+
+  validation {
+    condition = var.optional == null || var.optional == "foo"
+    error_message = "`optional` must only be `null` or `\"foo\"`."
+  }
+}
+
 resource "docker_image" "web_server" {
   name         = var.image
   keep_locally = false

.github/workflows/integration-tests.yaml

@@ -28,6 +28,7 @@ jobs:
           workspace: ${{ github.event.number }}
           variables: |-
             image: nginx:latest
+            optional:
       - name: Validate apply
         run: |
           status="$(curl -fsSL -o /dev/null -w "%{http_code}" http://localhost:8000)"
@@ -44,6 +45,7 @@ jobs:
           workspace: ${{ github.event.number }}
           variables: |-
             image: nginx:latest
+            optional:
       - name: Validate destroy
         run: |
           rc=0

apply/action.yaml

@@ -48,12 +48,16 @@ runs:
         # Execute
         set -eo pipefail
 
+        # Convert JSON variables into CLI flags. We'll remove entries with `null` values as we cannot
+        # pass those into Terraform:
+        # https://github.com/hashicorp/terraform/issues/29078
+        #
         # TODO: Add tests for JSON lists and values with spaces. If you aren't very careful can end up
         # with `'-var=foo="a b"'` which looks like a positional argument to terraform.
         var_flags=()
         while read -r var; do
             var_flags+=(-var "${var:?}")
-        done < <(jq -r 'to_entries[] | "\(.key)=\(.value | tostring)"' <<<"${variables_json}")
+        done < <(jq -r 'to_entries[] | select(.value != null) | "\(.key)=\(.value | tostring)"' <<<"${variables_json}")
 
         echo "::group::terraform init"
         terraform init

destroy/action.yaml

@@ -43,12 +43,16 @@ runs:
         # Destroy
         set -eo pipefail
 
+        # Convert JSON variables into CLI flags. We'll remove entries with `null` values as we cannot
+        # pass those into Terraform:
+        # https://github.com/hashicorp/terraform/issues/29078
+        #
         # TODO: Add tests for JSON lists and values with spaces. If you aren't very careful can end up
         # with `'-var=foo="a b"'` which looks like a positional argument to terraform.
         var_flags=()
         while read -r var; do
             var_flags+=(-var "${var:?}")
-        done < <(jq -r 'to_entries[] | "\(.key)=\(.value | tostring)"' <<<"${variables_json}")
+        done < <(jq -r 'to_entries[] | select(.value != null) | "\(.key)=\(.value | tostring)"' <<<"${variables_json}")
 
         echo "::group::terraform init"
         terraform init