diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json index a8d5b951cb..e2a0f20b1c 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -91,6 +93,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -101,12 +104,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json index ca645c2506..5baaf2ab4b 100644 --- a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json +++ b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json index 91cf0e5bb4..01e47405a6 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -81,6 +83,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -91,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json index 6c5211f4fc..8f25b435f2 100644 --- a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json +++ b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json index 85cdf02935..7018070fac 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -81,6 +83,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -91,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json index 1a44f1c2ba..3e633ac135 100644 --- a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json +++ b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json index 7c34c4a241..523a3bacf3 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json @@ -30,6 +30,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -40,6 +41,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -89,6 +91,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -101,6 +104,7 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -109,6 +113,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json index 7698800efe..504bb3502b 100644 --- a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json +++ b/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json index f2b5f5f817..bb1694171c 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json @@ -30,6 +30,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -40,6 +41,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -89,6 +91,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -101,6 +104,7 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -109,6 +113,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json index fd54371e20..eaf46fbc1e 100644 --- a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json +++ b/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json index 4e32609c10..3ba31efd64 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -69,6 +71,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -79,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json index 93a4845752..95d61e1c9d 100644 --- a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json +++ b/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json @@ -60,6 +60,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -71,6 +72,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh index 72b090dc6b..1b77c195f8 100755 --- a/provisioner/terraform/testdata/generate.sh +++ b/provisioner/terraform/testdata/generate.sh @@ -23,6 +23,48 @@ generate() { fi } +minimize_diff() { + for f in *.tf*.json; do + declare -A deleted=() + declare -a sed_args=() + while read -r line; do + # Deleted line (previous value). + if [[ $line = -\ * ]]; then + key="${line#*\"}" + key="${key%%\"*}" + value="${line#*: }" + value="${value#*\"}" + value="\"${value%\"*}\"" + declare deleted["$key"]="$value" + # Added line (new value). + elif [[ $line = +\ * ]]; then + key="${line#*\"}" + key="${key%%\"*}" + value="${line#*: }" + value="${value#*\"}" + value="\"${value%\"*}\"" + # Matched key, restore the value. + if [[ -v deleted["$key"] ]]; then + sed_args+=(-e "s|${value}|${deleted["$key"]}|") + unset "deleted[$key]" + fi + fi + if [[ ${#sed_args[@]} -gt 0 ]]; then + # Handle macOS compat. + if grep -q -- "\[-i extension\]" < <(sed -h 2>&1); then + sed -i '' "${sed_args[@]}" "$f" + else + sed -i'' "${sed_args[@]}" "$f" + fi + fi + done < <( + # Filter out known keys with autogenerated values. + git diff -- "$f" | + grep -E "\"(terraform_version|id|agent_id|resource_id|token|random|timestamp)\":" + ) + done +} + run() { d="$1" cd "$d" @@ -51,6 +93,10 @@ run() { echo "== Error generating test data for: $name" return 1 fi + if ((minimize)); then + echo "== Minimizing diffs for: $name" + minimize_diff + fi echo "== Done generating test data for: $name" exit 0 } @@ -60,6 +106,11 @@ if [[ " $* " == *" --help "* || " $* " == *" -h "* ]]; then exit 0 fi +minimize=1 +if [[ " $* " == *" --no-minimize "* ]]; then + minimize=0 +fi + declare -a jobs=() if [[ $# -gt 0 ]]; then for d in "$@"; do diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json index 1b3e8170c8..be2b976ca7 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -81,6 +83,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -91,12 +94,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json index 6d582d900d..710eb6ff54 100644 --- a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json +++ b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json index 7cf56ed335..1eb9888c03 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -121,6 +123,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -131,12 +134,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json index 8b1d71e9e7..67609142a5 100644 --- a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json +++ b/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json index fcf17ccf62..db9a8ef88e 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -49,6 +51,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -57,6 +60,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -192,6 +196,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -202,12 +207,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -233,6 +240,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -243,12 +251,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json index 27946bc039..e6b495afd4 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -74,6 +76,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -85,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json index 69dec4b3ed..199d4de012 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -49,6 +51,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -57,6 +60,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -148,6 +152,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -158,12 +163,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -189,6 +196,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -199,12 +207,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json index 0d22cdfd07..98c4b91e3f 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -74,6 +76,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -85,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json index a67e892754..1c0141a88c 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -49,6 +51,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -57,6 +60,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -169,6 +173,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -179,12 +184,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -210,6 +217,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -220,12 +228,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json index 183f5060c7..8a885bb5a0 100644 --- a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -74,6 +76,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -85,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json index 65639d5554..309442fcc4 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -49,6 +51,7 @@ "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", @@ -57,6 +60,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -77,6 +81,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", @@ -85,6 +90,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -105,6 +111,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -113,6 +120,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -153,6 +161,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -163,12 +172,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -194,6 +205,7 @@ "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", @@ -204,12 +216,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -235,6 +249,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", @@ -245,12 +260,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } @@ -276,6 +293,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -286,12 +304,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json index 4a4820d82e..a6a098a53e 100644 --- a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json +++ b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -74,6 +76,7 @@ "motd_file": "/etc/motd", "order": null, "os": "darwin", + "resources_monitoring": [], "shutdown_script": "echo bye bye", "startup_script": null, "startup_script_behavior": "non-blocking", @@ -85,6 +88,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -116,6 +120,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "blocking", @@ -127,6 +132,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -158,6 +164,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -169,6 +176,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json index 92046bb193..171999b122 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -152,6 +154,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -162,12 +165,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json index f482a40372..1240248b66 100644 --- a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json +++ b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json @@ -32,6 +32,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -43,6 +44,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json index 9e8a1b9d8c..b8fcf06257 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json @@ -30,6 +30,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -40,6 +41,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -145,6 +147,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -157,6 +160,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -165,6 +169,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json index 30c3c4e8bc..96a1bb0410 100644 --- a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json @@ -41,6 +41,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -54,6 +55,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json index 33d9f7209d..ff44c490a3 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json @@ -30,6 +30,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -40,6 +41,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, @@ -132,6 +134,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -144,6 +147,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true }, "before_sensitive": false, @@ -152,6 +156,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json index 25345b5a49..a690f36133 100644 --- a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json +++ b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json @@ -41,6 +41,7 @@ "motd_file": null, "order": null, "os": "linux", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -54,6 +55,7 @@ "metadata": [ {} ], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json index 07145608e1..4c6e99ed4b 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -69,6 +71,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -79,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json index ca4715e3cc..f54a97b9b0 100644 --- a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json @@ -86,6 +86,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -97,6 +98,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json index bedba54b2c..28e0219b45 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -69,6 +71,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -79,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json index 365f900773..592c62fcfd 100644 --- a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json @@ -254,6 +254,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -265,6 +266,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json index 165fa007bf..677af8a4d5 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json @@ -21,6 +21,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -29,6 +30,7 @@ "sensitive_values": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } }, @@ -69,6 +71,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -79,12 +82,14 @@ "id": true, "init_script": true, "metadata": [], + "resources_monitoring": [], "token": true }, "before_sensitive": false, "after_sensitive": { "display_apps": [], "metadata": [], + "resources_monitoring": [], "token": true } } diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json index 4a8a5f45c7..c84310be0e 100644 --- a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json +++ b/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json @@ -247,6 +247,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -258,6 +259,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } },