Add variables for flow JSON paths/contents in generated HCL

Author: patrickcping

internal/generate/templates/0.4/hcl_davinci_flow.tf.tmpl

@@ -13,7 +13,7 @@ resource "davinci_flow" "{{.ResourceName}}" {
   name        = var.davinci_flow_{{.ResourceName}}_name
   description = var.davinci_flow_{{.ResourceName}}_description
 
-  flow_json = file("{{.FlowJSONPath}}")
+  flow_json = var.davinci_flow_{{.ResourceName}}_json_file_path != null ? file(var.davinci_flow_{{.ResourceName}}_json_file_path) : var.davinci_flow_{{.ResourceName}}_json
 
 {{if .ConnectionLinks}}
 

internal/generate/templates/0.4/hcl_davinci_flow_vars.tf.tmpl

@@ -24,3 +24,24 @@ variable "davinci_flow_{{.ResourceName}}_description" {
   default = null
   {{- end}}
 }
+
+// The location of the flow file path
+variable "davinci_flow_{{.ResourceName}}_json_file_path" {
+  type = string
+  
+  description = "The filesystem location of the flow JSON with resource name '{{.ResourceName}}'. Cannot be set with the `davinci_flow_{{.ResourceName}}_json` variable."
+  default = "{{.FlowJSONPath}}"
+
+  validation {
+    condition = (var.davinci_flow_{{.ResourceName}}_json_file_path != null || var.davinci_flow_{{.ResourceName}}_json != null) && (var.davinci_flow_{{.ResourceName}}_json_file_path == null || var.davinci_flow_{{.ResourceName}}_json == null)
+    error_message = "Must set either 'davinci_flow_{{.ResourceName}}_json_file_path' or 'davinci_flow_{{.ResourceName}}_json', but not both together."
+  }
+}
+
+// The raw JSON of the flow
+variable "davinci_flow_{{.ResourceName}}_json" {
+  type = string
+  
+  description = "The filesystem location of the flow JSON with resource name '{{.ResourceName}}'. Cannot be set with the `davinci_flow_{{.ResourceName}}_json_file_path` variable."
+  default = null
+}

scripts/generate-multiple.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Directory containing the files
 directory="./assets/flows"

scripts/generate-test-all.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -e  # Exit immediately if a command exits with a non-zero status
+
+script_dir=$(dirname "$(realpath "$0")")
+echo $script_dir
+
+ls $script_dir/../testing/test-cases
+
+for dir in "$script_dir/../testing/test-cases"/*/; do
+  if [ -d "$dir" ]; then
+    echo "Running generate-test.sh in $dir"
+    $script_dir/generate-test.sh $dir
+  fi
+done

scripts/generate-test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 go build .
 

scripts/validate-test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Directory containing the files
 directory=$1

testing/test-cases/ciam-passwordless-flow-pack/general.tftest.hcl

@@ -88,6 +88,50 @@ run "properties_generated" {
   }
 }
 
+run "flow_vars_conflicting" {
+
+  variables {
+    pingone_environment_id = run.pingone_setup.pingone_environment_id
+
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json_file_path = "assets/flows/ciam_passwordless_protect_account_recovery_subflow.json"
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json = jsonencode({})
+  }
+
+  command = plan
+
+  expect_failures = [ 
+    var.davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json_file_path
+  ]
+}
+
+run "flow_vars_missing" {
+
+  variables {
+    pingone_environment_id = run.pingone_setup.pingone_environment_id
+
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json_file_path = null
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json = null
+  }
+
+  command = plan
+
+  expect_failures = [ 
+    var.davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json_file_path
+  ]
+}
+
+run "flow_json_override" {
+
+  variables {
+    pingone_environment_id = run.pingone_setup.pingone_environment_id
+
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json_file_path = null
+    davinci_flow_ciam_passwordless_protect_account_recovery_subflow_json = file("assets/flows/ciam_passwordless_protect_account_recovery_subflow.json")
+  }
+
+  command = plan
+}
+
 run "apply_success" {
 
   variables {