diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 6833d77681e89..553f131e3fcbd 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -863,7 +863,7 @@ func TestConvertResources(t *testing.T) { expected := expected t.Run(folderName, func(t *testing.T) { t.Parallel() - dir := filepath.Join(filepath.Dir(filename), "testdata", folderName) + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", folderName) t.Run("Plan", func(t *testing.T) { t.Parallel() ctx, logger := ctxAndLogger(t) @@ -1021,7 +1021,7 @@ func TestAppSlugValidation(t *testing.T) { _, filename, _, _ := runtime.Caller(0) // Load the multiple-apps state file and edit it. - dir := filepath.Join(filepath.Dir(filename), "testdata", "multiple-apps") + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "multiple-apps") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "multiple-apps.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan @@ -1070,7 +1070,7 @@ func TestAppSlugDuplicate(t *testing.T) { // nolint:dogsled _, filename, _, _ := runtime.Caller(0) - dir := filepath.Join(filepath.Dir(filename), "testdata", "multiple-apps") + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "multiple-apps") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "multiple-apps.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan @@ -1098,7 +1098,7 @@ func TestAgentNameInvalid(t *testing.T) { // nolint:dogsled _, filename, _, _ := runtime.Caller(0) - dir := filepath.Join(filepath.Dir(filename), "testdata", "multiple-agents") + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "multiple-agents") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "multiple-agents.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan @@ -1147,7 +1147,7 @@ func TestAgentNameDuplicate(t *testing.T) { // nolint:dogsled _, filename, _, _ := runtime.Caller(0) - dir := filepath.Join(filepath.Dir(filename), "testdata", "multiple-agents") + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "multiple-agents") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "multiple-agents.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan @@ -1178,7 +1178,7 @@ func TestMetadataResourceDuplicate(t *testing.T) { ctx, logger := ctxAndLogger(t) // Load the multiple-apps state file and edit it. - dir := filepath.Join("testdata", "resource-metadata-duplicate") + dir := filepath.Join("testdata", "resources", "resource-metadata-duplicate") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "resource-metadata-duplicate.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan @@ -1201,7 +1201,7 @@ func TestParameterValidation(t *testing.T) { _, filename, _, _ := runtime.Caller(0) // Load the rich-parameters state file and edit it. - dir := filepath.Join(filepath.Dir(filename), "testdata", "rich-parameters") + dir := filepath.Join(filepath.Dir(filename), "testdata", "resources", "rich-parameters") tfPlanRaw, err := os.ReadFile(filepath.Join(dir, "rich-parameters.tfplan.json")) require.NoError(t, err) var tfPlan tfjson.Plan diff --git a/provisioner/terraform/testdata/generate.sh b/provisioner/terraform/testdata/generate.sh index 1b77c195f8056..7eb396b24540e 100755 --- a/provisioner/terraform/testdata/generate.sh +++ b/provisioner/terraform/testdata/generate.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" +cd "$(dirname "${BASH_SOURCE[0]}")/resources" generate() { local name="$1" @@ -70,22 +70,17 @@ run() { cd "$d" name=$(basename "$(pwd)") - # This needs care to update correctly. - if [[ $name == "kubernetes-metadata" ]]; then - echo "== Skipping: $name" - return 0 - fi - - # This directory is used for a different purpose (quick workaround). - if [[ $name == "cleanup-stale-plugins" ]]; then - echo "== Skipping: $name" - return 0 - fi - - if [[ $name == "timings-aggregation" ]]; then - echo "== Skipping: $name" - return 0 - fi + toskip=( + # This needs care to update correctly. + "kubernetes-metadata" + ) + for skip in "${toskip[@]}"; do + if [[ $name == "$skip" ]]; then + echo "== Skipping: $name" + touch "$name.tfplan.json" "$name.tfplan.dot" "$name.tfstate.json" "$name.tfstate.dot" + return 0 + fi + done echo "== Generating test data for: $name" if ! out="$(generate "$name" 2>&1)"; then diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tf b/provisioner/terraform/testdata/resources/calling-module/calling-module.tf similarity index 100% rename from provisioner/terraform/testdata/calling-module/calling-module.tf rename to provisioner/terraform/testdata/resources/calling-module/calling-module.tf diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.dot b/provisioner/terraform/testdata/resources/calling-module/calling-module.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/calling-module/calling-module.tfplan.dot rename to provisioner/terraform/testdata/resources/calling-module/calling-module.tfplan.dot diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfplan.json b/provisioner/terraform/testdata/resources/calling-module/calling-module.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/calling-module/calling-module.tfplan.json rename to provisioner/terraform/testdata/resources/calling-module/calling-module.tfplan.json diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.dot b/provisioner/terraform/testdata/resources/calling-module/calling-module.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/calling-module/calling-module.tfstate.dot rename to provisioner/terraform/testdata/resources/calling-module/calling-module.tfstate.dot diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/resources/calling-module/calling-module.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/calling-module/calling-module.tfstate.json rename to provisioner/terraform/testdata/resources/calling-module/calling-module.tfstate.json diff --git a/provisioner/terraform/testdata/calling-module/module/module.tf b/provisioner/terraform/testdata/resources/calling-module/module/module.tf similarity index 100% rename from provisioner/terraform/testdata/calling-module/module/module.tf rename to provisioner/terraform/testdata/resources/calling-module/module/module.tf diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf b/provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tf similarity index 100% rename from provisioner/terraform/testdata/chaining-resources/chaining-resources.tf rename to provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tf diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.dot b/provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.dot rename to provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfplan.dot diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json b/provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json rename to provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfplan.json diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.dot b/provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.dot rename to provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfstate.dot diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json rename to provisioner/terraform/testdata/resources/chaining-resources/chaining-resources.tfstate.json diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf b/provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tf similarity index 100% rename from provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf rename to provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tf diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.dot b/provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.dot rename to provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfplan.dot diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json b/provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json rename to provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfplan.json diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.dot b/provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.dot rename to provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfstate.dot diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json rename to provisioner/terraform/testdata/resources/conflicting-resources/conflicting-resources.tfstate.json diff --git a/provisioner/terraform/testdata/devcontainer/devcontainer.tf b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tf similarity index 100% rename from provisioner/terraform/testdata/devcontainer/devcontainer.tf rename to provisioner/terraform/testdata/resources/devcontainer/devcontainer.tf diff --git a/provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.dot b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.dot rename to provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.dot diff --git a/provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.json b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/devcontainer/devcontainer.tfplan.json rename to provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfplan.json diff --git a/provisioner/terraform/testdata/devcontainer/devcontainer.tfstate.dot b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/devcontainer/devcontainer.tfstate.dot rename to provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.dot diff --git a/provisioner/terraform/testdata/devcontainer/devcontainer.tfstate.json b/provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/devcontainer/devcontainer.tfstate.json rename to provisioner/terraform/testdata/resources/devcontainer/devcontainer.tfstate.json diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf b/provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tf similarity index 100% rename from provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tf rename to provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tf diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.dot b/provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.dot rename to provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfplan.dot diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json b/provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfplan.json rename to provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfplan.json diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.dot b/provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.dot rename to provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfstate.dot diff --git a/provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json b/provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/display-apps-disabled/display-apps-disabled.tfstate.json rename to provisioner/terraform/testdata/resources/display-apps-disabled/display-apps-disabled.tfstate.json diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tf b/provisioner/terraform/testdata/resources/display-apps/display-apps.tf similarity index 100% rename from provisioner/terraform/testdata/display-apps/display-apps.tf rename to provisioner/terraform/testdata/resources/display-apps/display-apps.tf diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.dot b/provisioner/terraform/testdata/resources/display-apps/display-apps.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/display-apps/display-apps.tfplan.dot rename to provisioner/terraform/testdata/resources/display-apps/display-apps.tfplan.dot diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfplan.json b/provisioner/terraform/testdata/resources/display-apps/display-apps.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/display-apps/display-apps.tfplan.json rename to provisioner/terraform/testdata/resources/display-apps/display-apps.tfplan.json diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.dot b/provisioner/terraform/testdata/resources/display-apps/display-apps.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/display-apps/display-apps.tfstate.dot rename to provisioner/terraform/testdata/resources/display-apps/display-apps.tfstate.dot diff --git a/provisioner/terraform/testdata/display-apps/display-apps.tfstate.json b/provisioner/terraform/testdata/resources/display-apps/display-apps.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/display-apps/display-apps.tfstate.json rename to provisioner/terraform/testdata/resources/display-apps/display-apps.tfstate.json diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf b/provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tf similarity index 100% rename from provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tf rename to provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tf diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.dot b/provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.dot rename to provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfplan.dot diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json b/provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfplan.json rename to provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfplan.json diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.dot b/provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.dot rename to provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfstate.dot diff --git a/provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json b/provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/external-auth-providers/external-auth-providers.tfstate.json rename to provisioner/terraform/testdata/resources/external-auth-providers/external-auth-providers.tfstate.json diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tf b/provisioner/terraform/testdata/resources/instance-id/instance-id.tf similarity index 100% rename from provisioner/terraform/testdata/instance-id/instance-id.tf rename to provisioner/terraform/testdata/resources/instance-id/instance-id.tf diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.dot b/provisioner/terraform/testdata/resources/instance-id/instance-id.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/instance-id/instance-id.tfplan.dot rename to provisioner/terraform/testdata/resources/instance-id/instance-id.tfplan.dot diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfplan.json b/provisioner/terraform/testdata/resources/instance-id/instance-id.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/instance-id/instance-id.tfplan.json rename to provisioner/terraform/testdata/resources/instance-id/instance-id.tfplan.json diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.dot b/provisioner/terraform/testdata/resources/instance-id/instance-id.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/instance-id/instance-id.tfstate.dot rename to provisioner/terraform/testdata/resources/instance-id/instance-id.tfstate.dot diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/resources/instance-id/instance-id.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/instance-id/instance-id.tfstate.json rename to provisioner/terraform/testdata/resources/instance-id/instance-id.tfstate.json diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf b/provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tf similarity index 100% rename from provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tf rename to provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tf diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfplan.dot b/provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfplan.dot rename to provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfplan.dot diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfplan.json b/provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfplan.json rename to provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfplan.json diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfstate.dot b/provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfstate.dot rename to provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfstate.dot diff --git a/provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfstate.json b/provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/kubernetes-metadata/kubernetes-metadata.tfstate.json rename to provisioner/terraform/testdata/resources/kubernetes-metadata/kubernetes-metadata.tfstate.json diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tf b/provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tf similarity index 100% rename from provisioner/terraform/testdata/mapped-apps/mapped-apps.tf rename to provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tf diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.dot b/provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.dot rename to provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfplan.dot diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json b/provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/mapped-apps/mapped-apps.tfplan.json rename to provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfplan.json diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.dot b/provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.dot rename to provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfstate.dot diff --git a/provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json b/provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/mapped-apps/mapped-apps.tfstate.json rename to provisioner/terraform/testdata/resources/mapped-apps/mapped-apps.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf b/provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tf diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-apps/multiple-agents-multiple-apps.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf b/provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tf diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-envs/multiple-agents-multiple-envs.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf b/provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tf diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-monitors/multiple-agents-multiple-monitors.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf b/provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tf diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json b/provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-agents-multiple-scripts/multiple-agents-multiple-scripts.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf b/provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-agents/multiple-agents.tf rename to provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tf diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json b/provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-agents/multiple-agents.tfstate.json diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf b/provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tf similarity index 100% rename from provisioner/terraform/testdata/multiple-apps/multiple-apps.tf rename to provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tf diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.dot b/provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.dot rename to provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfplan.dot diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json rename to provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfplan.json diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.dot b/provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.dot rename to provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfstate.dot diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json rename to provisioner/terraform/testdata/resources/multiple-apps/multiple-apps.tfstate.json diff --git a/provisioner/terraform/testdata/presets/external-module/child-external-module/main.tf b/provisioner/terraform/testdata/resources/presets/external-module/child-external-module/main.tf similarity index 100% rename from provisioner/terraform/testdata/presets/external-module/child-external-module/main.tf rename to provisioner/terraform/testdata/resources/presets/external-module/child-external-module/main.tf diff --git a/provisioner/terraform/testdata/presets/external-module/main.tf b/provisioner/terraform/testdata/resources/presets/external-module/main.tf similarity index 100% rename from provisioner/terraform/testdata/presets/external-module/main.tf rename to provisioner/terraform/testdata/resources/presets/external-module/main.tf diff --git a/provisioner/terraform/testdata/presets/presets.tf b/provisioner/terraform/testdata/resources/presets/presets.tf similarity index 100% rename from provisioner/terraform/testdata/presets/presets.tf rename to provisioner/terraform/testdata/resources/presets/presets.tf diff --git a/provisioner/terraform/testdata/presets/presets.tfplan.dot b/provisioner/terraform/testdata/resources/presets/presets.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/presets/presets.tfplan.dot rename to provisioner/terraform/testdata/resources/presets/presets.tfplan.dot diff --git a/provisioner/terraform/testdata/presets/presets.tfplan.json b/provisioner/terraform/testdata/resources/presets/presets.tfplan.json similarity index 98% rename from provisioner/terraform/testdata/presets/presets.tfplan.json rename to provisioner/terraform/testdata/resources/presets/presets.tfplan.json index c88d977479106..afa9d68579194 100644 --- a/provisioner/terraform/testdata/presets/presets.tfplan.json +++ b/provisioner/terraform/testdata/resources/presets/presets.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/presets/presets.tfstate.dot b/provisioner/terraform/testdata/resources/presets/presets.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/presets/presets.tfstate.dot rename to provisioner/terraform/testdata/resources/presets/presets.tfstate.dot diff --git a/provisioner/terraform/testdata/presets/presets.tfstate.json b/provisioner/terraform/testdata/resources/presets/presets.tfstate.json similarity index 99% rename from provisioner/terraform/testdata/presets/presets.tfstate.json rename to provisioner/terraform/testdata/resources/presets/presets.tfstate.json index cf8b1f8743316..40f8763ffbfcf 100644 --- a/provisioner/terraform/testdata/presets/presets.tfstate.json +++ b/provisioner/terraform/testdata/resources/presets/presets.tfstate.json @@ -77,6 +77,7 @@ "motd_file": null, "order": null, "os": "windows", + "resources_monitoring": [], "shutdown_script": null, "startup_script": null, "startup_script_behavior": "non-blocking", @@ -88,6 +89,7 @@ {} ], "metadata": [], + "resources_monitoring": [], "token": true } }, diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf b/provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tf similarity index 100% rename from provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tf rename to provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tf diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.dot b/provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.dot rename to provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.dot diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json b/provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json rename to provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfplan.json diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.dot b/provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.dot rename to provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.dot diff --git a/provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json b/provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json rename to provisioner/terraform/testdata/resources/resource-metadata-duplicate/resource-metadata-duplicate.tfstate.json diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf b/provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tf similarity index 100% rename from provisioner/terraform/testdata/resource-metadata/resource-metadata.tf rename to provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tf diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.dot b/provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.dot rename to provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfplan.dot diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json b/provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json rename to provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfplan.json diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.dot b/provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.dot rename to provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfstate.dot diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json rename to provisioner/terraform/testdata/resources/resource-metadata/resource-metadata.tfstate.json diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf b/provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tf similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tf rename to provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tf diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.dot b/provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.dot rename to provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfplan.dot diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json b/provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfplan.json rename to provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfplan.json diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.dot b/provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.dot rename to provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfstate.dot diff --git a/provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json b/provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-order/rich-parameters-order.tfstate.json rename to provisioner/terraform/testdata/resources/rich-parameters-order/rich-parameters-order.tfstate.json diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf b/provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tf similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tf rename to provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tf diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot b/provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.dot rename to provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfplan.dot diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json b/provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfplan.json rename to provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfplan.json diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.dot b/provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.dot rename to provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfstate.dot diff --git a/provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json b/provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters-validation/rich-parameters-validation.tfstate.json rename to provisioner/terraform/testdata/resources/rich-parameters-validation/rich-parameters-validation.tfstate.json diff --git a/provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf b/provisioner/terraform/testdata/resources/rich-parameters/external-module/child-external-module/main.tf similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/external-module/child-external-module/main.tf rename to provisioner/terraform/testdata/resources/rich-parameters/external-module/child-external-module/main.tf diff --git a/provisioner/terraform/testdata/rich-parameters/external-module/main.tf b/provisioner/terraform/testdata/resources/rich-parameters/external-module/main.tf similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/external-module/main.tf rename to provisioner/terraform/testdata/resources/rich-parameters/external-module/main.tf diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tf b/provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tf similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/rich-parameters.tf rename to provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tf diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.dot b/provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfplan.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.dot rename to provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfplan.dot diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json b/provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfplan.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/rich-parameters.tfplan.json rename to provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfplan.json diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.dot b/provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfstate.dot similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.dot rename to provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfstate.dot diff --git a/provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json b/provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfstate.json similarity index 100% rename from provisioner/terraform/testdata/rich-parameters/rich-parameters.tfstate.json rename to provisioner/terraform/testdata/resources/rich-parameters/rich-parameters.tfstate.json