diff --git a/.gitignore b/.gitignore index 5982d2c642..f095d09ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,5 @@ website/node_modules website/vendor # Test exclusions -!command/test-fixtures/**/*.tfstate -!command/test-fixtures/**/.terraform/ +!command/testdata/**/*.tfstate +!command/testdata/**/.terraform/ diff --git a/backend/local/backend_apply_test.go b/backend/local/backend_apply_test.go index f8de90479c..cbf6747619 100644 --- a/backend/local/backend_apply_test.go +++ b/backend/local/backend_apply_test.go @@ -32,7 +32,7 @@ func TestLocal_applyBasic(t *testing.T) { "ami": cty.StringVal("bar"), })} - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -71,7 +71,7 @@ func TestLocal_applyEmptyDir(t *testing.T) { p := TestLocalProvider(t, b, "test", &terraform.ProviderSchema{}) p.ApplyResourceChangeResponse = providers.ApplyResourceChangeResponse{NewState: cty.ObjectVal(map[string]cty.Value{"id": cty.StringVal("yes")})} - op, configCleanup := testOperationApply(t, "./test-fixtures/empty") + op, configCleanup := testOperationApply(t, "./testdata/empty") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -99,7 +99,7 @@ func TestLocal_applyEmptyDirDestroy(t *testing.T) { p := TestLocalProvider(t, b, "test", &terraform.ProviderSchema{}) p.ApplyResourceChangeResponse = providers.ApplyResourceChangeResponse{} - op, configCleanup := testOperationApply(t, "./test-fixtures/empty") + op, configCleanup := testOperationApply(t, "./testdata/empty") defer configCleanup() op.Destroy = true @@ -161,7 +161,7 @@ func TestLocal_applyError(t *testing.T) { } } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-error") + op, configCleanup := testOperationApply(t, "./testdata/apply-error") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -201,7 +201,7 @@ func TestLocal_applyBackendFail(t *testing.T) { } defer os.Chdir(wd) - op, configCleanup := testOperationApply(t, wd+"/test-fixtures/apply") + op, configCleanup := testOperationApply(t, wd+"/testdata/apply") defer configCleanup() b.Backend = &backendWithFailingState{} @@ -282,7 +282,7 @@ func testApplyState() *terraform.State { } // applyFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/apply . This schema should be +// configuration in testdata/apply . This schema should be // assigned to a mock provider named "test". func applyFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ diff --git a/backend/local/backend_plan_test.go b/backend/local/backend_plan_test.go index 6554d72b8a..1aa4183a90 100644 --- a/backend/local/backend_plan_test.go +++ b/backend/local/backend_plan_test.go @@ -25,7 +25,7 @@ func TestLocal_planBasic(t *testing.T) { defer cleanup() p := TestLocalProvider(t, b, "test", planFixtureSchema()) - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = true @@ -59,7 +59,7 @@ func TestLocal_planInAutomation(t *testing.T) { b.RunningInAutomation = false b.CLI = cli.NewMockUi() { - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = true @@ -83,7 +83,7 @@ func TestLocal_planInAutomation(t *testing.T) { b.RunningInAutomation = true b.CLI = cli.NewMockUi() { - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = true @@ -111,7 +111,7 @@ func TestLocal_planNoConfig(t *testing.T) { b.CLI = cli.NewMockUi() - op, configCleanup := testOperationPlan(t, "./test-fixtures/empty") + op, configCleanup := testOperationPlan(t, "./testdata/empty") defer configCleanup() op.PlanRefresh = true @@ -139,7 +139,7 @@ func TestLocal_planTainted(t *testing.T) { outDir := testTempDir(t) defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = true op.PlanOutPath = planPath @@ -224,7 +224,7 @@ func TestLocal_planDeposedOnly(t *testing.T) { outDir := testTempDir(t) defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = true op.PlanOutPath = planPath @@ -317,7 +317,7 @@ func TestLocal_planTainted_createBeforeDestroy(t *testing.T) { outDir := testTempDir(t) defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-cbd") + op, configCleanup := testOperationPlan(t, "./testdata/plan-cbd") defer configCleanup() op.PlanRefresh = true op.PlanOutPath = planPath @@ -378,7 +378,7 @@ func TestLocal_planRefreshFalse(t *testing.T) { p := TestLocalProvider(t, b, "test", planFixtureSchema()) testStateFile(t, b.StatePath, testPlanState()) - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -410,7 +410,7 @@ func TestLocal_planDestroy(t *testing.T) { defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Destroy = true op.PlanRefresh = true @@ -466,7 +466,7 @@ func TestLocal_planDestroy_withDataSources(t *testing.T) { defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/destroy-with-ds") + op, configCleanup := testOperationPlan(t, "./testdata/destroy-with-ds") defer configCleanup() op.Destroy = true op.PlanRefresh = true @@ -551,7 +551,7 @@ func TestLocal_planOutPathNoChange(t *testing.T) { defer os.RemoveAll(outDir) planPath := filepath.Join(outDir, "plan.tfplan") - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanOutPath = planPath cfg := cty.ObjectVal(map[string]cty.Value{ @@ -601,7 +601,7 @@ func TestLocal_planScaleOutNoDupeCount(t *testing.T) { outDir := testTempDir(t) defer os.RemoveAll(outDir) - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-scaleout") + op, configCleanup := testOperationPlan(t, "./testdata/plan-scaleout") defer configCleanup() op.PlanRefresh = true @@ -751,7 +751,7 @@ func testReadPlan(t *testing.T, path string) *plans.Plan { } // planFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/plan . This schema should be +// configuration in testdata/plan . This schema should be // assigned to a mock provider named "test". func planFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ diff --git a/backend/local/backend_refresh_test.go b/backend/local/backend_refresh_test.go index c58c0597e0..4f5e1500e8 100644 --- a/backend/local/backend_refresh_test.go +++ b/backend/local/backend_refresh_test.go @@ -26,7 +26,7 @@ func TestLocal_refresh(t *testing.T) { "id": cty.StringVal("yes"), })} - op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh") + op, configCleanup := testOperationRefresh(t, "./testdata/refresh") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -56,7 +56,7 @@ func TestLocal_refreshNoConfig(t *testing.T) { "id": cty.StringVal("yes"), })} - op, configCleanup := testOperationRefresh(t, "./test-fixtures/empty") + op, configCleanup := testOperationRefresh(t, "./testdata/empty") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -89,7 +89,7 @@ func TestLocal_refreshNilModuleWithInput(t *testing.T) { b.OpInput = true - op, configCleanup := testOperationRefresh(t, "./test-fixtures/empty") + op, configCleanup := testOperationRefresh(t, "./testdata/empty") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -146,7 +146,7 @@ func TestLocal_refreshInput(t *testing.T) { b.OpInput = true b.ContextOpts.UIInput = &terraform.MockUIInput{InputReturnString: "bar"} - op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh-var-unset") + op, configCleanup := testOperationRefresh(t, "./testdata/refresh-var-unset") defer configCleanup() op.UIIn = b.ContextOpts.UIInput @@ -180,7 +180,7 @@ func TestLocal_refreshValidate(t *testing.T) { // Enable validation b.OpValidation = true - op, configCleanup := testOperationRefresh(t, "./test-fixtures/refresh") + op, configCleanup := testOperationRefresh(t, "./testdata/refresh") defer configCleanup() run, err := b.Operation(context.Background(), op) @@ -234,7 +234,7 @@ func testRefreshState() *terraform.State { } // refreshFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/refresh . This schema should be +// configuration in testdata/refresh . This schema should be // assigned to a mock provider named "test". func refreshFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ diff --git a/backend/local/test-fixtures/apply-empty/hello.txt b/backend/local/testdata/apply-empty/hello.txt similarity index 100% rename from backend/local/test-fixtures/apply-empty/hello.txt rename to backend/local/testdata/apply-empty/hello.txt diff --git a/backend/local/test-fixtures/apply-error/main.tf b/backend/local/testdata/apply-error/main.tf similarity index 100% rename from backend/local/test-fixtures/apply-error/main.tf rename to backend/local/testdata/apply-error/main.tf diff --git a/backend/local/test-fixtures/apply/main.tf b/backend/local/testdata/apply/main.tf similarity index 100% rename from backend/local/test-fixtures/apply/main.tf rename to backend/local/testdata/apply/main.tf diff --git a/backend/local/test-fixtures/destroy-with-ds/main.tf b/backend/local/testdata/destroy-with-ds/main.tf similarity index 100% rename from backend/local/test-fixtures/destroy-with-ds/main.tf rename to backend/local/testdata/destroy-with-ds/main.tf diff --git a/backend/local/test-fixtures/empty/.gitignore b/backend/local/testdata/empty/.gitignore similarity index 100% rename from backend/local/test-fixtures/empty/.gitignore rename to backend/local/testdata/empty/.gitignore diff --git a/backend/local/test-fixtures/plan-cbd/main.tf b/backend/local/testdata/plan-cbd/main.tf similarity index 100% rename from backend/local/test-fixtures/plan-cbd/main.tf rename to backend/local/testdata/plan-cbd/main.tf diff --git a/backend/local/test-fixtures/plan-scaleout/main.tf b/backend/local/testdata/plan-scaleout/main.tf similarity index 100% rename from backend/local/test-fixtures/plan-scaleout/main.tf rename to backend/local/testdata/plan-scaleout/main.tf diff --git a/backend/local/test-fixtures/plan/main.tf b/backend/local/testdata/plan/main.tf similarity index 100% rename from backend/local/test-fixtures/plan/main.tf rename to backend/local/testdata/plan/main.tf diff --git a/backend/local/test-fixtures/refresh-var-unset/main.tf b/backend/local/testdata/refresh-var-unset/main.tf similarity index 100% rename from backend/local/test-fixtures/refresh-var-unset/main.tf rename to backend/local/testdata/refresh-var-unset/main.tf diff --git a/backend/local/test-fixtures/refresh/main.tf b/backend/local/testdata/refresh/main.tf similarity index 100% rename from backend/local/test-fixtures/refresh/main.tf rename to backend/local/testdata/refresh/main.tf diff --git a/backend/remote/backend_apply_test.go b/backend/remote/backend_apply_test.go index 635c141be6..a8d2ef70c2 100644 --- a/backend/remote/backend_apply_test.go +++ b/backend/remote/backend_apply_test.go @@ -36,7 +36,7 @@ func TestRemote_applyBasic(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -80,7 +80,7 @@ func TestRemote_applyCanceled(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -116,7 +116,7 @@ func TestRemote_applyWithoutPermissions(t *testing.T) { } w.Permissions.CanQueueApply = false - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.UIOut = b.CLI @@ -155,7 +155,7 @@ func TestRemote_applyWithVCS(t *testing.T) { t.Fatalf("error creating named workspace: %v", err) } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.Workspace = "prod" @@ -183,7 +183,7 @@ func TestRemote_applyWithParallelism(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.Parallelism = 3 @@ -209,7 +209,7 @@ func TestRemote_applyWithPlan(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.PlanFile = &planfile.Reader{} @@ -238,7 +238,7 @@ func TestRemote_applyWithoutRefresh(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() op.PlanRefresh = false @@ -264,7 +264,7 @@ func TestRemote_applyWithTarget(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() addr, _ := addrs.ParseAbsResourceStr("null_resource.foo") @@ -295,7 +295,7 @@ func TestRemote_applyWithVariables(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-variables") + op, configCleanup := testOperationApply(t, "./testdata/apply-variables") defer configCleanup() op.Variables = testVariables(terraform.ValueFromNamedFile, "foo", "bar") @@ -321,7 +321,7 @@ func TestRemote_applyNoConfig(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/empty") + op, configCleanup := testOperationApply(t, "./testdata/empty") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -349,7 +349,7 @@ func TestRemote_applyNoChanges(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-no-changes") + op, configCleanup := testOperationApply(t, "./testdata/apply-no-changes") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -380,7 +380,7 @@ func TestRemote_applyNoApprove(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -418,7 +418,7 @@ func TestRemote_applyAutoApprove(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -463,7 +463,7 @@ func TestRemote_applyApprovedExternally(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -538,7 +538,7 @@ func TestRemote_applyDiscardedExternally(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -626,7 +626,7 @@ func TestRemote_applyWithAutoApply(t *testing.T) { t.Fatalf("error creating named workspace: %v", err) } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -677,7 +677,7 @@ func TestRemote_applyForceLocal(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -735,7 +735,7 @@ func TestRemote_applyWorkspaceWithoutOperations(t *testing.T) { t.Fatalf("error creating named workspace: %v", err) } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -802,7 +802,7 @@ func TestRemote_applyLockTimeout(t *testing.T) { t.Fatalf("error creating pending run: %v", err) } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply") + op, configCleanup := testOperationApply(t, "./testdata/apply") defer configCleanup() input := testInput(t, map[string]string{ @@ -853,7 +853,7 @@ func TestRemote_applyDestroy(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-destroy") + op, configCleanup := testOperationApply(t, "./testdata/apply-destroy") defer configCleanup() input := testInput(t, map[string]string{ @@ -902,7 +902,7 @@ func TestRemote_applyDestroyNoConfig(t *testing.T) { "approve": "yes", }) - op, configCleanup := testOperationApply(t, "./test-fixtures/empty") + op, configCleanup := testOperationApply(t, "./testdata/empty") defer configCleanup() op.Destroy = true @@ -932,7 +932,7 @@ func TestRemote_applyPolicyPass(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-policy-passed") + op, configCleanup := testOperationApply(t, "./testdata/apply-policy-passed") defer configCleanup() input := testInput(t, map[string]string{ @@ -979,7 +979,7 @@ func TestRemote_applyPolicyHardFail(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-policy-hard-failed") + op, configCleanup := testOperationApply(t, "./testdata/apply-policy-hard-failed") defer configCleanup() input := testInput(t, map[string]string{ @@ -1031,7 +1031,7 @@ func TestRemote_applyPolicySoftFail(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-policy-soft-failed") + op, configCleanup := testOperationApply(t, "./testdata/apply-policy-soft-failed") defer configCleanup() input := testInput(t, map[string]string{ @@ -1079,7 +1079,7 @@ func TestRemote_applyPolicySoftFailAutoApprove(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-policy-soft-failed") + op, configCleanup := testOperationApply(t, "./testdata/apply-policy-soft-failed") defer configCleanup() input := testInput(t, map[string]string{ @@ -1145,7 +1145,7 @@ func TestRemote_applyPolicySoftFailAutoApply(t *testing.T) { t.Fatalf("error creating named workspace: %v", err) } - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-policy-soft-failed") + op, configCleanup := testOperationApply(t, "./testdata/apply-policy-soft-failed") defer configCleanup() input := testInput(t, map[string]string{ @@ -1193,7 +1193,7 @@ func TestRemote_applyWithRemoteError(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationApply(t, "./test-fixtures/apply-with-error") + op, configCleanup := testOperationApply(t, "./testdata/apply-with-error") defer configCleanup() op.Workspace = backend.DefaultStateName diff --git a/backend/remote/backend_plan_test.go b/backend/remote/backend_plan_test.go index 1a469b85c7..fb63599930 100644 --- a/backend/remote/backend_plan_test.go +++ b/backend/remote/backend_plan_test.go @@ -36,7 +36,7 @@ func TestRemote_planBasic(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -67,7 +67,7 @@ func TestRemote_planCanceled(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -90,7 +90,7 @@ func TestRemote_planLongLine(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-long-line") + op, configCleanup := testOperationPlan(t, "./testdata/plan-long-line") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -134,7 +134,7 @@ func TestRemote_planWithoutPermissions(t *testing.T) { } w.Permissions.CanQueueRun = false - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = "prod" @@ -159,7 +159,7 @@ func TestRemote_planWithParallelism(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Parallelism = 3 @@ -185,7 +185,7 @@ func TestRemote_planWithPlan(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanFile = &planfile.Reader{} @@ -214,10 +214,10 @@ func TestRemote_planWithPath(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() - op.PlanOutPath = "./test-fixtures/plan" + op.PlanOutPath = "./testdata/plan" op.Workspace = backend.DefaultStateName run, err := b.Operation(context.Background(), op) @@ -243,7 +243,7 @@ func TestRemote_planWithoutRefresh(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.PlanRefresh = false @@ -269,7 +269,7 @@ func TestRemote_planWithTarget(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() addr, _ := addrs.ParseAbsResourceStr("null_resource.foo") @@ -300,7 +300,7 @@ func TestRemote_planWithVariables(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-variables") + op, configCleanup := testOperationPlan(t, "./testdata/plan-variables") defer configCleanup() op.Variables = testVariables(terraform.ValueFromCLIArg, "foo", "bar") @@ -326,7 +326,7 @@ func TestRemote_planNoConfig(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/empty") + op, configCleanup := testOperationPlan(t, "./testdata/empty") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -354,7 +354,7 @@ func TestRemote_planNoChanges(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-no-changes") + op, configCleanup := testOperationPlan(t, "./testdata/plan-no-changes") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -392,7 +392,7 @@ func TestRemote_planForceLocal(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -423,7 +423,7 @@ func TestRemote_planWithoutOperationsEntitlement(t *testing.T) { b, bCleanup := testBackendNoOperations(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -468,7 +468,7 @@ func TestRemote_planWorkspaceWithoutOperations(t *testing.T) { t.Fatalf("error creating named workspace: %v", err) } - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Workspace = "no-operations" @@ -522,7 +522,7 @@ func TestRemote_planLockTimeout(t *testing.T) { t.Fatalf("error creating pending run: %v", err) } - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() input := testInput(t, map[string]string{ @@ -570,7 +570,7 @@ func TestRemote_planDestroy(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan") + op, configCleanup := testOperationPlan(t, "./testdata/plan") defer configCleanup() op.Destroy = true @@ -594,7 +594,7 @@ func TestRemote_planDestroyNoConfig(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/empty") + op, configCleanup := testOperationPlan(t, "./testdata/empty") defer configCleanup() op.Destroy = true @@ -628,7 +628,7 @@ func TestRemote_planWithWorkingDirectory(t *testing.T) { t.Fatalf("error configuring working directory: %v", err) } - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-with-working-directory/terraform") + op, configCleanup := testOperationPlan(t, "./testdata/plan-with-working-directory/terraform") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -659,7 +659,7 @@ func TestRemote_planPolicyPass(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-policy-passed") + op, configCleanup := testOperationPlan(t, "./testdata/plan-policy-passed") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -693,7 +693,7 @@ func TestRemote_planPolicyHardFail(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-policy-hard-failed") + op, configCleanup := testOperationPlan(t, "./testdata/plan-policy-hard-failed") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -732,7 +732,7 @@ func TestRemote_planPolicySoftFail(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-policy-soft-failed") + op, configCleanup := testOperationPlan(t, "./testdata/plan-policy-soft-failed") defer configCleanup() op.Workspace = backend.DefaultStateName @@ -771,7 +771,7 @@ func TestRemote_planWithRemoteError(t *testing.T) { b, bCleanup := testBackendDefault(t) defer bCleanup() - op, configCleanup := testOperationPlan(t, "./test-fixtures/plan-with-error") + op, configCleanup := testOperationPlan(t, "./testdata/plan-with-error") defer configCleanup() op.Workspace = backend.DefaultStateName diff --git a/backend/remote/test-fixtures/apply-destroy/apply.log b/backend/remote/testdata/apply-destroy/apply.log similarity index 100% rename from backend/remote/test-fixtures/apply-destroy/apply.log rename to backend/remote/testdata/apply-destroy/apply.log diff --git a/backend/remote/test-fixtures/apply-destroy/main.tf b/backend/remote/testdata/apply-destroy/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-destroy/main.tf rename to backend/remote/testdata/apply-destroy/main.tf diff --git a/backend/remote/test-fixtures/apply-destroy/plan.log b/backend/remote/testdata/apply-destroy/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-destroy/plan.log rename to backend/remote/testdata/apply-destroy/plan.log diff --git a/backend/remote/test-fixtures/apply-no-changes/main.tf b/backend/remote/testdata/apply-no-changes/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-no-changes/main.tf rename to backend/remote/testdata/apply-no-changes/main.tf diff --git a/backend/remote/test-fixtures/apply-no-changes/plan.log b/backend/remote/testdata/apply-no-changes/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-no-changes/plan.log rename to backend/remote/testdata/apply-no-changes/plan.log diff --git a/backend/remote/test-fixtures/apply-no-changes/policy.log b/backend/remote/testdata/apply-no-changes/policy.log similarity index 100% rename from backend/remote/test-fixtures/apply-no-changes/policy.log rename to backend/remote/testdata/apply-no-changes/policy.log diff --git a/backend/remote/test-fixtures/apply-policy-hard-failed/main.tf b/backend/remote/testdata/apply-policy-hard-failed/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-policy-hard-failed/main.tf rename to backend/remote/testdata/apply-policy-hard-failed/main.tf diff --git a/backend/remote/test-fixtures/apply-policy-hard-failed/plan.log b/backend/remote/testdata/apply-policy-hard-failed/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-hard-failed/plan.log rename to backend/remote/testdata/apply-policy-hard-failed/plan.log diff --git a/backend/remote/test-fixtures/apply-policy-hard-failed/policy.log b/backend/remote/testdata/apply-policy-hard-failed/policy.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-hard-failed/policy.log rename to backend/remote/testdata/apply-policy-hard-failed/policy.log diff --git a/backend/remote/test-fixtures/apply-policy-passed/apply.log b/backend/remote/testdata/apply-policy-passed/apply.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-passed/apply.log rename to backend/remote/testdata/apply-policy-passed/apply.log diff --git a/backend/remote/test-fixtures/apply-policy-passed/main.tf b/backend/remote/testdata/apply-policy-passed/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-policy-passed/main.tf rename to backend/remote/testdata/apply-policy-passed/main.tf diff --git a/backend/remote/test-fixtures/apply-policy-passed/plan.log b/backend/remote/testdata/apply-policy-passed/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-passed/plan.log rename to backend/remote/testdata/apply-policy-passed/plan.log diff --git a/backend/remote/test-fixtures/apply-policy-passed/policy.log b/backend/remote/testdata/apply-policy-passed/policy.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-passed/policy.log rename to backend/remote/testdata/apply-policy-passed/policy.log diff --git a/backend/remote/test-fixtures/apply-policy-soft-failed/apply.log b/backend/remote/testdata/apply-policy-soft-failed/apply.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-soft-failed/apply.log rename to backend/remote/testdata/apply-policy-soft-failed/apply.log diff --git a/backend/remote/test-fixtures/apply-policy-soft-failed/main.tf b/backend/remote/testdata/apply-policy-soft-failed/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-policy-soft-failed/main.tf rename to backend/remote/testdata/apply-policy-soft-failed/main.tf diff --git a/backend/remote/test-fixtures/apply-policy-soft-failed/plan.log b/backend/remote/testdata/apply-policy-soft-failed/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-soft-failed/plan.log rename to backend/remote/testdata/apply-policy-soft-failed/plan.log diff --git a/backend/remote/test-fixtures/apply-policy-soft-failed/policy.log b/backend/remote/testdata/apply-policy-soft-failed/policy.log similarity index 100% rename from backend/remote/test-fixtures/apply-policy-soft-failed/policy.log rename to backend/remote/testdata/apply-policy-soft-failed/policy.log diff --git a/backend/remote/test-fixtures/apply-variables/apply.log b/backend/remote/testdata/apply-variables/apply.log similarity index 100% rename from backend/remote/test-fixtures/apply-variables/apply.log rename to backend/remote/testdata/apply-variables/apply.log diff --git a/backend/remote/test-fixtures/apply-variables/main.tf b/backend/remote/testdata/apply-variables/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-variables/main.tf rename to backend/remote/testdata/apply-variables/main.tf diff --git a/backend/remote/test-fixtures/apply-variables/plan.log b/backend/remote/testdata/apply-variables/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-variables/plan.log rename to backend/remote/testdata/apply-variables/plan.log diff --git a/backend/remote/test-fixtures/apply-with-error/main.tf b/backend/remote/testdata/apply-with-error/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply-with-error/main.tf rename to backend/remote/testdata/apply-with-error/main.tf diff --git a/backend/remote/test-fixtures/apply-with-error/plan.log b/backend/remote/testdata/apply-with-error/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply-with-error/plan.log rename to backend/remote/testdata/apply-with-error/plan.log diff --git a/backend/remote/test-fixtures/apply/apply.log b/backend/remote/testdata/apply/apply.log similarity index 100% rename from backend/remote/test-fixtures/apply/apply.log rename to backend/remote/testdata/apply/apply.log diff --git a/backend/remote/test-fixtures/apply/main.tf b/backend/remote/testdata/apply/main.tf similarity index 100% rename from backend/remote/test-fixtures/apply/main.tf rename to backend/remote/testdata/apply/main.tf diff --git a/backend/remote/test-fixtures/apply/plan.log b/backend/remote/testdata/apply/plan.log similarity index 100% rename from backend/remote/test-fixtures/apply/plan.log rename to backend/remote/testdata/apply/plan.log diff --git a/backend/remote/test-fixtures/empty/.gitignore b/backend/remote/testdata/empty/.gitignore similarity index 100% rename from backend/remote/test-fixtures/empty/.gitignore rename to backend/remote/testdata/empty/.gitignore diff --git a/backend/remote/test-fixtures/plan-cost-estimation/ce.log b/backend/remote/testdata/plan-cost-estimation/ce.log similarity index 100% rename from backend/remote/test-fixtures/plan-cost-estimation/ce.log rename to backend/remote/testdata/plan-cost-estimation/ce.log diff --git a/backend/remote/test-fixtures/plan-cost-estimation/main.tf b/backend/remote/testdata/plan-cost-estimation/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-cost-estimation/main.tf rename to backend/remote/testdata/plan-cost-estimation/main.tf diff --git a/backend/remote/test-fixtures/plan-cost-estimation/plan.log b/backend/remote/testdata/plan-cost-estimation/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-cost-estimation/plan.log rename to backend/remote/testdata/plan-cost-estimation/plan.log diff --git a/backend/remote/test-fixtures/plan-long-line/main.tf b/backend/remote/testdata/plan-long-line/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-long-line/main.tf rename to backend/remote/testdata/plan-long-line/main.tf diff --git a/backend/remote/test-fixtures/plan-long-line/plan.log b/backend/remote/testdata/plan-long-line/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-long-line/plan.log rename to backend/remote/testdata/plan-long-line/plan.log diff --git a/backend/remote/test-fixtures/plan-no-changes/main.tf b/backend/remote/testdata/plan-no-changes/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-no-changes/main.tf rename to backend/remote/testdata/plan-no-changes/main.tf diff --git a/backend/remote/test-fixtures/plan-no-changes/plan.log b/backend/remote/testdata/plan-no-changes/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-no-changes/plan.log rename to backend/remote/testdata/plan-no-changes/plan.log diff --git a/backend/remote/test-fixtures/plan-no-changes/policy.log b/backend/remote/testdata/plan-no-changes/policy.log similarity index 100% rename from backend/remote/test-fixtures/plan-no-changes/policy.log rename to backend/remote/testdata/plan-no-changes/policy.log diff --git a/backend/remote/test-fixtures/plan-policy-hard-failed/main.tf b/backend/remote/testdata/plan-policy-hard-failed/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-policy-hard-failed/main.tf rename to backend/remote/testdata/plan-policy-hard-failed/main.tf diff --git a/backend/remote/test-fixtures/plan-policy-hard-failed/plan.log b/backend/remote/testdata/plan-policy-hard-failed/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-hard-failed/plan.log rename to backend/remote/testdata/plan-policy-hard-failed/plan.log diff --git a/backend/remote/test-fixtures/plan-policy-hard-failed/policy.log b/backend/remote/testdata/plan-policy-hard-failed/policy.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-hard-failed/policy.log rename to backend/remote/testdata/plan-policy-hard-failed/policy.log diff --git a/backend/remote/test-fixtures/plan-policy-passed/main.tf b/backend/remote/testdata/plan-policy-passed/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-policy-passed/main.tf rename to backend/remote/testdata/plan-policy-passed/main.tf diff --git a/backend/remote/test-fixtures/plan-policy-passed/plan.log b/backend/remote/testdata/plan-policy-passed/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-passed/plan.log rename to backend/remote/testdata/plan-policy-passed/plan.log diff --git a/backend/remote/test-fixtures/plan-policy-passed/policy.log b/backend/remote/testdata/plan-policy-passed/policy.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-passed/policy.log rename to backend/remote/testdata/plan-policy-passed/policy.log diff --git a/backend/remote/test-fixtures/plan-policy-soft-failed/main.tf b/backend/remote/testdata/plan-policy-soft-failed/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-policy-soft-failed/main.tf rename to backend/remote/testdata/plan-policy-soft-failed/main.tf diff --git a/backend/remote/test-fixtures/plan-policy-soft-failed/plan.log b/backend/remote/testdata/plan-policy-soft-failed/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-soft-failed/plan.log rename to backend/remote/testdata/plan-policy-soft-failed/plan.log diff --git a/backend/remote/test-fixtures/plan-policy-soft-failed/policy.log b/backend/remote/testdata/plan-policy-soft-failed/policy.log similarity index 100% rename from backend/remote/test-fixtures/plan-policy-soft-failed/policy.log rename to backend/remote/testdata/plan-policy-soft-failed/policy.log diff --git a/backend/remote/test-fixtures/plan-variables/main.tf b/backend/remote/testdata/plan-variables/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-variables/main.tf rename to backend/remote/testdata/plan-variables/main.tf diff --git a/backend/remote/test-fixtures/plan-variables/plan.log b/backend/remote/testdata/plan-variables/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-variables/plan.log rename to backend/remote/testdata/plan-variables/plan.log diff --git a/backend/remote/test-fixtures/plan-with-error/main.tf b/backend/remote/testdata/plan-with-error/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-with-error/main.tf rename to backend/remote/testdata/plan-with-error/main.tf diff --git a/backend/remote/test-fixtures/plan-with-error/plan.log b/backend/remote/testdata/plan-with-error/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-with-error/plan.log rename to backend/remote/testdata/plan-with-error/plan.log diff --git a/backend/remote/test-fixtures/plan-with-working-directory/terraform/main.tf b/backend/remote/testdata/plan-with-working-directory/terraform/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan-with-working-directory/terraform/main.tf rename to backend/remote/testdata/plan-with-working-directory/terraform/main.tf diff --git a/backend/remote/test-fixtures/plan-with-working-directory/terraform/plan.log b/backend/remote/testdata/plan-with-working-directory/terraform/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan-with-working-directory/terraform/plan.log rename to backend/remote/testdata/plan-with-working-directory/terraform/plan.log diff --git a/backend/remote/test-fixtures/plan/main.tf b/backend/remote/testdata/plan/main.tf similarity index 100% rename from backend/remote/test-fixtures/plan/main.tf rename to backend/remote/testdata/plan/main.tf diff --git a/backend/remote/test-fixtures/plan/plan.log b/backend/remote/testdata/plan/plan.log similarity index 100% rename from backend/remote/test-fixtures/plan/plan.log rename to backend/remote/testdata/plan/plan.log diff --git a/builtin/providers/terraform/data_source_state_test.go b/builtin/providers/terraform/data_source_state_test.go index 78e54988b3..995bca5dcf 100644 --- a/builtin/providers/terraform/data_source_state_test.go +++ b/builtin/providers/terraform/data_source_state_test.go @@ -25,13 +25,13 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/basic.tfstate"), + "path": cty.StringVal("./testdata/basic.tfstate"), }), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/basic.tfstate"), + "path": cty.StringVal("./testdata/basic.tfstate"), }), "outputs": cty.ObjectVal(map[string]cty.Value{ "foo": cty.StringVal("bar"), @@ -45,13 +45,13 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/complex_outputs.tfstate"), + "path": cty.StringVal("./testdata/complex_outputs.tfstate"), }), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/complex_outputs.tfstate"), + "path": cty.StringVal("./testdata/complex_outputs.tfstate"), }), "outputs": cty.ObjectVal(map[string]cty.Value{ "computed_map": cty.MapVal(map[string]cty.Value{ @@ -79,13 +79,13 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/null_outputs.tfstate"), + "path": cty.StringVal("./testdata/null_outputs.tfstate"), }), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/null_outputs.tfstate"), + "path": cty.StringVal("./testdata/null_outputs.tfstate"), }), "outputs": cty.ObjectVal(map[string]cty.Value{ "map": cty.NullVal(cty.DynamicPseudoType), @@ -100,7 +100,7 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/empty.tfstate"), + "path": cty.StringVal("./testdata/empty.tfstate"), }), "defaults": cty.ObjectVal(map[string]cty.Value{ "foo": cty.StringVal("bar"), @@ -109,7 +109,7 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/empty.tfstate"), + "path": cty.StringVal("./testdata/empty.tfstate"), }), "defaults": cty.ObjectVal(map[string]cty.Value{ "foo": cty.StringVal("bar"), @@ -125,13 +125,13 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/missing.tfstate"), // intentionally not present on disk + "path": cty.StringVal("./testdata/missing.tfstate"), // intentionally not present on disk }), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/missing.tfstate"), + "path": cty.StringVal("./testdata/missing.tfstate"), }), "defaults": cty.NullVal(cty.DynamicPseudoType), "outputs": cty.EmptyObjectVal, @@ -167,7 +167,7 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/basic.tfstate"), + "path": cty.StringVal("./testdata/basic.tfstate"), }), "defaults": cty.StringVal("nope"), }), @@ -178,13 +178,13 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.MapVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/empty.tfstate"), + "path": cty.StringVal("./testdata/empty.tfstate"), }), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.MapVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/empty.tfstate"), + "path": cty.StringVal("./testdata/empty.tfstate"), }), "defaults": cty.NullVal(cty.DynamicPseudoType), "outputs": cty.EmptyObjectVal, @@ -196,14 +196,14 @@ func TestState_basic(t *testing.T) { cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/basic.tfstate"), + "path": cty.StringVal("./testdata/basic.tfstate"), }), "defaults": cty.MapValEmpty(cty.String), }), cty.ObjectVal(map[string]cty.Value{ "backend": cty.StringVal("local"), "config": cty.ObjectVal(map[string]cty.Value{ - "path": cty.StringVal("./test-fixtures/basic.tfstate"), + "path": cty.StringVal("./testdata/basic.tfstate"), }), "defaults": cty.MapValEmpty(cty.String), "outputs": cty.ObjectVal(map[string]cty.Value{ diff --git a/builtin/providers/terraform/test-fixtures/basic.tfstate b/builtin/providers/terraform/testdata/basic.tfstate similarity index 100% rename from builtin/providers/terraform/test-fixtures/basic.tfstate rename to builtin/providers/terraform/testdata/basic.tfstate diff --git a/builtin/providers/terraform/test-fixtures/complex_outputs.tfstate b/builtin/providers/terraform/testdata/complex_outputs.tfstate similarity index 100% rename from builtin/providers/terraform/test-fixtures/complex_outputs.tfstate rename to builtin/providers/terraform/testdata/complex_outputs.tfstate diff --git a/builtin/providers/terraform/test-fixtures/empty.tfstate b/builtin/providers/terraform/testdata/empty.tfstate similarity index 100% rename from builtin/providers/terraform/test-fixtures/empty.tfstate rename to builtin/providers/terraform/testdata/empty.tfstate diff --git a/builtin/providers/terraform/test-fixtures/null_outputs.tfstate b/builtin/providers/terraform/testdata/null_outputs.tfstate similarity index 100% rename from builtin/providers/terraform/test-fixtures/null_outputs.tfstate rename to builtin/providers/terraform/testdata/null_outputs.tfstate diff --git a/builtin/provisioners/chef/linux_provisioner_test.go b/builtin/provisioners/chef/linux_provisioner_test.go index 15aa44a4fb..6bf43b57a2 100644 --- a/builtin/provisioners/chef/linux_provisioner_test.go +++ b/builtin/provisioners/chef/linux_provisioner_test.go @@ -175,7 +175,7 @@ func TestResourceProvider_linuxCreateConfigFiles(t *testing.T) { }{ "Sudo": { Config: map[string]interface{}{ - "ohai_hints": []interface{}{"test-fixtures/ohaihint.json"}, + "ohai_hints": []interface{}{"testdata/ohaihint.json"}, "node_name": "nodename1", "run_list": []interface{}{"cookbook::recipe"}, "secret_key": "SECRET-KEY", diff --git a/builtin/provisioners/chef/test-fixtures/ohaihint.json b/builtin/provisioners/chef/testdata/ohaihint.json similarity index 100% rename from builtin/provisioners/chef/test-fixtures/ohaihint.json rename to builtin/provisioners/chef/testdata/ohaihint.json diff --git a/builtin/provisioners/chef/windows_provisioner_test.go b/builtin/provisioners/chef/windows_provisioner_test.go index 3697b7e247..603d924098 100644 --- a/builtin/provisioners/chef/windows_provisioner_test.go +++ b/builtin/provisioners/chef/windows_provisioner_test.go @@ -125,7 +125,7 @@ func TestResourceProvider_windowsCreateConfigFiles(t *testing.T) { }{ "Default": { Config: map[string]interface{}{ - "ohai_hints": []interface{}{"test-fixtures/ohaihint.json"}, + "ohai_hints": []interface{}{"testdata/ohaihint.json"}, "node_name": "nodename1", "run_list": []interface{}{"cookbook::recipe"}, "secret_key": "SECRET-KEY", diff --git a/builtin/provisioners/remote-exec/resource_provisioner_test.go b/builtin/provisioners/remote-exec/resource_provisioner_test.go index 38d5ffdd40..bec3eca5d1 100644 --- a/builtin/provisioners/remote-exec/resource_provisioner_test.go +++ b/builtin/provisioners/remote-exec/resource_provisioner_test.go @@ -134,7 +134,7 @@ func TestResourceProvider_CollectScripts_inline(t *testing.T) { func TestResourceProvider_CollectScripts_script(t *testing.T) { conf := map[string]interface{}{ - "script": "test-fixtures/script1.sh", + "script": "testdata/script1.sh", } scripts, err := collectScripts( @@ -162,9 +162,9 @@ func TestResourceProvider_CollectScripts_script(t *testing.T) { func TestResourceProvider_CollectScripts_scripts(t *testing.T) { conf := map[string]interface{}{ "scripts": []interface{}{ - "test-fixtures/script1.sh", - "test-fixtures/script1.sh", - "test-fixtures/script1.sh", + "testdata/script1.sh", + "testdata/script1.sh", + "testdata/script1.sh", }, } diff --git a/builtin/provisioners/remote-exec/test-fixtures/script1.sh b/builtin/provisioners/remote-exec/testdata/script1.sh similarity index 100% rename from builtin/provisioners/remote-exec/test-fixtures/script1.sh rename to builtin/provisioners/remote-exec/testdata/script1.sh diff --git a/command/apply_test.go b/command/apply_test.go index 5df59c6292..b949b6af72 100644 --- a/command/apply_test.go +++ b/command/apply_test.go @@ -1588,7 +1588,7 @@ func testHttpHandlerHeader(w http.ResponseWriter, r *http.Request) { } // applyFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/apply . This schema should be +// configuration in testdata/apply . This schema should be // assigned to a mock provider named "test". func applyFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ @@ -1604,7 +1604,7 @@ func applyFixtureSchema() *terraform.ProviderSchema { } // applyFixtureProvider returns a mock provider that is configured for basic -// operation with the configuration in test-fixtures/apply. This mock has +// operation with the configuration in testdata/apply. This mock has // GetSchemaReturn, PlanResourceChangeFn, and ApplyResourceChangeFn populated, // with the plan/apply steps just passing through the data determined by // Terraform Core. diff --git a/command/command_test.go b/command/command_test.go index d701c9a3b1..58b817c7a4 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -43,7 +43,7 @@ import ( // These are the directories for our test data and fixtures. var ( - fixtureDir = "./test-fixtures" + fixtureDir = "./testdata" testDataDir = "./testdata" ) diff --git a/command/e2etest/automation_test.go b/command/e2etest/automation_test.go index 80495fa1e9..a0914e7fe9 100644 --- a/command/e2etest/automation_test.go +++ b/command/e2etest/automation_test.go @@ -24,7 +24,7 @@ func TestPlanApplyInAutomation(t *testing.T) { // allowed. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "full-workflow-null") + fixturePath := filepath.Join("testdata", "full-workflow-null") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -119,7 +119,7 @@ func TestAutoApplyInAutomation(t *testing.T) { // allowed. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "full-workflow-null") + fixturePath := filepath.Join("testdata", "full-workflow-null") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -186,7 +186,7 @@ func TestPlanOnlyInAutomation(t *testing.T) { // allowed. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "full-workflow-null") + fixturePath := filepath.Join("testdata", "full-workflow-null") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() diff --git a/command/e2etest/init_test.go b/command/e2etest/init_test.go index 50e1fe3e95..800dc4f0ea 100644 --- a/command/e2etest/init_test.go +++ b/command/e2etest/init_test.go @@ -22,7 +22,7 @@ func TestInitProviders(t *testing.T) { // is to test the interaction with the real repository. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "template-provider") + fixturePath := filepath.Join("testdata", "template-provider") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -56,7 +56,7 @@ func TestInitProvidersInternal(t *testing.T) { // This test should _not_ reach out anywhere because the "terraform" // provider is internal to the core terraform binary. - fixturePath := filepath.Join("test-fixtures", "terraform-provider") + fixturePath := filepath.Join("testdata", "terraform-provider") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -89,7 +89,7 @@ func TestInitProviders_pluginCache(t *testing.T) { // should come from local cache. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "plugin-cache") + fixturePath := filepath.Join("testdata", "plugin-cache") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -140,7 +140,7 @@ func TestInit_fromModule(t *testing.T) { // and fetch a module. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "empty") + fixturePath := filepath.Join("testdata", "empty") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() diff --git a/command/e2etest/make-archive.sh b/command/e2etest/make-archive.sh index fa8e25ee6b..451039a684 100755 --- a/command/e2etest/make-archive.sh +++ b/command/e2etest/make-archive.sh @@ -31,7 +31,7 @@ OUTFILE="terraform-e2etest_${GOOS}_${GOARCH}.zip" mkdir -p "$OUTDIR" # We need the test fixtures available when we run the tests. -cp -r test-fixtures "$OUTDIR/test-fixtures" +cp -r testdata "$OUTDIR/testdata" # Bundle a copy of our binary so the target system doesn't need the go # compiler installed. diff --git a/command/e2etest/primary_test.go b/command/e2etest/primary_test.go index dd5b1160aa..3d0f859ac5 100644 --- a/command/e2etest/primary_test.go +++ b/command/e2etest/primary_test.go @@ -26,7 +26,7 @@ func TestPrimarySeparatePlan(t *testing.T) { // allowed. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "full-workflow-null") + fixturePath := filepath.Join("testdata", "full-workflow-null") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() diff --git a/command/e2etest/test-fixtures/empty/.exists b/command/e2etest/testdata/empty/.exists similarity index 100% rename from command/e2etest/test-fixtures/empty/.exists rename to command/e2etest/testdata/empty/.exists diff --git a/command/e2etest/test-fixtures/full-workflow-null/main.tf b/command/e2etest/testdata/full-workflow-null/main.tf similarity index 100% rename from command/e2etest/test-fixtures/full-workflow-null/main.tf rename to command/e2etest/testdata/full-workflow-null/main.tf diff --git a/command/e2etest/test-fixtures/plugin-cache/cache/os_arch/terraform-provider-template_v2.1.0_x4 b/command/e2etest/testdata/plugin-cache/cache/os_arch/terraform-provider-template_v2.1.0_x4 similarity index 100% rename from command/e2etest/test-fixtures/plugin-cache/cache/os_arch/terraform-provider-template_v2.1.0_x4 rename to command/e2etest/testdata/plugin-cache/cache/os_arch/terraform-provider-template_v2.1.0_x4 diff --git a/command/e2etest/test-fixtures/plugin-cache/main.tf b/command/e2etest/testdata/plugin-cache/main.tf similarity index 100% rename from command/e2etest/test-fixtures/plugin-cache/main.tf rename to command/e2etest/testdata/plugin-cache/main.tf diff --git a/command/e2etest/test-fixtures/template-provider/main.tf b/command/e2etest/testdata/template-provider/main.tf similarity index 100% rename from command/e2etest/test-fixtures/template-provider/main.tf rename to command/e2etest/testdata/template-provider/main.tf diff --git a/command/e2etest/test-fixtures/terraform-provider/main.tf b/command/e2etest/testdata/terraform-provider/main.tf similarity index 100% rename from command/e2etest/test-fixtures/terraform-provider/main.tf rename to command/e2etest/testdata/terraform-provider/main.tf diff --git a/command/e2etest/version_test.go b/command/e2etest/version_test.go index 8131155cb3..e8bcdb01c1 100644 --- a/command/e2etest/version_test.go +++ b/command/e2etest/version_test.go @@ -18,7 +18,7 @@ func TestVersion(t *testing.T) { t.Parallel() - fixturePath := filepath.Join("test-fixtures", "empty") + fixturePath := filepath.Join("testdata", "empty") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() @@ -47,7 +47,7 @@ func TestVersionWithProvider(t *testing.T) { // allowed. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "template-provider") + fixturePath := filepath.Join("testdata", "template-provider") tf := e2e.NewBinary(terraformBin, fixturePath) defer tf.Close() diff --git a/command/plan_test.go b/command/plan_test.go index 6786ec81c8..2d384edf48 100644 --- a/command/plan_test.go +++ b/command/plan_test.go @@ -848,7 +848,7 @@ func TestPlan_shutdown(t *testing.T) { } // planFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/plan . This schema should be +// configuration in testdata/plan . This schema should be // assigned to a mock provider named "test". func planFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ @@ -875,7 +875,7 @@ func planFixtureSchema() *terraform.ProviderSchema { } // planFixtureProvider returns a mock provider that is configured for basic -// operation with the configuration in test-fixtures/plan. This mock has +// operation with the configuration in testdata/plan. This mock has // GetSchemaReturn and PlanResourceChangeFn populated, with the plan // step just passing through the new object proposed by Terraform Core. func planFixtureProvider() *terraform.MockProvider { @@ -890,7 +890,7 @@ func planFixtureProvider() *terraform.MockProvider { } // planVarsFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/plan-vars . This schema should be +// configuration in testdata/plan-vars . This schema should be // assigned to a mock provider named "test". func planVarsFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ @@ -906,7 +906,7 @@ func planVarsFixtureSchema() *terraform.ProviderSchema { } // planVarsFixtureProvider returns a mock provider that is configured for basic -// operation with the configuration in test-fixtures/plan-vars. This mock has +// operation with the configuration in testdata/plan-vars. This mock has // GetSchemaReturn and PlanResourceChangeFn populated, with the plan // step just passing through the new object proposed by Terraform Core. func planVarsFixtureProvider() *terraform.MockProvider { diff --git a/command/plugins_test.go b/command/plugins_test.go index 4a4153df0c..1510a1f423 100644 --- a/command/plugins_test.go +++ b/command/plugins_test.go @@ -19,7 +19,7 @@ func TestMultiVersionProviderResolver(t *testing.T) { available.Add(discovery.PluginMeta{ Name: "plugin", Version: "1.0.0", - Path: "test-fixtures/empty-file", + Path: "testdata/empty-file", }) resolver := &multiVersionProviderResolver{ diff --git a/command/providers_schema_test.go b/command/providers_schema_test.go index fbc44f2158..b556bf876f 100644 --- a/command/providers_schema_test.go +++ b/command/providers_schema_test.go @@ -32,7 +32,7 @@ func TestProvidersSchema_error(t *testing.T) { func TestProvidersSchema_output(t *testing.T) { // there's only one test at this time. This can be refactored to have // multiple test cases in individual directories as needed. - fixtureDir := "test-fixtures/providers-schema" + fixtureDir := "testdata/providers-schema" testDirs, err := ioutil.ReadDir(fixtureDir) if err != nil { t.Fatal(err) diff --git a/command/refresh_test.go b/command/refresh_test.go index 5781c82d1c..aec83d334e 100644 --- a/command/refresh_test.go +++ b/command/refresh_test.go @@ -707,7 +707,7 @@ func newInstanceState(id string) *states.ResourceInstanceObjectSrc { } // refreshFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/refresh . This schema should be +// configuration in testdata/refresh . This schema should be // assigned to a mock provider named "test". func refreshFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ @@ -723,7 +723,7 @@ func refreshFixtureSchema() *terraform.ProviderSchema { } // refreshVarFixtureSchema returns a schema suitable for processing the -// configuration in test-fixtures/refresh-var . This schema should be +// configuration in testdata/refresh-var . This schema should be // assigned to a mock provider named "test". func refreshVarFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ diff --git a/command/show_test.go b/command/show_test.go index 530385b368..3c2cca3b61 100644 --- a/command/show_test.go +++ b/command/show_test.go @@ -135,7 +135,7 @@ func TestShow_state(t *testing.T) { } func TestShow_json_output(t *testing.T) { - fixtureDir := "test-fixtures/show-json" + fixtureDir := "testdata/show-json" testDirs, err := ioutil.ReadDir(fixtureDir) if err != nil { t.Fatal(err) @@ -230,7 +230,7 @@ func TestShow_json_output(t *testing.T) { // similar test as above, without the plan func TestShow_json_output_state(t *testing.T) { - fixtureDir := "test-fixtures/show-json-state" + fixtureDir := "testdata/show-json-state" testDirs, err := ioutil.ReadDir(fixtureDir) if err != nil { t.Fatal(err) @@ -311,7 +311,7 @@ func TestShow_json_output_state(t *testing.T) { } // showFixtureSchema returns a schema suitable for processing the configuration -// in test-fixtures/show. This schema should be assigned to a mock provider +// in testdata/show. This schema should be assigned to a mock provider // named "test". func showFixtureSchema() *terraform.ProviderSchema { return &terraform.ProviderSchema{ @@ -327,7 +327,7 @@ func showFixtureSchema() *terraform.ProviderSchema { } // showFixtureProvider returns a mock provider that is configured for basic -// operation with the configuration in test-fixtures/show. This mock has +// operation with the configuration in testdata/show. This mock has // GetSchemaReturn, PlanResourceChangeFn, and ApplyResourceChangeFn populated, // with the plan/apply steps just passing through the data determined by // Terraform Core. diff --git a/command/test-fixtures/.gitignore b/command/test-fixtures/.gitignore deleted file mode 100644 index 45a739cc22..0000000000 --- a/command/test-fixtures/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tfstate diff --git a/command/test-fixtures/apply-config-invalid/main.tf b/command/testdata/apply-config-invalid/main.tf similarity index 100% rename from command/test-fixtures/apply-config-invalid/main.tf rename to command/testdata/apply-config-invalid/main.tf diff --git a/command/test-fixtures/apply-destroy-targeted/main.tf b/command/testdata/apply-destroy-targeted/main.tf similarity index 100% rename from command/test-fixtures/apply-destroy-targeted/main.tf rename to command/testdata/apply-destroy-targeted/main.tf diff --git a/command/test-fixtures/apply-error/main.tf b/command/testdata/apply-error/main.tf similarity index 100% rename from command/test-fixtures/apply-error/main.tf rename to command/testdata/apply-error/main.tf diff --git a/command/test-fixtures/apply-input-partial/main.tf b/command/testdata/apply-input-partial/main.tf similarity index 100% rename from command/test-fixtures/apply-input-partial/main.tf rename to command/testdata/apply-input-partial/main.tf diff --git a/command/test-fixtures/apply-input/main.tf b/command/testdata/apply-input/main.tf similarity index 100% rename from command/test-fixtures/apply-input/main.tf rename to command/testdata/apply-input/main.tf diff --git a/command/test-fixtures/apply-plan-no-module/main.tf b/command/testdata/apply-plan-no-module/main.tf similarity index 100% rename from command/test-fixtures/apply-plan-no-module/main.tf rename to command/testdata/apply-plan-no-module/main.tf diff --git a/command/test-fixtures/apply-sensitive-output/main.tf b/command/testdata/apply-sensitive-output/main.tf similarity index 100% rename from command/test-fixtures/apply-sensitive-output/main.tf rename to command/testdata/apply-sensitive-output/main.tf diff --git a/command/test-fixtures/apply-shutdown/main.tf b/command/testdata/apply-shutdown/main.tf similarity index 100% rename from command/test-fixtures/apply-shutdown/main.tf rename to command/testdata/apply-shutdown/main.tf diff --git a/command/test-fixtures/apply-terraform-env/main.tf b/command/testdata/apply-terraform-env/main.tf similarity index 100% rename from command/test-fixtures/apply-terraform-env/main.tf rename to command/testdata/apply-terraform-env/main.tf diff --git a/command/test-fixtures/apply-vars/main.tf b/command/testdata/apply-vars/main.tf similarity index 100% rename from command/test-fixtures/apply-vars/main.tf rename to command/testdata/apply-vars/main.tf diff --git a/command/test-fixtures/apply/main.tf b/command/testdata/apply/main.tf similarity index 100% rename from command/test-fixtures/apply/main.tf rename to command/testdata/apply/main.tf diff --git a/command/test-fixtures/backend-change-multi-default-to-single/.terraform/terraform.tfstate b/command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-default-to-single/.terraform/terraform.tfstate rename to command/testdata/backend-change-multi-default-to-single/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-default-to-single/local-state.tfstate b/command/testdata/backend-change-multi-default-to-single/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-default-to-single/local-state.tfstate rename to command/testdata/backend-change-multi-default-to-single/local-state.tfstate diff --git a/command/test-fixtures/backend-change-multi-default-to-single/main.tf b/command/testdata/backend-change-multi-default-to-single/main.tf similarity index 100% rename from command/test-fixtures/backend-change-multi-default-to-single/main.tf rename to command/testdata/backend-change-multi-default-to-single/main.tf diff --git a/command/test-fixtures/backend-change-multi-to-multi/.terraform/terraform.tfstate b/command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-multi/.terraform/terraform.tfstate rename to command/testdata/backend-change-multi-to-multi/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-multi/local-state.tfstate b/command/testdata/backend-change-multi-to-multi/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-multi/local-state.tfstate rename to command/testdata/backend-change-multi-to-multi/local-state.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-multi/main.tf b/command/testdata/backend-change-multi-to-multi/main.tf similarity index 100% rename from command/test-fixtures/backend-change-multi-to-multi/main.tf rename to command/testdata/backend-change-multi-to-multi/main.tf diff --git a/command/test-fixtures/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate rename to command/testdata/backend-change-multi-to-multi/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate rename to command/testdata/backend-change-multi-to-no-default-with-default/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-no-default-with-default/local-state.tfstate b/command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-with-default/local-state.tfstate rename to command/testdata/backend-change-multi-to-no-default-with-default/local-state.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-no-default-with-default/main.tf b/command/testdata/backend-change-multi-to-no-default-with-default/main.tf similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-with-default/main.tf rename to command/testdata/backend-change-multi-to-no-default-with-default/main.tf diff --git a/command/test-fixtures/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate rename to command/testdata/backend-change-multi-to-no-default-with-default/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate rename to command/testdata/backend-change-multi-to-no-default-without-default/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-no-default-without-default/main.tf b/command/testdata/backend-change-multi-to-no-default-without-default/main.tf similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-without-default/main.tf rename to command/testdata/backend-change-multi-to-no-default-without-default/main.tf diff --git a/command/test-fixtures/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate rename to command/testdata/backend-change-multi-to-no-default-without-default/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-single/.terraform/environment b/command/testdata/backend-change-multi-to-single/.terraform/environment similarity index 100% rename from command/test-fixtures/backend-change-multi-to-single/.terraform/environment rename to command/testdata/backend-change-multi-to-single/.terraform/environment diff --git a/command/test-fixtures/backend-change-multi-to-single/.terraform/terraform.tfstate b/command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-single/.terraform/terraform.tfstate rename to command/testdata/backend-change-multi-to-single/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-single/main.tf b/command/testdata/backend-change-multi-to-single/main.tf similarity index 100% rename from command/test-fixtures/backend-change-multi-to-single/main.tf rename to command/testdata/backend-change-multi-to-single/main.tf diff --git a/command/test-fixtures/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate rename to command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env1/terraform.tfstate diff --git a/command/test-fixtures/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate b/command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate rename to command/testdata/backend-change-multi-to-single/terraform.tfstate.d/env2/terraform.tfstate diff --git a/command/test-fixtures/backend-change-single-to-single/.terraform/terraform.tfstate b/command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change-single-to-single/.terraform/terraform.tfstate rename to command/testdata/backend-change-single-to-single/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change-single-to-single/local-state.tfstate b/command/testdata/backend-change-single-to-single/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-change-single-to-single/local-state.tfstate rename to command/testdata/backend-change-single-to-single/local-state.tfstate diff --git a/command/test-fixtures/backend-change-single-to-single/main.tf b/command/testdata/backend-change-single-to-single/main.tf similarity index 100% rename from command/test-fixtures/backend-change-single-to-single/main.tf rename to command/testdata/backend-change-single-to-single/main.tf diff --git a/command/test-fixtures/backend-change/.terraform/terraform.tfstate b/command/testdata/backend-change/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-change/.terraform/terraform.tfstate rename to command/testdata/backend-change/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-change/local-state.tfstate b/command/testdata/backend-change/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-change/local-state.tfstate rename to command/testdata/backend-change/local-state.tfstate diff --git a/command/test-fixtures/backend-change/main.tf b/command/testdata/backend-change/main.tf similarity index 100% rename from command/test-fixtures/backend-change/main.tf rename to command/testdata/backend-change/main.tf diff --git a/command/test-fixtures/backend-changed-with-legacy/.terraform/terraform.tfstate b/command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-changed-with-legacy/.terraform/terraform.tfstate rename to command/testdata/backend-changed-with-legacy/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-changed-with-legacy/local-state-old.tfstate b/command/testdata/backend-changed-with-legacy/local-state-old.tfstate similarity index 100% rename from command/test-fixtures/backend-changed-with-legacy/local-state-old.tfstate rename to command/testdata/backend-changed-with-legacy/local-state-old.tfstate diff --git a/command/test-fixtures/backend-changed-with-legacy/local-state.tfstate b/command/testdata/backend-changed-with-legacy/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-changed-with-legacy/local-state.tfstate rename to command/testdata/backend-changed-with-legacy/local-state.tfstate diff --git a/command/test-fixtures/backend-changed-with-legacy/main.tf b/command/testdata/backend-changed-with-legacy/main.tf similarity index 100% rename from command/test-fixtures/backend-changed-with-legacy/main.tf rename to command/testdata/backend-changed-with-legacy/main.tf diff --git a/command/test-fixtures/backend-inmem-locked/main.tf b/command/testdata/backend-inmem-locked/main.tf similarity index 100% rename from command/test-fixtures/backend-inmem-locked/main.tf rename to command/testdata/backend-inmem-locked/main.tf diff --git a/command/test-fixtures/backend-new-interp/main.tf b/command/testdata/backend-new-interp/main.tf similarity index 100% rename from command/test-fixtures/backend-new-interp/main.tf rename to command/testdata/backend-new-interp/main.tf diff --git a/command/test-fixtures/backend-new-legacy/.terraform/terraform.tfstate b/command/testdata/backend-new-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-new-legacy/.terraform/terraform.tfstate rename to command/testdata/backend-new-legacy/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-new-legacy/local-state-old.tfstate b/command/testdata/backend-new-legacy/local-state-old.tfstate similarity index 100% rename from command/test-fixtures/backend-new-legacy/local-state-old.tfstate rename to command/testdata/backend-new-legacy/local-state-old.tfstate diff --git a/command/test-fixtures/backend-new-legacy/main.tf b/command/testdata/backend-new-legacy/main.tf similarity index 100% rename from command/test-fixtures/backend-new-legacy/main.tf rename to command/testdata/backend-new-legacy/main.tf diff --git a/command/test-fixtures/backend-new-migrate-existing/local-state.tfstate b/command/testdata/backend-new-migrate-existing/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-new-migrate-existing/local-state.tfstate rename to command/testdata/backend-new-migrate-existing/local-state.tfstate diff --git a/command/test-fixtures/backend-new-migrate-existing/main.tf b/command/testdata/backend-new-migrate-existing/main.tf similarity index 100% rename from command/test-fixtures/backend-new-migrate-existing/main.tf rename to command/testdata/backend-new-migrate-existing/main.tf diff --git a/command/test-fixtures/backend-new-migrate-existing/terraform.tfstate b/command/testdata/backend-new-migrate-existing/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-new-migrate-existing/terraform.tfstate rename to command/testdata/backend-new-migrate-existing/terraform.tfstate diff --git a/command/test-fixtures/backend-new-migrate/main.tf b/command/testdata/backend-new-migrate/main.tf similarity index 100% rename from command/test-fixtures/backend-new-migrate/main.tf rename to command/testdata/backend-new-migrate/main.tf diff --git a/command/test-fixtures/backend-new-migrate/terraform.tfstate b/command/testdata/backend-new-migrate/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-new-migrate/terraform.tfstate rename to command/testdata/backend-new-migrate/terraform.tfstate diff --git a/command/test-fixtures/backend-new/main.tf b/command/testdata/backend-new/main.tf similarity index 100% rename from command/test-fixtures/backend-new/main.tf rename to command/testdata/backend-new/main.tf diff --git a/command/test-fixtures/backend-plan-backend-empty-config/.terraform/terraform.tfstate b/command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-backend-empty-config/.terraform/terraform.tfstate rename to command/testdata/backend-plan-backend-empty-config/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-plan-backend-empty-config/local-state.tfstate b/command/testdata/backend-plan-backend-empty-config/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-backend-empty-config/local-state.tfstate rename to command/testdata/backend-plan-backend-empty-config/local-state.tfstate diff --git a/command/test-fixtures/backend-plan-backend-empty-config/main.tf b/command/testdata/backend-plan-backend-empty-config/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-backend-empty-config/main.tf rename to command/testdata/backend-plan-backend-empty-config/main.tf diff --git a/command/test-fixtures/backend-plan-backend-empty/readme.txt b/command/testdata/backend-plan-backend-empty/readme.txt similarity index 100% rename from command/test-fixtures/backend-plan-backend-empty/readme.txt rename to command/testdata/backend-plan-backend-empty/readme.txt diff --git a/command/test-fixtures/backend-plan-backend-match/local-state.tfstate b/command/testdata/backend-plan-backend-match/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-backend-match/local-state.tfstate rename to command/testdata/backend-plan-backend-match/local-state.tfstate diff --git a/command/test-fixtures/backend-plan-backend-match/readme.txt b/command/testdata/backend-plan-backend-match/readme.txt similarity index 100% rename from command/test-fixtures/backend-plan-backend-match/readme.txt rename to command/testdata/backend-plan-backend-match/readme.txt diff --git a/command/test-fixtures/backend-plan-backend-mismatch/local-state.tfstate b/command/testdata/backend-plan-backend-mismatch/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-backend-mismatch/local-state.tfstate rename to command/testdata/backend-plan-backend-mismatch/local-state.tfstate diff --git a/command/test-fixtures/backend-plan-legacy-data/local-state.tfstate b/command/testdata/backend-plan-legacy-data/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-legacy-data/local-state.tfstate rename to command/testdata/backend-plan-legacy-data/local-state.tfstate diff --git a/command/test-fixtures/backend-plan-legacy-data/main.tf b/command/testdata/backend-plan-legacy-data/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-legacy-data/main.tf rename to command/testdata/backend-plan-legacy-data/main.tf diff --git a/command/test-fixtures/backend-plan-legacy-data/state.tfstate b/command/testdata/backend-plan-legacy-data/state.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-legacy-data/state.tfstate rename to command/testdata/backend-plan-legacy-data/state.tfstate diff --git a/command/test-fixtures/backend-plan-legacy/readme.txt b/command/testdata/backend-plan-legacy/readme.txt similarity index 100% rename from command/test-fixtures/backend-plan-legacy/readme.txt rename to command/testdata/backend-plan-legacy/readme.txt diff --git a/command/test-fixtures/backend-plan-local-match/main.tf b/command/testdata/backend-plan-local-match/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-local-match/main.tf rename to command/testdata/backend-plan-local-match/main.tf diff --git a/command/test-fixtures/backend-plan-local-match/terraform.tfstate b/command/testdata/backend-plan-local-match/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-local-match/terraform.tfstate rename to command/testdata/backend-plan-local-match/terraform.tfstate diff --git a/command/test-fixtures/backend-plan-local-mismatch-lineage/main.tf b/command/testdata/backend-plan-local-mismatch-lineage/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-local-mismatch-lineage/main.tf rename to command/testdata/backend-plan-local-mismatch-lineage/main.tf diff --git a/command/test-fixtures/backend-plan-local-mismatch-lineage/terraform.tfstate b/command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-local-mismatch-lineage/terraform.tfstate rename to command/testdata/backend-plan-local-mismatch-lineage/terraform.tfstate diff --git a/command/test-fixtures/backend-plan-local-newer/main.tf b/command/testdata/backend-plan-local-newer/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-local-newer/main.tf rename to command/testdata/backend-plan-local-newer/main.tf diff --git a/command/test-fixtures/backend-plan-local-newer/terraform.tfstate b/command/testdata/backend-plan-local-newer/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-plan-local-newer/terraform.tfstate rename to command/testdata/backend-plan-local-newer/terraform.tfstate diff --git a/command/test-fixtures/backend-plan-local/main.tf b/command/testdata/backend-plan-local/main.tf similarity index 100% rename from command/test-fixtures/backend-plan-local/main.tf rename to command/testdata/backend-plan-local/main.tf diff --git a/command/test-fixtures/backend-unchanged-with-legacy/.terraform/terraform.tfstate b/command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-unchanged-with-legacy/.terraform/terraform.tfstate rename to command/testdata/backend-unchanged-with-legacy/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-unchanged-with-legacy/local-state-old.tfstate b/command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate similarity index 100% rename from command/test-fixtures/backend-unchanged-with-legacy/local-state-old.tfstate rename to command/testdata/backend-unchanged-with-legacy/local-state-old.tfstate diff --git a/command/test-fixtures/backend-unchanged-with-legacy/local-state.tfstate b/command/testdata/backend-unchanged-with-legacy/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-unchanged-with-legacy/local-state.tfstate rename to command/testdata/backend-unchanged-with-legacy/local-state.tfstate diff --git a/command/test-fixtures/backend-unchanged-with-legacy/main.tf b/command/testdata/backend-unchanged-with-legacy/main.tf similarity index 100% rename from command/test-fixtures/backend-unchanged-with-legacy/main.tf rename to command/testdata/backend-unchanged-with-legacy/main.tf diff --git a/command/test-fixtures/backend-unchanged/.terraform/terraform.tfstate b/command/testdata/backend-unchanged/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-unchanged/.terraform/terraform.tfstate rename to command/testdata/backend-unchanged/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-unchanged/local-state.tfstate b/command/testdata/backend-unchanged/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-unchanged/local-state.tfstate rename to command/testdata/backend-unchanged/local-state.tfstate diff --git a/command/test-fixtures/backend-unchanged/main.tf b/command/testdata/backend-unchanged/main.tf similarity index 100% rename from command/test-fixtures/backend-unchanged/main.tf rename to command/testdata/backend-unchanged/main.tf diff --git a/command/test-fixtures/backend-unset-with-legacy/.terraform/terraform.tfstate b/command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-unset-with-legacy/.terraform/terraform.tfstate rename to command/testdata/backend-unset-with-legacy/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-unset-with-legacy/local-state-old.tfstate b/command/testdata/backend-unset-with-legacy/local-state-old.tfstate similarity index 100% rename from command/test-fixtures/backend-unset-with-legacy/local-state-old.tfstate rename to command/testdata/backend-unset-with-legacy/local-state-old.tfstate diff --git a/command/test-fixtures/backend-unset-with-legacy/local-state.tfstate b/command/testdata/backend-unset-with-legacy/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-unset-with-legacy/local-state.tfstate rename to command/testdata/backend-unset-with-legacy/local-state.tfstate diff --git a/command/test-fixtures/backend-unset-with-legacy/main.tf b/command/testdata/backend-unset-with-legacy/main.tf similarity index 100% rename from command/test-fixtures/backend-unset-with-legacy/main.tf rename to command/testdata/backend-unset-with-legacy/main.tf diff --git a/command/test-fixtures/backend-unset/.terraform/terraform.tfstate b/command/testdata/backend-unset/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/backend-unset/.terraform/terraform.tfstate rename to command/testdata/backend-unset/.terraform/terraform.tfstate diff --git a/command/test-fixtures/backend-unset/local-state.tfstate b/command/testdata/backend-unset/local-state.tfstate similarity index 100% rename from command/test-fixtures/backend-unset/local-state.tfstate rename to command/testdata/backend-unset/local-state.tfstate diff --git a/command/test-fixtures/backend-unset/main.tf b/command/testdata/backend-unset/main.tf similarity index 100% rename from command/test-fixtures/backend-unset/main.tf rename to command/testdata/backend-unset/main.tf diff --git a/command/test-fixtures/empty-file b/command/testdata/empty-file similarity index 100% rename from command/test-fixtures/empty-file rename to command/testdata/empty-file diff --git a/command/test-fixtures/empty/README b/command/testdata/empty/README similarity index 100% rename from command/test-fixtures/empty/README rename to command/testdata/empty/README diff --git a/command/test-fixtures/get/foo/main.tf b/command/testdata/get/foo/main.tf similarity index 100% rename from command/test-fixtures/get/foo/main.tf rename to command/testdata/get/foo/main.tf diff --git a/command/test-fixtures/get/main.tf b/command/testdata/get/main.tf similarity index 100% rename from command/test-fixtures/get/main.tf rename to command/testdata/get/main.tf diff --git a/command/test-fixtures/graph/main.tf b/command/testdata/graph/main.tf similarity index 100% rename from command/test-fixtures/graph/main.tf rename to command/testdata/graph/main.tf diff --git a/command/test-fixtures/import-missing-resource-config/main.tf b/command/testdata/import-missing-resource-config/main.tf similarity index 100% rename from command/test-fixtures/import-missing-resource-config/main.tf rename to command/testdata/import-missing-resource-config/main.tf diff --git a/command/test-fixtures/import-provider-aliased/main.tf b/command/testdata/import-provider-aliased/main.tf similarity index 100% rename from command/test-fixtures/import-provider-aliased/main.tf rename to command/testdata/import-provider-aliased/main.tf diff --git a/command/test-fixtures/import-provider-implicit/main.tf b/command/testdata/import-provider-implicit/main.tf similarity index 100% rename from command/test-fixtures/import-provider-implicit/main.tf rename to command/testdata/import-provider-implicit/main.tf diff --git a/command/test-fixtures/import-provider-remote-state/main.tf b/command/testdata/import-provider-remote-state/main.tf similarity index 100% rename from command/test-fixtures/import-provider-remote-state/main.tf rename to command/testdata/import-provider-remote-state/main.tf diff --git a/command/test-fixtures/import-provider-var-default/main.tf b/command/testdata/import-provider-var-default/main.tf similarity index 100% rename from command/test-fixtures/import-provider-var-default/main.tf rename to command/testdata/import-provider-var-default/main.tf diff --git a/command/test-fixtures/import-provider-var-default/terraform.tfvars b/command/testdata/import-provider-var-default/terraform.tfvars similarity index 100% rename from command/test-fixtures/import-provider-var-default/terraform.tfvars rename to command/testdata/import-provider-var-default/terraform.tfvars diff --git a/command/test-fixtures/import-provider-var-file/blah.tfvars b/command/testdata/import-provider-var-file/blah.tfvars similarity index 100% rename from command/test-fixtures/import-provider-var-file/blah.tfvars rename to command/testdata/import-provider-var-file/blah.tfvars diff --git a/command/test-fixtures/import-provider-var-file/main.tf b/command/testdata/import-provider-var-file/main.tf similarity index 100% rename from command/test-fixtures/import-provider-var-file/main.tf rename to command/testdata/import-provider-var-file/main.tf diff --git a/command/test-fixtures/import-provider-var/main.tf b/command/testdata/import-provider-var/main.tf similarity index 100% rename from command/test-fixtures/import-provider-var/main.tf rename to command/testdata/import-provider-var/main.tf diff --git a/command/test-fixtures/import-provider/main.tf b/command/testdata/import-provider/main.tf similarity index 100% rename from command/test-fixtures/import-provider/main.tf rename to command/testdata/import-provider/main.tf diff --git a/command/test-fixtures/init-012upgrade/main.tf b/command/testdata/init-012upgrade/main.tf similarity index 100% rename from command/test-fixtures/init-012upgrade/main.tf rename to command/testdata/init-012upgrade/main.tf diff --git a/command/test-fixtures/init-backend-config-file-change/.terraform/terraform.tfstate b/command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/init-backend-config-file-change/.terraform/terraform.tfstate rename to command/testdata/init-backend-config-file-change/.terraform/terraform.tfstate diff --git a/command/test-fixtures/init-backend-config-file-change/input.config b/command/testdata/init-backend-config-file-change/input.config similarity index 100% rename from command/test-fixtures/init-backend-config-file-change/input.config rename to command/testdata/init-backend-config-file-change/input.config diff --git a/command/test-fixtures/init-backend-config-file-change/main.tf b/command/testdata/init-backend-config-file-change/main.tf similarity index 100% rename from command/test-fixtures/init-backend-config-file-change/main.tf rename to command/testdata/init-backend-config-file-change/main.tf diff --git a/command/test-fixtures/init-backend-config-file/input.config b/command/testdata/init-backend-config-file/input.config similarity index 100% rename from command/test-fixtures/init-backend-config-file/input.config rename to command/testdata/init-backend-config-file/input.config diff --git a/command/test-fixtures/init-backend-config-file/main.tf b/command/testdata/init-backend-config-file/main.tf similarity index 100% rename from command/test-fixtures/init-backend-config-file/main.tf rename to command/testdata/init-backend-config-file/main.tf diff --git a/command/test-fixtures/init-backend-config-kv/main.tf b/command/testdata/init-backend-config-kv/main.tf similarity index 100% rename from command/test-fixtures/init-backend-config-kv/main.tf rename to command/testdata/init-backend-config-kv/main.tf diff --git a/command/test-fixtures/init-backend-empty/main.tf b/command/testdata/init-backend-empty/main.tf similarity index 100% rename from command/test-fixtures/init-backend-empty/main.tf rename to command/testdata/init-backend-empty/main.tf diff --git a/command/test-fixtures/init-backend/main.tf b/command/testdata/init-backend/main.tf similarity index 100% rename from command/test-fixtures/init-backend/main.tf rename to command/testdata/init-backend/main.tf diff --git a/command/test-fixtures/init-check-required-version/main.tf b/command/testdata/init-check-required-version/main.tf similarity index 100% rename from command/test-fixtures/init-check-required-version/main.tf rename to command/testdata/init-check-required-version/main.tf diff --git a/command/test-fixtures/init-get-providers/main.tf b/command/testdata/init-get-providers/main.tf similarity index 100% rename from command/test-fixtures/init-get-providers/main.tf rename to command/testdata/init-get-providers/main.tf diff --git a/command/test-fixtures/init-get/foo/main.tf b/command/testdata/init-get/foo/main.tf similarity index 100% rename from command/test-fixtures/init-get/foo/main.tf rename to command/testdata/init-get/foo/main.tf diff --git a/command/test-fixtures/init-get/main.tf b/command/testdata/init-get/main.tf similarity index 100% rename from command/test-fixtures/init-get/main.tf rename to command/testdata/init-get/main.tf diff --git a/command/test-fixtures/init-internal/main.tf b/command/testdata/init-internal/main.tf similarity index 100% rename from command/test-fixtures/init-internal/main.tf rename to command/testdata/init-internal/main.tf diff --git a/command/test-fixtures/init-legacy-rc/main.tf b/command/testdata/init-legacy-rc/main.tf similarity index 100% rename from command/test-fixtures/init-legacy-rc/main.tf rename to command/testdata/init-legacy-rc/main.tf diff --git a/command/test-fixtures/init-provider-lock-file/main.tf b/command/testdata/init-provider-lock-file/main.tf similarity index 100% rename from command/test-fixtures/init-provider-lock-file/main.tf rename to command/testdata/init-provider-lock-file/main.tf diff --git a/command/test-fixtures/init-providers-lock/main.tf b/command/testdata/init-providers-lock/main.tf similarity index 100% rename from command/test-fixtures/init-providers-lock/main.tf rename to command/testdata/init-providers-lock/main.tf diff --git a/command/test-fixtures/init-sniff-version-error/init-sniff-version-error.tf b/command/testdata/init-sniff-version-error/init-sniff-version-error.tf similarity index 100% rename from command/test-fixtures/init-sniff-version-error/init-sniff-version-error.tf rename to command/testdata/init-sniff-version-error/init-sniff-version-error.tf diff --git a/command/test-fixtures/init/hello.tf b/command/testdata/init/hello.tf similarity index 100% rename from command/test-fixtures/init/hello.tf rename to command/testdata/init/hello.tf diff --git a/command/test-fixtures/inmem-backend/main.tf b/command/testdata/inmem-backend/main.tf similarity index 100% rename from command/test-fixtures/inmem-backend/main.tf rename to command/testdata/inmem-backend/main.tf diff --git a/command/test-fixtures/parallelism/main.tf b/command/testdata/parallelism/main.tf similarity index 100% rename from command/test-fixtures/parallelism/main.tf rename to command/testdata/parallelism/main.tf diff --git a/command/test-fixtures/plan-emptydiff/main.tf b/command/testdata/plan-emptydiff/main.tf similarity index 100% rename from command/test-fixtures/plan-emptydiff/main.tf rename to command/testdata/plan-emptydiff/main.tf diff --git a/command/test-fixtures/plan-invalid/main.tf b/command/testdata/plan-invalid/main.tf similarity index 100% rename from command/test-fixtures/plan-invalid/main.tf rename to command/testdata/plan-invalid/main.tf diff --git a/command/test-fixtures/plan-out-backend-legacy/main.tf b/command/testdata/plan-out-backend-legacy/main.tf similarity index 100% rename from command/test-fixtures/plan-out-backend-legacy/main.tf rename to command/testdata/plan-out-backend-legacy/main.tf diff --git a/command/test-fixtures/plan-out-backend/main.tf b/command/testdata/plan-out-backend/main.tf similarity index 100% rename from command/test-fixtures/plan-out-backend/main.tf rename to command/testdata/plan-out-backend/main.tf diff --git a/command/test-fixtures/plan-vars/main.tf b/command/testdata/plan-vars/main.tf similarity index 100% rename from command/test-fixtures/plan-vars/main.tf rename to command/testdata/plan-vars/main.tf diff --git a/command/test-fixtures/plan/main.tf b/command/testdata/plan/main.tf similarity index 100% rename from command/test-fixtures/plan/main.tf rename to command/testdata/plan/main.tf diff --git a/command/test-fixtures/providers-schema/basic/output.json b/command/testdata/providers-schema/basic/output.json similarity index 100% rename from command/test-fixtures/providers-schema/basic/output.json rename to command/testdata/providers-schema/basic/output.json diff --git a/command/test-fixtures/providers-schema/basic/provider.tf b/command/testdata/providers-schema/basic/provider.tf similarity index 100% rename from command/test-fixtures/providers-schema/basic/provider.tf rename to command/testdata/providers-schema/basic/provider.tf diff --git a/command/test-fixtures/providers-schema/empty/main.tf b/command/testdata/providers-schema/empty/main.tf similarity index 100% rename from command/test-fixtures/providers-schema/empty/main.tf rename to command/testdata/providers-schema/empty/main.tf diff --git a/command/test-fixtures/providers-schema/empty/output.json b/command/testdata/providers-schema/empty/output.json similarity index 100% rename from command/test-fixtures/providers-schema/empty/output.json rename to command/testdata/providers-schema/empty/output.json diff --git a/command/test-fixtures/providers/main.tf b/command/testdata/providers/main.tf similarity index 100% rename from command/test-fixtures/providers/main.tf rename to command/testdata/providers/main.tf diff --git a/command/test-fixtures/push-backend-new/main.tf b/command/testdata/push-backend-new/main.tf similarity index 100% rename from command/test-fixtures/push-backend-new/main.tf rename to command/testdata/push-backend-new/main.tf diff --git a/command/test-fixtures/push-input-partial/main.tf b/command/testdata/push-input-partial/main.tf similarity index 100% rename from command/test-fixtures/push-input-partial/main.tf rename to command/testdata/push-input-partial/main.tf diff --git a/command/test-fixtures/push-input/main.tf b/command/testdata/push-input/main.tf similarity index 100% rename from command/test-fixtures/push-input/main.tf rename to command/testdata/push-input/main.tf diff --git a/command/test-fixtures/push-no-remote/main.tf b/command/testdata/push-no-remote/main.tf similarity index 100% rename from command/test-fixtures/push-no-remote/main.tf rename to command/testdata/push-no-remote/main.tf diff --git a/command/test-fixtures/push-no-upload/child/main.tf b/command/testdata/push-no-upload/child/main.tf similarity index 100% rename from command/test-fixtures/push-no-upload/child/main.tf rename to command/testdata/push-no-upload/child/main.tf diff --git a/command/test-fixtures/push-no-upload/main.tf b/command/testdata/push-no-upload/main.tf similarity index 100% rename from command/test-fixtures/push-no-upload/main.tf rename to command/testdata/push-no-upload/main.tf diff --git a/command/test-fixtures/push-tfvars/main.tf b/command/testdata/push-tfvars/main.tf similarity index 100% rename from command/test-fixtures/push-tfvars/main.tf rename to command/testdata/push-tfvars/main.tf diff --git a/command/test-fixtures/push-tfvars/terraform.tfvars b/command/testdata/push-tfvars/terraform.tfvars similarity index 100% rename from command/test-fixtures/push-tfvars/terraform.tfvars rename to command/testdata/push-tfvars/terraform.tfvars diff --git a/command/test-fixtures/push/main.tf b/command/testdata/push/main.tf similarity index 100% rename from command/test-fixtures/push/main.tf rename to command/testdata/push/main.tf diff --git a/command/test-fixtures/refresh-empty/main.tf b/command/testdata/refresh-empty/main.tf similarity index 100% rename from command/test-fixtures/refresh-empty/main.tf rename to command/testdata/refresh-empty/main.tf diff --git a/command/test-fixtures/refresh-output/main.tf b/command/testdata/refresh-output/main.tf similarity index 100% rename from command/test-fixtures/refresh-output/main.tf rename to command/testdata/refresh-output/main.tf diff --git a/command/test-fixtures/refresh-unset-var/main.tf b/command/testdata/refresh-unset-var/main.tf similarity index 100% rename from command/test-fixtures/refresh-unset-var/main.tf rename to command/testdata/refresh-unset-var/main.tf diff --git a/command/test-fixtures/refresh-var/main.tf b/command/testdata/refresh-var/main.tf similarity index 100% rename from command/test-fixtures/refresh-var/main.tf rename to command/testdata/refresh-var/main.tf diff --git a/command/test-fixtures/refresh/main.tf b/command/testdata/refresh/main.tf similarity index 100% rename from command/test-fixtures/refresh/main.tf rename to command/testdata/refresh/main.tf diff --git a/command/test-fixtures/show-json-state/empty/output.json b/command/testdata/show-json-state/empty/output.json similarity index 100% rename from command/test-fixtures/show-json-state/empty/output.json rename to command/testdata/show-json-state/empty/output.json diff --git a/command/test-fixtures/show-json/basic-create/main.tf b/command/testdata/show-json/basic-create/main.tf similarity index 100% rename from command/test-fixtures/show-json/basic-create/main.tf rename to command/testdata/show-json/basic-create/main.tf diff --git a/command/test-fixtures/show-json/basic-create/output.json b/command/testdata/show-json/basic-create/output.json similarity index 100% rename from command/test-fixtures/show-json/basic-create/output.json rename to command/testdata/show-json/basic-create/output.json diff --git a/command/test-fixtures/show-json/basic-delete/main.tf b/command/testdata/show-json/basic-delete/main.tf similarity index 100% rename from command/test-fixtures/show-json/basic-delete/main.tf rename to command/testdata/show-json/basic-delete/main.tf diff --git a/command/test-fixtures/show-json/basic-delete/output.json b/command/testdata/show-json/basic-delete/output.json similarity index 100% rename from command/test-fixtures/show-json/basic-delete/output.json rename to command/testdata/show-json/basic-delete/output.json diff --git a/command/test-fixtures/show-json/basic-delete/terraform.tfstate b/command/testdata/show-json/basic-delete/terraform.tfstate similarity index 100% rename from command/test-fixtures/show-json/basic-delete/terraform.tfstate rename to command/testdata/show-json/basic-delete/terraform.tfstate diff --git a/command/test-fixtures/show-json/basic-update/main.tf b/command/testdata/show-json/basic-update/main.tf similarity index 100% rename from command/test-fixtures/show-json/basic-update/main.tf rename to command/testdata/show-json/basic-update/main.tf diff --git a/command/test-fixtures/show-json/basic-update/output.json b/command/testdata/show-json/basic-update/output.json similarity index 100% rename from command/test-fixtures/show-json/basic-update/output.json rename to command/testdata/show-json/basic-update/output.json diff --git a/command/test-fixtures/show-json/basic-update/terraform.tfstate b/command/testdata/show-json/basic-update/terraform.tfstate similarity index 100% rename from command/test-fixtures/show-json/basic-update/terraform.tfstate rename to command/testdata/show-json/basic-update/terraform.tfstate diff --git a/command/test-fixtures/show-json/modules/bar/main.tf b/command/testdata/show-json/modules/bar/main.tf similarity index 100% rename from command/test-fixtures/show-json/modules/bar/main.tf rename to command/testdata/show-json/modules/bar/main.tf diff --git a/command/test-fixtures/show-json/modules/foo/main.tf b/command/testdata/show-json/modules/foo/main.tf similarity index 100% rename from command/test-fixtures/show-json/modules/foo/main.tf rename to command/testdata/show-json/modules/foo/main.tf diff --git a/command/test-fixtures/show-json/modules/main.tf b/command/testdata/show-json/modules/main.tf similarity index 100% rename from command/test-fixtures/show-json/modules/main.tf rename to command/testdata/show-json/modules/main.tf diff --git a/command/test-fixtures/show-json/modules/output.json b/command/testdata/show-json/modules/output.json similarity index 100% rename from command/test-fixtures/show-json/modules/output.json rename to command/testdata/show-json/modules/output.json diff --git a/command/test-fixtures/show-json/nested-modules/main.tf b/command/testdata/show-json/nested-modules/main.tf similarity index 100% rename from command/test-fixtures/show-json/nested-modules/main.tf rename to command/testdata/show-json/nested-modules/main.tf diff --git a/command/test-fixtures/show-json/nested-modules/modules/main.tf b/command/testdata/show-json/nested-modules/modules/main.tf similarity index 100% rename from command/test-fixtures/show-json/nested-modules/modules/main.tf rename to command/testdata/show-json/nested-modules/modules/main.tf diff --git a/command/test-fixtures/show-json/nested-modules/modules/more-modules/main.tf b/command/testdata/show-json/nested-modules/modules/more-modules/main.tf similarity index 100% rename from command/test-fixtures/show-json/nested-modules/modules/more-modules/main.tf rename to command/testdata/show-json/nested-modules/modules/more-modules/main.tf diff --git a/command/test-fixtures/show-json/nested-modules/output.json b/command/testdata/show-json/nested-modules/output.json similarity index 100% rename from command/test-fixtures/show-json/nested-modules/output.json rename to command/testdata/show-json/nested-modules/output.json diff --git a/command/test-fixtures/show/main.tf b/command/testdata/show/main.tf similarity index 100% rename from command/test-fixtures/show/main.tf rename to command/testdata/show/main.tf diff --git a/command/test-fixtures/state-list-backend-custom/.terraform/terraform.tfstate b/command/testdata/state-list-backend-custom/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-list-backend-custom/.terraform/terraform.tfstate rename to command/testdata/state-list-backend-custom/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-list-backend-custom/local-state.tfstate b/command/testdata/state-list-backend-custom/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-list-backend-custom/local-state.tfstate rename to command/testdata/state-list-backend-custom/local-state.tfstate diff --git a/command/test-fixtures/state-list-backend-custom/main.tf b/command/testdata/state-list-backend-custom/main.tf similarity index 100% rename from command/test-fixtures/state-list-backend-custom/main.tf rename to command/testdata/state-list-backend-custom/main.tf diff --git a/command/test-fixtures/state-list-backend-default/.terraform/terraform.tfstate b/command/testdata/state-list-backend-default/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-list-backend-default/.terraform/terraform.tfstate rename to command/testdata/state-list-backend-default/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-list-backend-default/main.tf b/command/testdata/state-list-backend-default/main.tf similarity index 100% rename from command/test-fixtures/state-list-backend-default/main.tf rename to command/testdata/state-list-backend-default/main.tf diff --git a/command/test-fixtures/state-list-backend-default/terraform.tfstate b/command/testdata/state-list-backend-default/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-list-backend-default/terraform.tfstate rename to command/testdata/state-list-backend-default/terraform.tfstate diff --git a/command/test-fixtures/state-pull-backend/.terraform/terraform.tfstate b/command/testdata/state-pull-backend/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-pull-backend/.terraform/terraform.tfstate rename to command/testdata/state-pull-backend/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-pull-backend/local-state.tfstate b/command/testdata/state-pull-backend/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-pull-backend/local-state.tfstate rename to command/testdata/state-pull-backend/local-state.tfstate diff --git a/command/test-fixtures/state-pull-backend/main.tf b/command/testdata/state-pull-backend/main.tf similarity index 100% rename from command/test-fixtures/state-pull-backend/main.tf rename to command/testdata/state-pull-backend/main.tf diff --git a/command/test-fixtures/state-push-bad-lineage/.terraform/terraform.tfstate b/command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-push-bad-lineage/.terraform/terraform.tfstate rename to command/testdata/state-push-bad-lineage/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-push-bad-lineage/local-state.tfstate b/command/testdata/state-push-bad-lineage/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-push-bad-lineage/local-state.tfstate rename to command/testdata/state-push-bad-lineage/local-state.tfstate diff --git a/command/test-fixtures/state-push-bad-lineage/main.tf b/command/testdata/state-push-bad-lineage/main.tf similarity index 100% rename from command/test-fixtures/state-push-bad-lineage/main.tf rename to command/testdata/state-push-bad-lineage/main.tf diff --git a/command/test-fixtures/state-push-bad-lineage/replace.tfstate b/command/testdata/state-push-bad-lineage/replace.tfstate similarity index 100% rename from command/test-fixtures/state-push-bad-lineage/replace.tfstate rename to command/testdata/state-push-bad-lineage/replace.tfstate diff --git a/command/test-fixtures/state-push-good/.terraform/terraform.tfstate b/command/testdata/state-push-good/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-push-good/.terraform/terraform.tfstate rename to command/testdata/state-push-good/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-push-good/main.tf b/command/testdata/state-push-good/main.tf similarity index 100% rename from command/test-fixtures/state-push-good/main.tf rename to command/testdata/state-push-good/main.tf diff --git a/command/test-fixtures/state-push-good/replace.tfstate b/command/testdata/state-push-good/replace.tfstate similarity index 100% rename from command/test-fixtures/state-push-good/replace.tfstate rename to command/testdata/state-push-good/replace.tfstate diff --git a/command/test-fixtures/state-push-replace-match/.terraform/terraform.tfstate b/command/testdata/state-push-replace-match/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-push-replace-match/.terraform/terraform.tfstate rename to command/testdata/state-push-replace-match/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-push-replace-match/local-state.tfstate b/command/testdata/state-push-replace-match/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-push-replace-match/local-state.tfstate rename to command/testdata/state-push-replace-match/local-state.tfstate diff --git a/command/test-fixtures/state-push-replace-match/main.tf b/command/testdata/state-push-replace-match/main.tf similarity index 100% rename from command/test-fixtures/state-push-replace-match/main.tf rename to command/testdata/state-push-replace-match/main.tf diff --git a/command/test-fixtures/state-push-replace-match/replace.tfstate b/command/testdata/state-push-replace-match/replace.tfstate similarity index 100% rename from command/test-fixtures/state-push-replace-match/replace.tfstate rename to command/testdata/state-push-replace-match/replace.tfstate diff --git a/command/test-fixtures/state-push-serial-newer/.terraform/terraform.tfstate b/command/testdata/state-push-serial-newer/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-newer/.terraform/terraform.tfstate rename to command/testdata/state-push-serial-newer/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-push-serial-newer/local-state.tfstate b/command/testdata/state-push-serial-newer/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-newer/local-state.tfstate rename to command/testdata/state-push-serial-newer/local-state.tfstate diff --git a/command/test-fixtures/state-push-serial-newer/main.tf b/command/testdata/state-push-serial-newer/main.tf similarity index 100% rename from command/test-fixtures/state-push-serial-newer/main.tf rename to command/testdata/state-push-serial-newer/main.tf diff --git a/command/test-fixtures/state-push-serial-newer/replace.tfstate b/command/testdata/state-push-serial-newer/replace.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-newer/replace.tfstate rename to command/testdata/state-push-serial-newer/replace.tfstate diff --git a/command/test-fixtures/state-push-serial-older/.terraform/terraform.tfstate b/command/testdata/state-push-serial-older/.terraform/terraform.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-older/.terraform/terraform.tfstate rename to command/testdata/state-push-serial-older/.terraform/terraform.tfstate diff --git a/command/test-fixtures/state-push-serial-older/local-state.tfstate b/command/testdata/state-push-serial-older/local-state.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-older/local-state.tfstate rename to command/testdata/state-push-serial-older/local-state.tfstate diff --git a/command/test-fixtures/state-push-serial-older/main.tf b/command/testdata/state-push-serial-older/main.tf similarity index 100% rename from command/test-fixtures/state-push-serial-older/main.tf rename to command/testdata/state-push-serial-older/main.tf diff --git a/command/test-fixtures/state-push-serial-older/replace.tfstate b/command/testdata/state-push-serial-older/replace.tfstate similarity index 100% rename from command/test-fixtures/state-push-serial-older/replace.tfstate rename to command/testdata/state-push-serial-older/replace.tfstate diff --git a/command/test-fixtures/validate-invalid/incorrectmodulename/main.tf b/command/testdata/validate-invalid/incorrectmodulename/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/incorrectmodulename/main.tf rename to command/testdata/validate-invalid/incorrectmodulename/main.tf diff --git a/command/test-fixtures/validate-invalid/interpolation/main.tf b/command/testdata/validate-invalid/interpolation/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/interpolation/main.tf rename to command/testdata/validate-invalid/interpolation/main.tf diff --git a/command/test-fixtures/validate-invalid/main.tf b/command/testdata/validate-invalid/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/main.tf rename to command/testdata/validate-invalid/main.tf diff --git a/command/test-fixtures/validate-invalid/missing_defined_var/main.tf b/command/testdata/validate-invalid/missing_defined_var/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/missing_defined_var/main.tf rename to command/testdata/validate-invalid/missing_defined_var/main.tf diff --git a/command/test-fixtures/validate-invalid/missing_quote/main.tf b/command/testdata/validate-invalid/missing_quote/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/missing_quote/main.tf rename to command/testdata/validate-invalid/missing_quote/main.tf diff --git a/command/test-fixtures/validate-invalid/missing_var/main.tf b/command/testdata/validate-invalid/missing_var/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/missing_var/main.tf rename to command/testdata/validate-invalid/missing_var/main.tf diff --git a/command/test-fixtures/validate-invalid/multiple_modules/main.tf b/command/testdata/validate-invalid/multiple_modules/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/multiple_modules/main.tf rename to command/testdata/validate-invalid/multiple_modules/main.tf diff --git a/command/test-fixtures/validate-invalid/multiple_providers/main.tf b/command/testdata/validate-invalid/multiple_providers/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/multiple_providers/main.tf rename to command/testdata/validate-invalid/multiple_providers/main.tf diff --git a/command/test-fixtures/validate-invalid/multiple_resources/main.tf b/command/testdata/validate-invalid/multiple_resources/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/multiple_resources/main.tf rename to command/testdata/validate-invalid/multiple_resources/main.tf diff --git a/command/test-fixtures/validate-invalid/outputs/main.tf b/command/testdata/validate-invalid/outputs/main.tf similarity index 100% rename from command/test-fixtures/validate-invalid/outputs/main.tf rename to command/testdata/validate-invalid/outputs/main.tf diff --git a/command/test-fixtures/validate-valid/main.tf b/command/testdata/validate-valid/main.tf similarity index 100% rename from command/test-fixtures/validate-valid/main.tf rename to command/testdata/validate-valid/main.tf diff --git a/command/test-fixtures/validate-valid/with-tfvars-file/main.tf b/command/testdata/validate-valid/with-tfvars-file/main.tf similarity index 100% rename from command/test-fixtures/validate-valid/with-tfvars-file/main.tf rename to command/testdata/validate-valid/with-tfvars-file/main.tf diff --git a/command/test-fixtures/validate-valid/with-tfvars-file/terraform.tfvars b/command/testdata/validate-valid/with-tfvars-file/terraform.tfvars similarity index 100% rename from command/test-fixtures/validate-valid/with-tfvars-file/terraform.tfvars rename to command/testdata/validate-valid/with-tfvars-file/terraform.tfvars diff --git a/config/config_test.go b/config/config_test.go index 6f6e7a468d..8de5d764f1 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -16,7 +16,7 @@ import ( ) // This is the directory where our test fixtures are. -const fixtureDir = "./test-fixtures" +const fixtureDir = "./testdata" func TestMain(m *testing.M) { flag.Parse() diff --git a/config/import_tree_test.go b/config/import_tree_test.go index 04938e7457..53b7781609 100644 --- a/config/import_tree_test.go +++ b/config/import_tree_test.go @@ -15,7 +15,7 @@ func TestImportTreeHCL2Experiment(t *testing.T) { t.Run("HCL not opted in", func(t *testing.T) { // .tf file without opt-in should use the old HCL parser - imp, err := loadTree("test-fixtures/hcl2-experiment-switch/not-opted-in.tf") + imp, err := loadTree("testdata/hcl2-experiment-switch/not-opted-in.tf") if err != nil { t.Fatal(err) } @@ -37,7 +37,7 @@ func TestImportTreeHCL2Experiment(t *testing.T) { t.Run("HCL opted in", func(t *testing.T) { // .tf file with opt-in should use the new HCL2 parser - imp, err := loadTree("test-fixtures/hcl2-experiment-switch/opted-in.tf") + imp, err := loadTree("testdata/hcl2-experiment-switch/opted-in.tf") if err != nil { t.Fatal(err) } @@ -59,7 +59,7 @@ func TestImportTreeHCL2Experiment(t *testing.T) { t.Run("JSON ineligible", func(t *testing.T) { // .tf.json file should always use the old HCL parser - imp, err := loadTree("test-fixtures/hcl2-experiment-switch/not-eligible.tf.json") + imp, err := loadTree("testdata/hcl2-experiment-switch/not-eligible.tf.json") if err != nil { t.Fatal(err) } diff --git a/config/loader_hcl2_test.go b/config/loader_hcl2_test.go index feb530094c..d20d416e56 100644 --- a/config/loader_hcl2_test.go +++ b/config/loader_hcl2_test.go @@ -16,7 +16,7 @@ func TestHCL2ConfigurableConfigurable(t *testing.T) { func TestHCL2Basic(t *testing.T) { loader := globalHCL2Loader - cbl, _, err := loader.loadFile("test-fixtures/basic-hcl2.tf") + cbl, _, err := loader.loadFile("testdata/basic-hcl2.tf") if err != nil { if diags, isDiags := err.(hcl2.Diagnostics); isDiags { for _, diag := range diags { diff --git a/config/loader_test.go b/config/loader_test.go index e1ba75c96a..a11da589aa 100644 --- a/config/loader_test.go +++ b/config/loader_test.go @@ -79,7 +79,7 @@ func TestLoadFile_resourceArityMistake(t *testing.T) { if err == nil { t.Fatal("should have error") } - expected := "Error loading test-fixtures/resource-arity-mistake.tf: position 2:10: resource must be followed by exactly two strings, a type and a name" + expected := "Error loading testdata/resource-arity-mistake.tf: position 2:10: resource must be followed by exactly two strings, a type and a name" if err.Error() != expected { t.Fatalf("expected:\n%s\ngot:\n%s", expected, err) } @@ -97,7 +97,7 @@ func TestLoadFile_dataSourceArityMistake(t *testing.T) { if err == nil { t.Fatal("should have error") } - expected := "Error loading test-fixtures/data-source-arity-mistake.tf: position 2:6: 'data' must be followed by exactly two strings: a type and a name" + expected := "Error loading testdata/data-source-arity-mistake.tf: position 2:6: 'data' must be followed by exactly two strings: a type and a name" if err.Error() != expected { t.Fatalf("expected:\n%s\ngot:\n%s", expected, err) } diff --git a/config/module/module_test.go b/config/module/module_test.go index 80e931e0b5..73483c4129 100644 --- a/config/module/module_test.go +++ b/config/module/module_test.go @@ -17,7 +17,7 @@ func init() { } } -const fixtureDir = "./test-fixtures" +const fixtureDir = "./testdata" func tempDir(t *testing.T) string { t.Helper() diff --git a/config/module/test-fixtures/basic-dot/.test/foo.tf b/config/module/testdata/basic-dot/.test/foo.tf similarity index 100% rename from config/module/test-fixtures/basic-dot/.test/foo.tf rename to config/module/testdata/basic-dot/.test/foo.tf diff --git a/config/module/test-fixtures/basic-dot/main.tf b/config/module/testdata/basic-dot/main.tf similarity index 100% rename from config/module/test-fixtures/basic-dot/main.tf rename to config/module/testdata/basic-dot/main.tf diff --git a/config/module/test-fixtures/basic-git/DOTgit/COMMIT_EDITMSG b/config/module/testdata/basic-git/DOTgit/COMMIT_EDITMSG similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/COMMIT_EDITMSG rename to config/module/testdata/basic-git/DOTgit/COMMIT_EDITMSG diff --git a/config/module/test-fixtures/basic-git/DOTgit/HEAD b/config/module/testdata/basic-git/DOTgit/HEAD similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/HEAD rename to config/module/testdata/basic-git/DOTgit/HEAD diff --git a/config/module/test-fixtures/basic-git/DOTgit/config b/config/module/testdata/basic-git/DOTgit/config similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/config rename to config/module/testdata/basic-git/DOTgit/config diff --git a/config/module/test-fixtures/basic-git/DOTgit/description b/config/module/testdata/basic-git/DOTgit/description similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/description rename to config/module/testdata/basic-git/DOTgit/description diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/applypatch-msg.sample b/config/module/testdata/basic-git/DOTgit/hooks/applypatch-msg.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/applypatch-msg.sample rename to config/module/testdata/basic-git/DOTgit/hooks/applypatch-msg.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/commit-msg.sample b/config/module/testdata/basic-git/DOTgit/hooks/commit-msg.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/commit-msg.sample rename to config/module/testdata/basic-git/DOTgit/hooks/commit-msg.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/post-update.sample b/config/module/testdata/basic-git/DOTgit/hooks/post-update.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/post-update.sample rename to config/module/testdata/basic-git/DOTgit/hooks/post-update.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/pre-applypatch.sample b/config/module/testdata/basic-git/DOTgit/hooks/pre-applypatch.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/pre-applypatch.sample rename to config/module/testdata/basic-git/DOTgit/hooks/pre-applypatch.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/pre-commit.sample b/config/module/testdata/basic-git/DOTgit/hooks/pre-commit.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/pre-commit.sample rename to config/module/testdata/basic-git/DOTgit/hooks/pre-commit.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/pre-push.sample b/config/module/testdata/basic-git/DOTgit/hooks/pre-push.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/pre-push.sample rename to config/module/testdata/basic-git/DOTgit/hooks/pre-push.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/pre-rebase.sample b/config/module/testdata/basic-git/DOTgit/hooks/pre-rebase.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/pre-rebase.sample rename to config/module/testdata/basic-git/DOTgit/hooks/pre-rebase.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/prepare-commit-msg.sample b/config/module/testdata/basic-git/DOTgit/hooks/prepare-commit-msg.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/prepare-commit-msg.sample rename to config/module/testdata/basic-git/DOTgit/hooks/prepare-commit-msg.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/hooks/update.sample b/config/module/testdata/basic-git/DOTgit/hooks/update.sample similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/hooks/update.sample rename to config/module/testdata/basic-git/DOTgit/hooks/update.sample diff --git a/config/module/test-fixtures/basic-git/DOTgit/index b/config/module/testdata/basic-git/DOTgit/index similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/index rename to config/module/testdata/basic-git/DOTgit/index diff --git a/config/module/test-fixtures/basic-git/DOTgit/info/exclude b/config/module/testdata/basic-git/DOTgit/info/exclude similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/info/exclude rename to config/module/testdata/basic-git/DOTgit/info/exclude diff --git a/config/module/test-fixtures/basic-git/DOTgit/logs/HEAD b/config/module/testdata/basic-git/DOTgit/logs/HEAD similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/logs/HEAD rename to config/module/testdata/basic-git/DOTgit/logs/HEAD diff --git a/config/module/test-fixtures/basic-git/DOTgit/logs/refs/heads/master b/config/module/testdata/basic-git/DOTgit/logs/refs/heads/master similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/logs/refs/heads/master rename to config/module/testdata/basic-git/DOTgit/logs/refs/heads/master diff --git a/config/module/test-fixtures/basic-git/DOTgit/logs/refs/heads/test-branch b/config/module/testdata/basic-git/DOTgit/logs/refs/heads/test-branch similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/logs/refs/heads/test-branch rename to config/module/testdata/basic-git/DOTgit/logs/refs/heads/test-branch diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/14/6492b04efe0aae2b8288c5c0aef6a951030fde b/config/module/testdata/basic-git/DOTgit/objects/14/6492b04efe0aae2b8288c5c0aef6a951030fde similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/14/6492b04efe0aae2b8288c5c0aef6a951030fde rename to config/module/testdata/basic-git/DOTgit/objects/14/6492b04efe0aae2b8288c5c0aef6a951030fde diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/1d/3d6744266642cb7623e2c678c33c77b075c49f b/config/module/testdata/basic-git/DOTgit/objects/1d/3d6744266642cb7623e2c678c33c77b075c49f similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/1d/3d6744266642cb7623e2c678c33c77b075c49f rename to config/module/testdata/basic-git/DOTgit/objects/1d/3d6744266642cb7623e2c678c33c77b075c49f diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/1f/31e97f053caeb5d6b7bffa3faf82941c99efa2 b/config/module/testdata/basic-git/DOTgit/objects/1f/31e97f053caeb5d6b7bffa3faf82941c99efa2 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/1f/31e97f053caeb5d6b7bffa3faf82941c99efa2 rename to config/module/testdata/basic-git/DOTgit/objects/1f/31e97f053caeb5d6b7bffa3faf82941c99efa2 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/24/3f0fc5c4e586d1a3daa54c981b6f34e9ab1085 b/config/module/testdata/basic-git/DOTgit/objects/24/3f0fc5c4e586d1a3daa54c981b6f34e9ab1085 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/24/3f0fc5c4e586d1a3daa54c981b6f34e9ab1085 rename to config/module/testdata/basic-git/DOTgit/objects/24/3f0fc5c4e586d1a3daa54c981b6f34e9ab1085 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/38/30637158f774a20edcc0bf1c4d07b0bf87c43d b/config/module/testdata/basic-git/DOTgit/objects/38/30637158f774a20edcc0bf1c4d07b0bf87c43d similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/38/30637158f774a20edcc0bf1c4d07b0bf87c43d rename to config/module/testdata/basic-git/DOTgit/objects/38/30637158f774a20edcc0bf1c4d07b0bf87c43d diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/40/4618c9d96dfa0a5d365b518e0dfbb5a387c649 b/config/module/testdata/basic-git/DOTgit/objects/40/4618c9d96dfa0a5d365b518e0dfbb5a387c649 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/40/4618c9d96dfa0a5d365b518e0dfbb5a387c649 rename to config/module/testdata/basic-git/DOTgit/objects/40/4618c9d96dfa0a5d365b518e0dfbb5a387c649 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/49/7bc37401eb3c9b11865b1768725b64066eccee b/config/module/testdata/basic-git/DOTgit/objects/49/7bc37401eb3c9b11865b1768725b64066eccee similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/49/7bc37401eb3c9b11865b1768725b64066eccee rename to config/module/testdata/basic-git/DOTgit/objects/49/7bc37401eb3c9b11865b1768725b64066eccee diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/7b/7614f8759ac8b5e4b02be65ad8e2667be6dd87 b/config/module/testdata/basic-git/DOTgit/objects/7b/7614f8759ac8b5e4b02be65ad8e2667be6dd87 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/7b/7614f8759ac8b5e4b02be65ad8e2667be6dd87 rename to config/module/testdata/basic-git/DOTgit/objects/7b/7614f8759ac8b5e4b02be65ad8e2667be6dd87 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/8c/1a79ca1f98b6d00f5bf5c6cc9e8d3c092dd3ba b/config/module/testdata/basic-git/DOTgit/objects/8c/1a79ca1f98b6d00f5bf5c6cc9e8d3c092dd3ba similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/8c/1a79ca1f98b6d00f5bf5c6cc9e8d3c092dd3ba rename to config/module/testdata/basic-git/DOTgit/objects/8c/1a79ca1f98b6d00f5bf5c6cc9e8d3c092dd3ba diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/96/43088174e25a9bd91c27970a580af0085c9f32 b/config/module/testdata/basic-git/DOTgit/objects/96/43088174e25a9bd91c27970a580af0085c9f32 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/96/43088174e25a9bd91c27970a580af0085c9f32 rename to config/module/testdata/basic-git/DOTgit/objects/96/43088174e25a9bd91c27970a580af0085c9f32 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/b7/757b6a3696ad036e9aa2f5b4856d09e7f17993 b/config/module/testdata/basic-git/DOTgit/objects/b7/757b6a3696ad036e9aa2f5b4856d09e7f17993 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/b7/757b6a3696ad036e9aa2f5b4856d09e7f17993 rename to config/module/testdata/basic-git/DOTgit/objects/b7/757b6a3696ad036e9aa2f5b4856d09e7f17993 diff --git a/config/module/test-fixtures/basic-git/DOTgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/config/module/testdata/basic-git/DOTgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 rename to config/module/testdata/basic-git/DOTgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/config/module/test-fixtures/basic-git/DOTgit/refs/heads/master b/config/module/testdata/basic-git/DOTgit/refs/heads/master similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/refs/heads/master rename to config/module/testdata/basic-git/DOTgit/refs/heads/master diff --git a/config/module/test-fixtures/basic-git/DOTgit/refs/heads/test-branch b/config/module/testdata/basic-git/DOTgit/refs/heads/test-branch similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/refs/heads/test-branch rename to config/module/testdata/basic-git/DOTgit/refs/heads/test-branch diff --git a/config/module/test-fixtures/basic-git/DOTgit/refs/tags/v1.0 b/config/module/testdata/basic-git/DOTgit/refs/tags/v1.0 similarity index 100% rename from config/module/test-fixtures/basic-git/DOTgit/refs/tags/v1.0 rename to config/module/testdata/basic-git/DOTgit/refs/tags/v1.0 diff --git a/config/module/test-fixtures/basic-git/main.tf b/config/module/testdata/basic-git/main.tf similarity index 100% rename from config/module/test-fixtures/basic-git/main.tf rename to config/module/testdata/basic-git/main.tf diff --git a/config/module/test-fixtures/basic-git/subdir/sub.tf b/config/module/testdata/basic-git/subdir/sub.tf similarity index 100% rename from config/module/test-fixtures/basic-git/subdir/sub.tf rename to config/module/testdata/basic-git/subdir/sub.tf diff --git a/config/module/test-fixtures/basic-hg/.hg/00changelog.i b/config/module/testdata/basic-hg/.hg/00changelog.i similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/00changelog.i rename to config/module/testdata/basic-hg/.hg/00changelog.i diff --git a/config/module/test-fixtures/basic-hg/.hg/branch b/config/module/testdata/basic-hg/.hg/branch similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/branch rename to config/module/testdata/basic-hg/.hg/branch diff --git a/config/module/test-fixtures/basic-hg/.hg/cache/branch2-served b/config/module/testdata/basic-hg/.hg/cache/branch2-served similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/cache/branch2-served rename to config/module/testdata/basic-hg/.hg/cache/branch2-served diff --git a/config/module/test-fixtures/basic-hg/.hg/cache/tags b/config/module/testdata/basic-hg/.hg/cache/tags similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/cache/tags rename to config/module/testdata/basic-hg/.hg/cache/tags diff --git a/config/module/test-fixtures/basic-hg/.hg/dirstate b/config/module/testdata/basic-hg/.hg/dirstate similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/dirstate rename to config/module/testdata/basic-hg/.hg/dirstate diff --git a/config/module/test-fixtures/basic-hg/.hg/last-message.txt b/config/module/testdata/basic-hg/.hg/last-message.txt similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/last-message.txt rename to config/module/testdata/basic-hg/.hg/last-message.txt diff --git a/config/module/test-fixtures/basic-hg/.hg/requires b/config/module/testdata/basic-hg/.hg/requires similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/requires rename to config/module/testdata/basic-hg/.hg/requires diff --git a/config/module/test-fixtures/basic-hg/.hg/store/00changelog.i b/config/module/testdata/basic-hg/.hg/store/00changelog.i similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/00changelog.i rename to config/module/testdata/basic-hg/.hg/store/00changelog.i diff --git a/config/module/test-fixtures/basic-hg/.hg/store/00manifest.i b/config/module/testdata/basic-hg/.hg/store/00manifest.i similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/00manifest.i rename to config/module/testdata/basic-hg/.hg/store/00manifest.i diff --git a/config/module/test-fixtures/basic-hg/.hg/store/data/main.tf.i b/config/module/testdata/basic-hg/.hg/store/data/main.tf.i similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/data/main.tf.i rename to config/module/testdata/basic-hg/.hg/store/data/main.tf.i diff --git a/config/module/test-fixtures/basic-hg/.hg/store/data/main__branch.tf.i b/config/module/testdata/basic-hg/.hg/store/data/main__branch.tf.i similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/data/main__branch.tf.i rename to config/module/testdata/basic-hg/.hg/store/data/main__branch.tf.i diff --git a/config/module/test-fixtures/basic-hg/.hg/store/fncache b/config/module/testdata/basic-hg/.hg/store/fncache similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/fncache rename to config/module/testdata/basic-hg/.hg/store/fncache diff --git a/config/module/test-fixtures/basic-hg/.hg/store/phaseroots b/config/module/testdata/basic-hg/.hg/store/phaseroots similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/phaseroots rename to config/module/testdata/basic-hg/.hg/store/phaseroots diff --git a/config/module/test-fixtures/basic-hg/.hg/store/undo b/config/module/testdata/basic-hg/.hg/store/undo similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/undo rename to config/module/testdata/basic-hg/.hg/store/undo diff --git a/config/module/test-fixtures/basic-hg/.hg/store/undo.phaseroots b/config/module/testdata/basic-hg/.hg/store/undo.phaseroots similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/store/undo.phaseroots rename to config/module/testdata/basic-hg/.hg/store/undo.phaseroots diff --git a/config/module/test-fixtures/basic-hg/.hg/undo.bookmarks b/config/module/testdata/basic-hg/.hg/undo.bookmarks similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/undo.bookmarks rename to config/module/testdata/basic-hg/.hg/undo.bookmarks diff --git a/config/module/test-fixtures/basic-hg/.hg/undo.branch b/config/module/testdata/basic-hg/.hg/undo.branch similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/undo.branch rename to config/module/testdata/basic-hg/.hg/undo.branch diff --git a/config/module/test-fixtures/basic-hg/.hg/undo.desc b/config/module/testdata/basic-hg/.hg/undo.desc similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/undo.desc rename to config/module/testdata/basic-hg/.hg/undo.desc diff --git a/config/module/test-fixtures/basic-hg/.hg/undo.dirstate b/config/module/testdata/basic-hg/.hg/undo.dirstate similarity index 100% rename from config/module/test-fixtures/basic-hg/.hg/undo.dirstate rename to config/module/testdata/basic-hg/.hg/undo.dirstate diff --git a/config/module/test-fixtures/basic-hg/main.tf b/config/module/testdata/basic-hg/main.tf similarity index 100% rename from config/module/test-fixtures/basic-hg/main.tf rename to config/module/testdata/basic-hg/main.tf diff --git a/config/module/test-fixtures/basic-parent/a/a.tf b/config/module/testdata/basic-parent/a/a.tf similarity index 100% rename from config/module/test-fixtures/basic-parent/a/a.tf rename to config/module/testdata/basic-parent/a/a.tf diff --git a/config/module/test-fixtures/basic-parent/c/c.tf b/config/module/testdata/basic-parent/c/c.tf similarity index 100% rename from config/module/test-fixtures/basic-parent/c/c.tf rename to config/module/testdata/basic-parent/c/c.tf diff --git a/config/module/test-fixtures/basic-parent/main.tf b/config/module/testdata/basic-parent/main.tf similarity index 100% rename from config/module/test-fixtures/basic-parent/main.tf rename to config/module/testdata/basic-parent/main.tf diff --git a/config/module/test-fixtures/basic-subdir/foo/sub/baz/main.tf b/config/module/testdata/basic-subdir/foo/sub/baz/main.tf similarity index 100% rename from config/module/test-fixtures/basic-subdir/foo/sub/baz/main.tf rename to config/module/testdata/basic-subdir/foo/sub/baz/main.tf diff --git a/config/module/test-fixtures/basic-subdir/foo/sub/main.tf b/config/module/testdata/basic-subdir/foo/sub/main.tf similarity index 100% rename from config/module/test-fixtures/basic-subdir/foo/sub/main.tf rename to config/module/testdata/basic-subdir/foo/sub/main.tf diff --git a/config/module/test-fixtures/basic-subdir/main.tf b/config/module/testdata/basic-subdir/main.tf similarity index 100% rename from config/module/test-fixtures/basic-subdir/main.tf rename to config/module/testdata/basic-subdir/main.tf diff --git a/config/module/test-fixtures/basic-tar-subdir/foo.tgz b/config/module/testdata/basic-tar-subdir/foo.tgz similarity index 100% rename from config/module/test-fixtures/basic-tar-subdir/foo.tgz rename to config/module/testdata/basic-tar-subdir/foo.tgz diff --git a/config/module/test-fixtures/basic-tar-subdir/main.tf b/config/module/testdata/basic-tar-subdir/main.tf similarity index 100% rename from config/module/test-fixtures/basic-tar-subdir/main.tf rename to config/module/testdata/basic-tar-subdir/main.tf diff --git a/config/module/test-fixtures/basic/foo/main.tf b/config/module/testdata/basic/foo/main.tf similarity index 100% rename from config/module/test-fixtures/basic/foo/main.tf rename to config/module/testdata/basic/foo/main.tf diff --git a/config/module/test-fixtures/basic/main.tf b/config/module/testdata/basic/main.tf similarity index 100% rename from config/module/test-fixtures/basic/main.tf rename to config/module/testdata/basic/main.tf diff --git a/config/module/test-fixtures/basic/subdir/sub.tf b/config/module/testdata/basic/subdir/sub.tf similarity index 100% rename from config/module/test-fixtures/basic/subdir/sub.tf rename to config/module/testdata/basic/subdir/sub.tf diff --git a/config/module/test-fixtures/change-intermediate-source/a/b/main.tf b/config/module/testdata/change-intermediate-source/a/b/main.tf similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/a/b/main.tf rename to config/module/testdata/change-intermediate-source/a/b/main.tf diff --git a/config/module/test-fixtures/change-intermediate-source/a/main.tf b/config/module/testdata/change-intermediate-source/a/main.tf similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/a/main.tf rename to config/module/testdata/change-intermediate-source/a/main.tf diff --git a/config/module/test-fixtures/change-intermediate-source/c/b/main.tf b/config/module/testdata/change-intermediate-source/c/b/main.tf similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/c/b/main.tf rename to config/module/testdata/change-intermediate-source/c/b/main.tf diff --git a/config/module/test-fixtures/change-intermediate-source/c/main.tf b/config/module/testdata/change-intermediate-source/c/main.tf similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/c/main.tf rename to config/module/testdata/change-intermediate-source/c/main.tf diff --git a/config/module/test-fixtures/change-intermediate-source/main.tf b/config/module/testdata/change-intermediate-source/main.tf similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/main.tf rename to config/module/testdata/change-intermediate-source/main.tf diff --git a/config/module/test-fixtures/change-intermediate-source/main.tf.disabled b/config/module/testdata/change-intermediate-source/main.tf.disabled similarity index 100% rename from config/module/test-fixtures/change-intermediate-source/main.tf.disabled rename to config/module/testdata/change-intermediate-source/main.tf.disabled diff --git a/config/module/test-fixtures/child/foo/bar/main.tf b/config/module/testdata/child/foo/bar/main.tf similarity index 100% rename from config/module/test-fixtures/child/foo/bar/main.tf rename to config/module/testdata/child/foo/bar/main.tf diff --git a/config/module/test-fixtures/child/foo/main.tf b/config/module/testdata/child/foo/main.tf similarity index 100% rename from config/module/test-fixtures/child/foo/main.tf rename to config/module/testdata/child/foo/main.tf diff --git a/config/module/test-fixtures/child/main.tf b/config/module/testdata/child/main.tf similarity index 100% rename from config/module/test-fixtures/child/main.tf rename to config/module/testdata/child/main.tf diff --git a/config/module/test-fixtures/conficting-submodule-names/a/c/main.tf b/config/module/testdata/conficting-submodule-names/a/c/main.tf similarity index 100% rename from config/module/test-fixtures/conficting-submodule-names/a/c/main.tf rename to config/module/testdata/conficting-submodule-names/a/c/main.tf diff --git a/config/module/test-fixtures/conficting-submodule-names/a/main.tf b/config/module/testdata/conficting-submodule-names/a/main.tf similarity index 100% rename from config/module/test-fixtures/conficting-submodule-names/a/main.tf rename to config/module/testdata/conficting-submodule-names/a/main.tf diff --git a/config/module/test-fixtures/conficting-submodule-names/b/c/main.tf b/config/module/testdata/conficting-submodule-names/b/c/main.tf similarity index 100% rename from config/module/test-fixtures/conficting-submodule-names/b/c/main.tf rename to config/module/testdata/conficting-submodule-names/b/c/main.tf diff --git a/config/module/test-fixtures/conficting-submodule-names/b/main.tf b/config/module/testdata/conficting-submodule-names/b/main.tf similarity index 100% rename from config/module/test-fixtures/conficting-submodule-names/b/main.tf rename to config/module/testdata/conficting-submodule-names/b/main.tf diff --git a/config/module/test-fixtures/conficting-submodule-names/main.tf b/config/module/testdata/conficting-submodule-names/main.tf similarity index 100% rename from config/module/test-fixtures/conficting-submodule-names/main.tf rename to config/module/testdata/conficting-submodule-names/main.tf diff --git a/config/module/test-fixtures/discover-registry-local/exists-in-registry/identifier/provider/main.tf b/config/module/testdata/discover-registry-local/exists-in-registry/identifier/provider/main.tf similarity index 100% rename from config/module/test-fixtures/discover-registry-local/exists-in-registry/identifier/provider/main.tf rename to config/module/testdata/discover-registry-local/exists-in-registry/identifier/provider/main.tf diff --git a/config/module/test-fixtures/discover-registry-local/main.tf b/config/module/testdata/discover-registry-local/main.tf similarity index 100% rename from config/module/test-fixtures/discover-registry-local/main.tf rename to config/module/testdata/discover-registry-local/main.tf diff --git a/config/module/test-fixtures/discover-subdirs/main.tf b/config/module/testdata/discover-subdirs/main.tf similarity index 100% rename from config/module/test-fixtures/discover-subdirs/main.tf rename to config/module/testdata/discover-subdirs/main.tf diff --git a/config/module/test-fixtures/discover-subdirs/namespace/identifier/provider/main.tf b/config/module/testdata/discover-subdirs/namespace/identifier/provider/main.tf similarity index 100% rename from config/module/test-fixtures/discover-subdirs/namespace/identifier/provider/main.tf rename to config/module/testdata/discover-subdirs/namespace/identifier/provider/main.tf diff --git a/config/module/test-fixtures/dup/foo/main.tf b/config/module/testdata/dup/foo/main.tf similarity index 100% rename from config/module/test-fixtures/dup/foo/main.tf rename to config/module/testdata/dup/foo/main.tf diff --git a/config/module/test-fixtures/dup/main.tf b/config/module/testdata/dup/main.tf similarity index 100% rename from config/module/test-fixtures/dup/main.tf rename to config/module/testdata/dup/main.tf diff --git a/config/module/test-fixtures/registry-load/main.tf b/config/module/testdata/registry-load/main.tf similarity index 100% rename from config/module/test-fixtures/registry-load/main.tf rename to config/module/testdata/registry-load/main.tf diff --git a/config/module/test-fixtures/registry-subdir/main.tf b/config/module/testdata/registry-subdir/main.tf similarity index 100% rename from config/module/test-fixtures/registry-subdir/main.tf rename to config/module/testdata/registry-subdir/main.tf diff --git a/config/module/test-fixtures/registry-tar-subdir/foo.tgz b/config/module/testdata/registry-tar-subdir/foo.tgz similarity index 100% rename from config/module/test-fixtures/registry-tar-subdir/foo.tgz rename to config/module/testdata/registry-tar-subdir/foo.tgz diff --git a/config/module/test-fixtures/registry-tar-subdir/main.tf b/config/module/testdata/registry-tar-subdir/main.tf similarity index 100% rename from config/module/test-fixtures/registry-tar-subdir/main.tf rename to config/module/testdata/registry-tar-subdir/main.tf diff --git a/config/module/test-fixtures/tar-subdir-to-parent/foo.tgz b/config/module/testdata/tar-subdir-to-parent/foo.tgz similarity index 100% rename from config/module/test-fixtures/tar-subdir-to-parent/foo.tgz rename to config/module/testdata/tar-subdir-to-parent/foo.tgz diff --git a/config/module/test-fixtures/tar-subdir-to-parent/main.tf b/config/module/testdata/tar-subdir-to-parent/main.tf similarity index 100% rename from config/module/test-fixtures/tar-subdir-to-parent/main.tf rename to config/module/testdata/tar-subdir-to-parent/main.tf diff --git a/config/module/test-fixtures/validate-alias-bad/child/main.tf b/config/module/testdata/validate-alias-bad/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-alias-bad/child/main.tf rename to config/module/testdata/validate-alias-bad/child/main.tf diff --git a/config/module/test-fixtures/validate-alias-bad/main.tf b/config/module/testdata/validate-alias-bad/main.tf similarity index 100% rename from config/module/test-fixtures/validate-alias-bad/main.tf rename to config/module/testdata/validate-alias-bad/main.tf diff --git a/config/module/test-fixtures/validate-alias-good/child/main.tf b/config/module/testdata/validate-alias-good/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-alias-good/child/main.tf rename to config/module/testdata/validate-alias-good/child/main.tf diff --git a/config/module/test-fixtures/validate-alias-good/main.tf b/config/module/testdata/validate-alias-good/main.tf similarity index 100% rename from config/module/test-fixtures/validate-alias-good/main.tf rename to config/module/testdata/validate-alias-good/main.tf diff --git a/config/module/test-fixtures/validate-bad-output-to-module/child/main.tf b/config/module/testdata/validate-bad-output-to-module/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-output-to-module/child/main.tf rename to config/module/testdata/validate-bad-output-to-module/child/main.tf diff --git a/config/module/test-fixtures/validate-bad-output-to-module/main.tf b/config/module/testdata/validate-bad-output-to-module/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-output-to-module/main.tf rename to config/module/testdata/validate-bad-output-to-module/main.tf diff --git a/config/module/test-fixtures/validate-bad-output/child/main.tf b/config/module/testdata/validate-bad-output/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-output/child/main.tf rename to config/module/testdata/validate-bad-output/child/main.tf diff --git a/config/module/test-fixtures/validate-bad-output/main.tf b/config/module/testdata/validate-bad-output/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-output/main.tf rename to config/module/testdata/validate-bad-output/main.tf diff --git a/config/module/test-fixtures/validate-bad-var/child/main.tf b/config/module/testdata/validate-bad-var/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-var/child/main.tf rename to config/module/testdata/validate-bad-var/child/main.tf diff --git a/config/module/test-fixtures/validate-bad-var/main.tf b/config/module/testdata/validate-bad-var/main.tf similarity index 100% rename from config/module/test-fixtures/validate-bad-var/main.tf rename to config/module/testdata/validate-bad-var/main.tf diff --git a/config/module/test-fixtures/validate-child-bad/child/main.tf b/config/module/testdata/validate-child-bad/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-child-bad/child/main.tf rename to config/module/testdata/validate-child-bad/child/main.tf diff --git a/config/module/test-fixtures/validate-child-bad/main.tf b/config/module/testdata/validate-child-bad/main.tf similarity index 100% rename from config/module/test-fixtures/validate-child-bad/main.tf rename to config/module/testdata/validate-child-bad/main.tf diff --git a/config/module/test-fixtures/validate-child-good/child/main.tf b/config/module/testdata/validate-child-good/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-child-good/child/main.tf rename to config/module/testdata/validate-child-good/child/main.tf diff --git a/config/module/test-fixtures/validate-child-good/main.tf b/config/module/testdata/validate-child-good/main.tf similarity index 100% rename from config/module/test-fixtures/validate-child-good/main.tf rename to config/module/testdata/validate-child-good/main.tf diff --git a/config/module/test-fixtures/validate-module-root-grandchild/child/child/main.tf b/config/module/testdata/validate-module-root-grandchild/child/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-root-grandchild/child/child/main.tf rename to config/module/testdata/validate-module-root-grandchild/child/child/main.tf diff --git a/config/module/test-fixtures/validate-module-root-grandchild/child/main.tf b/config/module/testdata/validate-module-root-grandchild/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-root-grandchild/child/main.tf rename to config/module/testdata/validate-module-root-grandchild/child/main.tf diff --git a/config/module/test-fixtures/validate-module-root-grandchild/main.tf b/config/module/testdata/validate-module-root-grandchild/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-root-grandchild/main.tf rename to config/module/testdata/validate-module-root-grandchild/main.tf diff --git a/config/module/test-fixtures/validate-module-root/child/main.tf b/config/module/testdata/validate-module-root/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-root/child/main.tf rename to config/module/testdata/validate-module-root/child/main.tf diff --git a/config/module/test-fixtures/validate-module-root/main.tf b/config/module/testdata/validate-module-root/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-root/main.tf rename to config/module/testdata/validate-module-root/main.tf diff --git a/config/module/test-fixtures/validate-module-unknown/main.tf b/config/module/testdata/validate-module-unknown/main.tf similarity index 100% rename from config/module/test-fixtures/validate-module-unknown/main.tf rename to config/module/testdata/validate-module-unknown/main.tf diff --git a/config/module/test-fixtures/validate-required-var/child/main.tf b/config/module/testdata/validate-required-var/child/main.tf similarity index 100% rename from config/module/test-fixtures/validate-required-var/child/main.tf rename to config/module/testdata/validate-required-var/child/main.tf diff --git a/config/module/test-fixtures/validate-required-var/main.tf b/config/module/testdata/validate-required-var/main.tf similarity index 100% rename from config/module/test-fixtures/validate-required-var/main.tf rename to config/module/testdata/validate-required-var/main.tf diff --git a/config/module/test-fixtures/validate-root-bad/main.tf b/config/module/testdata/validate-root-bad/main.tf similarity index 100% rename from config/module/test-fixtures/validate-root-bad/main.tf rename to config/module/testdata/validate-root-bad/main.tf diff --git a/config/test-fixtures/.gitattributes b/config/testdata/.gitattributes similarity index 100% rename from config/test-fixtures/.gitattributes rename to config/testdata/.gitattributes diff --git a/config/test-fixtures/attributes.tf b/config/testdata/attributes.tf similarity index 100% rename from config/test-fixtures/attributes.tf rename to config/testdata/attributes.tf diff --git a/config/test-fixtures/attributes.tf.json b/config/testdata/attributes.tf.json similarity index 100% rename from config/test-fixtures/attributes.tf.json rename to config/testdata/attributes.tf.json diff --git a/config/test-fixtures/backend-hash-basic/main.tf b/config/testdata/backend-hash-basic/main.tf similarity index 100% rename from config/test-fixtures/backend-hash-basic/main.tf rename to config/testdata/backend-hash-basic/main.tf diff --git a/config/test-fixtures/backend-hash-empty/main.tf b/config/testdata/backend-hash-empty/main.tf similarity index 100% rename from config/test-fixtures/backend-hash-empty/main.tf rename to config/testdata/backend-hash-empty/main.tf diff --git a/config/test-fixtures/backend-hash-no-terraform/main.tf b/config/testdata/backend-hash-no-terraform/main.tf similarity index 100% rename from config/test-fixtures/backend-hash-no-terraform/main.tf rename to config/testdata/backend-hash-no-terraform/main.tf diff --git a/config/test-fixtures/backend-hash-type-only/main.tf b/config/testdata/backend-hash-type-only/main.tf similarity index 100% rename from config/test-fixtures/backend-hash-type-only/main.tf rename to config/testdata/backend-hash-type-only/main.tf diff --git a/config/test-fixtures/bad-variable-type.tf b/config/testdata/bad-variable-type.tf similarity index 100% rename from config/test-fixtures/bad-variable-type.tf rename to config/testdata/bad-variable-type.tf diff --git a/config/test-fixtures/bad_type.tf.nope b/config/testdata/bad_type.tf.nope similarity index 100% rename from config/test-fixtures/bad_type.tf.nope rename to config/testdata/bad_type.tf.nope diff --git a/config/test-fixtures/basic-hcl2.tf b/config/testdata/basic-hcl2.tf similarity index 100% rename from config/test-fixtures/basic-hcl2.tf rename to config/testdata/basic-hcl2.tf diff --git a/config/test-fixtures/basic.tf b/config/testdata/basic.tf similarity index 100% rename from config/test-fixtures/basic.tf rename to config/testdata/basic.tf diff --git a/config/test-fixtures/basic.tf.json b/config/testdata/basic.tf.json similarity index 100% rename from config/test-fixtures/basic.tf.json rename to config/testdata/basic.tf.json diff --git a/config/test-fixtures/connection.tf b/config/testdata/connection.tf similarity index 100% rename from config/test-fixtures/connection.tf rename to config/testdata/connection.tf diff --git a/config/test-fixtures/copy-basic/main.tf b/config/testdata/copy-basic/main.tf similarity index 100% rename from config/test-fixtures/copy-basic/main.tf rename to config/testdata/copy-basic/main.tf diff --git a/config/test-fixtures/count-int/main.tf b/config/testdata/count-int/main.tf similarity index 100% rename from config/test-fixtures/count-int/main.tf rename to config/testdata/count-int/main.tf diff --git a/config/test-fixtures/count-list/main.tf b/config/testdata/count-list/main.tf similarity index 100% rename from config/test-fixtures/count-list/main.tf rename to config/testdata/count-list/main.tf diff --git a/config/test-fixtures/count-string/main.tf b/config/testdata/count-string/main.tf similarity index 100% rename from config/test-fixtures/count-string/main.tf rename to config/testdata/count-string/main.tf diff --git a/config/test-fixtures/count-var/main.tf b/config/testdata/count-var/main.tf similarity index 100% rename from config/test-fixtures/count-var/main.tf rename to config/testdata/count-var/main.tf diff --git a/config/test-fixtures/create-before-destroy.tf b/config/testdata/create-before-destroy.tf similarity index 100% rename from config/test-fixtures/create-before-destroy.tf rename to config/testdata/create-before-destroy.tf diff --git a/config/test-fixtures/data-count/main.tf b/config/testdata/data-count/main.tf similarity index 100% rename from config/test-fixtures/data-count/main.tf rename to config/testdata/data-count/main.tf diff --git a/config/test-fixtures/data-source-arity-mistake.tf b/config/testdata/data-source-arity-mistake.tf similarity index 100% rename from config/test-fixtures/data-source-arity-mistake.tf rename to config/testdata/data-source-arity-mistake.tf diff --git a/config/test-fixtures/dir-basic/README.md b/config/testdata/dir-basic/README.md similarity index 100% rename from config/test-fixtures/dir-basic/README.md rename to config/testdata/dir-basic/README.md diff --git a/config/test-fixtures/dir-basic/nested/nested.tf b/config/testdata/dir-basic/nested/nested.tf similarity index 100% rename from config/test-fixtures/dir-basic/nested/nested.tf rename to config/testdata/dir-basic/nested/nested.tf diff --git a/config/test-fixtures/dir-basic/one.tf b/config/testdata/dir-basic/one.tf similarity index 100% rename from config/test-fixtures/dir-basic/one.tf rename to config/testdata/dir-basic/one.tf diff --git a/config/test-fixtures/dir-basic/two.tf b/config/testdata/dir-basic/two.tf similarity index 100% rename from config/test-fixtures/dir-basic/two.tf rename to config/testdata/dir-basic/two.tf diff --git a/config/test-fixtures/dir-empty/.gitkeep b/config/testdata/dir-empty/.gitkeep similarity index 100% rename from config/test-fixtures/dir-empty/.gitkeep rename to config/testdata/dir-empty/.gitkeep diff --git a/config/test-fixtures/dir-merge/one.tf b/config/testdata/dir-merge/one.tf similarity index 100% rename from config/test-fixtures/dir-merge/one.tf rename to config/testdata/dir-merge/one.tf diff --git a/config/test-fixtures/dir-merge/two.tf b/config/testdata/dir-merge/two.tf similarity index 100% rename from config/test-fixtures/dir-merge/two.tf rename to config/testdata/dir-merge/two.tf diff --git a/config/test-fixtures/dir-only-override/main_override.tf b/config/testdata/dir-only-override/main_override.tf similarity index 100% rename from config/test-fixtures/dir-only-override/main_override.tf rename to config/testdata/dir-only-override/main_override.tf diff --git a/config/test-fixtures/dir-override-var/main.tf b/config/testdata/dir-override-var/main.tf similarity index 100% rename from config/test-fixtures/dir-override-var/main.tf rename to config/testdata/dir-override-var/main.tf diff --git a/config/test-fixtures/dir-override-var/main_override.tf b/config/testdata/dir-override-var/main_override.tf similarity index 100% rename from config/test-fixtures/dir-override-var/main_override.tf rename to config/testdata/dir-override-var/main_override.tf diff --git a/config/test-fixtures/dir-override/foo_override.tf.json b/config/testdata/dir-override/foo_override.tf.json similarity index 100% rename from config/test-fixtures/dir-override/foo_override.tf.json rename to config/testdata/dir-override/foo_override.tf.json diff --git a/config/test-fixtures/dir-override/one.tf b/config/testdata/dir-override/one.tf similarity index 100% rename from config/test-fixtures/dir-override/one.tf rename to config/testdata/dir-override/one.tf diff --git a/config/test-fixtures/dir-override/override.tf.json b/config/testdata/dir-override/override.tf.json similarity index 100% rename from config/test-fixtures/dir-override/override.tf.json rename to config/testdata/dir-override/override.tf.json diff --git a/config/test-fixtures/dir-override/two.tf b/config/testdata/dir-override/two.tf similarity index 100% rename from config/test-fixtures/dir-override/two.tf rename to config/testdata/dir-override/two.tf diff --git a/config/test-fixtures/dir-temporary-files/#emacs-two.tf# b/config/testdata/dir-temporary-files/#emacs-two.tf# similarity index 100% rename from config/test-fixtures/dir-temporary-files/#emacs-two.tf# rename to config/testdata/dir-temporary-files/#emacs-two.tf# diff --git a/config/test-fixtures/dir-temporary-files/.#emacs-one.tf b/config/testdata/dir-temporary-files/.#emacs-one.tf similarity index 100% rename from config/test-fixtures/dir-temporary-files/.#emacs-one.tf rename to config/testdata/dir-temporary-files/.#emacs-one.tf diff --git a/config/test-fixtures/dir-temporary-files/.hidden.tf b/config/testdata/dir-temporary-files/.hidden.tf similarity index 100% rename from config/test-fixtures/dir-temporary-files/.hidden.tf rename to config/testdata/dir-temporary-files/.hidden.tf diff --git a/config/test-fixtures/dir-temporary-files/vim-one.tf~ b/config/testdata/dir-temporary-files/vim-one.tf~ similarity index 100% rename from config/test-fixtures/dir-temporary-files/vim-one.tf~ rename to config/testdata/dir-temporary-files/vim-one.tf~ diff --git a/config/test-fixtures/empty-collections/main.tf b/config/testdata/empty-collections/main.tf similarity index 100% rename from config/test-fixtures/empty-collections/main.tf rename to config/testdata/empty-collections/main.tf diff --git a/config/test-fixtures/empty.tf b/config/testdata/empty.tf similarity index 100% rename from config/test-fixtures/empty.tf rename to config/testdata/empty.tf diff --git a/config/test-fixtures/escapedquotes.tf b/config/testdata/escapedquotes.tf similarity index 100% rename from config/test-fixtures/escapedquotes.tf rename to config/testdata/escapedquotes.tf diff --git a/config/test-fixtures/git-crypt.tf b/config/testdata/git-crypt.tf similarity index 100% rename from config/test-fixtures/git-crypt.tf rename to config/testdata/git-crypt.tf diff --git a/config/test-fixtures/hcl2-experiment-switch/not-eligible.tf.json b/config/testdata/hcl2-experiment-switch/not-eligible.tf.json similarity index 100% rename from config/test-fixtures/hcl2-experiment-switch/not-eligible.tf.json rename to config/testdata/hcl2-experiment-switch/not-eligible.tf.json diff --git a/config/test-fixtures/hcl2-experiment-switch/not-opted-in.tf b/config/testdata/hcl2-experiment-switch/not-opted-in.tf similarity index 100% rename from config/test-fixtures/hcl2-experiment-switch/not-opted-in.tf rename to config/testdata/hcl2-experiment-switch/not-opted-in.tf diff --git a/config/test-fixtures/hcl2-experiment-switch/opted-in.tf b/config/testdata/hcl2-experiment-switch/opted-in.tf similarity index 100% rename from config/test-fixtures/hcl2-experiment-switch/opted-in.tf rename to config/testdata/hcl2-experiment-switch/opted-in.tf diff --git a/config/test-fixtures/heredoc.tf b/config/testdata/heredoc.tf similarity index 100% rename from config/test-fixtures/heredoc.tf rename to config/testdata/heredoc.tf diff --git a/config/test-fixtures/ignore-changes.tf b/config/testdata/ignore-changes.tf similarity index 100% rename from config/test-fixtures/ignore-changes.tf rename to config/testdata/ignore-changes.tf diff --git a/config/test-fixtures/import.tf b/config/testdata/import.tf similarity index 100% rename from config/test-fixtures/import.tf rename to config/testdata/import.tf diff --git a/config/test-fixtures/import/one.tf b/config/testdata/import/one.tf similarity index 100% rename from config/test-fixtures/import/one.tf rename to config/testdata/import/one.tf diff --git a/config/test-fixtures/interpolations/concat.hcl b/config/testdata/interpolations/concat.hcl similarity index 100% rename from config/test-fixtures/interpolations/concat.hcl rename to config/testdata/interpolations/concat.hcl diff --git a/config/test-fixtures/lifecycle_cbd_typo.tf b/config/testdata/lifecycle_cbd_typo.tf similarity index 100% rename from config/test-fixtures/lifecycle_cbd_typo.tf rename to config/testdata/lifecycle_cbd_typo.tf diff --git a/config/test-fixtures/module-providers/main.tf b/config/testdata/module-providers/main.tf similarity index 100% rename from config/test-fixtures/module-providers/main.tf rename to config/testdata/module-providers/main.tf diff --git a/config/test-fixtures/module-unnamed.tf b/config/testdata/module-unnamed.tf similarity index 100% rename from config/test-fixtures/module-unnamed.tf rename to config/testdata/module-unnamed.tf diff --git a/config/test-fixtures/modules.tf b/config/testdata/modules.tf similarity index 100% rename from config/test-fixtures/modules.tf rename to config/testdata/modules.tf diff --git a/config/test-fixtures/output-depends-on.tf b/config/testdata/output-depends-on.tf similarity index 100% rename from config/test-fixtures/output-depends-on.tf rename to config/testdata/output-depends-on.tf diff --git a/config/test-fixtures/output-no-warnings/main.tf b/config/testdata/output-no-warnings/main.tf similarity index 100% rename from config/test-fixtures/output-no-warnings/main.tf rename to config/testdata/output-no-warnings/main.tf diff --git a/config/test-fixtures/output-unnamed.tf b/config/testdata/output-unnamed.tf similarity index 100% rename from config/test-fixtures/output-unnamed.tf rename to config/testdata/output-unnamed.tf diff --git a/config/test-fixtures/output-warnings/main.tf b/config/testdata/output-warnings/main.tf similarity index 100% rename from config/test-fixtures/output-warnings/main.tf rename to config/testdata/output-warnings/main.tf diff --git a/config/test-fixtures/prevent-destroy-string.tf b/config/testdata/prevent-destroy-string.tf similarity index 100% rename from config/test-fixtures/prevent-destroy-string.tf rename to config/testdata/prevent-destroy-string.tf diff --git a/config/test-fixtures/provider-version-invalid/main.tf b/config/testdata/provider-version-invalid/main.tf similarity index 100% rename from config/test-fixtures/provider-version-invalid/main.tf rename to config/testdata/provider-version-invalid/main.tf diff --git a/config/test-fixtures/provider-version/main.tf b/config/testdata/provider-version/main.tf similarity index 100% rename from config/test-fixtures/provider-version/main.tf rename to config/testdata/provider-version/main.tf diff --git a/config/test-fixtures/provisioners-destroy.tf b/config/testdata/provisioners-destroy.tf similarity index 100% rename from config/test-fixtures/provisioners-destroy.tf rename to config/testdata/provisioners-destroy.tf diff --git a/config/test-fixtures/provisioners.tf b/config/testdata/provisioners.tf similarity index 100% rename from config/test-fixtures/provisioners.tf rename to config/testdata/provisioners.tf diff --git a/config/test-fixtures/resource-arity-mistake.tf b/config/testdata/resource-arity-mistake.tf similarity index 100% rename from config/test-fixtures/resource-arity-mistake.tf rename to config/testdata/resource-arity-mistake.tf diff --git a/config/test-fixtures/resource-multi-lifecycle.tf b/config/testdata/resource-multi-lifecycle.tf similarity index 100% rename from config/test-fixtures/resource-multi-lifecycle.tf rename to config/testdata/resource-multi-lifecycle.tf diff --git a/config/test-fixtures/resource-no-name.tf.json b/config/testdata/resource-no-name.tf.json similarity index 100% rename from config/test-fixtures/resource-no-name.tf.json rename to config/testdata/resource-no-name.tf.json diff --git a/config/test-fixtures/terraform-backend-2.tf.json b/config/testdata/terraform-backend-2.tf.json similarity index 100% rename from config/test-fixtures/terraform-backend-2.tf.json rename to config/testdata/terraform-backend-2.tf.json diff --git a/config/test-fixtures/terraform-backend-multi.tf b/config/testdata/terraform-backend-multi.tf similarity index 100% rename from config/test-fixtures/terraform-backend-multi.tf rename to config/testdata/terraform-backend-multi.tf diff --git a/config/test-fixtures/terraform-backend.tf b/config/testdata/terraform-backend.tf similarity index 100% rename from config/test-fixtures/terraform-backend.tf rename to config/testdata/terraform-backend.tf diff --git a/config/test-fixtures/terraform-backend.tf.json b/config/testdata/terraform-backend.tf.json similarity index 100% rename from config/test-fixtures/terraform-backend.tf.json rename to config/testdata/terraform-backend.tf.json diff --git a/config/test-fixtures/validate-backend-interpolate/main.tf b/config/testdata/validate-backend-interpolate/main.tf similarity index 100% rename from config/test-fixtures/validate-backend-interpolate/main.tf rename to config/testdata/validate-backend-interpolate/main.tf diff --git a/config/test-fixtures/validate-bad-depends-on/main.tf b/config/testdata/validate-bad-depends-on/main.tf similarity index 100% rename from config/test-fixtures/validate-bad-depends-on/main.tf rename to config/testdata/validate-bad-depends-on/main.tf diff --git a/config/test-fixtures/validate-bad-multi-resource/main.tf b/config/testdata/validate-bad-multi-resource/main.tf similarity index 100% rename from config/test-fixtures/validate-bad-multi-resource/main.tf rename to config/testdata/validate-bad-multi-resource/main.tf diff --git a/config/test-fixtures/validate-bad-tf-version/main.tf b/config/testdata/validate-bad-tf-version/main.tf similarity index 100% rename from config/test-fixtures/validate-bad-tf-version/main.tf rename to config/testdata/validate-bad-tf-version/main.tf diff --git a/config/test-fixtures/validate-basic-provisioners/main.tf b/config/testdata/validate-basic-provisioners/main.tf similarity index 100% rename from config/test-fixtures/validate-basic-provisioners/main.tf rename to config/testdata/validate-basic-provisioners/main.tf diff --git a/config/test-fixtures/validate-count-bad-context/main.tf b/config/testdata/validate-count-bad-context/main.tf similarity index 100% rename from config/test-fixtures/validate-count-bad-context/main.tf rename to config/testdata/validate-count-bad-context/main.tf diff --git a/config/test-fixtures/validate-count-below-zero/main.tf b/config/testdata/validate-count-below-zero/main.tf similarity index 100% rename from config/test-fixtures/validate-count-below-zero/main.tf rename to config/testdata/validate-count-below-zero/main.tf diff --git a/config/test-fixtures/validate-count-count-var/main.tf b/config/testdata/validate-count-count-var/main.tf similarity index 100% rename from config/test-fixtures/validate-count-count-var/main.tf rename to config/testdata/validate-count-count-var/main.tf diff --git a/config/test-fixtures/validate-count-int/main.tf b/config/testdata/validate-count-int/main.tf similarity index 100% rename from config/test-fixtures/validate-count-int/main.tf rename to config/testdata/validate-count-int/main.tf diff --git a/config/test-fixtures/validate-count-module-var/main.tf b/config/testdata/validate-count-module-var/main.tf similarity index 100% rename from config/test-fixtures/validate-count-module-var/main.tf rename to config/testdata/validate-count-module-var/main.tf diff --git a/config/test-fixtures/validate-count-not-int-const/main.tf b/config/testdata/validate-count-not-int-const/main.tf similarity index 100% rename from config/test-fixtures/validate-count-not-int-const/main.tf rename to config/testdata/validate-count-not-int-const/main.tf diff --git a/config/test-fixtures/validate-count-not-int/main.tf b/config/testdata/validate-count-not-int/main.tf similarity index 100% rename from config/test-fixtures/validate-count-not-int/main.tf rename to config/testdata/validate-count-not-int/main.tf diff --git a/config/test-fixtures/validate-count-resource-var-multi/main.tf b/config/testdata/validate-count-resource-var-multi/main.tf similarity index 100% rename from config/test-fixtures/validate-count-resource-var-multi/main.tf rename to config/testdata/validate-count-resource-var-multi/main.tf diff --git a/config/test-fixtures/validate-count-resource-var/main.tf b/config/testdata/validate-count-resource-var/main.tf similarity index 100% rename from config/test-fixtures/validate-count-resource-var/main.tf rename to config/testdata/validate-count-resource-var/main.tf diff --git a/config/test-fixtures/validate-count-user-var/main.tf b/config/testdata/validate-count-user-var/main.tf similarity index 100% rename from config/test-fixtures/validate-count-user-var/main.tf rename to config/testdata/validate-count-user-var/main.tf diff --git a/config/test-fixtures/validate-count-var-invalid/main.tf b/config/testdata/validate-count-var-invalid/main.tf similarity index 100% rename from config/test-fixtures/validate-count-var-invalid/main.tf rename to config/testdata/validate-count-var-invalid/main.tf diff --git a/config/test-fixtures/validate-count-var-unknown/main.tf b/config/testdata/validate-count-var-unknown/main.tf similarity index 100% rename from config/test-fixtures/validate-count-var-unknown/main.tf rename to config/testdata/validate-count-var-unknown/main.tf diff --git a/config/test-fixtures/validate-count-var/main.tf b/config/testdata/validate-count-var/main.tf similarity index 100% rename from config/test-fixtures/validate-count-var/main.tf rename to config/testdata/validate-count-var/main.tf diff --git a/config/test-fixtures/validate-count-zero/main.tf b/config/testdata/validate-count-zero/main.tf similarity index 100% rename from config/test-fixtures/validate-count-zero/main.tf rename to config/testdata/validate-count-zero/main.tf diff --git a/config/test-fixtures/validate-data-provisioner/main.tf b/config/testdata/validate-data-provisioner/main.tf similarity index 100% rename from config/test-fixtures/validate-data-provisioner/main.tf rename to config/testdata/validate-data-provisioner/main.tf diff --git a/config/test-fixtures/validate-depends-on-bad-module/main.tf b/config/testdata/validate-depends-on-bad-module/main.tf similarity index 100% rename from config/test-fixtures/validate-depends-on-bad-module/main.tf rename to config/testdata/validate-depends-on-bad-module/main.tf diff --git a/config/test-fixtures/validate-depends-on-module/main.tf b/config/testdata/validate-depends-on-module/main.tf similarity index 100% rename from config/test-fixtures/validate-depends-on-module/main.tf rename to config/testdata/validate-depends-on-module/main.tf diff --git a/config/test-fixtures/validate-depends-on-var/main.tf b/config/testdata/validate-depends-on-var/main.tf similarity index 100% rename from config/test-fixtures/validate-depends-on-var/main.tf rename to config/testdata/validate-depends-on-var/main.tf diff --git a/config/test-fixtures/validate-dup-module/main.tf b/config/testdata/validate-dup-module/main.tf similarity index 100% rename from config/test-fixtures/validate-dup-module/main.tf rename to config/testdata/validate-dup-module/main.tf diff --git a/config/test-fixtures/validate-dup-resource/main.tf b/config/testdata/validate-dup-resource/main.tf similarity index 100% rename from config/test-fixtures/validate-dup-resource/main.tf rename to config/testdata/validate-dup-resource/main.tf diff --git a/config/test-fixtures/validate-good/main.tf b/config/testdata/validate-good/main.tf similarity index 100% rename from config/test-fixtures/validate-good/main.tf rename to config/testdata/validate-good/main.tf diff --git a/config/test-fixtures/validate-ignore-changes-bad/main.tf b/config/testdata/validate-ignore-changes-bad/main.tf similarity index 100% rename from config/test-fixtures/validate-ignore-changes-bad/main.tf rename to config/testdata/validate-ignore-changes-bad/main.tf diff --git a/config/test-fixtures/validate-ignore-changes-interpolate/main.tf b/config/testdata/validate-ignore-changes-interpolate/main.tf similarity index 100% rename from config/test-fixtures/validate-ignore-changes-interpolate/main.tf rename to config/testdata/validate-ignore-changes-interpolate/main.tf diff --git a/config/test-fixtures/validate-ignore-changes/main.tf b/config/testdata/validate-ignore-changes/main.tf similarity index 100% rename from config/test-fixtures/validate-ignore-changes/main.tf rename to config/testdata/validate-ignore-changes/main.tf diff --git a/config/test-fixtures/validate-local-multi-file/local-def.tf b/config/testdata/validate-local-multi-file/local-def.tf similarity index 100% rename from config/test-fixtures/validate-local-multi-file/local-def.tf rename to config/testdata/validate-local-multi-file/local-def.tf diff --git a/config/test-fixtures/validate-local-multi-file/local-use.tf b/config/testdata/validate-local-multi-file/local-use.tf similarity index 100% rename from config/test-fixtures/validate-local-multi-file/local-use.tf rename to config/testdata/validate-local-multi-file/local-use.tf diff --git a/config/test-fixtures/validate-local-value-count/main.tf b/config/testdata/validate-local-value-count/main.tf similarity index 100% rename from config/test-fixtures/validate-local-value-count/main.tf rename to config/testdata/validate-local-value-count/main.tf diff --git a/config/test-fixtures/validate-missing-provider/main.tf b/config/testdata/validate-missing-provider/main.tf similarity index 100% rename from config/test-fixtures/validate-missing-provider/main.tf rename to config/testdata/validate-missing-provider/main.tf diff --git a/config/test-fixtures/validate-module-name-bad/main.tf b/config/testdata/validate-module-name-bad/main.tf similarity index 100% rename from config/test-fixtures/validate-module-name-bad/main.tf rename to config/testdata/validate-module-name-bad/main.tf diff --git a/config/test-fixtures/validate-module-source-var/main.tf b/config/testdata/validate-module-source-var/main.tf similarity index 100% rename from config/test-fixtures/validate-module-source-var/main.tf rename to config/testdata/validate-module-source-var/main.tf diff --git a/config/test-fixtures/validate-module-var-int/main.tf b/config/testdata/validate-module-var-int/main.tf similarity index 100% rename from config/test-fixtures/validate-module-var-int/main.tf rename to config/testdata/validate-module-var-int/main.tf diff --git a/config/test-fixtures/validate-module-var-list/main.tf b/config/testdata/validate-module-var-list/main.tf similarity index 100% rename from config/test-fixtures/validate-module-var-list/main.tf rename to config/testdata/validate-module-var-list/main.tf diff --git a/config/test-fixtures/validate-module-var-map/main.tf b/config/testdata/validate-module-var-map/main.tf similarity index 100% rename from config/test-fixtures/validate-module-var-map/main.tf rename to config/testdata/validate-module-var-map/main.tf diff --git a/config/test-fixtures/validate-module-var-self/main.tf b/config/testdata/validate-module-var-self/main.tf similarity index 100% rename from config/test-fixtures/validate-module-var-self/main.tf rename to config/testdata/validate-module-var-self/main.tf diff --git a/config/test-fixtures/validate-output-bad-field/main.tf b/config/testdata/validate-output-bad-field/main.tf similarity index 100% rename from config/test-fixtures/validate-output-bad-field/main.tf rename to config/testdata/validate-output-bad-field/main.tf diff --git a/config/test-fixtures/validate-output-description/main.tf b/config/testdata/validate-output-description/main.tf similarity index 100% rename from config/test-fixtures/validate-output-description/main.tf rename to config/testdata/validate-output-description/main.tf diff --git a/config/test-fixtures/validate-output-dup/main.tf b/config/testdata/validate-output-dup/main.tf similarity index 100% rename from config/test-fixtures/validate-output-dup/main.tf rename to config/testdata/validate-output-dup/main.tf diff --git a/config/test-fixtures/validate-path-var-invalid/main.tf b/config/testdata/validate-path-var-invalid/main.tf similarity index 100% rename from config/test-fixtures/validate-path-var-invalid/main.tf rename to config/testdata/validate-path-var-invalid/main.tf diff --git a/config/test-fixtures/validate-path-var/main.tf b/config/testdata/validate-path-var/main.tf similarity index 100% rename from config/test-fixtures/validate-path-var/main.tf rename to config/testdata/validate-path-var/main.tf diff --git a/config/test-fixtures/validate-prov-conn-splat-other/main.tf b/config/testdata/validate-prov-conn-splat-other/main.tf similarity index 100% rename from config/test-fixtures/validate-prov-conn-splat-other/main.tf rename to config/testdata/validate-prov-conn-splat-other/main.tf diff --git a/config/test-fixtures/validate-prov-conn-splat-self/main.tf b/config/testdata/validate-prov-conn-splat-self/main.tf similarity index 100% rename from config/test-fixtures/validate-prov-conn-splat-self/main.tf rename to config/testdata/validate-prov-conn-splat-self/main.tf diff --git a/config/test-fixtures/validate-prov-splat-other/main.tf b/config/testdata/validate-prov-splat-other/main.tf similarity index 100% rename from config/test-fixtures/validate-prov-splat-other/main.tf rename to config/testdata/validate-prov-splat-other/main.tf diff --git a/config/test-fixtures/validate-prov-splat-self/main.tf b/config/testdata/validate-prov-splat-self/main.tf similarity index 100% rename from config/test-fixtures/validate-prov-splat-self/main.tf rename to config/testdata/validate-prov-splat-self/main.tf diff --git a/config/test-fixtures/validate-provider-multi-good/main.tf b/config/testdata/validate-provider-multi-good/main.tf similarity index 100% rename from config/test-fixtures/validate-provider-multi-good/main.tf rename to config/testdata/validate-provider-multi-good/main.tf diff --git a/config/test-fixtures/validate-provider-multi-ref-bad/main.tf b/config/testdata/validate-provider-multi-ref-bad/main.tf similarity index 100% rename from config/test-fixtures/validate-provider-multi-ref-bad/main.tf rename to config/testdata/validate-provider-multi-ref-bad/main.tf diff --git a/config/test-fixtures/validate-provider-multi-ref-good/main.tf b/config/testdata/validate-provider-multi-ref-good/main.tf similarity index 100% rename from config/test-fixtures/validate-provider-multi-ref-good/main.tf rename to config/testdata/validate-provider-multi-ref-good/main.tf diff --git a/config/test-fixtures/validate-provider-multi/main.tf b/config/testdata/validate-provider-multi/main.tf similarity index 100% rename from config/test-fixtures/validate-provider-multi/main.tf rename to config/testdata/validate-provider-multi/main.tf diff --git a/config/test-fixtures/validate-provider-version-invalid/main.tf b/config/testdata/validate-provider-version-invalid/main.tf similarity index 100% rename from config/test-fixtures/validate-provider-version-invalid/main.tf rename to config/testdata/validate-provider-version-invalid/main.tf diff --git a/config/test-fixtures/validate-resource-prov-self/main.tf b/config/testdata/validate-resource-prov-self/main.tf similarity index 100% rename from config/test-fixtures/validate-resource-prov-self/main.tf rename to config/testdata/validate-resource-prov-self/main.tf diff --git a/config/test-fixtures/validate-resource-self/main.tf b/config/testdata/validate-resource-self/main.tf similarity index 100% rename from config/test-fixtures/validate-resource-self/main.tf rename to config/testdata/validate-resource-self/main.tf diff --git a/config/test-fixtures/validate-tf-version-interp/main.tf b/config/testdata/validate-tf-version-interp/main.tf similarity index 100% rename from config/test-fixtures/validate-tf-version-interp/main.tf rename to config/testdata/validate-tf-version-interp/main.tf diff --git a/config/test-fixtures/validate-tf-version/main.tf b/config/testdata/validate-tf-version/main.tf similarity index 100% rename from config/test-fixtures/validate-tf-version/main.tf rename to config/testdata/validate-tf-version/main.tf diff --git a/config/test-fixtures/validate-unknown-resource-var-output/main.tf b/config/testdata/validate-unknown-resource-var-output/main.tf similarity index 100% rename from config/test-fixtures/validate-unknown-resource-var-output/main.tf rename to config/testdata/validate-unknown-resource-var-output/main.tf diff --git a/config/test-fixtures/validate-unknown-resource-var/main.tf b/config/testdata/validate-unknown-resource-var/main.tf similarity index 100% rename from config/test-fixtures/validate-unknown-resource-var/main.tf rename to config/testdata/validate-unknown-resource-var/main.tf diff --git a/config/test-fixtures/validate-unknownthing/main.tf b/config/testdata/validate-unknownthing/main.tf similarity index 100% rename from config/test-fixtures/validate-unknownthing/main.tf rename to config/testdata/validate-unknownthing/main.tf diff --git a/config/test-fixtures/validate-unknownvar-count/main.tf b/config/testdata/validate-unknownvar-count/main.tf similarity index 100% rename from config/test-fixtures/validate-unknownvar-count/main.tf rename to config/testdata/validate-unknownvar-count/main.tf diff --git a/config/test-fixtures/validate-unknownvar/main.tf b/config/testdata/validate-unknownvar/main.tf similarity index 100% rename from config/test-fixtures/validate-unknownvar/main.tf rename to config/testdata/validate-unknownvar/main.tf diff --git a/config/test-fixtures/validate-var-default-interpolate-escaped/main.tf b/config/testdata/validate-var-default-interpolate-escaped/main.tf similarity index 100% rename from config/test-fixtures/validate-var-default-interpolate-escaped/main.tf rename to config/testdata/validate-var-default-interpolate-escaped/main.tf diff --git a/config/test-fixtures/validate-var-default-interpolate/main.tf b/config/testdata/validate-var-default-interpolate/main.tf similarity index 100% rename from config/test-fixtures/validate-var-default-interpolate/main.tf rename to config/testdata/validate-var-default-interpolate/main.tf diff --git a/config/test-fixtures/validate-var-default-list-type/main.tf b/config/testdata/validate-var-default-list-type/main.tf similarity index 100% rename from config/test-fixtures/validate-var-default-list-type/main.tf rename to config/testdata/validate-var-default-list-type/main.tf diff --git a/config/test-fixtures/validate-var-default/main.tf b/config/testdata/validate-var-default/main.tf similarity index 100% rename from config/test-fixtures/validate-var-default/main.tf rename to config/testdata/validate-var-default/main.tf diff --git a/config/test-fixtures/validate-var-dup/main.tf b/config/testdata/validate-var-dup/main.tf similarity index 100% rename from config/test-fixtures/validate-var-dup/main.tf rename to config/testdata/validate-var-dup/main.tf diff --git a/config/test-fixtures/validate-var-module-invalid/main.tf b/config/testdata/validate-var-module-invalid/main.tf similarity index 100% rename from config/test-fixtures/validate-var-module-invalid/main.tf rename to config/testdata/validate-var-module-invalid/main.tf diff --git a/config/test-fixtures/validate-var-module/main.tf b/config/testdata/validate-var-module/main.tf similarity index 100% rename from config/test-fixtures/validate-var-module/main.tf rename to config/testdata/validate-var-module/main.tf diff --git a/config/test-fixtures/validate-var-multi-exact-non-slice/main.tf b/config/testdata/validate-var-multi-exact-non-slice/main.tf similarity index 100% rename from config/test-fixtures/validate-var-multi-exact-non-slice/main.tf rename to config/testdata/validate-var-multi-exact-non-slice/main.tf diff --git a/config/test-fixtures/validate-var-multi-func/main.tf b/config/testdata/validate-var-multi-func/main.tf similarity index 100% rename from config/test-fixtures/validate-var-multi-func/main.tf rename to config/testdata/validate-var-multi-func/main.tf diff --git a/config/test-fixtures/validate-var-nested/main.tf b/config/testdata/validate-var-nested/main.tf similarity index 100% rename from config/test-fixtures/validate-var-nested/main.tf rename to config/testdata/validate-var-nested/main.tf diff --git a/config/test-fixtures/var-invalid-key.tf b/config/testdata/var-invalid-key.tf similarity index 100% rename from config/test-fixtures/var-invalid-key.tf rename to config/testdata/var-invalid-key.tf diff --git a/config/test-fixtures/var_int.tf b/config/testdata/var_int.tf similarity index 100% rename from config/test-fixtures/var_int.tf rename to config/testdata/var_int.tf diff --git a/config/test-fixtures/var_int_bare.tf b/config/testdata/var_int_bare.tf similarity index 100% rename from config/test-fixtures/var_int_bare.tf rename to config/testdata/var_int_bare.tf diff --git a/config/test-fixtures/variable-mismatched-type.tf b/config/testdata/variable-mismatched-type.tf similarity index 100% rename from config/test-fixtures/variable-mismatched-type.tf rename to config/testdata/variable-mismatched-type.tf diff --git a/config/test-fixtures/variable-no-name.tf b/config/testdata/variable-no-name.tf similarity index 100% rename from config/test-fixtures/variable-no-name.tf rename to config/testdata/variable-no-name.tf diff --git a/config/test-fixtures/variables.tf b/config/testdata/variables.tf similarity index 100% rename from config/test-fixtures/variables.tf rename to config/testdata/variables.tf diff --git a/config/test-fixtures/windows-line-endings.tf b/config/testdata/windows-line-endings.tf similarity index 100% rename from config/test-fixtures/windows-line-endings.tf rename to config/testdata/windows-line-endings.tf diff --git a/config_test.go b/config_test.go index d48cfddd29..34c7a12fc7 100644 --- a/config_test.go +++ b/config_test.go @@ -10,7 +10,7 @@ import ( ) // This is the directory where our test fixtures are. -const fixtureDir = "./test-fixtures" +const fixtureDir = "./testdata" func TestLoadConfig(t *testing.T) { c, err := loadConfigFile(filepath.Join(fixtureDir, "config")) diff --git a/configs/config_build_test.go b/configs/config_build_test.go index 1e409d8469..95abe94d25 100644 --- a/configs/config_build_test.go +++ b/configs/config_build_test.go @@ -16,7 +16,7 @@ import ( func TestBuildConfig(t *testing.T) { parser := NewParser(nil) - mod, diags := parser.LoadConfigDir("test-fixtures/config-build") + mod, diags := parser.LoadConfigDir("testdata/config-build") assertNoDiagnostics(t, diags) if mod == nil { t.Fatal("got nil root module; want non-nil") @@ -29,7 +29,7 @@ func TestBuildConfig(t *testing.T) { // SourceAddr as a path relative to our fixture directory. // A "real" implementation of ModuleWalker should accept the // various different source address syntaxes Terraform supports. - sourcePath := filepath.Join("test-fixtures/config-build", req.SourceAddr) + sourcePath := filepath.Join("testdata/config-build", req.SourceAddr) mod, diags := parser.LoadConfigDir(sourcePath) version, _ := version.NewVersion(fmt.Sprintf("1.0.%d", versionI)) diff --git a/configs/config_test.go b/configs/config_test.go index f2c03db8bf..7e9f9e130f 100644 --- a/configs/config_test.go +++ b/configs/config_test.go @@ -7,7 +7,7 @@ import ( ) func TestConfigProviderTypes(t *testing.T) { - mod, diags := testModuleFromFile("test-fixtures/valid-files/providers-explicit-implied.tf") + mod, diags := testModuleFromFile("testdata/valid-files/providers-explicit-implied.tf") if diags.HasErrors() { t.Fatal(diags.Error()) } diff --git a/configs/configload/loader_load_test.go b/configs/configload/loader_load_test.go index 62fc1069b7..8a56c7551b 100644 --- a/configs/configload/loader_load_test.go +++ b/configs/configload/loader_load_test.go @@ -14,7 +14,7 @@ import ( ) func TestLoaderLoadConfig_okay(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/already-installed") + fixtureDir := filepath.Clean("testdata/already-installed") loader, err := NewLoader(&Config{ ModulesDir: filepath.Join(fixtureDir, ".terraform/modules"), }) @@ -62,7 +62,7 @@ func TestLoaderLoadConfig_okay(t *testing.T) { func TestLoaderLoadConfig_addVersion(t *testing.T) { // This test is for what happens when there is a version constraint added // to a module that previously didn't have one. - fixtureDir := filepath.Clean("test-fixtures/add-version-constraint") + fixtureDir := filepath.Clean("testdata/add-version-constraint") loader, err := NewLoader(&Config{ ModulesDir: filepath.Join(fixtureDir, ".terraform/modules"), }) diff --git a/configs/configload/loader_snapshot_test.go b/configs/configload/loader_snapshot_test.go index cb70d864d2..24e41bafc4 100644 --- a/configs/configload/loader_snapshot_test.go +++ b/configs/configload/loader_snapshot_test.go @@ -10,7 +10,7 @@ import ( ) func TestLoadConfigWithSnapshot(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/already-installed") + fixtureDir := filepath.Clean("testdata/already-installed") loader, err := NewLoader(&Config{ ModulesDir: filepath.Join(fixtureDir, ".terraform/modules"), }) @@ -32,11 +32,11 @@ func TestLoadConfigWithSnapshot(t *testing.T) { gotModuleDirs[k] = m.Dir } wantModuleDirs := map[string]string{ - "": "test-fixtures/already-installed", - "child_a": "test-fixtures/already-installed/.terraform/modules/child_a", - "child_a.child_c": "test-fixtures/already-installed/.terraform/modules/child_a/child_c", - "child_b": "test-fixtures/already-installed/.terraform/modules/child_b", - "child_b.child_d": "test-fixtures/already-installed/.terraform/modules/child_b.child_d", + "": "testdata/already-installed", + "child_a": "testdata/already-installed/.terraform/modules/child_a", + "child_a.child_c": "testdata/already-installed/.terraform/modules/child_a/child_c", + "child_b": "testdata/already-installed/.terraform/modules/child_b", + "child_b.child_d": "testdata/already-installed/.terraform/modules/child_b.child_d", } problems := deep.Equal(wantModuleDirs, gotModuleDirs) @@ -50,7 +50,7 @@ func TestLoadConfigWithSnapshot(t *testing.T) { gotRoot := got.Modules[""] wantRoot := &SnapshotModule{ - Dir: "test-fixtures/already-installed", + Dir: "testdata/already-installed", Files: map[string][]byte{ "root.tf": []byte(` module "child_a" { @@ -72,7 +72,7 @@ module "child_b" { } func TestSnapshotRoundtrip(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/already-installed") + fixtureDir := filepath.Clean("testdata/already-installed") loader, err := NewLoader(&Config{ ModulesDir: filepath.Join(fixtureDir, ".terraform/modules"), }) @@ -99,7 +99,7 @@ func TestSnapshotRoundtrip(t *testing.T) { if config.Module == nil { t.Fatalf("config has no root module") } - if got, want := config.Module.SourceDir, "test-fixtures/already-installed"; got != want { + if got, want := config.Module.SourceDir, "testdata/already-installed"; got != want { t.Errorf("wrong root module sourcedir %q; want %q", got, want) } if got, want := len(config.Module.ModuleCalls), 2; got != want { @@ -112,7 +112,7 @@ func TestSnapshotRoundtrip(t *testing.T) { if childA.Module == nil { t.Fatalf("child_a config has no module") } - if got, want := childA.Module.SourceDir, "test-fixtures/already-installed/.terraform/modules/child_a"; got != want { + if got, want := childA.Module.SourceDir, "testdata/already-installed/.terraform/modules/child_a"; got != want { t.Errorf("wrong child_a sourcedir %q; want %q", got, want) } if got, want := len(childA.Module.ModuleCalls), 1; got != want { diff --git a/configs/configload/test-fixtures/already-installed/.terraform/modules/modules.json b/configs/configload/test-fixtures/already-installed/.terraform/modules/modules.json deleted file mode 100644 index 454e719ab6..0000000000 --- a/configs/configload/test-fixtures/already-installed/.terraform/modules/modules.json +++ /dev/null @@ -1 +0,0 @@ -{"Modules":[{"Key":"","Source":"","Dir":"test-fixtures/already-installed"},{"Key":"child_a","Source":"example.com/foo/bar_a/baz","Version":"1.0.1","Dir":"test-fixtures/already-installed/.terraform/modules/child_a"},{"Key":"child_b","Source":"example.com/foo/bar_b/baz","Version":"1.0.0","Dir":"test-fixtures/already-installed/.terraform/modules/child_b"},{"Key":"child_a.child_c","Source":"./child_c","Dir":"test-fixtures/already-installed/.terraform/modules/child_a/child_c"},{"Key":"child_b.child_d","Source":"example.com/foo/bar_d/baz","Version":"1.2.0","Dir":"test-fixtures/already-installed/.terraform/modules/child_b.child_d"}]} \ No newline at end of file diff --git a/configs/configload/test-fixtures/add-version-constraint/.terraform/modules/child/empty.tf b/configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf similarity index 100% rename from configs/configload/test-fixtures/add-version-constraint/.terraform/modules/child/empty.tf rename to configs/configload/testdata/add-version-constraint/.terraform/modules/child/empty.tf diff --git a/configs/configload/test-fixtures/add-version-constraint/.terraform/modules/modules.json b/configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json similarity index 59% rename from configs/configload/test-fixtures/add-version-constraint/.terraform/modules/modules.json rename to configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json index addc19b783..c02f40016b 100644 --- a/configs/configload/test-fixtures/add-version-constraint/.terraform/modules/modules.json +++ b/configs/configload/testdata/add-version-constraint/.terraform/modules/modules.json @@ -3,12 +3,12 @@ { "Key": "", "Source": "", - "Dir": "test-fixtures/add-version-constraint" + "Dir": "testdata/add-version-constraint" }, { "Key": "child", "Source": "hashicorp/module-installer-acctest/aws", - "Dir": "test-fixtures/add-version-constraint/.terraform/modules/child" + "Dir": "testdata/add-version-constraint/.terraform/modules/child" } ] } diff --git a/configs/configload/test-fixtures/add-version-constraint/add-version-constraint.tf b/configs/configload/testdata/add-version-constraint/add-version-constraint.tf similarity index 100% rename from configs/configload/test-fixtures/add-version-constraint/add-version-constraint.tf rename to configs/configload/testdata/add-version-constraint/add-version-constraint.tf diff --git a/configs/configload/test-fixtures/already-installed/.terraform/modules/child_a/child_a.tf b/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf similarity index 100% rename from configs/configload/test-fixtures/already-installed/.terraform/modules/child_a/child_a.tf rename to configs/configload/testdata/already-installed/.terraform/modules/child_a/child_a.tf diff --git a/configs/configload/test-fixtures/already-installed/.terraform/modules/child_a/child_c/child_c.tf b/configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf similarity index 100% rename from configs/configload/test-fixtures/already-installed/.terraform/modules/child_a/child_c/child_c.tf rename to configs/configload/testdata/already-installed/.terraform/modules/child_a/child_c/child_c.tf diff --git a/configs/configload/test-fixtures/already-installed/.terraform/modules/child_b.child_d/child_d.tf b/configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf similarity index 100% rename from configs/configload/test-fixtures/already-installed/.terraform/modules/child_b.child_d/child_d.tf rename to configs/configload/testdata/already-installed/.terraform/modules/child_b.child_d/child_d.tf diff --git a/configs/configload/test-fixtures/already-installed/.terraform/modules/child_b/child_b.tf b/configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf similarity index 100% rename from configs/configload/test-fixtures/already-installed/.terraform/modules/child_b/child_b.tf rename to configs/configload/testdata/already-installed/.terraform/modules/child_b/child_b.tf diff --git a/configs/configload/testdata/already-installed/.terraform/modules/modules.json b/configs/configload/testdata/already-installed/.terraform/modules/modules.json new file mode 100644 index 0000000000..43439865a9 --- /dev/null +++ b/configs/configload/testdata/already-installed/.terraform/modules/modules.json @@ -0,0 +1 @@ +{"Modules":[{"Key":"","Source":"","Dir":"testdata/already-installed"},{"Key":"child_a","Source":"example.com/foo/bar_a/baz","Version":"1.0.1","Dir":"testdata/already-installed/.terraform/modules/child_a"},{"Key":"child_b","Source":"example.com/foo/bar_b/baz","Version":"1.0.0","Dir":"testdata/already-installed/.terraform/modules/child_b"},{"Key":"child_a.child_c","Source":"./child_c","Dir":"testdata/already-installed/.terraform/modules/child_a/child_c"},{"Key":"child_b.child_d","Source":"example.com/foo/bar_d/baz","Version":"1.2.0","Dir":"testdata/already-installed/.terraform/modules/child_b.child_d"}]} \ No newline at end of file diff --git a/configs/configload/test-fixtures/already-installed/root.tf b/configs/configload/testdata/already-installed/root.tf similarity index 100% rename from configs/configload/test-fixtures/already-installed/root.tf rename to configs/configload/testdata/already-installed/root.tf diff --git a/configs/configload/test-fixtures/empty/.gitignore b/configs/configload/testdata/empty/.gitignore similarity index 100% rename from configs/configload/test-fixtures/empty/.gitignore rename to configs/configload/testdata/empty/.gitignore diff --git a/configs/configload/test-fixtures/go-getter-modules/.gitignore b/configs/configload/testdata/go-getter-modules/.gitignore similarity index 100% rename from configs/configload/test-fixtures/go-getter-modules/.gitignore rename to configs/configload/testdata/go-getter-modules/.gitignore diff --git a/configs/configload/test-fixtures/go-getter-modules/root.tf b/configs/configload/testdata/go-getter-modules/root.tf similarity index 100% rename from configs/configload/test-fixtures/go-getter-modules/root.tf rename to configs/configload/testdata/go-getter-modules/root.tf diff --git a/configs/configload/test-fixtures/local-modules/child_a/child_a.tf b/configs/configload/testdata/local-modules/child_a/child_a.tf similarity index 100% rename from configs/configload/test-fixtures/local-modules/child_a/child_a.tf rename to configs/configload/testdata/local-modules/child_a/child_a.tf diff --git a/configs/configload/test-fixtures/local-modules/child_a/child_b/child_b.tf b/configs/configload/testdata/local-modules/child_a/child_b/child_b.tf similarity index 100% rename from configs/configload/test-fixtures/local-modules/child_a/child_b/child_b.tf rename to configs/configload/testdata/local-modules/child_a/child_b/child_b.tf diff --git a/configs/configload/test-fixtures/local-modules/root.tf b/configs/configload/testdata/local-modules/root.tf similarity index 100% rename from configs/configload/test-fixtures/local-modules/root.tf rename to configs/configload/testdata/local-modules/root.tf diff --git a/configs/configload/test-fixtures/registry-modules/.gitignore b/configs/configload/testdata/registry-modules/.gitignore similarity index 100% rename from configs/configload/test-fixtures/registry-modules/.gitignore rename to configs/configload/testdata/registry-modules/.gitignore diff --git a/configs/configload/test-fixtures/registry-modules/root.tf b/configs/configload/testdata/registry-modules/root.tf similarity index 100% rename from configs/configload/test-fixtures/registry-modules/root.tf rename to configs/configload/testdata/registry-modules/root.tf diff --git a/configs/configupgrade/module_sources_test.go b/configs/configupgrade/module_sources_test.go index bd39b30e11..097cd18f7f 100644 --- a/configs/configupgrade/module_sources_test.go +++ b/configs/configupgrade/module_sources_test.go @@ -9,7 +9,7 @@ import ( func TestMaybeAlreadyUpgraded(t *testing.T) { t.Run("already upgraded", func(t *testing.T) { - sources, err := LoadModule("test-fixtures/already-upgraded") + sources, err := LoadModule("testdata/already-upgraded") if err != nil { t.Fatal(err) } @@ -29,7 +29,7 @@ func TestMaybeAlreadyUpgraded(t *testing.T) { } }) t.Run("not yet upgraded", func(t *testing.T) { - sources, err := LoadModule("test-fixtures/valid/noop/input") + sources, err := LoadModule("testdata/valid/noop/input") if err != nil { t.Fatal(err) } diff --git a/configs/configupgrade/test-fixtures/already-upgraded/versions.tf b/configs/configupgrade/testdata/already-upgraded/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/already-upgraded/versions.tf rename to configs/configupgrade/testdata/already-upgraded/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/argument-commas/input/argument-commas.tf b/configs/configupgrade/testdata/valid/argument-commas/input/argument-commas.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/argument-commas/input/argument-commas.tf rename to configs/configupgrade/testdata/valid/argument-commas/input/argument-commas.tf diff --git a/configs/configupgrade/test-fixtures/valid/argument-commas/want/argument-commas.tf b/configs/configupgrade/testdata/valid/argument-commas/want/argument-commas.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/argument-commas/want/argument-commas.tf rename to configs/configupgrade/testdata/valid/argument-commas/want/argument-commas.tf diff --git a/configs/configupgrade/test-fixtures/valid/argument-commas/want/versions.tf b/configs/configupgrade/testdata/valid/argument-commas/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/argument-commas/want/versions.tf rename to configs/configupgrade/testdata/valid/argument-commas/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-attr/input/block-as-list-attr.tf b/configs/configupgrade/testdata/valid/block-as-list-attr/input/block-as-list-attr.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-attr/input/block-as-list-attr.tf rename to configs/configupgrade/testdata/valid/block-as-list-attr/input/block-as-list-attr.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-attr/want/block-as-list-attr.tf b/configs/configupgrade/testdata/valid/block-as-list-attr/want/block-as-list-attr.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-attr/want/block-as-list-attr.tf rename to configs/configupgrade/testdata/valid/block-as-list-attr/want/block-as-list-attr.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-attr/want/versions.tf b/configs/configupgrade/testdata/valid/block-as-list-attr/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-attr/want/versions.tf rename to configs/configupgrade/testdata/valid/block-as-list-attr/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/input/block-as-list-dynamic-item.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-item/input/block-as-list-dynamic-item.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/input/block-as-list-dynamic-item.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-item/input/block-as-list-dynamic-item.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/want/block-as-list-dynamic-item.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-item/want/block-as-list-dynamic-item.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/want/block-as-list-dynamic-item.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-item/want/block-as-list-dynamic-item.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/want/versions.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-item/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-item/want/versions.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-item/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/input/block-as-list-dynamic-nested.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/input/block-as-list-dynamic-nested.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/input/block-as-list-dynamic-nested.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/input/block-as-list-dynamic-nested.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/want/block-as-list-dynamic-nested.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/want/block-as-list-dynamic-nested.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/want/block-as-list-dynamic-nested.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/want/block-as-list-dynamic-nested.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/want/versions.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic-nested/want/versions.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic-nested/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/input/block-as-list-dynamic.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic/input/block-as-list-dynamic.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/input/block-as-list-dynamic.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic/input/block-as-list-dynamic.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/want/block-as-list-dynamic.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic/want/block-as-list-dynamic.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/want/block-as-list-dynamic.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic/want/block-as-list-dynamic.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/want/versions.tf b/configs/configupgrade/testdata/valid/block-as-list-dynamic/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-list-dynamic/want/versions.tf rename to configs/configupgrade/testdata/valid/block-as-list-dynamic/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-map-attr/input/block-as-map-attr.tf b/configs/configupgrade/testdata/valid/block-as-map-attr/input/block-as-map-attr.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-map-attr/input/block-as-map-attr.tf rename to configs/configupgrade/testdata/valid/block-as-map-attr/input/block-as-map-attr.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-map-attr/want/block-as-map-attr.tf b/configs/configupgrade/testdata/valid/block-as-map-attr/want/block-as-map-attr.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-map-attr/want/block-as-map-attr.tf rename to configs/configupgrade/testdata/valid/block-as-map-attr/want/block-as-map-attr.tf diff --git a/configs/configupgrade/test-fixtures/valid/block-as-map-attr/want/versions.tf b/configs/configupgrade/testdata/valid/block-as-map-attr/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/block-as-map-attr/want/versions.tf rename to configs/configupgrade/testdata/valid/block-as-map-attr/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/depends-on/input/depends-on.tf b/configs/configupgrade/testdata/valid/depends-on/input/depends-on.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/depends-on/input/depends-on.tf rename to configs/configupgrade/testdata/valid/depends-on/input/depends-on.tf diff --git a/configs/configupgrade/test-fixtures/valid/depends-on/want/depends-on.tf b/configs/configupgrade/testdata/valid/depends-on/want/depends-on.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/depends-on/want/depends-on.tf rename to configs/configupgrade/testdata/valid/depends-on/want/depends-on.tf diff --git a/configs/configupgrade/test-fixtures/valid/depends-on/want/versions.tf b/configs/configupgrade/testdata/valid/depends-on/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/depends-on/want/versions.tf rename to configs/configupgrade/testdata/valid/depends-on/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/element-of-set/input/element-of-set.tf b/configs/configupgrade/testdata/valid/element-of-set/input/element-of-set.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/element-of-set/input/element-of-set.tf rename to configs/configupgrade/testdata/valid/element-of-set/input/element-of-set.tf diff --git a/configs/configupgrade/test-fixtures/valid/element-of-set/want/element-of-set.tf b/configs/configupgrade/testdata/valid/element-of-set/want/element-of-set.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/element-of-set/want/element-of-set.tf rename to configs/configupgrade/testdata/valid/element-of-set/want/element-of-set.tf diff --git a/configs/configupgrade/test-fixtures/valid/element-of-set/want/versions.tf b/configs/configupgrade/testdata/valid/element-of-set/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/element-of-set/want/versions.tf rename to configs/configupgrade/testdata/valid/element-of-set/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/funcs-replaced/input/funcs-replaced.tf b/configs/configupgrade/testdata/valid/funcs-replaced/input/funcs-replaced.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/funcs-replaced/input/funcs-replaced.tf rename to configs/configupgrade/testdata/valid/funcs-replaced/input/funcs-replaced.tf diff --git a/configs/configupgrade/test-fixtures/valid/funcs-replaced/want/funcs-replaced.tf b/configs/configupgrade/testdata/valid/funcs-replaced/want/funcs-replaced.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/funcs-replaced/want/funcs-replaced.tf rename to configs/configupgrade/testdata/valid/funcs-replaced/want/funcs-replaced.tf diff --git a/configs/configupgrade/test-fixtures/valid/funcs-replaced/want/versions.tf b/configs/configupgrade/testdata/valid/funcs-replaced/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/funcs-replaced/want/versions.tf rename to configs/configupgrade/testdata/valid/funcs-replaced/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/hash-of-file/input/hash-of-file.tf b/configs/configupgrade/testdata/valid/hash-of-file/input/hash-of-file.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/hash-of-file/input/hash-of-file.tf rename to configs/configupgrade/testdata/valid/hash-of-file/input/hash-of-file.tf diff --git a/configs/configupgrade/test-fixtures/valid/hash-of-file/want/hash-of-file.tf b/configs/configupgrade/testdata/valid/hash-of-file/want/hash-of-file.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/hash-of-file/want/hash-of-file.tf rename to configs/configupgrade/testdata/valid/hash-of-file/want/hash-of-file.tf diff --git a/configs/configupgrade/test-fixtures/valid/hash-of-file/want/versions.tf b/configs/configupgrade/testdata/valid/hash-of-file/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/hash-of-file/want/versions.tf rename to configs/configupgrade/testdata/valid/hash-of-file/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-flush/input/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-flush/input/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-flush/input/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-flush/input/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-flush/want/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-flush/want/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-flush/want/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-flush/want/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-flush/want/versions.tf b/configs/configupgrade/testdata/valid/heredoc-flush/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-flush/want/versions.tf rename to configs/configupgrade/testdata/valid/heredoc-flush/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-no-interp/input/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-no-interp/input/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-no-interp/input/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-no-interp/input/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-no-interp/want/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-no-interp/want/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-no-interp/want/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-no-interp/want/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-no-interp/want/versions.tf b/configs/configupgrade/testdata/valid/heredoc-no-interp/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-no-interp/want/versions.tf rename to configs/configupgrade/testdata/valid/heredoc-no-interp/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-sameline/input/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-sameline/input/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-sameline/input/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-sameline/input/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-sameline/want/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-sameline/want/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-sameline/want/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-sameline/want/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-sameline/want/versions.tf b/configs/configupgrade/testdata/valid/heredoc-sameline/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-sameline/want/versions.tf rename to configs/configupgrade/testdata/valid/heredoc-sameline/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-standard/input/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-standard/input/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-standard/input/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-standard/input/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-standard/want/heredoc.tf b/configs/configupgrade/testdata/valid/heredoc-standard/want/heredoc.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-standard/want/heredoc.tf rename to configs/configupgrade/testdata/valid/heredoc-standard/want/heredoc.tf diff --git a/configs/configupgrade/test-fixtures/valid/heredoc-standard/want/versions.tf b/configs/configupgrade/testdata/valid/heredoc-standard/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/heredoc-standard/want/versions.tf rename to configs/configupgrade/testdata/valid/heredoc-standard/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/input/ignore-changes-flatmap-colls.tf b/configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/input/ignore-changes-flatmap-colls.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/input/ignore-changes-flatmap-colls.tf rename to configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/input/ignore-changes-flatmap-colls.tf diff --git a/configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/want/ignore-changes-flatmap-colls.tf b/configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/want/ignore-changes-flatmap-colls.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/want/ignore-changes-flatmap-colls.tf rename to configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/want/ignore-changes-flatmap-colls.tf diff --git a/configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/want/versions.tf b/configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/ignore-changes-flatmap-colls/want/versions.tf rename to configs/configupgrade/testdata/valid/ignore-changes-flatmap-colls/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/indexed-splat/input/indexed-splat.tf b/configs/configupgrade/testdata/valid/indexed-splat/input/indexed-splat.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/indexed-splat/input/indexed-splat.tf rename to configs/configupgrade/testdata/valid/indexed-splat/input/indexed-splat.tf diff --git a/configs/configupgrade/test-fixtures/valid/indexed-splat/want/indexed-splat.tf b/configs/configupgrade/testdata/valid/indexed-splat/want/indexed-splat.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/indexed-splat/want/indexed-splat.tf rename to configs/configupgrade/testdata/valid/indexed-splat/want/indexed-splat.tf diff --git a/configs/configupgrade/test-fixtures/valid/indexed-splat/want/versions.tf b/configs/configupgrade/testdata/valid/indexed-splat/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/indexed-splat/want/versions.tf rename to configs/configupgrade/testdata/valid/indexed-splat/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/inline-comments/input/main.tf b/configs/configupgrade/testdata/valid/inline-comments/input/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/inline-comments/input/main.tf rename to configs/configupgrade/testdata/valid/inline-comments/input/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/inline-comments/want/main.tf b/configs/configupgrade/testdata/valid/inline-comments/want/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/inline-comments/want/main.tf rename to configs/configupgrade/testdata/valid/inline-comments/want/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/inline-comments/want/versions.tf b/configs/configupgrade/testdata/valid/inline-comments/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/inline-comments/want/versions.tf rename to configs/configupgrade/testdata/valid/inline-comments/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/interp-naked/input/try.tf b/configs/configupgrade/testdata/valid/interp-naked/input/try.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/interp-naked/input/try.tf rename to configs/configupgrade/testdata/valid/interp-naked/input/try.tf diff --git a/configs/configupgrade/test-fixtures/valid/interp-naked/want/try.tf b/configs/configupgrade/testdata/valid/interp-naked/want/try.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/interp-naked/want/try.tf rename to configs/configupgrade/testdata/valid/interp-naked/want/try.tf diff --git a/configs/configupgrade/test-fixtures/valid/interp-naked/want/versions.tf b/configs/configupgrade/testdata/valid/interp-naked/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/interp-naked/want/versions.tf rename to configs/configupgrade/testdata/valid/interp-naked/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/invalid-resource-name/input/resource.tf b/configs/configupgrade/testdata/valid/invalid-resource-name/input/resource.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/invalid-resource-name/input/resource.tf rename to configs/configupgrade/testdata/valid/invalid-resource-name/input/resource.tf diff --git a/configs/configupgrade/test-fixtures/valid/invalid-resource-name/want/resource.tf b/configs/configupgrade/testdata/valid/invalid-resource-name/want/resource.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/invalid-resource-name/want/resource.tf rename to configs/configupgrade/testdata/valid/invalid-resource-name/want/resource.tf diff --git a/configs/configupgrade/test-fixtures/valid/invalid-resource-name/want/versions.tf b/configs/configupgrade/testdata/valid/invalid-resource-name/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/invalid-resource-name/want/versions.tf rename to configs/configupgrade/testdata/valid/invalid-resource-name/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/lifecycle/input/lifecycle.tf b/configs/configupgrade/testdata/valid/lifecycle/input/lifecycle.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/lifecycle/input/lifecycle.tf rename to configs/configupgrade/testdata/valid/lifecycle/input/lifecycle.tf diff --git a/configs/configupgrade/test-fixtures/valid/lifecycle/want/lifecycle.tf b/configs/configupgrade/testdata/valid/lifecycle/want/lifecycle.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/lifecycle/want/lifecycle.tf rename to configs/configupgrade/testdata/valid/lifecycle/want/lifecycle.tf diff --git a/configs/configupgrade/test-fixtures/valid/lifecycle/want/versions.tf b/configs/configupgrade/testdata/valid/lifecycle/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/lifecycle/want/versions.tf rename to configs/configupgrade/testdata/valid/lifecycle/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/input/list-of-obj-as-block.tf b/configs/configupgrade/testdata/valid/list-of-obj-as-block/input/list-of-obj-as-block.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/input/list-of-obj-as-block.tf rename to configs/configupgrade/testdata/valid/list-of-obj-as-block/input/list-of-obj-as-block.tf diff --git a/configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/want/list-of-obj-as-block.tf b/configs/configupgrade/testdata/valid/list-of-obj-as-block/want/list-of-obj-as-block.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/want/list-of-obj-as-block.tf rename to configs/configupgrade/testdata/valid/list-of-obj-as-block/want/list-of-obj-as-block.tf diff --git a/configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/want/versions.tf b/configs/configupgrade/testdata/valid/list-of-obj-as-block/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/list-of-obj-as-block/want/versions.tf rename to configs/configupgrade/testdata/valid/list-of-obj-as-block/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/map-attr-as-block/input/map-attr-as-block.tf b/configs/configupgrade/testdata/valid/map-attr-as-block/input/map-attr-as-block.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/map-attr-as-block/input/map-attr-as-block.tf rename to configs/configupgrade/testdata/valid/map-attr-as-block/input/map-attr-as-block.tf diff --git a/configs/configupgrade/test-fixtures/valid/map-attr-as-block/want/map-attr-as-block.tf b/configs/configupgrade/testdata/valid/map-attr-as-block/want/map-attr-as-block.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/map-attr-as-block/want/map-attr-as-block.tf rename to configs/configupgrade/testdata/valid/map-attr-as-block/want/map-attr-as-block.tf diff --git a/configs/configupgrade/test-fixtures/valid/map-attr-as-block/want/versions.tf b/configs/configupgrade/testdata/valid/map-attr-as-block/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/map-attr-as-block/want/versions.tf rename to configs/configupgrade/testdata/valid/map-attr-as-block/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/module-source/input/main.tf b/configs/configupgrade/testdata/valid/module-source/input/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/module-source/input/main.tf rename to configs/configupgrade/testdata/valid/module-source/input/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/module-source/want/main.tf b/configs/configupgrade/testdata/valid/module-source/want/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/module-source/want/main.tf rename to configs/configupgrade/testdata/valid/module-source/want/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/module-source/want/versions.tf b/configs/configupgrade/testdata/valid/module-source/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/module-source/want/versions.tf rename to configs/configupgrade/testdata/valid/module-source/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/input/nested-exprs-in-hcl.tf b/configs/configupgrade/testdata/valid/nested-exprs-in-hcl/input/nested-exprs-in-hcl.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/input/nested-exprs-in-hcl.tf rename to configs/configupgrade/testdata/valid/nested-exprs-in-hcl/input/nested-exprs-in-hcl.tf diff --git a/configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/want/nested-exprs-in-hcl.tf b/configs/configupgrade/testdata/valid/nested-exprs-in-hcl/want/nested-exprs-in-hcl.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/want/nested-exprs-in-hcl.tf rename to configs/configupgrade/testdata/valid/nested-exprs-in-hcl/want/nested-exprs-in-hcl.tf diff --git a/configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/want/versions.tf b/configs/configupgrade/testdata/valid/nested-exprs-in-hcl/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/nested-exprs-in-hcl/want/versions.tf rename to configs/configupgrade/testdata/valid/nested-exprs-in-hcl/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop-exprs/input/exprs.tf b/configs/configupgrade/testdata/valid/noop-exprs/input/exprs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop-exprs/input/exprs.tf rename to configs/configupgrade/testdata/valid/noop-exprs/input/exprs.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop-exprs/want/exprs.tf b/configs/configupgrade/testdata/valid/noop-exprs/want/exprs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop-exprs/want/exprs.tf rename to configs/configupgrade/testdata/valid/noop-exprs/want/exprs.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop-exprs/want/versions.tf b/configs/configupgrade/testdata/valid/noop-exprs/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop-exprs/want/versions.tf rename to configs/configupgrade/testdata/valid/noop-exprs/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/input/modules.tf b/configs/configupgrade/testdata/valid/noop/input/modules.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/input/modules.tf rename to configs/configupgrade/testdata/valid/noop/input/modules.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/input/outputs.tf b/configs/configupgrade/testdata/valid/noop/input/outputs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/input/outputs.tf rename to configs/configupgrade/testdata/valid/noop/input/outputs.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/input/providers.tf b/configs/configupgrade/testdata/valid/noop/input/providers.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/input/providers.tf rename to configs/configupgrade/testdata/valid/noop/input/providers.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/input/resources.tf b/configs/configupgrade/testdata/valid/noop/input/resources.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/input/resources.tf rename to configs/configupgrade/testdata/valid/noop/input/resources.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/input/variables.tf b/configs/configupgrade/testdata/valid/noop/input/variables.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/input/variables.tf rename to configs/configupgrade/testdata/valid/noop/input/variables.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/modules.tf b/configs/configupgrade/testdata/valid/noop/want/modules.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/modules.tf rename to configs/configupgrade/testdata/valid/noop/want/modules.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/outputs.tf b/configs/configupgrade/testdata/valid/noop/want/outputs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/outputs.tf rename to configs/configupgrade/testdata/valid/noop/want/outputs.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/providers.tf b/configs/configupgrade/testdata/valid/noop/want/providers.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/providers.tf rename to configs/configupgrade/testdata/valid/noop/want/providers.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/resources.tf b/configs/configupgrade/testdata/valid/noop/want/resources.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/resources.tf rename to configs/configupgrade/testdata/valid/noop/want/resources.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/variables.tf b/configs/configupgrade/testdata/valid/noop/want/variables.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/variables.tf rename to configs/configupgrade/testdata/valid/noop/want/variables.tf diff --git a/configs/configupgrade/test-fixtures/valid/noop/want/versions.tf b/configs/configupgrade/testdata/valid/noop/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/noop/want/versions.tf rename to configs/configupgrade/testdata/valid/noop/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/number-literals/input/number-literals.tf b/configs/configupgrade/testdata/valid/number-literals/input/number-literals.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/number-literals/input/number-literals.tf rename to configs/configupgrade/testdata/valid/number-literals/input/number-literals.tf diff --git a/configs/configupgrade/test-fixtures/valid/number-literals/want/number-literals.tf b/configs/configupgrade/testdata/valid/number-literals/want/number-literals.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/number-literals/want/number-literals.tf rename to configs/configupgrade/testdata/valid/number-literals/want/number-literals.tf diff --git a/configs/configupgrade/test-fixtures/valid/number-literals/want/versions.tf b/configs/configupgrade/testdata/valid/number-literals/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/number-literals/want/versions.tf rename to configs/configupgrade/testdata/valid/number-literals/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/provider-addrs/input/provider-addrs.tf b/configs/configupgrade/testdata/valid/provider-addrs/input/provider-addrs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provider-addrs/input/provider-addrs.tf rename to configs/configupgrade/testdata/valid/provider-addrs/input/provider-addrs.tf diff --git a/configs/configupgrade/test-fixtures/valid/provider-addrs/want/provider-addrs.tf b/configs/configupgrade/testdata/valid/provider-addrs/want/provider-addrs.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provider-addrs/want/provider-addrs.tf rename to configs/configupgrade/testdata/valid/provider-addrs/want/provider-addrs.tf diff --git a/configs/configupgrade/test-fixtures/valid/provider-addrs/want/versions.tf b/configs/configupgrade/testdata/valid/provider-addrs/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provider-addrs/want/versions.tf rename to configs/configupgrade/testdata/valid/provider-addrs/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/provisioner/input/provisioner.tf b/configs/configupgrade/testdata/valid/provisioner/input/provisioner.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provisioner/input/provisioner.tf rename to configs/configupgrade/testdata/valid/provisioner/input/provisioner.tf diff --git a/configs/configupgrade/test-fixtures/valid/provisioner/want/provisioner.tf b/configs/configupgrade/testdata/valid/provisioner/want/provisioner.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provisioner/want/provisioner.tf rename to configs/configupgrade/testdata/valid/provisioner/want/provisioner.tf diff --git a/configs/configupgrade/test-fixtures/valid/provisioner/want/versions.tf b/configs/configupgrade/testdata/valid/provisioner/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/provisioner/want/versions.tf rename to configs/configupgrade/testdata/valid/provisioner/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/redundant-list/input/redundant-list.tf b/configs/configupgrade/testdata/valid/redundant-list/input/redundant-list.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/redundant-list/input/redundant-list.tf rename to configs/configupgrade/testdata/valid/redundant-list/input/redundant-list.tf diff --git a/configs/configupgrade/test-fixtures/valid/redundant-list/want/redundant-list.tf b/configs/configupgrade/testdata/valid/redundant-list/want/redundant-list.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/redundant-list/want/redundant-list.tf rename to configs/configupgrade/testdata/valid/redundant-list/want/redundant-list.tf diff --git a/configs/configupgrade/test-fixtures/valid/redundant-list/want/versions.tf b/configs/configupgrade/testdata/valid/redundant-list/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/redundant-list/want/versions.tf rename to configs/configupgrade/testdata/valid/redundant-list/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/relative-module-source/input/main.tf b/configs/configupgrade/testdata/valid/relative-module-source/input/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/relative-module-source/input/main.tf rename to configs/configupgrade/testdata/valid/relative-module-source/input/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/relative-module-source/input/module/main.tf b/configs/configupgrade/testdata/valid/relative-module-source/input/module/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/relative-module-source/input/module/main.tf rename to configs/configupgrade/testdata/valid/relative-module-source/input/module/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/relative-module-source/want/main.tf b/configs/configupgrade/testdata/valid/relative-module-source/want/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/relative-module-source/want/main.tf rename to configs/configupgrade/testdata/valid/relative-module-source/want/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/relative-module-source/want/module/main.tf b/configs/configupgrade/testdata/valid/relative-module-source/want/module/main.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/relative-module-source/want/module/main.tf rename to configs/configupgrade/testdata/valid/relative-module-source/want/module/main.tf diff --git a/configs/configupgrade/test-fixtures/valid/relative-module-source/want/versions.tf b/configs/configupgrade/testdata/valid/relative-module-source/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/relative-module-source/want/versions.tf rename to configs/configupgrade/testdata/valid/relative-module-source/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/rename-json-conflict/input/foo.tf b/configs/configupgrade/testdata/valid/rename-json-conflict/input/foo.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json-conflict/input/foo.tf rename to configs/configupgrade/testdata/valid/rename-json-conflict/input/foo.tf diff --git a/configs/configupgrade/test-fixtures/valid/rename-json-conflict/input/foo.tf.json b/configs/configupgrade/testdata/valid/rename-json-conflict/input/foo.tf.json similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json-conflict/input/foo.tf.json rename to configs/configupgrade/testdata/valid/rename-json-conflict/input/foo.tf.json diff --git a/configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/foo-1.tf.json b/configs/configupgrade/testdata/valid/rename-json-conflict/want/foo-1.tf.json similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/foo-1.tf.json rename to configs/configupgrade/testdata/valid/rename-json-conflict/want/foo-1.tf.json diff --git a/configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/foo.tf.json b/configs/configupgrade/testdata/valid/rename-json-conflict/want/foo.tf.json similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/foo.tf.json rename to configs/configupgrade/testdata/valid/rename-json-conflict/want/foo.tf.json diff --git a/configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/versions.tf b/configs/configupgrade/testdata/valid/rename-json-conflict/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json-conflict/want/versions.tf rename to configs/configupgrade/testdata/valid/rename-json-conflict/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/rename-json/input/misnamed-json.tf b/configs/configupgrade/testdata/valid/rename-json/input/misnamed-json.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json/input/misnamed-json.tf rename to configs/configupgrade/testdata/valid/rename-json/input/misnamed-json.tf diff --git a/configs/configupgrade/test-fixtures/valid/rename-json/want/misnamed-json.tf.json b/configs/configupgrade/testdata/valid/rename-json/want/misnamed-json.tf.json similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json/want/misnamed-json.tf.json rename to configs/configupgrade/testdata/valid/rename-json/want/misnamed-json.tf.json diff --git a/configs/configupgrade/test-fixtures/valid/rename-json/want/versions.tf b/configs/configupgrade/testdata/valid/rename-json/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/rename-json/want/versions.tf rename to configs/configupgrade/testdata/valid/rename-json/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/resource-count-ref/input/resource-count-ref.tf b/configs/configupgrade/testdata/valid/resource-count-ref/input/resource-count-ref.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/resource-count-ref/input/resource-count-ref.tf rename to configs/configupgrade/testdata/valid/resource-count-ref/input/resource-count-ref.tf diff --git a/configs/configupgrade/test-fixtures/valid/resource-count-ref/want/resource-count-ref.tf b/configs/configupgrade/testdata/valid/resource-count-ref/want/resource-count-ref.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/resource-count-ref/want/resource-count-ref.tf rename to configs/configupgrade/testdata/valid/resource-count-ref/want/resource-count-ref.tf diff --git a/configs/configupgrade/test-fixtures/valid/resource-count-ref/want/versions.tf b/configs/configupgrade/testdata/valid/resource-count-ref/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/resource-count-ref/want/versions.tf rename to configs/configupgrade/testdata/valid/resource-count-ref/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/traversals/input/traversals.tf b/configs/configupgrade/testdata/valid/traversals/input/traversals.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/traversals/input/traversals.tf rename to configs/configupgrade/testdata/valid/traversals/input/traversals.tf diff --git a/configs/configupgrade/test-fixtures/valid/traversals/want/traversals.tf b/configs/configupgrade/testdata/valid/traversals/want/traversals.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/traversals/want/traversals.tf rename to configs/configupgrade/testdata/valid/traversals/want/traversals.tf diff --git a/configs/configupgrade/test-fixtures/valid/traversals/want/versions.tf b/configs/configupgrade/testdata/valid/traversals/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/traversals/want/versions.tf rename to configs/configupgrade/testdata/valid/traversals/want/versions.tf diff --git a/configs/configupgrade/test-fixtures/valid/variable-type/input/variables.tf b/configs/configupgrade/testdata/valid/variable-type/input/variables.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/variable-type/input/variables.tf rename to configs/configupgrade/testdata/valid/variable-type/input/variables.tf diff --git a/configs/configupgrade/test-fixtures/valid/variable-type/want/variables.tf b/configs/configupgrade/testdata/valid/variable-type/want/variables.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/variable-type/want/variables.tf rename to configs/configupgrade/testdata/valid/variable-type/want/variables.tf diff --git a/configs/configupgrade/test-fixtures/valid/variable-type/want/versions.tf b/configs/configupgrade/testdata/valid/variable-type/want/versions.tf similarity index 100% rename from configs/configupgrade/test-fixtures/valid/variable-type/want/versions.tf rename to configs/configupgrade/testdata/valid/variable-type/want/versions.tf diff --git a/configs/configupgrade/upgrade_test.go b/configs/configupgrade/upgrade_test.go index b2a6e10aa9..f4940ebee5 100644 --- a/configs/configupgrade/upgrade_test.go +++ b/configs/configupgrade/upgrade_test.go @@ -23,11 +23,11 @@ import ( ) func TestUpgradeValid(t *testing.T) { - // This test uses the contents of the test-fixtures/valid directory as + // This test uses the contents of the testdata/valid directory as // a table of tests. Every directory there must have both "input" and // "want" subdirectories, where "input" is the configuration to be // upgraded and "want" is the expected result. - fixtureDir := "test-fixtures/valid" + fixtureDir := "testdata/valid" testDirs, err := ioutil.ReadDir(fixtureDir) if err != nil { t.Fatal(err) @@ -93,7 +93,7 @@ func TestUpgradeValid(t *testing.T) { } func TestUpgradeRenameJSON(t *testing.T) { - inputDir := filepath.Join("test-fixtures/valid/rename-json/input") + inputDir := filepath.Join("testdata/valid/rename-json/input") inputSrc, err := LoadModule(inputDir) if err != nil { t.Fatal(err) diff --git a/configs/module_call_test.go b/configs/module_call_test.go index 2bc425ad95..2b06694ce3 100644 --- a/configs/module_call_test.go +++ b/configs/module_call_test.go @@ -9,7 +9,7 @@ import ( ) func TestLoadModuleCall(t *testing.T) { - src, err := ioutil.ReadFile("test-fixtures/invalid-files/module-calls.tf") + src, err := ioutil.ReadFile("testdata/invalid-files/module-calls.tf") if err != nil { t.Fatal(err) } diff --git a/configs/module_merge_test.go b/configs/module_merge_test.go index a540b0a85b..80b1a71eec 100644 --- a/configs/module_merge_test.go +++ b/configs/module_merge_test.go @@ -9,7 +9,7 @@ import ( ) func TestModuleOverrideVariable(t *testing.T) { - mod, diags := testModuleFromDir("test-fixtures/valid-modules/override-variable") + mod, diags := testModuleFromDir("testdata/valid-modules/override-variable") assertNoDiagnostics(t, diags) if mod == nil { t.Fatalf("module is nil") @@ -25,7 +25,7 @@ func TestModuleOverrideVariable(t *testing.T) { Type: cty.String, ParsingMode: VariableParseLiteral, DeclRange: hcl.Range{ - Filename: "test-fixtures/valid-modules/override-variable/primary.tf", + Filename: "testdata/valid-modules/override-variable/primary.tf", Start: hcl.Pos{ Line: 1, Column: 1, @@ -46,7 +46,7 @@ func TestModuleOverrideVariable(t *testing.T) { Type: cty.String, ParsingMode: VariableParseLiteral, DeclRange: hcl.Range{ - Filename: "test-fixtures/valid-modules/override-variable/primary.tf", + Filename: "testdata/valid-modules/override-variable/primary.tf", Start: hcl.Pos{ Line: 7, Column: 1, @@ -64,7 +64,7 @@ func TestModuleOverrideVariable(t *testing.T) { } func TestModuleOverrideModule(t *testing.T) { - mod, diags := testModuleFromDir("test-fixtures/valid-modules/override-module") + mod, diags := testModuleFromDir("testdata/valid-modules/override-module") assertNoDiagnostics(t, diags) if mod == nil { t.Fatalf("module is nil") @@ -82,7 +82,7 @@ func TestModuleOverrideModule(t *testing.T) { Name: "example", SourceAddr: "./example2-a_override", SourceAddrRange: hcl.Range{ - Filename: "test-fixtures/valid-modules/override-module/a_override.tf", + Filename: "testdata/valid-modules/override-module/a_override.tf", Start: hcl.Pos{ Line: 3, Column: 12, @@ -96,7 +96,7 @@ func TestModuleOverrideModule(t *testing.T) { }, SourceSet: true, DeclRange: hcl.Range{ - Filename: "test-fixtures/valid-modules/override-module/primary.tf", + Filename: "testdata/valid-modules/override-module/primary.tf", Start: hcl.Pos{ Line: 2, Column: 1, @@ -146,7 +146,7 @@ func TestModuleOverrideDynamic(t *testing.T) { } t.Run("base is dynamic", func(t *testing.T) { - mod, diags := testModuleFromDir("test-fixtures/valid-modules/override-dynamic-block-base") + mod, diags := testModuleFromDir("testdata/valid-modules/override-dynamic-block-base") assertNoDiagnostics(t, diags) if mod == nil { t.Fatalf("module is nil") @@ -171,7 +171,7 @@ func TestModuleOverrideDynamic(t *testing.T) { } }) t.Run("override is dynamic", func(t *testing.T) { - mod, diags := testModuleFromDir("test-fixtures/valid-modules/override-dynamic-block-override") + mod, diags := testModuleFromDir("testdata/valid-modules/override-dynamic-block-override") assertNoDiagnostics(t, diags) if mod == nil { t.Fatalf("module is nil") diff --git a/configs/parser_config_dir_test.go b/configs/parser_config_dir_test.go index a4c09516de..ab73128128 100644 --- a/configs/parser_config_dir_test.go +++ b/configs/parser_config_dir_test.go @@ -8,10 +8,10 @@ import ( ) // TestParseLoadConfigDirSuccess is a simple test that just verifies that -// a number of test configuration directories (in test-fixtures/valid-modules) +// a number of test configuration directories (in testdata/valid-modules) // can be parsed without raising any diagnostics. // -// It also re-tests the individual files in test-fixtures/valid-files as if +// It also re-tests the individual files in testdata/valid-files as if // they were single-file modules, to ensure that they can be bundled into // modules correctly. // @@ -19,7 +19,7 @@ import ( // module element contents. More detailed assertions may be made on some subset // of these configuration files in other tests. func TestParserLoadConfigDirSuccess(t *testing.T) { - dirs, err := ioutil.ReadDir("test-fixtures/valid-modules") + dirs, err := ioutil.ReadDir("testdata/valid-modules") if err != nil { t.Fatal(err) } @@ -28,7 +28,7 @@ func TestParserLoadConfigDirSuccess(t *testing.T) { name := info.Name() t.Run(name, func(t *testing.T) { parser := NewParser(nil) - path := filepath.Join("test-fixtures/valid-modules", name) + path := filepath.Join("testdata/valid-modules", name) mod, diags := parser.LoadConfigDir(path) if len(diags) != 0 { @@ -44,9 +44,9 @@ func TestParserLoadConfigDirSuccess(t *testing.T) { }) } - // The individual files in test-fixtures/valid-files should also work + // The individual files in testdata/valid-files should also work // when loaded as modules. - files, err := ioutil.ReadDir("test-fixtures/valid-files") + files, err := ioutil.ReadDir("testdata/valid-files") if err != nil { t.Fatal(err) } @@ -54,7 +54,7 @@ func TestParserLoadConfigDirSuccess(t *testing.T) { for _, info := range files { name := info.Name() t.Run(fmt.Sprintf("%s as module", name), func(t *testing.T) { - src, err := ioutil.ReadFile(filepath.Join("test-fixtures/valid-files", name)) + src, err := ioutil.ReadFile(filepath.Join("testdata/valid-files", name)) if err != nil { t.Fatal(err) } @@ -76,10 +76,10 @@ func TestParserLoadConfigDirSuccess(t *testing.T) { } // TestParseLoadConfigDirFailure is a simple test that just verifies that -// a number of test configuration directories (in test-fixtures/invalid-modules) +// a number of test configuration directories (in testdata/invalid-modules) // produce diagnostics when parsed. // -// It also re-tests the individual files in test-fixtures/invalid-files as if +// It also re-tests the individual files in testdata/invalid-files as if // they were single-file modules, to ensure that their errors are still // detected when loading as part of a module. // @@ -87,7 +87,7 @@ func TestParserLoadConfigDirSuccess(t *testing.T) { // diagnostics in particular. More detailed assertions may be made on some subset // of these configuration files in other tests. func TestParserLoadConfigDirFailure(t *testing.T) { - dirs, err := ioutil.ReadDir("test-fixtures/invalid-modules") + dirs, err := ioutil.ReadDir("testdata/invalid-modules") if err != nil { t.Fatal(err) } @@ -96,7 +96,7 @@ func TestParserLoadConfigDirFailure(t *testing.T) { name := info.Name() t.Run(name, func(t *testing.T) { parser := NewParser(nil) - path := filepath.Join("test-fixtures/invalid-modules", name) + path := filepath.Join("testdata/invalid-modules", name) _, diags := parser.LoadConfigDir(path) if !diags.HasErrors() { @@ -108,9 +108,9 @@ func TestParserLoadConfigDirFailure(t *testing.T) { }) } - // The individual files in test-fixtures/valid-files should also work + // The individual files in testdata/valid-files should also work // when loaded as modules. - files, err := ioutil.ReadDir("test-fixtures/invalid-files") + files, err := ioutil.ReadDir("testdata/invalid-files") if err != nil { t.Fatal(err) } @@ -118,7 +118,7 @@ func TestParserLoadConfigDirFailure(t *testing.T) { for _, info := range files { name := info.Name() t.Run(fmt.Sprintf("%s as module", name), func(t *testing.T) { - src, err := ioutil.ReadFile(filepath.Join("test-fixtures/invalid-files", name)) + src, err := ioutil.ReadFile(filepath.Join("testdata/invalid-files", name)) if err != nil { t.Fatal(err) } diff --git a/configs/parser_config_test.go b/configs/parser_config_test.go index 9f0e79bbde..bb68ada094 100644 --- a/configs/parser_config_test.go +++ b/configs/parser_config_test.go @@ -9,14 +9,14 @@ import ( ) // TestParseLoadConfigFileSuccess is a simple test that just verifies that -// a number of test configuration files (in test-fixtures/valid-files) can +// a number of test configuration files (in testdata/valid-files) can // be parsed without raising any diagnostics. // // This test does not verify that reading these files produces the correct // file element contents. More detailed assertions may be made on some subset // of these configuration files in other tests. func TestParserLoadConfigFileSuccess(t *testing.T) { - files, err := ioutil.ReadDir("test-fixtures/valid-files") + files, err := ioutil.ReadDir("testdata/valid-files") if err != nil { t.Fatal(err) } @@ -24,7 +24,7 @@ func TestParserLoadConfigFileSuccess(t *testing.T) { for _, info := range files { name := info.Name() t.Run(name, func(t *testing.T) { - src, err := ioutil.ReadFile(filepath.Join("test-fixtures/valid-files", name)) + src, err := ioutil.ReadFile(filepath.Join("testdata/valid-files", name)) if err != nil { t.Fatal(err) } @@ -45,14 +45,14 @@ func TestParserLoadConfigFileSuccess(t *testing.T) { } // TestParseLoadConfigFileFailure is a simple test that just verifies that -// a number of test configuration files (in test-fixtures/invalid-files) +// a number of test configuration files (in testdata/invalid-files) // produce errors as expected. // // This test does not verify specific error messages, so more detailed // assertions should be made on some subset of these configuration files in // other tests. func TestParserLoadConfigFileFailure(t *testing.T) { - files, err := ioutil.ReadDir("test-fixtures/invalid-files") + files, err := ioutil.ReadDir("testdata/invalid-files") if err != nil { t.Fatal(err) } @@ -60,7 +60,7 @@ func TestParserLoadConfigFileFailure(t *testing.T) { for _, info := range files { name := info.Name() t.Run(name, func(t *testing.T) { - src, err := ioutil.ReadFile(filepath.Join("test-fixtures/invalid-files", name)) + src, err := ioutil.ReadFile(filepath.Join("testdata/invalid-files", name)) if err != nil { t.Fatal(err) } @@ -128,7 +128,7 @@ func TestParserLoadConfigFileFailureMessages(t *testing.T) { for _, test := range tests { t.Run(test.Filename, func(t *testing.T) { - src, err := ioutil.ReadFile(filepath.Join("test-fixtures", test.Filename)) + src, err := ioutil.ReadFile(filepath.Join("testdata", test.Filename)) if err != nil { t.Fatal(err) } diff --git a/configs/provider_test.go b/configs/provider_test.go index 526f2342e1..625108759e 100644 --- a/configs/provider_test.go +++ b/configs/provider_test.go @@ -6,7 +6,7 @@ import ( ) func TestProviderReservedNames(t *testing.T) { - src, err := ioutil.ReadFile("test-fixtures/invalid-files/provider-reserved.tf") + src, err := ioutil.ReadFile("testdata/invalid-files/provider-reserved.tf") if err != nil { t.Fatal(err) } diff --git a/configs/test-fixtures/config-build/child_a/child_a.tf b/configs/testdata/config-build/child_a/child_a.tf similarity index 100% rename from configs/test-fixtures/config-build/child_a/child_a.tf rename to configs/testdata/config-build/child_a/child_a.tf diff --git a/configs/test-fixtures/config-build/child_b/child_b.tf b/configs/testdata/config-build/child_b/child_b.tf similarity index 100% rename from configs/test-fixtures/config-build/child_b/child_b.tf rename to configs/testdata/config-build/child_b/child_b.tf diff --git a/configs/test-fixtures/config-build/child_c/child_c.tf b/configs/testdata/config-build/child_c/child_c.tf similarity index 100% rename from configs/test-fixtures/config-build/child_c/child_c.tf rename to configs/testdata/config-build/child_c/child_c.tf diff --git a/configs/test-fixtures/config-build/root.tf b/configs/testdata/config-build/root.tf similarity index 100% rename from configs/test-fixtures/config-build/root.tf rename to configs/testdata/config-build/root.tf diff --git a/configs/test-fixtures/invalid-files/data-reserved-for_each.tf b/configs/testdata/invalid-files/data-reserved-for_each.tf similarity index 100% rename from configs/test-fixtures/invalid-files/data-reserved-for_each.tf rename to configs/testdata/invalid-files/data-reserved-for_each.tf diff --git a/configs/test-fixtures/invalid-files/data-reserved-lifecycle.tf b/configs/testdata/invalid-files/data-reserved-lifecycle.tf similarity index 100% rename from configs/test-fixtures/invalid-files/data-reserved-lifecycle.tf rename to configs/testdata/invalid-files/data-reserved-lifecycle.tf diff --git a/configs/test-fixtures/invalid-files/data-reserved-locals.tf b/configs/testdata/invalid-files/data-reserved-locals.tf similarity index 100% rename from configs/test-fixtures/invalid-files/data-reserved-locals.tf rename to configs/testdata/invalid-files/data-reserved-locals.tf diff --git a/configs/test-fixtures/invalid-files/data-resource-lifecycle.tf b/configs/testdata/invalid-files/data-resource-lifecycle.tf similarity index 100% rename from configs/test-fixtures/invalid-files/data-resource-lifecycle.tf rename to configs/testdata/invalid-files/data-resource-lifecycle.tf diff --git a/configs/test-fixtures/invalid-files/interp-in-data-label.tf b/configs/testdata/invalid-files/interp-in-data-label.tf similarity index 100% rename from configs/test-fixtures/invalid-files/interp-in-data-label.tf rename to configs/testdata/invalid-files/interp-in-data-label.tf diff --git a/configs/test-fixtures/invalid-files/interp-in-rsrc-label.tf b/configs/testdata/invalid-files/interp-in-rsrc-label.tf similarity index 100% rename from configs/test-fixtures/invalid-files/interp-in-rsrc-label.tf rename to configs/testdata/invalid-files/interp-in-rsrc-label.tf diff --git a/configs/test-fixtures/invalid-files/json-as-native-syntax.tf b/configs/testdata/invalid-files/json-as-native-syntax.tf similarity index 100% rename from configs/test-fixtures/invalid-files/json-as-native-syntax.tf rename to configs/testdata/invalid-files/json-as-native-syntax.tf diff --git a/configs/test-fixtures/invalid-files/module-calls.tf b/configs/testdata/invalid-files/module-calls.tf similarity index 100% rename from configs/test-fixtures/invalid-files/module-calls.tf rename to configs/testdata/invalid-files/module-calls.tf diff --git a/configs/test-fixtures/invalid-files/native-syntax-as-json.tf.json b/configs/testdata/invalid-files/native-syntax-as-json.tf.json similarity index 100% rename from configs/test-fixtures/invalid-files/native-syntax-as-json.tf.json rename to configs/testdata/invalid-files/native-syntax-as-json.tf.json diff --git a/configs/test-fixtures/invalid-files/provider-reserved.tf b/configs/testdata/invalid-files/provider-reserved.tf similarity index 100% rename from configs/test-fixtures/invalid-files/provider-reserved.tf rename to configs/testdata/invalid-files/provider-reserved.tf diff --git a/configs/test-fixtures/invalid-files/provider-syntax.tf b/configs/testdata/invalid-files/provider-syntax.tf similarity index 100% rename from configs/test-fixtures/invalid-files/provider-syntax.tf rename to configs/testdata/invalid-files/provider-syntax.tf diff --git a/configs/test-fixtures/invalid-files/resource-lifecycle-badbool.tf b/configs/testdata/invalid-files/resource-lifecycle-badbool.tf similarity index 100% rename from configs/test-fixtures/invalid-files/resource-lifecycle-badbool.tf rename to configs/testdata/invalid-files/resource-lifecycle-badbool.tf diff --git a/configs/test-fixtures/invalid-files/resource-reserved-for_each.tf b/configs/testdata/invalid-files/resource-reserved-for_each.tf similarity index 100% rename from configs/test-fixtures/invalid-files/resource-reserved-for_each.tf rename to configs/testdata/invalid-files/resource-reserved-for_each.tf diff --git a/configs/test-fixtures/invalid-files/resource-reserved-locals.tf b/configs/testdata/invalid-files/resource-reserved-locals.tf similarity index 100% rename from configs/test-fixtures/invalid-files/resource-reserved-locals.tf rename to configs/testdata/invalid-files/resource-reserved-locals.tf diff --git a/configs/test-fixtures/invalid-files/resources-ignorechanges-all-legacymix.tf b/configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf similarity index 100% rename from configs/test-fixtures/invalid-files/resources-ignorechanges-all-legacymix.tf rename to configs/testdata/invalid-files/resources-ignorechanges-all-legacymix.tf diff --git a/configs/test-fixtures/invalid-files/unexpected-attr.tf b/configs/testdata/invalid-files/unexpected-attr.tf similarity index 100% rename from configs/test-fixtures/invalid-files/unexpected-attr.tf rename to configs/testdata/invalid-files/unexpected-attr.tf diff --git a/configs/test-fixtures/invalid-files/unexpected-block.tf b/configs/testdata/invalid-files/unexpected-block.tf similarity index 100% rename from configs/test-fixtures/invalid-files/unexpected-block.tf rename to configs/testdata/invalid-files/unexpected-block.tf diff --git a/configs/test-fixtures/invalid-files/variable-bad-default.tf b/configs/testdata/invalid-files/variable-bad-default.tf similarity index 100% rename from configs/test-fixtures/invalid-files/variable-bad-default.tf rename to configs/testdata/invalid-files/variable-bad-default.tf diff --git a/configs/test-fixtures/invalid-files/variable-type-unknown.tf b/configs/testdata/invalid-files/variable-type-unknown.tf similarity index 100% rename from configs/test-fixtures/invalid-files/variable-type-unknown.tf rename to configs/testdata/invalid-files/variable-type-unknown.tf diff --git a/configs/test-fixtures/invalid-files/version-variable.tf b/configs/testdata/invalid-files/version-variable.tf similarity index 100% rename from configs/test-fixtures/invalid-files/version-variable.tf rename to configs/testdata/invalid-files/version-variable.tf diff --git a/configs/test-fixtures/invalid-files/zerolen.tf.json b/configs/testdata/invalid-files/zerolen.tf.json similarity index 100% rename from configs/test-fixtures/invalid-files/zerolen.tf.json rename to configs/testdata/invalid-files/zerolen.tf.json diff --git a/configs/test-fixtures/invalid-modules/override-nonexist-variable/override.tf b/configs/testdata/invalid-modules/override-nonexist-variable/override.tf similarity index 100% rename from configs/test-fixtures/invalid-modules/override-nonexist-variable/override.tf rename to configs/testdata/invalid-modules/override-nonexist-variable/override.tf diff --git a/configs/test-fixtures/invalid-modules/override-variable-causes-bad-default/base.tf b/configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf similarity index 100% rename from configs/test-fixtures/invalid-modules/override-variable-causes-bad-default/base.tf rename to configs/testdata/invalid-modules/override-variable-causes-bad-default/base.tf diff --git a/configs/test-fixtures/invalid-modules/override-variable-causes-bad-default/override.tf b/configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf similarity index 100% rename from configs/test-fixtures/invalid-modules/override-variable-causes-bad-default/override.tf rename to configs/testdata/invalid-modules/override-variable-causes-bad-default/override.tf diff --git a/configs/test-fixtures/valid-files/backend.tf b/configs/testdata/valid-files/backend.tf similarity index 100% rename from configs/test-fixtures/valid-files/backend.tf rename to configs/testdata/valid-files/backend.tf diff --git a/configs/test-fixtures/valid-files/data-sources.tf b/configs/testdata/valid-files/data-sources.tf similarity index 100% rename from configs/test-fixtures/valid-files/data-sources.tf rename to configs/testdata/valid-files/data-sources.tf diff --git a/configs/test-fixtures/valid-files/empty.tf b/configs/testdata/valid-files/empty.tf similarity index 100% rename from configs/test-fixtures/valid-files/empty.tf rename to configs/testdata/valid-files/empty.tf diff --git a/configs/test-fixtures/valid-files/empty.tf.json b/configs/testdata/valid-files/empty.tf.json similarity index 100% rename from configs/test-fixtures/valid-files/empty.tf.json rename to configs/testdata/valid-files/empty.tf.json diff --git a/configs/test-fixtures/valid-files/locals.tf b/configs/testdata/valid-files/locals.tf similarity index 100% rename from configs/test-fixtures/valid-files/locals.tf rename to configs/testdata/valid-files/locals.tf diff --git a/configs/test-fixtures/valid-files/locals.tf.json b/configs/testdata/valid-files/locals.tf.json similarity index 100% rename from configs/test-fixtures/valid-files/locals.tf.json rename to configs/testdata/valid-files/locals.tf.json diff --git a/configs/test-fixtures/valid-files/outputs.tf b/configs/testdata/valid-files/outputs.tf similarity index 100% rename from configs/test-fixtures/valid-files/outputs.tf rename to configs/testdata/valid-files/outputs.tf diff --git a/configs/test-fixtures/valid-files/provider-configs.tf b/configs/testdata/valid-files/provider-configs.tf similarity index 100% rename from configs/test-fixtures/valid-files/provider-configs.tf rename to configs/testdata/valid-files/provider-configs.tf diff --git a/configs/test-fixtures/valid-files/providers-explicit-implied.tf b/configs/testdata/valid-files/providers-explicit-implied.tf similarity index 100% rename from configs/test-fixtures/valid-files/providers-explicit-implied.tf rename to configs/testdata/valid-files/providers-explicit-implied.tf diff --git a/configs/test-fixtures/valid-files/required-providers.tf b/configs/testdata/valid-files/required-providers.tf similarity index 100% rename from configs/test-fixtures/valid-files/required-providers.tf rename to configs/testdata/valid-files/required-providers.tf diff --git a/configs/test-fixtures/valid-files/required-version.tf b/configs/testdata/valid-files/required-version.tf similarity index 100% rename from configs/test-fixtures/valid-files/required-version.tf rename to configs/testdata/valid-files/required-version.tf diff --git a/configs/test-fixtures/valid-files/resources-dependson-quoted.tf b/configs/testdata/valid-files/resources-dependson-quoted.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-dependson-quoted.tf rename to configs/testdata/valid-files/resources-dependson-quoted.tf diff --git a/configs/test-fixtures/valid-files/resources-ignorechanges-all-legacy.tf b/configs/testdata/valid-files/resources-ignorechanges-all-legacy.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-ignorechanges-all-legacy.tf rename to configs/testdata/valid-files/resources-ignorechanges-all-legacy.tf diff --git a/configs/test-fixtures/valid-files/resources-ignorechanges-all-legacy.tf.json b/configs/testdata/valid-files/resources-ignorechanges-all-legacy.tf.json similarity index 100% rename from configs/test-fixtures/valid-files/resources-ignorechanges-all-legacy.tf.json rename to configs/testdata/valid-files/resources-ignorechanges-all-legacy.tf.json diff --git a/configs/test-fixtures/valid-files/resources-ignorechanges-all.tf b/configs/testdata/valid-files/resources-ignorechanges-all.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-ignorechanges-all.tf rename to configs/testdata/valid-files/resources-ignorechanges-all.tf diff --git a/configs/test-fixtures/valid-files/resources-ignorechanges-all.tf.json b/configs/testdata/valid-files/resources-ignorechanges-all.tf.json similarity index 100% rename from configs/test-fixtures/valid-files/resources-ignorechanges-all.tf.json rename to configs/testdata/valid-files/resources-ignorechanges-all.tf.json diff --git a/configs/test-fixtures/valid-files/resources-ignorechanges-quoted.tf b/configs/testdata/valid-files/resources-ignorechanges-quoted.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-ignorechanges-quoted.tf rename to configs/testdata/valid-files/resources-ignorechanges-quoted.tf diff --git a/configs/test-fixtures/valid-files/resources-provisioner-onfailure-quoted.tf b/configs/testdata/valid-files/resources-provisioner-onfailure-quoted.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-provisioner-onfailure-quoted.tf rename to configs/testdata/valid-files/resources-provisioner-onfailure-quoted.tf diff --git a/configs/test-fixtures/valid-files/resources-provisioner-when-quoted.tf b/configs/testdata/valid-files/resources-provisioner-when-quoted.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources-provisioner-when-quoted.tf rename to configs/testdata/valid-files/resources-provisioner-when-quoted.tf diff --git a/configs/test-fixtures/valid-files/resources.tf b/configs/testdata/valid-files/resources.tf similarity index 100% rename from configs/test-fixtures/valid-files/resources.tf rename to configs/testdata/valid-files/resources.tf diff --git a/configs/test-fixtures/valid-files/variable-type-quoted.tf b/configs/testdata/valid-files/variable-type-quoted.tf similarity index 100% rename from configs/test-fixtures/valid-files/variable-type-quoted.tf rename to configs/testdata/valid-files/variable-type-quoted.tf diff --git a/configs/test-fixtures/valid-files/variables.tf b/configs/testdata/valid-files/variables.tf similarity index 100% rename from configs/test-fixtures/valid-files/variables.tf rename to configs/testdata/valid-files/variables.tf diff --git a/configs/test-fixtures/valid-files/variables.tf.json b/configs/testdata/valid-files/variables.tf.json similarity index 100% rename from configs/test-fixtures/valid-files/variables.tf.json rename to configs/testdata/valid-files/variables.tf.json diff --git a/configs/test-fixtures/valid-modules/empty/README b/configs/testdata/valid-modules/empty/README similarity index 100% rename from configs/test-fixtures/valid-modules/empty/README rename to configs/testdata/valid-modules/empty/README diff --git a/configs/test-fixtures/valid-modules/override-dynamic-block-base/a_override.tf b/configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-dynamic-block-base/a_override.tf rename to configs/testdata/valid-modules/override-dynamic-block-base/a_override.tf diff --git a/configs/test-fixtures/valid-modules/override-dynamic-block-base/base.tf b/configs/testdata/valid-modules/override-dynamic-block-base/base.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-dynamic-block-base/base.tf rename to configs/testdata/valid-modules/override-dynamic-block-base/base.tf diff --git a/configs/test-fixtures/valid-modules/override-dynamic-block-override/a_override.tf b/configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-dynamic-block-override/a_override.tf rename to configs/testdata/valid-modules/override-dynamic-block-override/a_override.tf diff --git a/configs/test-fixtures/valid-modules/override-dynamic-block-override/base.tf b/configs/testdata/valid-modules/override-dynamic-block-override/base.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-dynamic-block-override/base.tf rename to configs/testdata/valid-modules/override-dynamic-block-override/base.tf diff --git a/configs/test-fixtures/valid-modules/override-module/a_override.tf b/configs/testdata/valid-modules/override-module/a_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-module/a_override.tf rename to configs/testdata/valid-modules/override-module/a_override.tf diff --git a/configs/test-fixtures/valid-modules/override-module/b_override.tf b/configs/testdata/valid-modules/override-module/b_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-module/b_override.tf rename to configs/testdata/valid-modules/override-module/b_override.tf diff --git a/configs/test-fixtures/valid-modules/override-module/primary.tf b/configs/testdata/valid-modules/override-module/primary.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-module/primary.tf rename to configs/testdata/valid-modules/override-module/primary.tf diff --git a/configs/test-fixtures/valid-modules/override-output-sensitive/override.tf b/configs/testdata/valid-modules/override-output-sensitive/override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-output-sensitive/override.tf rename to configs/testdata/valid-modules/override-output-sensitive/override.tf diff --git a/configs/test-fixtures/valid-modules/override-output-sensitive/primary.tf b/configs/testdata/valid-modules/override-output-sensitive/primary.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-output-sensitive/primary.tf rename to configs/testdata/valid-modules/override-output-sensitive/primary.tf diff --git a/configs/test-fixtures/valid-modules/override-variable/a_override.tf b/configs/testdata/valid-modules/override-variable/a_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-variable/a_override.tf rename to configs/testdata/valid-modules/override-variable/a_override.tf diff --git a/configs/test-fixtures/valid-modules/override-variable/b_override.tf b/configs/testdata/valid-modules/override-variable/b_override.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-variable/b_override.tf rename to configs/testdata/valid-modules/override-variable/b_override.tf diff --git a/configs/test-fixtures/valid-modules/override-variable/primary.tf b/configs/testdata/valid-modules/override-variable/primary.tf similarity index 100% rename from configs/test-fixtures/valid-modules/override-variable/primary.tf rename to configs/testdata/valid-modules/override-variable/primary.tf diff --git a/e2e/e2e.go b/e2e/e2e.go index 2262f5a1e8..a263362221 100644 --- a/e2e/e2e.go +++ b/e2e/e2e.go @@ -40,7 +40,7 @@ func NewBinary(binaryPath, workingDir string) *binary { // For our purposes here we do a very simplistic file copy that doesn't // attempt to preserve file permissions, attributes, alternate data // streams, etc. Since we only have to deal with our own fixtures in - // the test-fixtures subdir, we know we don't need to deal with anything + // the testdata subdir, we know we don't need to deal with anything // of this nature. err = filepath.Walk(workingDir, func(path string, info os.FileInfo, err error) error { if err != nil { diff --git a/internal/initwd/from_module_test.go b/internal/initwd/from_module_test.go index d48643e00d..480ead680f 100644 --- a/internal/initwd/from_module_test.go +++ b/internal/initwd/from_module_test.go @@ -18,7 +18,7 @@ func TestDirFromModule_registry(t *testing.T) { t.Skip("this test accesses registry.terraform.io and github.com; set TF_ACC=1 to run it") } - fixtureDir := filepath.Clean("test-fixtures/empty") + fixtureDir := filepath.Clean("testdata/empty") dir, done := tempChdir(t, fixtureDir) modsDir := filepath.Join(dir, ".terraform/modules") defer done() diff --git a/internal/initwd/module_install_test.go b/internal/initwd/module_install_test.go index 8828fa75cc..27a82aef7c 100644 --- a/internal/initwd/module_install_test.go +++ b/internal/initwd/module_install_test.go @@ -33,7 +33,7 @@ func TestMain(m *testing.M) { } func TestModuleInstaller(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/local-modules") + fixtureDir := filepath.Clean("testdata/local-modules") dir, done := tempChdir(t, fixtureDir) defer done() @@ -94,7 +94,7 @@ func TestModuleInstaller(t *testing.T) { } func TestModuleInstaller_error(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/local-module-error") + fixtureDir := filepath.Clean("testdata/local-module-error") dir, done := tempChdir(t, fixtureDir) defer done() @@ -112,7 +112,7 @@ func TestModuleInstaller_error(t *testing.T) { } func TestModuleInstaller_invalid_version_constraint_error(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/invalid-version-constraint") + fixtureDir := filepath.Clean("testdata/invalid-version-constraint") dir, done := tempChdir(t, fixtureDir) defer done() @@ -130,7 +130,7 @@ func TestModuleInstaller_invalid_version_constraint_error(t *testing.T) { } func TestModuleInstaller_invalidVersionConstraintGetter(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/invalid-version-constraint") + fixtureDir := filepath.Clean("testdata/invalid-version-constraint") dir, done := tempChdir(t, fixtureDir) defer done() @@ -148,7 +148,7 @@ func TestModuleInstaller_invalidVersionConstraintGetter(t *testing.T) { } func TestModuleInstaller_invalidVersionConstraintLocal(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/invalid-version-constraint-local") + fixtureDir := filepath.Clean("testdata/invalid-version-constraint-local") dir, done := tempChdir(t, fixtureDir) defer done() @@ -166,7 +166,7 @@ func TestModuleInstaller_invalidVersionConstraintLocal(t *testing.T) { } func TestModuleInstaller_symlink(t *testing.T) { - fixtureDir := filepath.Clean("test-fixtures/local-module-symlink") + fixtureDir := filepath.Clean("testdata/local-module-symlink") dir, done := tempChdir(t, fixtureDir) defer done() @@ -231,7 +231,7 @@ func TestLoaderInstallModules_registry(t *testing.T) { t.Skip("this test accesses registry.terraform.io and github.com; set TF_ACC=1 to run it") } - fixtureDir := filepath.Clean("test-fixtures/registry-modules") + fixtureDir := filepath.Clean("testdata/registry-modules") dir, done := tempChdir(t, fixtureDir) defer done() @@ -358,7 +358,7 @@ func TestLoaderInstallModules_goGetter(t *testing.T) { t.Skip("this test accesses github.com; set TF_ACC=1 to run it") } - fixtureDir := filepath.Clean("test-fixtures/go-getter-modules") + fixtureDir := filepath.Clean("testdata/go-getter-modules") dir, done := tempChdir(t, fixtureDir) defer done() diff --git a/internal/initwd/test-fixtures/already-installed/root.tf b/internal/initwd/testdata/already-installed/root.tf similarity index 100% rename from internal/initwd/test-fixtures/already-installed/root.tf rename to internal/initwd/testdata/already-installed/root.tf diff --git a/internal/initwd/test-fixtures/empty/.gitignore b/internal/initwd/testdata/empty/.gitignore similarity index 100% rename from internal/initwd/test-fixtures/empty/.gitignore rename to internal/initwd/testdata/empty/.gitignore diff --git a/internal/initwd/test-fixtures/go-getter-modules/.gitignore b/internal/initwd/testdata/go-getter-modules/.gitignore similarity index 100% rename from internal/initwd/test-fixtures/go-getter-modules/.gitignore rename to internal/initwd/testdata/go-getter-modules/.gitignore diff --git a/internal/initwd/test-fixtures/go-getter-modules/root.tf b/internal/initwd/testdata/go-getter-modules/root.tf similarity index 100% rename from internal/initwd/test-fixtures/go-getter-modules/root.tf rename to internal/initwd/testdata/go-getter-modules/root.tf diff --git a/internal/initwd/test-fixtures/invalid-version-constraint-local/.gitignore b/internal/initwd/testdata/invalid-version-constraint-local/.gitignore similarity index 100% rename from internal/initwd/test-fixtures/invalid-version-constraint-local/.gitignore rename to internal/initwd/testdata/invalid-version-constraint-local/.gitignore diff --git a/internal/initwd/test-fixtures/invalid-version-constraint-local/root.tf b/internal/initwd/testdata/invalid-version-constraint-local/root.tf similarity index 100% rename from internal/initwd/test-fixtures/invalid-version-constraint-local/root.tf rename to internal/initwd/testdata/invalid-version-constraint-local/root.tf diff --git a/internal/initwd/test-fixtures/invalid-version-constraint/.gitignore b/internal/initwd/testdata/invalid-version-constraint/.gitignore similarity index 100% rename from internal/initwd/test-fixtures/invalid-version-constraint/.gitignore rename to internal/initwd/testdata/invalid-version-constraint/.gitignore diff --git a/internal/initwd/test-fixtures/invalid-version-constraint/root.tf b/internal/initwd/testdata/invalid-version-constraint/root.tf similarity index 100% rename from internal/initwd/test-fixtures/invalid-version-constraint/root.tf rename to internal/initwd/testdata/invalid-version-constraint/root.tf diff --git a/internal/initwd/test-fixtures/local-module-error/child_a/main.tf b/internal/initwd/testdata/local-module-error/child_a/main.tf similarity index 100% rename from internal/initwd/test-fixtures/local-module-error/child_a/main.tf rename to internal/initwd/testdata/local-module-error/child_a/main.tf diff --git a/internal/initwd/test-fixtures/local-module-error/main.tf b/internal/initwd/testdata/local-module-error/main.tf similarity index 100% rename from internal/initwd/test-fixtures/local-module-error/main.tf rename to internal/initwd/testdata/local-module-error/main.tf diff --git a/internal/initwd/test-fixtures/local-module-symlink/child_a/child_a.tf b/internal/initwd/testdata/local-module-symlink/child_a/child_a.tf similarity index 100% rename from internal/initwd/test-fixtures/local-module-symlink/child_a/child_a.tf rename to internal/initwd/testdata/local-module-symlink/child_a/child_a.tf diff --git a/internal/initwd/test-fixtures/local-module-symlink/child_a/child_b/child_b.tf b/internal/initwd/testdata/local-module-symlink/child_a/child_b/child_b.tf similarity index 100% rename from internal/initwd/test-fixtures/local-module-symlink/child_a/child_b/child_b.tf rename to internal/initwd/testdata/local-module-symlink/child_a/child_b/child_b.tf diff --git a/internal/initwd/test-fixtures/local-module-symlink/modules/child_a b/internal/initwd/testdata/local-module-symlink/modules/child_a similarity index 100% rename from internal/initwd/test-fixtures/local-module-symlink/modules/child_a rename to internal/initwd/testdata/local-module-symlink/modules/child_a diff --git a/internal/initwd/test-fixtures/local-module-symlink/root.tf b/internal/initwd/testdata/local-module-symlink/root.tf similarity index 100% rename from internal/initwd/test-fixtures/local-module-symlink/root.tf rename to internal/initwd/testdata/local-module-symlink/root.tf diff --git a/internal/initwd/test-fixtures/local-modules/child_a/child_a.tf b/internal/initwd/testdata/local-modules/child_a/child_a.tf similarity index 100% rename from internal/initwd/test-fixtures/local-modules/child_a/child_a.tf rename to internal/initwd/testdata/local-modules/child_a/child_a.tf diff --git a/internal/initwd/test-fixtures/local-modules/child_a/child_b/child_b.tf b/internal/initwd/testdata/local-modules/child_a/child_b/child_b.tf similarity index 100% rename from internal/initwd/test-fixtures/local-modules/child_a/child_b/child_b.tf rename to internal/initwd/testdata/local-modules/child_a/child_b/child_b.tf diff --git a/internal/initwd/test-fixtures/local-modules/root.tf b/internal/initwd/testdata/local-modules/root.tf similarity index 100% rename from internal/initwd/test-fixtures/local-modules/root.tf rename to internal/initwd/testdata/local-modules/root.tf diff --git a/internal/initwd/test-fixtures/registry-modules/.gitignore b/internal/initwd/testdata/registry-modules/.gitignore similarity index 100% rename from internal/initwd/test-fixtures/registry-modules/.gitignore rename to internal/initwd/testdata/registry-modules/.gitignore diff --git a/internal/initwd/test-fixtures/registry-modules/root.tf b/internal/initwd/testdata/registry-modules/root.tf similarity index 100% rename from internal/initwd/test-fixtures/registry-modules/root.tf rename to internal/initwd/testdata/registry-modules/root.tf diff --git a/plugin/discovery/find_test.go b/plugin/discovery/find_test.go index 6a86b77930..8bad7061be 100644 --- a/plugin/discovery/find_test.go +++ b/plugin/discovery/find_test.go @@ -11,19 +11,19 @@ func TestFindPluginPaths(t *testing.T) { got := findPluginPaths( "foo", []string{ - "test-fixtures/current-style-plugins/mockos_mockarch", - "test-fixtures/legacy-style-plugins", - "test-fixtures/non-existent", - "test-fixtures/not-a-dir", + "testdata/current-style-plugins/mockos_mockarch", + "testdata/legacy-style-plugins", + "testdata/non-existent", + "testdata/not-a-dir", }, ) want := []string{ - filepath.Join("test-fixtures", "current-style-plugins", "mockos_mockarch", "terraform-foo-bar_v0.0.1"), - filepath.Join("test-fixtures", "current-style-plugins", "mockos_mockarch", "terraform-foo-bar_v1.0.0.exe"), + filepath.Join("testdata", "current-style-plugins", "mockos_mockarch", "terraform-foo-bar_v0.0.1"), + filepath.Join("testdata", "current-style-plugins", "mockos_mockarch", "terraform-foo-bar_v1.0.0.exe"), // un-versioned plugins are still picked up, even in current-style paths - filepath.Join("test-fixtures", "current-style-plugins", "mockos_mockarch", "terraform-foo-missing-version"), - filepath.Join("test-fixtures", "legacy-style-plugins", "terraform-foo-bar"), - filepath.Join("test-fixtures", "legacy-style-plugins", "terraform-foo-baz"), + filepath.Join("testdata", "current-style-plugins", "mockos_mockarch", "terraform-foo-missing-version"), + filepath.Join("testdata", "legacy-style-plugins", "terraform-foo-bar"), + filepath.Join("testdata", "legacy-style-plugins", "terraform-foo-baz"), } // Turn the paths back into relative paths, since we don't care exactly diff --git a/plugin/discovery/get_cache_test.go b/plugin/discovery/get_cache_test.go index 0753dc571e..a7e3eeab46 100644 --- a/plugin/discovery/get_cache_test.go +++ b/plugin/discovery/get_cache_test.go @@ -5,7 +5,7 @@ import ( ) func TestLocalPluginCache(t *testing.T) { - cache := NewLocalPluginCache("test-fixtures/plugin-cache") + cache := NewLocalPluginCache("testdata/plugin-cache") foo1Path := cache.CachedPluginPath("provider", "foo", VersionStr("v0.0.1").MustParse()) if foo1Path == "" { diff --git a/plugin/discovery/meta_test.go b/plugin/discovery/meta_test.go index 3efd3ab343..5cbd6721ab 100644 --- a/plugin/discovery/meta_test.go +++ b/plugin/discovery/meta_test.go @@ -7,7 +7,7 @@ import ( func TestMetaSHA256(t *testing.T) { m := PluginMeta{ - Path: "test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1", + Path: "testdata/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1", } hash, err := m.SHA256() if err != nil { diff --git a/plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1 b/plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1 similarity index 100% rename from plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1 rename to plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-bar_v0.0.1 diff --git a/plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-bar_v1.0.0.exe b/plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-bar_v1.0.0.exe similarity index 100% rename from plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-bar_v1.0.0.exe rename to plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-bar_v1.0.0.exe diff --git a/plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-missing-version b/plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-missing-version similarity index 100% rename from plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-foo-missing-version rename to plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-foo-missing-version diff --git a/plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-notfoo-bar_v0.0.1 b/plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-notfoo-bar_v0.0.1 similarity index 100% rename from plugin/discovery/test-fixtures/current-style-plugins/mockos_mockarch/terraform-notfoo-bar_v0.0.1 rename to plugin/discovery/testdata/current-style-plugins/mockos_mockarch/terraform-notfoo-bar_v0.0.1 diff --git a/plugin/discovery/test-fixtures/legacy-style-plugins/terraform-foo-bar b/plugin/discovery/testdata/legacy-style-plugins/terraform-foo-bar similarity index 100% rename from plugin/discovery/test-fixtures/legacy-style-plugins/terraform-foo-bar rename to plugin/discovery/testdata/legacy-style-plugins/terraform-foo-bar diff --git a/plugin/discovery/test-fixtures/legacy-style-plugins/terraform-foo-baz b/plugin/discovery/testdata/legacy-style-plugins/terraform-foo-baz similarity index 100% rename from plugin/discovery/test-fixtures/legacy-style-plugins/terraform-foo-baz rename to plugin/discovery/testdata/legacy-style-plugins/terraform-foo-baz diff --git a/plugin/discovery/test-fixtures/legacy-style-plugins/terraform-notfoo-bar b/plugin/discovery/testdata/legacy-style-plugins/terraform-notfoo-bar similarity index 100% rename from plugin/discovery/test-fixtures/legacy-style-plugins/terraform-notfoo-bar rename to plugin/discovery/testdata/legacy-style-plugins/terraform-notfoo-bar diff --git a/plugin/discovery/test-fixtures/not-a-dir b/plugin/discovery/testdata/not-a-dir similarity index 100% rename from plugin/discovery/test-fixtures/not-a-dir rename to plugin/discovery/testdata/not-a-dir diff --git a/plugin/discovery/test-fixtures/plugin-cache/terraform-provider-foo_v0.0.1_x4 b/plugin/discovery/testdata/plugin-cache/terraform-provider-foo_v0.0.1_x4 similarity index 100% rename from plugin/discovery/test-fixtures/plugin-cache/terraform-provider-foo_v0.0.1_x4 rename to plugin/discovery/testdata/plugin-cache/terraform-provider-foo_v0.0.1_x4 diff --git a/registry/test/mock_registry.go b/registry/test/mock_registry.go index 9688fbeb59..f89cfc0162 100644 --- a/registry/test/mock_registry.go +++ b/registry/test/mock_registry.go @@ -77,7 +77,7 @@ var testMods = map[string][]testMod{ version: "1.10.0", }}, "registry/local/sub": {{ - location: "test-fixtures/registry-tar-subdir/foo.tgz//*?archive=tar.gz", + location: "testdata/registry-tar-subdir/foo.tgz//*?archive=tar.gz", version: "0.1.2", }}, "exists-in-registry/identifier/provider": {{ diff --git a/repl/session_test.go b/repl/session_test.go index 2f35c4859b..d79ba33a8c 100644 --- a/repl/session_test.go +++ b/repl/session_test.go @@ -270,7 +270,7 @@ func testSession(t *testing.T, test testSessionTest) { type testSessionTest struct { State *states.State // State to use - Module string // Module name in test-fixtures to load + Module string // Module name in testdata to load // Inputs are the list of test inputs that are run in order. // Each input can test the output of each step. diff --git a/scripts/generate-plugins.go b/scripts/generate-plugins.go index c61d8dc197..0859fe5a20 100644 --- a/scripts/generate-plugins.go +++ b/scripts/generate-plugins.go @@ -124,7 +124,7 @@ func listDirectories(path string) ([]string, error) { for _, item := range items { // We only want directories if item.IsDir() { - if item.Name() == "test-fixtures" { + if item.Name() == "testdata" { continue } currentDir := filepath.Join(path, item.Name()) diff --git a/svchost/auth/helper_program_test.go b/svchost/auth/helper_program_test.go index 3fa1c3aa5e..e8b73c3e03 100644 --- a/svchost/auth/helper_program_test.go +++ b/svchost/auth/helper_program_test.go @@ -14,7 +14,7 @@ func TestHelperProgramCredentialsSource(t *testing.T) { t.Fatal(err) } - program := filepath.Join(wd, "test-helper/test-helper") + program := filepath.Join(wd, "testdata/test-helper") t.Logf("testing with helper at %s", program) src := HelperProgramCredentialsSource(program) diff --git a/svchost/auth/test-helper/.gitignore b/svchost/auth/testdata/.gitignore similarity index 100% rename from svchost/auth/test-helper/.gitignore rename to svchost/auth/testdata/.gitignore diff --git a/svchost/auth/test-helper/main.go b/svchost/auth/testdata/main.go similarity index 100% rename from svchost/auth/test-helper/main.go rename to svchost/auth/testdata/main.go diff --git a/svchost/auth/test-helper/test-helper b/svchost/auth/testdata/test-helper similarity index 100% rename from svchost/auth/test-helper/test-helper rename to svchost/auth/testdata/test-helper diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go index afb5bd80a0..acc4fd5899 100644 --- a/terraform/context_fixtures_test.go +++ b/terraform/context_fixtures_test.go @@ -31,7 +31,7 @@ func (f *contextTestFixture) ContextOpts() *ContextOpts { // contextFixtureApplyVars builds and returns a test fixture for testing // input variables, primarily during the apply phase. The configuration is -// loaded from test-fixtures/apply-vars, and the provider resolver is +// loaded from testdata/apply-vars, and the provider resolver is // configured with a resource type schema for aws_instance that matches // what's used in that configuration. func contextFixtureApplyVars(t *testing.T) *contextTestFixture { @@ -61,7 +61,7 @@ func contextFixtureApplyVars(t *testing.T) *contextTestFixture { // contextFixtureApplyVarsEnv builds and returns a test fixture for testing // input variables set from the environment. The configuration is -// loaded from test-fixtures/apply-vars-env, and the provider resolver is +// loaded from testdata/apply-vars-env, and the provider resolver is // configured with a resource type schema for aws_instance that matches // what's used in that configuration. func contextFixtureApplyVarsEnv(t *testing.T) *contextTestFixture { diff --git a/terraform/module_dependencies_test.go b/terraform/module_dependencies_test.go index 4245a767ca..64a8edbbbe 100644 --- a/terraform/module_dependencies_test.go +++ b/terraform/module_dependencies_test.go @@ -12,7 +12,7 @@ import ( func TestModuleTreeDependencies(t *testing.T) { tests := map[string]struct { - ConfigDir string // directory name from test-fixtures dir + ConfigDir string // directory name from testdata dir State *State Want *moduledeps.Module }{ diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go index 5b9ef6cd1f..9f0a63529d 100644 --- a/terraform/terraform_test.go +++ b/terraform/terraform_test.go @@ -29,7 +29,7 @@ import ( ) // This is the directory where our test fixtures are. -const fixtureDir = "./test-fixtures" +const fixtureDir = "./testdata" func TestMain(m *testing.M) { // We want to shadow on tests just to make sure the shadow graph works diff --git a/terraform/test-fixtures/apply-blank/main.tf b/terraform/testdata/apply-blank/main.tf similarity index 100% rename from terraform/test-fixtures/apply-blank/main.tf rename to terraform/testdata/apply-blank/main.tf diff --git a/terraform/test-fixtures/apply-cancel-block/main.tf b/terraform/testdata/apply-cancel-block/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cancel-block/main.tf rename to terraform/testdata/apply-cancel-block/main.tf diff --git a/terraform/test-fixtures/apply-cancel-provisioner/main.tf b/terraform/testdata/apply-cancel-provisioner/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cancel-provisioner/main.tf rename to terraform/testdata/apply-cancel-provisioner/main.tf diff --git a/terraform/test-fixtures/apply-cancel/main.tf b/terraform/testdata/apply-cancel/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cancel/main.tf rename to terraform/testdata/apply-cancel/main.tf diff --git a/terraform/test-fixtures/apply-cbd-count/main.tf b/terraform/testdata/apply-cbd-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cbd-count/main.tf rename to terraform/testdata/apply-cbd-count/main.tf diff --git a/terraform/test-fixtures/apply-cbd-depends-non-cbd/main.tf b/terraform/testdata/apply-cbd-depends-non-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cbd-depends-non-cbd/main.tf rename to terraform/testdata/apply-cbd-depends-non-cbd/main.tf diff --git a/terraform/test-fixtures/apply-cbd-deposed-only/main.tf b/terraform/testdata/apply-cbd-deposed-only/main.tf similarity index 100% rename from terraform/test-fixtures/apply-cbd-deposed-only/main.tf rename to terraform/testdata/apply-cbd-deposed-only/main.tf diff --git a/terraform/test-fixtures/apply-compute/main.tf b/terraform/testdata/apply-compute/main.tf similarity index 100% rename from terraform/test-fixtures/apply-compute/main.tf rename to terraform/testdata/apply-compute/main.tf diff --git a/terraform/test-fixtures/apply-count-dec-one/main.tf b/terraform/testdata/apply-count-dec-one/main.tf similarity index 100% rename from terraform/test-fixtures/apply-count-dec-one/main.tf rename to terraform/testdata/apply-count-dec-one/main.tf diff --git a/terraform/test-fixtures/apply-count-dec/main.tf b/terraform/testdata/apply-count-dec/main.tf similarity index 100% rename from terraform/test-fixtures/apply-count-dec/main.tf rename to terraform/testdata/apply-count-dec/main.tf diff --git a/terraform/test-fixtures/apply-count-tainted/main.tf b/terraform/testdata/apply-count-tainted/main.tf similarity index 100% rename from terraform/test-fixtures/apply-count-tainted/main.tf rename to terraform/testdata/apply-count-tainted/main.tf diff --git a/terraform/test-fixtures/apply-count-variable-ref/main.tf b/terraform/testdata/apply-count-variable-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-count-variable-ref/main.tf rename to terraform/testdata/apply-count-variable-ref/main.tf diff --git a/terraform/test-fixtures/apply-count-variable/main.tf b/terraform/testdata/apply-count-variable/main.tf similarity index 100% rename from terraform/test-fixtures/apply-count-variable/main.tf rename to terraform/testdata/apply-count-variable/main.tf diff --git a/terraform/test-fixtures/apply-data-basic/main.tf b/terraform/testdata/apply-data-basic/main.tf similarity index 100% rename from terraform/test-fixtures/apply-data-basic/main.tf rename to terraform/testdata/apply-data-basic/main.tf diff --git a/terraform/test-fixtures/apply-data-depends-on/main.tf b/terraform/testdata/apply-data-depends-on/main.tf similarity index 100% rename from terraform/test-fixtures/apply-data-depends-on/main.tf rename to terraform/testdata/apply-data-depends-on/main.tf diff --git a/terraform/test-fixtures/apply-depends-create-before/main.tf b/terraform/testdata/apply-depends-create-before/main.tf similarity index 100% rename from terraform/test-fixtures/apply-depends-create-before/main.tf rename to terraform/testdata/apply-depends-create-before/main.tf diff --git a/terraform/test-fixtures/apply-destroy-cbd/main.tf b/terraform/testdata/apply-destroy-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-cbd/main.tf rename to terraform/testdata/apply-destroy-cbd/main.tf diff --git a/terraform/test-fixtures/apply-destroy-computed/child/main.tf b/terraform/testdata/apply-destroy-computed/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-computed/child/main.tf rename to terraform/testdata/apply-destroy-computed/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-computed/main.tf b/terraform/testdata/apply-destroy-computed/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-computed/main.tf rename to terraform/testdata/apply-destroy-computed/main.tf diff --git a/terraform/test-fixtures/apply-destroy-cross-providers/child/main.tf b/terraform/testdata/apply-destroy-cross-providers/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-cross-providers/child/main.tf rename to terraform/testdata/apply-destroy-cross-providers/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-cross-providers/main.tf b/terraform/testdata/apply-destroy-cross-providers/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-cross-providers/main.tf rename to terraform/testdata/apply-destroy-cross-providers/main.tf diff --git a/terraform/test-fixtures/apply-destroy-data-resource/main.tf b/terraform/testdata/apply-destroy-data-resource/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-data-resource/main.tf rename to terraform/testdata/apply-destroy-data-resource/main.tf diff --git a/terraform/test-fixtures/apply-destroy-deeply-nested-module/child/main.tf b/terraform/testdata/apply-destroy-deeply-nested-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-deeply-nested-module/child/main.tf rename to terraform/testdata/apply-destroy-deeply-nested-module/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-deeply-nested-module/child/subchild/main.tf b/terraform/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-deeply-nested-module/child/subchild/main.tf rename to terraform/testdata/apply-destroy-deeply-nested-module/child/subchild/main.tf diff --git a/terraform/test-fixtures/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf b/terraform/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf rename to terraform/testdata/apply-destroy-deeply-nested-module/child/subchild/subsubchild/main.tf diff --git a/terraform/test-fixtures/apply-destroy-deeply-nested-module/main.tf b/terraform/testdata/apply-destroy-deeply-nested-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-deeply-nested-module/main.tf rename to terraform/testdata/apply-destroy-deeply-nested-module/main.tf diff --git a/terraform/test-fixtures/apply-destroy-depends-on/main.tf b/terraform/testdata/apply-destroy-depends-on/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-depends-on/main.tf rename to terraform/testdata/apply-destroy-depends-on/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/child/child2/main.tf b/terraform/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/child/child2/main.tf rename to terraform/testdata/apply-destroy-mod-var-and-count-nested/child/child2/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/child/main.tf b/terraform/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/child/main.tf rename to terraform/testdata/apply-destroy-mod-var-and-count-nested/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/main.tf b/terraform/testdata/apply-destroy-mod-var-and-count-nested/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-and-count-nested/main.tf rename to terraform/testdata/apply-destroy-mod-var-and-count-nested/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-and-count/child/main.tf b/terraform/testdata/apply-destroy-mod-var-and-count/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-and-count/child/main.tf rename to terraform/testdata/apply-destroy-mod-var-and-count/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-and-count/main.tf b/terraform/testdata/apply-destroy-mod-var-and-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-and-count/main.tf rename to terraform/testdata/apply-destroy-mod-var-and-count/main.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-provider-config/child/child.tf b/terraform/testdata/apply-destroy-mod-var-provider-config/child/child.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-provider-config/child/child.tf rename to terraform/testdata/apply-destroy-mod-var-provider-config/child/child.tf diff --git a/terraform/test-fixtures/apply-destroy-mod-var-provider-config/main.tf b/terraform/testdata/apply-destroy-mod-var-provider-config/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-mod-var-provider-config/main.tf rename to terraform/testdata/apply-destroy-mod-var-provider-config/main.tf diff --git a/terraform/test-fixtures/apply-destroy-module-resource-prefix/child/main.tf b/terraform/testdata/apply-destroy-module-resource-prefix/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-module-resource-prefix/child/main.tf rename to terraform/testdata/apply-destroy-module-resource-prefix/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-module-resource-prefix/main.tf b/terraform/testdata/apply-destroy-module-resource-prefix/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-module-resource-prefix/main.tf rename to terraform/testdata/apply-destroy-module-resource-prefix/main.tf diff --git a/terraform/test-fixtures/apply-destroy-module-with-attrs/child/main.tf b/terraform/testdata/apply-destroy-module-with-attrs/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-module-with-attrs/child/main.tf rename to terraform/testdata/apply-destroy-module-with-attrs/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-module-with-attrs/main.tf b/terraform/testdata/apply-destroy-module-with-attrs/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-module-with-attrs/main.tf rename to terraform/testdata/apply-destroy-module-with-attrs/main.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf b/terraform/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf rename to terraform/testdata/apply-destroy-nested-module-with-attrs/middle/bottom/bottom.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module-with-attrs/middle/middle.tf b/terraform/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module-with-attrs/middle/middle.tf rename to terraform/testdata/apply-destroy-nested-module-with-attrs/middle/middle.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module-with-attrs/top.tf b/terraform/testdata/apply-destroy-nested-module-with-attrs/top.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module-with-attrs/top.tf rename to terraform/testdata/apply-destroy-nested-module-with-attrs/top.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module/child/main.tf b/terraform/testdata/apply-destroy-nested-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module/child/main.tf rename to terraform/testdata/apply-destroy-nested-module/child/main.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module/child/subchild/main.tf b/terraform/testdata/apply-destroy-nested-module/child/subchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module/child/subchild/main.tf rename to terraform/testdata/apply-destroy-nested-module/child/subchild/main.tf diff --git a/terraform/test-fixtures/apply-destroy-nested-module/main.tf b/terraform/testdata/apply-destroy-nested-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-nested-module/main.tf rename to terraform/testdata/apply-destroy-nested-module/main.tf diff --git a/terraform/test-fixtures/apply-destroy-outputs/main.tf b/terraform/testdata/apply-destroy-outputs/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-outputs/main.tf rename to terraform/testdata/apply-destroy-outputs/main.tf diff --git a/terraform/test-fixtures/apply-destroy-provisioner/main.tf b/terraform/testdata/apply-destroy-provisioner/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-provisioner/main.tf rename to terraform/testdata/apply-destroy-provisioner/main.tf diff --git a/terraform/test-fixtures/apply-destroy-targeted-count/main.tf b/terraform/testdata/apply-destroy-targeted-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-targeted-count/main.tf rename to terraform/testdata/apply-destroy-targeted-count/main.tf diff --git a/terraform/test-fixtures/apply-destroy-with-locals/main.tf b/terraform/testdata/apply-destroy-with-locals/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy-with-locals/main.tf rename to terraform/testdata/apply-destroy-with-locals/main.tf diff --git a/terraform/test-fixtures/apply-destroy/main.tf b/terraform/testdata/apply-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/apply-destroy/main.tf rename to terraform/testdata/apply-destroy/main.tf diff --git a/terraform/test-fixtures/apply-empty-module/child/main.tf b/terraform/testdata/apply-empty-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-empty-module/child/main.tf rename to terraform/testdata/apply-empty-module/child/main.tf diff --git a/terraform/test-fixtures/apply-empty-module/main.tf b/terraform/testdata/apply-empty-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-empty-module/main.tf rename to terraform/testdata/apply-empty-module/main.tf diff --git a/terraform/test-fixtures/apply-error-create-before/main.tf b/terraform/testdata/apply-error-create-before/main.tf similarity index 100% rename from terraform/test-fixtures/apply-error-create-before/main.tf rename to terraform/testdata/apply-error-create-before/main.tf diff --git a/terraform/test-fixtures/apply-error/main.tf b/terraform/testdata/apply-error/main.tf similarity index 100% rename from terraform/test-fixtures/apply-error/main.tf rename to terraform/testdata/apply-error/main.tf diff --git a/terraform/test-fixtures/apply-escape/main.tf b/terraform/testdata/apply-escape/main.tf similarity index 100% rename from terraform/test-fixtures/apply-escape/main.tf rename to terraform/testdata/apply-escape/main.tf diff --git a/terraform/test-fixtures/apply-good-create-before-count/main.tf b/terraform/testdata/apply-good-create-before-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-good-create-before-count/main.tf rename to terraform/testdata/apply-good-create-before-count/main.tf diff --git a/terraform/test-fixtures/apply-good-create-before-update/main.tf b/terraform/testdata/apply-good-create-before-update/main.tf similarity index 100% rename from terraform/test-fixtures/apply-good-create-before-update/main.tf rename to terraform/testdata/apply-good-create-before-update/main.tf diff --git a/terraform/test-fixtures/apply-good-create-before/main.tf b/terraform/testdata/apply-good-create-before/main.tf similarity index 100% rename from terraform/test-fixtures/apply-good-create-before/main.tf rename to terraform/testdata/apply-good-create-before/main.tf diff --git a/terraform/test-fixtures/apply-good/main.tf b/terraform/testdata/apply-good/main.tf similarity index 100% rename from terraform/test-fixtures/apply-good/main.tf rename to terraform/testdata/apply-good/main.tf diff --git a/terraform/test-fixtures/apply-idattr/main.tf b/terraform/testdata/apply-idattr/main.tf similarity index 100% rename from terraform/test-fixtures/apply-idattr/main.tf rename to terraform/testdata/apply-idattr/main.tf diff --git a/terraform/test-fixtures/apply-ignore-changes-create/main.tf b/terraform/testdata/apply-ignore-changes-create/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ignore-changes-create/main.tf rename to terraform/testdata/apply-ignore-changes-create/main.tf diff --git a/terraform/test-fixtures/apply-ignore-changes-dep/main.tf b/terraform/testdata/apply-ignore-changes-dep/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ignore-changes-dep/main.tf rename to terraform/testdata/apply-ignore-changes-dep/main.tf diff --git a/terraform/test-fixtures/apply-ignore-changes-wildcard/main.tf b/terraform/testdata/apply-ignore-changes-wildcard/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ignore-changes-wildcard/main.tf rename to terraform/testdata/apply-ignore-changes-wildcard/main.tf diff --git a/terraform/test-fixtures/apply-inconsistent-with-plan/main.tf b/terraform/testdata/apply-inconsistent-with-plan/main.tf similarity index 100% rename from terraform/test-fixtures/apply-inconsistent-with-plan/main.tf rename to terraform/testdata/apply-inconsistent-with-plan/main.tf diff --git a/terraform/test-fixtures/apply-interpolated-count/main.tf b/terraform/testdata/apply-interpolated-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-interpolated-count/main.tf rename to terraform/testdata/apply-interpolated-count/main.tf diff --git a/terraform/test-fixtures/apply-issue19908/issue19908.tf b/terraform/testdata/apply-issue19908/issue19908.tf similarity index 100% rename from terraform/test-fixtures/apply-issue19908/issue19908.tf rename to terraform/testdata/apply-issue19908/issue19908.tf diff --git a/terraform/test-fixtures/apply-local-val/child/child.tf b/terraform/testdata/apply-local-val/child/child.tf similarity index 100% rename from terraform/test-fixtures/apply-local-val/child/child.tf rename to terraform/testdata/apply-local-val/child/child.tf diff --git a/terraform/test-fixtures/apply-local-val/main.tf b/terraform/testdata/apply-local-val/main.tf similarity index 100% rename from terraform/test-fixtures/apply-local-val/main.tf rename to terraform/testdata/apply-local-val/main.tf diff --git a/terraform/test-fixtures/apply-local-val/outputs.tf b/terraform/testdata/apply-local-val/outputs.tf similarity index 100% rename from terraform/test-fixtures/apply-local-val/outputs.tf rename to terraform/testdata/apply-local-val/outputs.tf diff --git a/terraform/test-fixtures/apply-map-var-through-module/amodule/main.tf b/terraform/testdata/apply-map-var-through-module/amodule/main.tf similarity index 100% rename from terraform/test-fixtures/apply-map-var-through-module/amodule/main.tf rename to terraform/testdata/apply-map-var-through-module/amodule/main.tf diff --git a/terraform/test-fixtures/apply-map-var-through-module/main.tf b/terraform/testdata/apply-map-var-through-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-map-var-through-module/main.tf rename to terraform/testdata/apply-map-var-through-module/main.tf diff --git a/terraform/test-fixtures/apply-minimal/main.tf b/terraform/testdata/apply-minimal/main.tf similarity index 100% rename from terraform/test-fixtures/apply-minimal/main.tf rename to terraform/testdata/apply-minimal/main.tf diff --git a/terraform/test-fixtures/apply-module-bool/child/main.tf b/terraform/testdata/apply-module-bool/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-bool/child/main.tf rename to terraform/testdata/apply-module-bool/child/main.tf diff --git a/terraform/test-fixtures/apply-module-bool/main.tf b/terraform/testdata/apply-module-bool/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-bool/main.tf rename to terraform/testdata/apply-module-bool/main.tf diff --git a/terraform/test-fixtures/apply-module-destroy-order/child/main.tf b/terraform/testdata/apply-module-destroy-order/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-destroy-order/child/main.tf rename to terraform/testdata/apply-module-destroy-order/child/main.tf diff --git a/terraform/test-fixtures/apply-module-destroy-order/main.tf b/terraform/testdata/apply-module-destroy-order/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-destroy-order/main.tf rename to terraform/testdata/apply-module-destroy-order/main.tf diff --git a/terraform/test-fixtures/apply-module-grandchild-provider-inherit/child/grandchild/main.tf b/terraform/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-grandchild-provider-inherit/child/grandchild/main.tf rename to terraform/testdata/apply-module-grandchild-provider-inherit/child/grandchild/main.tf diff --git a/terraform/test-fixtures/apply-module-grandchild-provider-inherit/child/main.tf b/terraform/testdata/apply-module-grandchild-provider-inherit/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-grandchild-provider-inherit/child/main.tf rename to terraform/testdata/apply-module-grandchild-provider-inherit/child/main.tf diff --git a/terraform/test-fixtures/apply-module-grandchild-provider-inherit/main.tf b/terraform/testdata/apply-module-grandchild-provider-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-grandchild-provider-inherit/main.tf rename to terraform/testdata/apply-module-grandchild-provider-inherit/main.tf diff --git a/terraform/test-fixtures/apply-module-only-provider/child/main.tf b/terraform/testdata/apply-module-only-provider/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-only-provider/child/main.tf rename to terraform/testdata/apply-module-only-provider/child/main.tf diff --git a/terraform/test-fixtures/apply-module-only-provider/main.tf b/terraform/testdata/apply-module-only-provider/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-only-provider/main.tf rename to terraform/testdata/apply-module-only-provider/main.tf diff --git a/terraform/test-fixtures/apply-module-orphan-provider-inherit/main.tf b/terraform/testdata/apply-module-orphan-provider-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-orphan-provider-inherit/main.tf rename to terraform/testdata/apply-module-orphan-provider-inherit/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-alias/child/main.tf b/terraform/testdata/apply-module-provider-alias/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-alias/child/main.tf rename to terraform/testdata/apply-module-provider-alias/child/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-alias/main.tf b/terraform/testdata/apply-module-provider-alias/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-alias/main.tf rename to terraform/testdata/apply-module-provider-alias/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf b/terraform/testdata/apply-module-provider-close-nested/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-close-nested/child/main.tf rename to terraform/testdata/apply-module-provider-close-nested/child/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf b/terraform/testdata/apply-module-provider-close-nested/child/subchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-close-nested/child/subchild/main.tf rename to terraform/testdata/apply-module-provider-close-nested/child/subchild/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-close-nested/main.tf b/terraform/testdata/apply-module-provider-close-nested/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-close-nested/main.tf rename to terraform/testdata/apply-module-provider-close-nested/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-inherit-alias-orphan/main.tf b/terraform/testdata/apply-module-provider-inherit-alias-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-inherit-alias-orphan/main.tf rename to terraform/testdata/apply-module-provider-inherit-alias-orphan/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-inherit-alias/child/main.tf b/terraform/testdata/apply-module-provider-inherit-alias/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-inherit-alias/child/main.tf rename to terraform/testdata/apply-module-provider-inherit-alias/child/main.tf diff --git a/terraform/test-fixtures/apply-module-provider-inherit-alias/main.tf b/terraform/testdata/apply-module-provider-inherit-alias/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-provider-inherit-alias/main.tf rename to terraform/testdata/apply-module-provider-inherit-alias/main.tf diff --git a/terraform/test-fixtures/apply-module-var-resource-count/child/main.tf b/terraform/testdata/apply-module-var-resource-count/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-var-resource-count/child/main.tf rename to terraform/testdata/apply-module-var-resource-count/child/main.tf diff --git a/terraform/test-fixtures/apply-module-var-resource-count/main.tf b/terraform/testdata/apply-module-var-resource-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module-var-resource-count/main.tf rename to terraform/testdata/apply-module-var-resource-count/main.tf diff --git a/terraform/test-fixtures/apply-module/child/main.tf b/terraform/testdata/apply-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module/child/main.tf rename to terraform/testdata/apply-module/child/main.tf diff --git a/terraform/test-fixtures/apply-module/main.tf b/terraform/testdata/apply-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-module/main.tf rename to terraform/testdata/apply-module/main.tf diff --git a/terraform/test-fixtures/apply-multi-depose-create-before-destroy/main.tf b/terraform/testdata/apply-multi-depose-create-before-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-depose-create-before-destroy/main.tf rename to terraform/testdata/apply-multi-depose-create-before-destroy/main.tf diff --git a/terraform/test-fixtures/apply-multi-provider-destroy-child/child/main.tf b/terraform/testdata/apply-multi-provider-destroy-child/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-provider-destroy-child/child/main.tf rename to terraform/testdata/apply-multi-provider-destroy-child/child/main.tf diff --git a/terraform/test-fixtures/apply-multi-provider-destroy-child/main.tf b/terraform/testdata/apply-multi-provider-destroy-child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-provider-destroy-child/main.tf rename to terraform/testdata/apply-multi-provider-destroy-child/main.tf diff --git a/terraform/test-fixtures/apply-multi-provider-destroy/main.tf b/terraform/testdata/apply-multi-provider-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-provider-destroy/main.tf rename to terraform/testdata/apply-multi-provider-destroy/main.tf diff --git a/terraform/test-fixtures/apply-multi-provider/main.tf b/terraform/testdata/apply-multi-provider/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-provider/main.tf rename to terraform/testdata/apply-multi-provider/main.tf diff --git a/terraform/test-fixtures/apply-multi-ref/main.tf b/terraform/testdata/apply-multi-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-ref/main.tf rename to terraform/testdata/apply-multi-ref/main.tf diff --git a/terraform/test-fixtures/apply-multi-var-comprehensive/child/child.tf b/terraform/testdata/apply-multi-var-comprehensive/child/child.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-comprehensive/child/child.tf rename to terraform/testdata/apply-multi-var-comprehensive/child/child.tf diff --git a/terraform/test-fixtures/apply-multi-var-comprehensive/root.tf b/terraform/testdata/apply-multi-var-comprehensive/root.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-comprehensive/root.tf rename to terraform/testdata/apply-multi-var-comprehensive/root.tf diff --git a/terraform/test-fixtures/apply-multi-var-count-dec/main.tf b/terraform/testdata/apply-multi-var-count-dec/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-count-dec/main.tf rename to terraform/testdata/apply-multi-var-count-dec/main.tf diff --git a/terraform/test-fixtures/apply-multi-var-missing-state/child/child.tf b/terraform/testdata/apply-multi-var-missing-state/child/child.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-missing-state/child/child.tf rename to terraform/testdata/apply-multi-var-missing-state/child/child.tf diff --git a/terraform/test-fixtures/apply-multi-var-missing-state/root.tf b/terraform/testdata/apply-multi-var-missing-state/root.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-missing-state/root.tf rename to terraform/testdata/apply-multi-var-missing-state/root.tf diff --git a/terraform/test-fixtures/apply-multi-var-order-interp/main.tf b/terraform/testdata/apply-multi-var-order-interp/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-order-interp/main.tf rename to terraform/testdata/apply-multi-var-order-interp/main.tf diff --git a/terraform/test-fixtures/apply-multi-var-order/main.tf b/terraform/testdata/apply-multi-var-order/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var-order/main.tf rename to terraform/testdata/apply-multi-var-order/main.tf diff --git a/terraform/test-fixtures/apply-multi-var/main.tf b/terraform/testdata/apply-multi-var/main.tf similarity index 100% rename from terraform/test-fixtures/apply-multi-var/main.tf rename to terraform/testdata/apply-multi-var/main.tf diff --git a/terraform/test-fixtures/apply-orphan-resource/main.tf b/terraform/testdata/apply-orphan-resource/main.tf similarity index 100% rename from terraform/test-fixtures/apply-orphan-resource/main.tf rename to terraform/testdata/apply-orphan-resource/main.tf diff --git a/terraform/test-fixtures/apply-output-add-after/main.tf b/terraform/testdata/apply-output-add-after/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-add-after/main.tf rename to terraform/testdata/apply-output-add-after/main.tf diff --git a/terraform/test-fixtures/apply-output-add-after/outputs.tf.json b/terraform/testdata/apply-output-add-after/outputs.tf.json similarity index 100% rename from terraform/test-fixtures/apply-output-add-after/outputs.tf.json rename to terraform/testdata/apply-output-add-after/outputs.tf.json diff --git a/terraform/test-fixtures/apply-output-add-before/main.tf b/terraform/testdata/apply-output-add-before/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-add-before/main.tf rename to terraform/testdata/apply-output-add-before/main.tf diff --git a/terraform/test-fixtures/apply-output-add-before/outputs.tf.json b/terraform/testdata/apply-output-add-before/outputs.tf.json similarity index 100% rename from terraform/test-fixtures/apply-output-add-before/outputs.tf.json rename to terraform/testdata/apply-output-add-before/outputs.tf.json diff --git a/terraform/test-fixtures/apply-output-depends-on/main.tf b/terraform/testdata/apply-output-depends-on/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-depends-on/main.tf rename to terraform/testdata/apply-output-depends-on/main.tf diff --git a/terraform/test-fixtures/apply-output-list/main.tf b/terraform/testdata/apply-output-list/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-list/main.tf rename to terraform/testdata/apply-output-list/main.tf diff --git a/terraform/test-fixtures/apply-output-multi-index/main.tf b/terraform/testdata/apply-output-multi-index/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-multi-index/main.tf rename to terraform/testdata/apply-output-multi-index/main.tf diff --git a/terraform/test-fixtures/apply-output-multi/main.tf b/terraform/testdata/apply-output-multi/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-multi/main.tf rename to terraform/testdata/apply-output-multi/main.tf diff --git a/terraform/test-fixtures/apply-output-orphan-module/child/main.tf b/terraform/testdata/apply-output-orphan-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-orphan-module/child/main.tf rename to terraform/testdata/apply-output-orphan-module/child/main.tf diff --git a/terraform/test-fixtures/apply-output-orphan-module/main.tf b/terraform/testdata/apply-output-orphan-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-orphan-module/main.tf rename to terraform/testdata/apply-output-orphan-module/main.tf diff --git a/terraform/test-fixtures/apply-output-orphan/main.tf b/terraform/testdata/apply-output-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output-orphan/main.tf rename to terraform/testdata/apply-output-orphan/main.tf diff --git a/terraform/test-fixtures/apply-output/main.tf b/terraform/testdata/apply-output/main.tf similarity index 100% rename from terraform/test-fixtures/apply-output/main.tf rename to terraform/testdata/apply-output/main.tf diff --git a/terraform/test-fixtures/apply-provider-alias-configure/main.tf b/terraform/testdata/apply-provider-alias-configure/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-alias-configure/main.tf rename to terraform/testdata/apply-provider-alias-configure/main.tf diff --git a/terraform/test-fixtures/apply-provider-alias/main.tf b/terraform/testdata/apply-provider-alias/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-alias/main.tf rename to terraform/testdata/apply-provider-alias/main.tf diff --git a/terraform/test-fixtures/apply-provider-computed/main.tf b/terraform/testdata/apply-provider-computed/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-computed/main.tf rename to terraform/testdata/apply-provider-computed/main.tf diff --git a/terraform/test-fixtures/apply-provider-configure-disabled/child/main.tf b/terraform/testdata/apply-provider-configure-disabled/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-configure-disabled/child/main.tf rename to terraform/testdata/apply-provider-configure-disabled/child/main.tf diff --git a/terraform/test-fixtures/apply-provider-configure-disabled/main.tf b/terraform/testdata/apply-provider-configure-disabled/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-configure-disabled/main.tf rename to terraform/testdata/apply-provider-configure-disabled/main.tf diff --git a/terraform/test-fixtures/apply-provider-warning/main.tf b/terraform/testdata/apply-provider-warning/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provider-warning/main.tf rename to terraform/testdata/apply-provider-warning/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-compute/main.tf b/terraform/testdata/apply-provisioner-compute/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-compute/main.tf rename to terraform/testdata/apply-provisioner-compute/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-conninfo/main.tf b/terraform/testdata/apply-provisioner-conninfo/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-conninfo/main.tf rename to terraform/testdata/apply-provisioner-conninfo/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-continue/main.tf b/terraform/testdata/apply-provisioner-destroy-continue/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-continue/main.tf rename to terraform/testdata/apply-provisioner-destroy-continue/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-fail/main.tf b/terraform/testdata/apply-provisioner-destroy-fail/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-fail/main.tf rename to terraform/testdata/apply-provisioner-destroy-fail/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-locals/main.tf b/terraform/testdata/apply-provisioner-destroy-locals/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-locals/main.tf rename to terraform/testdata/apply-provisioner-destroy-locals/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-module/child/main.tf b/terraform/testdata/apply-provisioner-destroy-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-module/child/main.tf rename to terraform/testdata/apply-provisioner-destroy-module/child/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-module/main.tf b/terraform/testdata/apply-provisioner-destroy-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-module/main.tf rename to terraform/testdata/apply-provisioner-destroy-module/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-multiple-locals/main.tf b/terraform/testdata/apply-provisioner-destroy-multiple-locals/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-multiple-locals/main.tf rename to terraform/testdata/apply-provisioner-destroy-multiple-locals/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-outputs/main.tf b/terraform/testdata/apply-provisioner-destroy-outputs/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-outputs/main.tf rename to terraform/testdata/apply-provisioner-destroy-outputs/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-outputs/mod/main.tf b/terraform/testdata/apply-provisioner-destroy-outputs/mod/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-outputs/mod/main.tf rename to terraform/testdata/apply-provisioner-destroy-outputs/mod/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-outputs/mod2/main.tf b/terraform/testdata/apply-provisioner-destroy-outputs/mod2/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-outputs/mod2/main.tf rename to terraform/testdata/apply-provisioner-destroy-outputs/mod2/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-ref-invalid/main.tf b/terraform/testdata/apply-provisioner-destroy-ref-invalid/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-ref-invalid/main.tf rename to terraform/testdata/apply-provisioner-destroy-ref-invalid/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy-ref/main.tf b/terraform/testdata/apply-provisioner-destroy-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy-ref/main.tf rename to terraform/testdata/apply-provisioner-destroy-ref/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-destroy/main.tf b/terraform/testdata/apply-provisioner-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-destroy/main.tf rename to terraform/testdata/apply-provisioner-destroy/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-diff/main.tf b/terraform/testdata/apply-provisioner-diff/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-diff/main.tf rename to terraform/testdata/apply-provisioner-diff/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-explicit-self-ref/main.tf b/terraform/testdata/apply-provisioner-explicit-self-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-explicit-self-ref/main.tf rename to terraform/testdata/apply-provisioner-explicit-self-ref/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-fail-continue/main.tf b/terraform/testdata/apply-provisioner-fail-continue/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-fail-continue/main.tf rename to terraform/testdata/apply-provisioner-fail-continue/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-fail-create-before/main.tf b/terraform/testdata/apply-provisioner-fail-create-before/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-fail-create-before/main.tf rename to terraform/testdata/apply-provisioner-fail-create-before/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-fail-create/main.tf b/terraform/testdata/apply-provisioner-fail-create/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-fail-create/main.tf rename to terraform/testdata/apply-provisioner-fail-create/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-fail/main.tf b/terraform/testdata/apply-provisioner-fail/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-fail/main.tf rename to terraform/testdata/apply-provisioner-fail/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-interp-count/provisioner-interp-count.tf b/terraform/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-interp-count/provisioner-interp-count.tf rename to terraform/testdata/apply-provisioner-interp-count/provisioner-interp-count.tf diff --git a/terraform/test-fixtures/apply-provisioner-module/child/main.tf b/terraform/testdata/apply-provisioner-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-module/child/main.tf rename to terraform/testdata/apply-provisioner-module/child/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-module/main.tf b/terraform/testdata/apply-provisioner-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-module/main.tf rename to terraform/testdata/apply-provisioner-module/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-multi-self-ref-single/main.tf b/terraform/testdata/apply-provisioner-multi-self-ref-single/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-multi-self-ref-single/main.tf rename to terraform/testdata/apply-provisioner-multi-self-ref-single/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-multi-self-ref/main.tf b/terraform/testdata/apply-provisioner-multi-self-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-multi-self-ref/main.tf rename to terraform/testdata/apply-provisioner-multi-self-ref/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-resource-ref/main.tf b/terraform/testdata/apply-provisioner-resource-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-resource-ref/main.tf rename to terraform/testdata/apply-provisioner-resource-ref/main.tf diff --git a/terraform/test-fixtures/apply-provisioner-self-ref/main.tf b/terraform/testdata/apply-provisioner-self-ref/main.tf similarity index 100% rename from terraform/test-fixtures/apply-provisioner-self-ref/main.tf rename to terraform/testdata/apply-provisioner-self-ref/main.tf diff --git a/terraform/test-fixtures/apply-ref-count/main.tf b/terraform/testdata/apply-ref-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ref-count/main.tf rename to terraform/testdata/apply-ref-count/main.tf diff --git a/terraform/test-fixtures/apply-ref-existing/child/main.tf b/terraform/testdata/apply-ref-existing/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ref-existing/child/main.tf rename to terraform/testdata/apply-ref-existing/child/main.tf diff --git a/terraform/test-fixtures/apply-ref-existing/main.tf b/terraform/testdata/apply-ref-existing/main.tf similarity index 100% rename from terraform/test-fixtures/apply-ref-existing/main.tf rename to terraform/testdata/apply-ref-existing/main.tf diff --git a/terraform/test-fixtures/apply-resource-count-one-list/main.tf b/terraform/testdata/apply-resource-count-one-list/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-count-one-list/main.tf rename to terraform/testdata/apply-resource-count-one-list/main.tf diff --git a/terraform/test-fixtures/apply-resource-count-zero-list/main.tf b/terraform/testdata/apply-resource-count-zero-list/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-count-zero-list/main.tf rename to terraform/testdata/apply-resource-count-zero-list/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-deep/child/child/main.tf b/terraform/testdata/apply-resource-depends-on-module-deep/child/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-deep/child/child/main.tf rename to terraform/testdata/apply-resource-depends-on-module-deep/child/child/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-deep/child/main.tf b/terraform/testdata/apply-resource-depends-on-module-deep/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-deep/child/main.tf rename to terraform/testdata/apply-resource-depends-on-module-deep/child/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-deep/main.tf b/terraform/testdata/apply-resource-depends-on-module-deep/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-deep/main.tf rename to terraform/testdata/apply-resource-depends-on-module-deep/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-empty/main.tf b/terraform/testdata/apply-resource-depends-on-module-empty/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-empty/main.tf rename to terraform/testdata/apply-resource-depends-on-module-empty/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-in-module/child/child/main.tf b/terraform/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-in-module/child/child/main.tf rename to terraform/testdata/apply-resource-depends-on-module-in-module/child/child/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-in-module/child/main.tf b/terraform/testdata/apply-resource-depends-on-module-in-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-in-module/child/main.tf rename to terraform/testdata/apply-resource-depends-on-module-in-module/child/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module-in-module/main.tf b/terraform/testdata/apply-resource-depends-on-module-in-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module-in-module/main.tf rename to terraform/testdata/apply-resource-depends-on-module-in-module/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module/child/main.tf b/terraform/testdata/apply-resource-depends-on-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module/child/main.tf rename to terraform/testdata/apply-resource-depends-on-module/child/main.tf diff --git a/terraform/test-fixtures/apply-resource-depends-on-module/main.tf b/terraform/testdata/apply-resource-depends-on-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-depends-on-module/main.tf rename to terraform/testdata/apply-resource-depends-on-module/main.tf diff --git a/terraform/test-fixtures/apply-resource-scale-in/main.tf b/terraform/testdata/apply-resource-scale-in/main.tf similarity index 100% rename from terraform/test-fixtures/apply-resource-scale-in/main.tf rename to terraform/testdata/apply-resource-scale-in/main.tf diff --git a/terraform/test-fixtures/apply-taint-dep-requires-new/main.tf b/terraform/testdata/apply-taint-dep-requires-new/main.tf similarity index 100% rename from terraform/test-fixtures/apply-taint-dep-requires-new/main.tf rename to terraform/testdata/apply-taint-dep-requires-new/main.tf diff --git a/terraform/test-fixtures/apply-taint-dep/main.tf b/terraform/testdata/apply-taint-dep/main.tf similarity index 100% rename from terraform/test-fixtures/apply-taint-dep/main.tf rename to terraform/testdata/apply-taint-dep/main.tf diff --git a/terraform/test-fixtures/apply-taint/main.tf b/terraform/testdata/apply-taint/main.tf similarity index 100% rename from terraform/test-fixtures/apply-taint/main.tf rename to terraform/testdata/apply-taint/main.tf diff --git a/terraform/test-fixtures/apply-tainted-targets/main.tf b/terraform/testdata/apply-tainted-targets/main.tf similarity index 100% rename from terraform/test-fixtures/apply-tainted-targets/main.tf rename to terraform/testdata/apply-tainted-targets/main.tf diff --git a/terraform/test-fixtures/apply-targeted-count/main.tf b/terraform/testdata/apply-targeted-count/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-count/main.tf rename to terraform/testdata/apply-targeted-count/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-dep/child/main.tf b/terraform/testdata/apply-targeted-module-dep/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-dep/child/main.tf rename to terraform/testdata/apply-targeted-module-dep/child/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-dep/main.tf b/terraform/testdata/apply-targeted-module-dep/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-dep/main.tf rename to terraform/testdata/apply-targeted-module-dep/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-recursive/child/main.tf b/terraform/testdata/apply-targeted-module-recursive/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-recursive/child/main.tf rename to terraform/testdata/apply-targeted-module-recursive/child/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-recursive/child/subchild/main.tf b/terraform/testdata/apply-targeted-module-recursive/child/subchild/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-recursive/child/subchild/main.tf rename to terraform/testdata/apply-targeted-module-recursive/child/subchild/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-recursive/main.tf b/terraform/testdata/apply-targeted-module-recursive/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-recursive/main.tf rename to terraform/testdata/apply-targeted-module-recursive/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-resource/child/main.tf b/terraform/testdata/apply-targeted-module-resource/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-resource/child/main.tf rename to terraform/testdata/apply-targeted-module-resource/child/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-resource/main.tf b/terraform/testdata/apply-targeted-module-resource/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-resource/main.tf rename to terraform/testdata/apply-targeted-module-resource/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-unrelated-outputs/child1/main.tf b/terraform/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-unrelated-outputs/child1/main.tf rename to terraform/testdata/apply-targeted-module-unrelated-outputs/child1/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-unrelated-outputs/child2/main.tf b/terraform/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-unrelated-outputs/child2/main.tf rename to terraform/testdata/apply-targeted-module-unrelated-outputs/child2/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module-unrelated-outputs/main.tf b/terraform/testdata/apply-targeted-module-unrelated-outputs/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module-unrelated-outputs/main.tf rename to terraform/testdata/apply-targeted-module-unrelated-outputs/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module/child/main.tf b/terraform/testdata/apply-targeted-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module/child/main.tf rename to terraform/testdata/apply-targeted-module/child/main.tf diff --git a/terraform/test-fixtures/apply-targeted-module/main.tf b/terraform/testdata/apply-targeted-module/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted-module/main.tf rename to terraform/testdata/apply-targeted-module/main.tf diff --git a/terraform/test-fixtures/apply-targeted/main.tf b/terraform/testdata/apply-targeted/main.tf similarity index 100% rename from terraform/test-fixtures/apply-targeted/main.tf rename to terraform/testdata/apply-targeted/main.tf diff --git a/terraform/test-fixtures/apply-terraform-workspace/main.tf b/terraform/testdata/apply-terraform-workspace/main.tf similarity index 100% rename from terraform/test-fixtures/apply-terraform-workspace/main.tf rename to terraform/testdata/apply-terraform-workspace/main.tf diff --git a/terraform/test-fixtures/apply-unknown-interpolate/child/main.tf b/terraform/testdata/apply-unknown-interpolate/child/main.tf similarity index 100% rename from terraform/test-fixtures/apply-unknown-interpolate/child/main.tf rename to terraform/testdata/apply-unknown-interpolate/child/main.tf diff --git a/terraform/test-fixtures/apply-unknown-interpolate/main.tf b/terraform/testdata/apply-unknown-interpolate/main.tf similarity index 100% rename from terraform/test-fixtures/apply-unknown-interpolate/main.tf rename to terraform/testdata/apply-unknown-interpolate/main.tf diff --git a/terraform/test-fixtures/apply-unknown/main.tf b/terraform/testdata/apply-unknown/main.tf similarity index 100% rename from terraform/test-fixtures/apply-unknown/main.tf rename to terraform/testdata/apply-unknown/main.tf diff --git a/terraform/test-fixtures/apply-unstable/main.tf b/terraform/testdata/apply-unstable/main.tf similarity index 100% rename from terraform/test-fixtures/apply-unstable/main.tf rename to terraform/testdata/apply-unstable/main.tf diff --git a/terraform/test-fixtures/apply-vars-env/main.tf b/terraform/testdata/apply-vars-env/main.tf similarity index 100% rename from terraform/test-fixtures/apply-vars-env/main.tf rename to terraform/testdata/apply-vars-env/main.tf diff --git a/terraform/test-fixtures/apply-vars/main.tf b/terraform/testdata/apply-vars/main.tf similarity index 100% rename from terraform/test-fixtures/apply-vars/main.tf rename to terraform/testdata/apply-vars/main.tf diff --git a/terraform/test-fixtures/context-required-version-module/child/main.tf b/terraform/testdata/context-required-version-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/context-required-version-module/child/main.tf rename to terraform/testdata/context-required-version-module/child/main.tf diff --git a/terraform/test-fixtures/context-required-version-module/main.tf b/terraform/testdata/context-required-version-module/main.tf similarity index 100% rename from terraform/test-fixtures/context-required-version-module/main.tf rename to terraform/testdata/context-required-version-module/main.tf diff --git a/terraform/test-fixtures/context-required-version/main.tf b/terraform/testdata/context-required-version/main.tf similarity index 100% rename from terraform/test-fixtures/context-required-version/main.tf rename to terraform/testdata/context-required-version/main.tf diff --git a/terraform/test-fixtures/destroy-module-with-provider/main.tf b/terraform/testdata/destroy-module-with-provider/main.tf similarity index 100% rename from terraform/test-fixtures/destroy-module-with-provider/main.tf rename to terraform/testdata/destroy-module-with-provider/main.tf diff --git a/terraform/test-fixtures/destroy-module-with-provider/mod/main.tf b/terraform/testdata/destroy-module-with-provider/mod/main.tf similarity index 100% rename from terraform/test-fixtures/destroy-module-with-provider/mod/main.tf rename to terraform/testdata/destroy-module-with-provider/mod/main.tf diff --git a/terraform/test-fixtures/empty-with-child-module/child/child.tf b/terraform/testdata/empty-with-child-module/child/child.tf similarity index 100% rename from terraform/test-fixtures/empty-with-child-module/child/child.tf rename to terraform/testdata/empty-with-child-module/child/child.tf diff --git a/terraform/test-fixtures/empty-with-child-module/grandchild/grandchild.tf b/terraform/testdata/empty-with-child-module/grandchild/grandchild.tf similarity index 100% rename from terraform/test-fixtures/empty-with-child-module/grandchild/grandchild.tf rename to terraform/testdata/empty-with-child-module/grandchild/grandchild.tf diff --git a/terraform/test-fixtures/empty-with-child-module/root.tf b/terraform/testdata/empty-with-child-module/root.tf similarity index 100% rename from terraform/test-fixtures/empty-with-child-module/root.tf rename to terraform/testdata/empty-with-child-module/root.tf diff --git a/terraform/test-fixtures/empty/main.tf b/terraform/testdata/empty/main.tf similarity index 100% rename from terraform/test-fixtures/empty/main.tf rename to terraform/testdata/empty/main.tf diff --git a/terraform/test-fixtures/graph-basic/main.tf b/terraform/testdata/graph-basic/main.tf similarity index 100% rename from terraform/test-fixtures/graph-basic/main.tf rename to terraform/testdata/graph-basic/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-basic/child/main.tf b/terraform/testdata/graph-builder-apply-basic/child/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-basic/child/main.tf rename to terraform/testdata/graph-builder-apply-basic/child/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-basic/main.tf b/terraform/testdata/graph-builder-apply-basic/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-basic/main.tf rename to terraform/testdata/graph-builder-apply-basic/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-count/main.tf b/terraform/testdata/graph-builder-apply-count/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-count/main.tf rename to terraform/testdata/graph-builder-apply-count/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-dep-cbd/main.tf b/terraform/testdata/graph-builder-apply-dep-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-dep-cbd/main.tf rename to terraform/testdata/graph-builder-apply-dep-cbd/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-double-cbd/main.tf b/terraform/testdata/graph-builder-apply-double-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-double-cbd/main.tf rename to terraform/testdata/graph-builder-apply-double-cbd/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-module-destroy/A/main.tf b/terraform/testdata/graph-builder-apply-module-destroy/A/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-module-destroy/A/main.tf rename to terraform/testdata/graph-builder-apply-module-destroy/A/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-module-destroy/main.tf b/terraform/testdata/graph-builder-apply-module-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-module-destroy/main.tf rename to terraform/testdata/graph-builder-apply-module-destroy/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-provisioner/main.tf b/terraform/testdata/graph-builder-apply-provisioner/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-provisioner/main.tf rename to terraform/testdata/graph-builder-apply-provisioner/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-target-module/child1/main.tf b/terraform/testdata/graph-builder-apply-target-module/child1/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-target-module/child1/main.tf rename to terraform/testdata/graph-builder-apply-target-module/child1/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-target-module/child2/main.tf b/terraform/testdata/graph-builder-apply-target-module/child2/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-target-module/child2/main.tf rename to terraform/testdata/graph-builder-apply-target-module/child2/main.tf diff --git a/terraform/test-fixtures/graph-builder-apply-target-module/main.tf b/terraform/testdata/graph-builder-apply-target-module/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-apply-target-module/main.tf rename to terraform/testdata/graph-builder-apply-target-module/main.tf diff --git a/terraform/test-fixtures/graph-builder-basic/main.tf b/terraform/testdata/graph-builder-basic/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-basic/main.tf rename to terraform/testdata/graph-builder-basic/main.tf diff --git a/terraform/test-fixtures/graph-builder-cbd-non-cbd/main.tf b/terraform/testdata/graph-builder-cbd-non-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-cbd-non-cbd/main.tf rename to terraform/testdata/graph-builder-cbd-non-cbd/main.tf diff --git a/terraform/test-fixtures/graph-builder-modules/consul/main.tf b/terraform/testdata/graph-builder-modules/consul/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-modules/consul/main.tf rename to terraform/testdata/graph-builder-modules/consul/main.tf diff --git a/terraform/test-fixtures/graph-builder-modules/main.tf b/terraform/testdata/graph-builder-modules/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-modules/main.tf rename to terraform/testdata/graph-builder-modules/main.tf diff --git a/terraform/test-fixtures/graph-builder-multi-level-module/foo/bar/main.tf b/terraform/testdata/graph-builder-multi-level-module/foo/bar/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-multi-level-module/foo/bar/main.tf rename to terraform/testdata/graph-builder-multi-level-module/foo/bar/main.tf diff --git a/terraform/test-fixtures/graph-builder-multi-level-module/foo/main.tf b/terraform/testdata/graph-builder-multi-level-module/foo/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-multi-level-module/foo/main.tf rename to terraform/testdata/graph-builder-multi-level-module/foo/main.tf diff --git a/terraform/test-fixtures/graph-builder-multi-level-module/main.tf b/terraform/testdata/graph-builder-multi-level-module/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-multi-level-module/main.tf rename to terraform/testdata/graph-builder-multi-level-module/main.tf diff --git a/terraform/test-fixtures/graph-builder-orphan-deps/main.tf b/terraform/testdata/graph-builder-orphan-deps/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-orphan-deps/main.tf rename to terraform/testdata/graph-builder-orphan-deps/main.tf diff --git a/terraform/test-fixtures/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf b/terraform/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf rename to terraform/testdata/graph-builder-plan-attr-as-blocks/attr-as-blocks.tf diff --git a/terraform/test-fixtures/graph-builder-plan-basic/main.tf b/terraform/testdata/graph-builder-plan-basic/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-basic/main.tf rename to terraform/testdata/graph-builder-plan-basic/main.tf diff --git a/terraform/test-fixtures/graph-builder-plan-dynblock/dynblock.tf b/terraform/testdata/graph-builder-plan-dynblock/dynblock.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-dynblock/dynblock.tf rename to terraform/testdata/graph-builder-plan-dynblock/dynblock.tf diff --git a/terraform/test-fixtures/graph-builder-plan-target-module-provider/child1/main.tf b/terraform/testdata/graph-builder-plan-target-module-provider/child1/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-target-module-provider/child1/main.tf rename to terraform/testdata/graph-builder-plan-target-module-provider/child1/main.tf diff --git a/terraform/test-fixtures/graph-builder-plan-target-module-provider/child2/main.tf b/terraform/testdata/graph-builder-plan-target-module-provider/child2/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-target-module-provider/child2/main.tf rename to terraform/testdata/graph-builder-plan-target-module-provider/child2/main.tf diff --git a/terraform/test-fixtures/graph-builder-plan-target-module-provider/main.tf b/terraform/testdata/graph-builder-plan-target-module-provider/main.tf similarity index 100% rename from terraform/test-fixtures/graph-builder-plan-target-module-provider/main.tf rename to terraform/testdata/graph-builder-plan-target-module-provider/main.tf diff --git a/terraform/test-fixtures/graph-count-var-resource/main.tf b/terraform/testdata/graph-count-var-resource/main.tf similarity index 100% rename from terraform/test-fixtures/graph-count-var-resource/main.tf rename to terraform/testdata/graph-count-var-resource/main.tf diff --git a/terraform/test-fixtures/graph-count/main.tf b/terraform/testdata/graph-count/main.tf similarity index 100% rename from terraform/test-fixtures/graph-count/main.tf rename to terraform/testdata/graph-count/main.tf diff --git a/terraform/test-fixtures/graph-cycle/main.tf b/terraform/testdata/graph-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/graph-cycle/main.tf rename to terraform/testdata/graph-cycle/main.tf diff --git a/terraform/test-fixtures/graph-depends-on-count/main.tf b/terraform/testdata/graph-depends-on-count/main.tf similarity index 100% rename from terraform/test-fixtures/graph-depends-on-count/main.tf rename to terraform/testdata/graph-depends-on-count/main.tf diff --git a/terraform/test-fixtures/graph-depends-on/main.tf b/terraform/testdata/graph-depends-on/main.tf similarity index 100% rename from terraform/test-fixtures/graph-depends-on/main.tf rename to terraform/testdata/graph-depends-on/main.tf diff --git a/terraform/test-fixtures/graph-diff-create-before/main.tf b/terraform/testdata/graph-diff-create-before/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-create-before/main.tf rename to terraform/testdata/graph-diff-create-before/main.tf diff --git a/terraform/test-fixtures/graph-diff-destroy/main.tf b/terraform/testdata/graph-diff-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-destroy/main.tf rename to terraform/testdata/graph-diff-destroy/main.tf diff --git a/terraform/test-fixtures/graph-diff-module-dep-module/bar/main.tf b/terraform/testdata/graph-diff-module-dep-module/bar/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module-dep-module/bar/main.tf rename to terraform/testdata/graph-diff-module-dep-module/bar/main.tf diff --git a/terraform/test-fixtures/graph-diff-module-dep-module/foo/main.tf b/terraform/testdata/graph-diff-module-dep-module/foo/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module-dep-module/foo/main.tf rename to terraform/testdata/graph-diff-module-dep-module/foo/main.tf diff --git a/terraform/test-fixtures/graph-diff-module-dep-module/main.tf b/terraform/testdata/graph-diff-module-dep-module/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module-dep-module/main.tf rename to terraform/testdata/graph-diff-module-dep-module/main.tf diff --git a/terraform/test-fixtures/graph-diff-module-dep/child/main.tf b/terraform/testdata/graph-diff-module-dep/child/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module-dep/child/main.tf rename to terraform/testdata/graph-diff-module-dep/child/main.tf diff --git a/terraform/test-fixtures/graph-diff-module-dep/main.tf b/terraform/testdata/graph-diff-module-dep/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module-dep/main.tf rename to terraform/testdata/graph-diff-module-dep/main.tf diff --git a/terraform/test-fixtures/graph-diff-module/child/main.tf b/terraform/testdata/graph-diff-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module/child/main.tf rename to terraform/testdata/graph-diff-module/child/main.tf diff --git a/terraform/test-fixtures/graph-diff-module/main.tf b/terraform/testdata/graph-diff-module/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff-module/main.tf rename to terraform/testdata/graph-diff-module/main.tf diff --git a/terraform/test-fixtures/graph-diff/main.tf b/terraform/testdata/graph-diff/main.tf similarity index 100% rename from terraform/test-fixtures/graph-diff/main.tf rename to terraform/testdata/graph-diff/main.tf diff --git a/terraform/test-fixtures/graph-missing-deps/main.tf b/terraform/testdata/graph-missing-deps/main.tf similarity index 100% rename from terraform/test-fixtures/graph-missing-deps/main.tf rename to terraform/testdata/graph-missing-deps/main.tf diff --git a/terraform/test-fixtures/graph-module-orphan/main.tf b/terraform/testdata/graph-module-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/graph-module-orphan/main.tf rename to terraform/testdata/graph-module-orphan/main.tf diff --git a/terraform/test-fixtures/graph-modules/consul/main.tf b/terraform/testdata/graph-modules/consul/main.tf similarity index 100% rename from terraform/test-fixtures/graph-modules/consul/main.tf rename to terraform/testdata/graph-modules/consul/main.tf diff --git a/terraform/test-fixtures/graph-modules/main.tf b/terraform/testdata/graph-modules/main.tf similarity index 100% rename from terraform/test-fixtures/graph-modules/main.tf rename to terraform/testdata/graph-modules/main.tf diff --git a/terraform/test-fixtures/graph-node-module-expand/child/main.tf b/terraform/testdata/graph-node-module-expand/child/main.tf similarity index 100% rename from terraform/test-fixtures/graph-node-module-expand/child/main.tf rename to terraform/testdata/graph-node-module-expand/child/main.tf diff --git a/terraform/test-fixtures/graph-node-module-expand/main.tf b/terraform/testdata/graph-node-module-expand/main.tf similarity index 100% rename from terraform/test-fixtures/graph-node-module-expand/main.tf rename to terraform/testdata/graph-node-module-expand/main.tf diff --git a/terraform/test-fixtures/graph-node-module-flatten/child/main.tf b/terraform/testdata/graph-node-module-flatten/child/main.tf similarity index 100% rename from terraform/test-fixtures/graph-node-module-flatten/child/main.tf rename to terraform/testdata/graph-node-module-flatten/child/main.tf diff --git a/terraform/test-fixtures/graph-node-module-flatten/main.tf b/terraform/testdata/graph-node-module-flatten/main.tf similarity index 100% rename from terraform/test-fixtures/graph-node-module-flatten/main.tf rename to terraform/testdata/graph-node-module-flatten/main.tf diff --git a/terraform/test-fixtures/graph-outputs/main.tf b/terraform/testdata/graph-outputs/main.tf similarity index 100% rename from terraform/test-fixtures/graph-outputs/main.tf rename to terraform/testdata/graph-outputs/main.tf diff --git a/terraform/test-fixtures/graph-provider-alias/main.tf b/terraform/testdata/graph-provider-alias/main.tf similarity index 100% rename from terraform/test-fixtures/graph-provider-alias/main.tf rename to terraform/testdata/graph-provider-alias/main.tf diff --git a/terraform/test-fixtures/graph-provider-prune/main.tf b/terraform/testdata/graph-provider-prune/main.tf similarity index 100% rename from terraform/test-fixtures/graph-provider-prune/main.tf rename to terraform/testdata/graph-provider-prune/main.tf diff --git a/terraform/test-fixtures/graph-provisioners/main.tf b/terraform/testdata/graph-provisioners/main.tf similarity index 100% rename from terraform/test-fixtures/graph-provisioners/main.tf rename to terraform/testdata/graph-provisioners/main.tf diff --git a/terraform/test-fixtures/graph-resource-expand-prov-deps/main.tf b/terraform/testdata/graph-resource-expand-prov-deps/main.tf similarity index 100% rename from terraform/test-fixtures/graph-resource-expand-prov-deps/main.tf rename to terraform/testdata/graph-resource-expand-prov-deps/main.tf diff --git a/terraform/test-fixtures/graph-resource-expand/main.tf b/terraform/testdata/graph-resource-expand/main.tf similarity index 100% rename from terraform/test-fixtures/graph-resource-expand/main.tf rename to terraform/testdata/graph-resource-expand/main.tf diff --git a/terraform/test-fixtures/graph-tainted/main.tf b/terraform/testdata/graph-tainted/main.tf similarity index 100% rename from terraform/test-fixtures/graph-tainted/main.tf rename to terraform/testdata/graph-tainted/main.tf diff --git a/terraform/test-fixtures/import-provider-alias/main.tf b/terraform/testdata/import-provider-alias/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-alias/main.tf rename to terraform/testdata/import-provider-alias/main.tf diff --git a/terraform/test-fixtures/import-provider-module/child/main.tf b/terraform/testdata/import-provider-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-module/child/main.tf rename to terraform/testdata/import-provider-module/child/main.tf diff --git a/terraform/test-fixtures/import-provider-module/main.tf b/terraform/testdata/import-provider-module/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-module/main.tf rename to terraform/testdata/import-provider-module/main.tf diff --git a/terraform/test-fixtures/import-provider-non-vars/main.tf b/terraform/testdata/import-provider-non-vars/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-non-vars/main.tf rename to terraform/testdata/import-provider-non-vars/main.tf diff --git a/terraform/test-fixtures/import-provider-resource/main.tf b/terraform/testdata/import-provider-resource/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-resource/main.tf rename to terraform/testdata/import-provider-resource/main.tf diff --git a/terraform/test-fixtures/import-provider-vars/main.tf b/terraform/testdata/import-provider-vars/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider-vars/main.tf rename to terraform/testdata/import-provider-vars/main.tf diff --git a/terraform/test-fixtures/import-provider/main.tf b/terraform/testdata/import-provider/main.tf similarity index 100% rename from terraform/test-fixtures/import-provider/main.tf rename to terraform/testdata/import-provider/main.tf diff --git a/terraform/test-fixtures/input-bad-var-default/main.tf b/terraform/testdata/input-bad-var-default/main.tf similarity index 100% rename from terraform/test-fixtures/input-bad-var-default/main.tf rename to terraform/testdata/input-bad-var-default/main.tf diff --git a/terraform/test-fixtures/input-hcl/main.tf b/terraform/testdata/input-hcl/main.tf similarity index 100% rename from terraform/test-fixtures/input-hcl/main.tf rename to terraform/testdata/input-hcl/main.tf diff --git a/terraform/test-fixtures/input-interpolate-var/child/main.tf b/terraform/testdata/input-interpolate-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/input-interpolate-var/child/main.tf rename to terraform/testdata/input-interpolate-var/child/main.tf diff --git a/terraform/test-fixtures/input-interpolate-var/main.tf b/terraform/testdata/input-interpolate-var/main.tf similarity index 100% rename from terraform/test-fixtures/input-interpolate-var/main.tf rename to terraform/testdata/input-interpolate-var/main.tf diff --git a/terraform/test-fixtures/input-interpolate-var/source/main.tf b/terraform/testdata/input-interpolate-var/source/main.tf similarity index 100% rename from terraform/test-fixtures/input-interpolate-var/source/main.tf rename to terraform/testdata/input-interpolate-var/source/main.tf diff --git a/terraform/test-fixtures/input-module-computed-output-element/main.tf b/terraform/testdata/input-module-computed-output-element/main.tf similarity index 100% rename from terraform/test-fixtures/input-module-computed-output-element/main.tf rename to terraform/testdata/input-module-computed-output-element/main.tf diff --git a/terraform/test-fixtures/input-module-computed-output-element/moda/main.tf b/terraform/testdata/input-module-computed-output-element/moda/main.tf similarity index 100% rename from terraform/test-fixtures/input-module-computed-output-element/moda/main.tf rename to terraform/testdata/input-module-computed-output-element/moda/main.tf diff --git a/terraform/test-fixtures/input-module-computed-output-element/modb/main.tf b/terraform/testdata/input-module-computed-output-element/modb/main.tf similarity index 100% rename from terraform/test-fixtures/input-module-computed-output-element/modb/main.tf rename to terraform/testdata/input-module-computed-output-element/modb/main.tf diff --git a/terraform/test-fixtures/input-module-data-vars/child/main.tf b/terraform/testdata/input-module-data-vars/child/main.tf similarity index 100% rename from terraform/test-fixtures/input-module-data-vars/child/main.tf rename to terraform/testdata/input-module-data-vars/child/main.tf diff --git a/terraform/test-fixtures/input-module-data-vars/main.tf b/terraform/testdata/input-module-data-vars/main.tf similarity index 100% rename from terraform/test-fixtures/input-module-data-vars/main.tf rename to terraform/testdata/input-module-data-vars/main.tf diff --git a/terraform/test-fixtures/input-provider-multi/main.tf b/terraform/testdata/input-provider-multi/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-multi/main.tf rename to terraform/testdata/input-provider-multi/main.tf diff --git a/terraform/test-fixtures/input-provider-once/child/main.tf b/terraform/testdata/input-provider-once/child/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-once/child/main.tf rename to terraform/testdata/input-provider-once/child/main.tf diff --git a/terraform/test-fixtures/input-provider-once/main.tf b/terraform/testdata/input-provider-once/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-once/main.tf rename to terraform/testdata/input-provider-once/main.tf diff --git a/terraform/test-fixtures/input-provider-vars/main.tf b/terraform/testdata/input-provider-vars/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-vars/main.tf rename to terraform/testdata/input-provider-vars/main.tf diff --git a/terraform/test-fixtures/input-provider-with-vars-and-module/child/main.tf b/terraform/testdata/input-provider-with-vars-and-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-with-vars-and-module/child/main.tf rename to terraform/testdata/input-provider-with-vars-and-module/child/main.tf diff --git a/terraform/test-fixtures/input-provider-with-vars-and-module/main.tf b/terraform/testdata/input-provider-with-vars-and-module/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-with-vars-and-module/main.tf rename to terraform/testdata/input-provider-with-vars-and-module/main.tf diff --git a/terraform/test-fixtures/input-provider-with-vars/main.tf b/terraform/testdata/input-provider-with-vars/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider-with-vars/main.tf rename to terraform/testdata/input-provider-with-vars/main.tf diff --git a/terraform/test-fixtures/input-provider/main.tf b/terraform/testdata/input-provider/main.tf similarity index 100% rename from terraform/test-fixtures/input-provider/main.tf rename to terraform/testdata/input-provider/main.tf diff --git a/terraform/test-fixtures/input-submodule-count/main.tf b/terraform/testdata/input-submodule-count/main.tf similarity index 100% rename from terraform/test-fixtures/input-submodule-count/main.tf rename to terraform/testdata/input-submodule-count/main.tf diff --git a/terraform/test-fixtures/input-submodule-count/mod/main.tf b/terraform/testdata/input-submodule-count/mod/main.tf similarity index 100% rename from terraform/test-fixtures/input-submodule-count/mod/main.tf rename to terraform/testdata/input-submodule-count/mod/main.tf diff --git a/terraform/test-fixtures/input-submodule-count/mod/submod/main.tf b/terraform/testdata/input-submodule-count/mod/submod/main.tf similarity index 100% rename from terraform/test-fixtures/input-submodule-count/mod/submod/main.tf rename to terraform/testdata/input-submodule-count/mod/submod/main.tf diff --git a/terraform/test-fixtures/input-var-default/main.tf b/terraform/testdata/input-var-default/main.tf similarity index 100% rename from terraform/test-fixtures/input-var-default/main.tf rename to terraform/testdata/input-var-default/main.tf diff --git a/terraform/test-fixtures/input-var-partially-computed/child/main.tf b/terraform/testdata/input-var-partially-computed/child/main.tf similarity index 100% rename from terraform/test-fixtures/input-var-partially-computed/child/main.tf rename to terraform/testdata/input-var-partially-computed/child/main.tf diff --git a/terraform/test-fixtures/input-var-partially-computed/main.tf b/terraform/testdata/input-var-partially-computed/main.tf similarity index 100% rename from terraform/test-fixtures/input-var-partially-computed/main.tf rename to terraform/testdata/input-var-partially-computed/main.tf diff --git a/terraform/test-fixtures/input-vars-unset/main.tf b/terraform/testdata/input-vars-unset/main.tf similarity index 100% rename from terraform/test-fixtures/input-vars-unset/main.tf rename to terraform/testdata/input-vars-unset/main.tf diff --git a/terraform/test-fixtures/input-vars/main.tf b/terraform/testdata/input-vars/main.tf similarity index 100% rename from terraform/test-fixtures/input-vars/main.tf rename to terraform/testdata/input-vars/main.tf diff --git a/terraform/test-fixtures/interpolate-local/main.tf b/terraform/testdata/interpolate-local/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-local/main.tf rename to terraform/testdata/interpolate-local/main.tf diff --git a/terraform/test-fixtures/interpolate-multi-interp/main.tf b/terraform/testdata/interpolate-multi-interp/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-multi-interp/main.tf rename to terraform/testdata/interpolate-multi-interp/main.tf diff --git a/terraform/test-fixtures/interpolate-multi-vars/main.tf b/terraform/testdata/interpolate-multi-vars/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-multi-vars/main.tf rename to terraform/testdata/interpolate-multi-vars/main.tf diff --git a/terraform/test-fixtures/interpolate-path-module/child/main.tf b/terraform/testdata/interpolate-path-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-path-module/child/main.tf rename to terraform/testdata/interpolate-path-module/child/main.tf diff --git a/terraform/test-fixtures/interpolate-path-module/main.tf b/terraform/testdata/interpolate-path-module/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-path-module/main.tf rename to terraform/testdata/interpolate-path-module/main.tf diff --git a/terraform/test-fixtures/interpolate-resource-variable-multi/main.tf b/terraform/testdata/interpolate-resource-variable-multi/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-resource-variable-multi/main.tf rename to terraform/testdata/interpolate-resource-variable-multi/main.tf diff --git a/terraform/test-fixtures/interpolate-resource-variable/main.tf b/terraform/testdata/interpolate-resource-variable/main.tf similarity index 100% rename from terraform/test-fixtures/interpolate-resource-variable/main.tf rename to terraform/testdata/interpolate-resource-variable/main.tf diff --git a/terraform/test-fixtures/issue-5254/step-0/main.tf b/terraform/testdata/issue-5254/step-0/main.tf similarity index 100% rename from terraform/test-fixtures/issue-5254/step-0/main.tf rename to terraform/testdata/issue-5254/step-0/main.tf diff --git a/terraform/test-fixtures/issue-5254/step-1/main.tf b/terraform/testdata/issue-5254/step-1/main.tf similarity index 100% rename from terraform/test-fixtures/issue-5254/step-1/main.tf rename to terraform/testdata/issue-5254/step-1/main.tf diff --git a/terraform/test-fixtures/issue-7824/main.tf b/terraform/testdata/issue-7824/main.tf similarity index 100% rename from terraform/test-fixtures/issue-7824/main.tf rename to terraform/testdata/issue-7824/main.tf diff --git a/terraform/test-fixtures/issue-9549/main.tf b/terraform/testdata/issue-9549/main.tf similarity index 100% rename from terraform/test-fixtures/issue-9549/main.tf rename to terraform/testdata/issue-9549/main.tf diff --git a/terraform/test-fixtures/issue-9549/mod/main.tf b/terraform/testdata/issue-9549/mod/main.tf similarity index 100% rename from terraform/test-fixtures/issue-9549/mod/main.tf rename to terraform/testdata/issue-9549/mod/main.tf diff --git a/terraform/test-fixtures/module-deps-explicit-provider-resource/main.tf b/terraform/testdata/module-deps-explicit-provider-resource/main.tf similarity index 100% rename from terraform/test-fixtures/module-deps-explicit-provider-resource/main.tf rename to terraform/testdata/module-deps-explicit-provider-resource/main.tf diff --git a/terraform/test-fixtures/module-deps-explicit-provider-unconstrained/main.tf b/terraform/testdata/module-deps-explicit-provider-unconstrained/main.tf similarity index 100% rename from terraform/test-fixtures/module-deps-explicit-provider-unconstrained/main.tf rename to terraform/testdata/module-deps-explicit-provider-unconstrained/main.tf diff --git a/terraform/test-fixtures/module-deps-explicit-provider/main.tf b/terraform/testdata/module-deps-explicit-provider/main.tf similarity index 100% rename from terraform/test-fixtures/module-deps-explicit-provider/main.tf rename to terraform/testdata/module-deps-explicit-provider/main.tf diff --git a/terraform/test-fixtures/module-deps-implicit-provider/main.tf b/terraform/testdata/module-deps-implicit-provider/main.tf similarity index 100% rename from terraform/test-fixtures/module-deps-implicit-provider/main.tf rename to terraform/testdata/module-deps-implicit-provider/main.tf diff --git a/terraform/test-fixtures/module-deps-inherit-provider/child/child.tf b/terraform/testdata/module-deps-inherit-provider/child/child.tf similarity index 100% rename from terraform/test-fixtures/module-deps-inherit-provider/child/child.tf rename to terraform/testdata/module-deps-inherit-provider/child/child.tf diff --git a/terraform/test-fixtures/module-deps-inherit-provider/grandchild/grandchild.tf b/terraform/testdata/module-deps-inherit-provider/grandchild/grandchild.tf similarity index 100% rename from terraform/test-fixtures/module-deps-inherit-provider/grandchild/grandchild.tf rename to terraform/testdata/module-deps-inherit-provider/grandchild/grandchild.tf diff --git a/terraform/test-fixtures/module-deps-inherit-provider/main.tf b/terraform/testdata/module-deps-inherit-provider/main.tf similarity index 100% rename from terraform/test-fixtures/module-deps-inherit-provider/main.tf rename to terraform/testdata/module-deps-inherit-provider/main.tf diff --git a/terraform/test-fixtures/nested-resource-count-plan/main.tf b/terraform/testdata/nested-resource-count-plan/main.tf similarity index 100% rename from terraform/test-fixtures/nested-resource-count-plan/main.tf rename to terraform/testdata/nested-resource-count-plan/main.tf diff --git a/terraform/test-fixtures/new-good/main.tf b/terraform/testdata/new-good/main.tf similarity index 100% rename from terraform/test-fixtures/new-good/main.tf rename to terraform/testdata/new-good/main.tf diff --git a/terraform/test-fixtures/new-graph-cycle/main.tf b/terraform/testdata/new-graph-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/new-graph-cycle/main.tf rename to terraform/testdata/new-graph-cycle/main.tf diff --git a/terraform/test-fixtures/new-pc-cache/main.tf b/terraform/testdata/new-pc-cache/main.tf similarity index 100% rename from terraform/test-fixtures/new-pc-cache/main.tf rename to terraform/testdata/new-pc-cache/main.tf diff --git a/terraform/test-fixtures/new-provider-validate/main.tf b/terraform/testdata/new-provider-validate/main.tf similarity index 100% rename from terraform/test-fixtures/new-provider-validate/main.tf rename to terraform/testdata/new-provider-validate/main.tf diff --git a/terraform/test-fixtures/new-variables/main.tf b/terraform/testdata/new-variables/main.tf similarity index 100% rename from terraform/test-fixtures/new-variables/main.tf rename to terraform/testdata/new-variables/main.tf diff --git a/terraform/test-fixtures/plan-block-nesting-group/block-nesting-group.tf b/terraform/testdata/plan-block-nesting-group/block-nesting-group.tf similarity index 100% rename from terraform/test-fixtures/plan-block-nesting-group/block-nesting-group.tf rename to terraform/testdata/plan-block-nesting-group/block-nesting-group.tf diff --git a/terraform/test-fixtures/plan-cbd-depends-datasource/main.tf b/terraform/testdata/plan-cbd-depends-datasource/main.tf similarity index 100% rename from terraform/test-fixtures/plan-cbd-depends-datasource/main.tf rename to terraform/testdata/plan-cbd-depends-datasource/main.tf diff --git a/terraform/test-fixtures/plan-cbd-maintain-root/main.tf b/terraform/testdata/plan-cbd-maintain-root/main.tf similarity index 100% rename from terraform/test-fixtures/plan-cbd-maintain-root/main.tf rename to terraform/testdata/plan-cbd-maintain-root/main.tf diff --git a/terraform/test-fixtures/plan-cbd/main.tf b/terraform/testdata/plan-cbd/main.tf similarity index 100% rename from terraform/test-fixtures/plan-cbd/main.tf rename to terraform/testdata/plan-cbd/main.tf diff --git a/terraform/test-fixtures/plan-close-module-provider/main.tf b/terraform/testdata/plan-close-module-provider/main.tf similarity index 100% rename from terraform/test-fixtures/plan-close-module-provider/main.tf rename to terraform/testdata/plan-close-module-provider/main.tf diff --git a/terraform/test-fixtures/plan-close-module-provider/mod/main.tf b/terraform/testdata/plan-close-module-provider/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-close-module-provider/mod/main.tf rename to terraform/testdata/plan-close-module-provider/mod/main.tf diff --git a/terraform/test-fixtures/plan-computed-attr-ref-type-mismatch/main.tf b/terraform/testdata/plan-computed-attr-ref-type-mismatch/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-attr-ref-type-mismatch/main.tf rename to terraform/testdata/plan-computed-attr-ref-type-mismatch/main.tf diff --git a/terraform/test-fixtures/plan-computed-data-count/main.tf b/terraform/testdata/plan-computed-data-count/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-data-count/main.tf rename to terraform/testdata/plan-computed-data-count/main.tf diff --git a/terraform/test-fixtures/plan-computed-data-resource/main.tf b/terraform/testdata/plan-computed-data-resource/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-data-resource/main.tf rename to terraform/testdata/plan-computed-data-resource/main.tf diff --git a/terraform/test-fixtures/plan-computed-in-function/main.tf b/terraform/testdata/plan-computed-in-function/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-in-function/main.tf rename to terraform/testdata/plan-computed-in-function/main.tf diff --git a/terraform/test-fixtures/plan-computed-list/main.tf b/terraform/testdata/plan-computed-list/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-list/main.tf rename to terraform/testdata/plan-computed-list/main.tf diff --git a/terraform/test-fixtures/plan-computed-multi-index/main.tf b/terraform/testdata/plan-computed-multi-index/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-multi-index/main.tf rename to terraform/testdata/plan-computed-multi-index/main.tf diff --git a/terraform/test-fixtures/plan-computed-value-in-map/main.tf b/terraform/testdata/plan-computed-value-in-map/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-value-in-map/main.tf rename to terraform/testdata/plan-computed-value-in-map/main.tf diff --git a/terraform/test-fixtures/plan-computed-value-in-map/mod/main.tf b/terraform/testdata/plan-computed-value-in-map/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed-value-in-map/mod/main.tf rename to terraform/testdata/plan-computed-value-in-map/mod/main.tf diff --git a/terraform/test-fixtures/plan-computed/main.tf b/terraform/testdata/plan-computed/main.tf similarity index 100% rename from terraform/test-fixtures/plan-computed/main.tf rename to terraform/testdata/plan-computed/main.tf diff --git a/terraform/test-fixtures/plan-count-computed-module/child/main.tf b/terraform/testdata/plan-count-computed-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-computed-module/child/main.tf rename to terraform/testdata/plan-count-computed-module/child/main.tf diff --git a/terraform/test-fixtures/plan-count-computed-module/main.tf b/terraform/testdata/plan-count-computed-module/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-computed-module/main.tf rename to terraform/testdata/plan-count-computed-module/main.tf diff --git a/terraform/test-fixtures/plan-count-computed/main.tf b/terraform/testdata/plan-count-computed/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-computed/main.tf rename to terraform/testdata/plan-count-computed/main.tf diff --git a/terraform/test-fixtures/plan-count-dec/main.tf b/terraform/testdata/plan-count-dec/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-dec/main.tf rename to terraform/testdata/plan-count-dec/main.tf diff --git a/terraform/test-fixtures/plan-count-inc/main.tf b/terraform/testdata/plan-count-inc/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-inc/main.tf rename to terraform/testdata/plan-count-inc/main.tf diff --git a/terraform/test-fixtures/plan-count-index/main.tf b/terraform/testdata/plan-count-index/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-index/main.tf rename to terraform/testdata/plan-count-index/main.tf diff --git a/terraform/test-fixtures/plan-count-module-static-grandchild/child/child/main.tf b/terraform/testdata/plan-count-module-static-grandchild/child/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-module-static-grandchild/child/child/main.tf rename to terraform/testdata/plan-count-module-static-grandchild/child/child/main.tf diff --git a/terraform/test-fixtures/plan-count-module-static-grandchild/child/main.tf b/terraform/testdata/plan-count-module-static-grandchild/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-module-static-grandchild/child/main.tf rename to terraform/testdata/plan-count-module-static-grandchild/child/main.tf diff --git a/terraform/test-fixtures/plan-count-module-static-grandchild/main.tf b/terraform/testdata/plan-count-module-static-grandchild/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-module-static-grandchild/main.tf rename to terraform/testdata/plan-count-module-static-grandchild/main.tf diff --git a/terraform/test-fixtures/plan-count-module-static/child/main.tf b/terraform/testdata/plan-count-module-static/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-module-static/child/main.tf rename to terraform/testdata/plan-count-module-static/child/main.tf diff --git a/terraform/test-fixtures/plan-count-module-static/main.tf b/terraform/testdata/plan-count-module-static/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-module-static/main.tf rename to terraform/testdata/plan-count-module-static/main.tf diff --git a/terraform/test-fixtures/plan-count-one-index/main.tf b/terraform/testdata/plan-count-one-index/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-one-index/main.tf rename to terraform/testdata/plan-count-one-index/main.tf diff --git a/terraform/test-fixtures/plan-count-splat-reference/main.tf b/terraform/testdata/plan-count-splat-reference/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-splat-reference/main.tf rename to terraform/testdata/plan-count-splat-reference/main.tf diff --git a/terraform/test-fixtures/plan-count-var/main.tf b/terraform/testdata/plan-count-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-var/main.tf rename to terraform/testdata/plan-count-var/main.tf diff --git a/terraform/test-fixtures/plan-count-zero/main.tf b/terraform/testdata/plan-count-zero/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count-zero/main.tf rename to terraform/testdata/plan-count-zero/main.tf diff --git a/terraform/test-fixtures/plan-count/main.tf b/terraform/testdata/plan-count/main.tf similarity index 100% rename from terraform/test-fixtures/plan-count/main.tf rename to terraform/testdata/plan-count/main.tf diff --git a/terraform/test-fixtures/plan-data-resource-becomes-computed/main.tf b/terraform/testdata/plan-data-resource-becomes-computed/main.tf similarity index 100% rename from terraform/test-fixtures/plan-data-resource-becomes-computed/main.tf rename to terraform/testdata/plan-data-resource-becomes-computed/main.tf diff --git a/terraform/test-fixtures/plan-data-source-type-mismatch/main.tf b/terraform/testdata/plan-data-source-type-mismatch/main.tf similarity index 100% rename from terraform/test-fixtures/plan-data-source-type-mismatch/main.tf rename to terraform/testdata/plan-data-source-type-mismatch/main.tf diff --git a/terraform/test-fixtures/plan-destroy-interpolated-count/main.tf b/terraform/testdata/plan-destroy-interpolated-count/main.tf similarity index 100% rename from terraform/test-fixtures/plan-destroy-interpolated-count/main.tf rename to terraform/testdata/plan-destroy-interpolated-count/main.tf diff --git a/terraform/test-fixtures/plan-destroy/main.tf b/terraform/testdata/plan-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/plan-destroy/main.tf rename to terraform/testdata/plan-destroy/main.tf diff --git a/terraform/test-fixtures/plan-diffvar/main.tf b/terraform/testdata/plan-diffvar/main.tf similarity index 100% rename from terraform/test-fixtures/plan-diffvar/main.tf rename to terraform/testdata/plan-diffvar/main.tf diff --git a/terraform/test-fixtures/plan-empty/main.tf b/terraform/testdata/plan-empty/main.tf similarity index 100% rename from terraform/test-fixtures/plan-empty/main.tf rename to terraform/testdata/plan-empty/main.tf diff --git a/terraform/test-fixtures/plan-escaped-var/main.tf b/terraform/testdata/plan-escaped-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-escaped-var/main.tf rename to terraform/testdata/plan-escaped-var/main.tf diff --git a/terraform/test-fixtures/plan-good/main.tf b/terraform/testdata/plan-good/main.tf similarity index 100% rename from terraform/test-fixtures/plan-good/main.tf rename to terraform/testdata/plan-good/main.tf diff --git a/terraform/test-fixtures/plan-ignore-changes-in-map/ignore-changes-in-map.tf b/terraform/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf similarity index 100% rename from terraform/test-fixtures/plan-ignore-changes-in-map/ignore-changes-in-map.tf rename to terraform/testdata/plan-ignore-changes-in-map/ignore-changes-in-map.tf diff --git a/terraform/test-fixtures/plan-ignore-changes-wildcard/main.tf b/terraform/testdata/plan-ignore-changes-wildcard/main.tf similarity index 100% rename from terraform/test-fixtures/plan-ignore-changes-wildcard/main.tf rename to terraform/testdata/plan-ignore-changes-wildcard/main.tf diff --git a/terraform/test-fixtures/plan-ignore-changes-with-flatmaps/main.tf b/terraform/testdata/plan-ignore-changes-with-flatmaps/main.tf similarity index 100% rename from terraform/test-fixtures/plan-ignore-changes-with-flatmaps/main.tf rename to terraform/testdata/plan-ignore-changes-with-flatmaps/main.tf diff --git a/terraform/test-fixtures/plan-ignore-changes/main.tf b/terraform/testdata/plan-ignore-changes/main.tf similarity index 100% rename from terraform/test-fixtures/plan-ignore-changes/main.tf rename to terraform/testdata/plan-ignore-changes/main.tf diff --git a/terraform/test-fixtures/plan-list-order/main.tf b/terraform/testdata/plan-list-order/main.tf similarity index 100% rename from terraform/test-fixtures/plan-list-order/main.tf rename to terraform/testdata/plan-list-order/main.tf diff --git a/terraform/test-fixtures/plan-local-value-count/main.tf b/terraform/testdata/plan-local-value-count/main.tf similarity index 100% rename from terraform/test-fixtures/plan-local-value-count/main.tf rename to terraform/testdata/plan-local-value-count/main.tf diff --git a/terraform/test-fixtures/plan-module-cycle/child/main.tf b/terraform/testdata/plan-module-cycle/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-cycle/child/main.tf rename to terraform/testdata/plan-module-cycle/child/main.tf diff --git a/terraform/test-fixtures/plan-module-cycle/main.tf b/terraform/testdata/plan-module-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-cycle/main.tf rename to terraform/testdata/plan-module-cycle/main.tf diff --git a/terraform/test-fixtures/plan-module-deadlock/child/main.tf b/terraform/testdata/plan-module-deadlock/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-deadlock/child/main.tf rename to terraform/testdata/plan-module-deadlock/child/main.tf diff --git a/terraform/test-fixtures/plan-module-deadlock/main.tf b/terraform/testdata/plan-module-deadlock/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-deadlock/main.tf rename to terraform/testdata/plan-module-deadlock/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy-gh-1835/a/main.tf b/terraform/testdata/plan-module-destroy-gh-1835/a/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy-gh-1835/a/main.tf rename to terraform/testdata/plan-module-destroy-gh-1835/a/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy-gh-1835/b/main.tf b/terraform/testdata/plan-module-destroy-gh-1835/b/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy-gh-1835/b/main.tf rename to terraform/testdata/plan-module-destroy-gh-1835/b/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy-gh-1835/main.tf b/terraform/testdata/plan-module-destroy-gh-1835/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy-gh-1835/main.tf rename to terraform/testdata/plan-module-destroy-gh-1835/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy-multivar/child/main.tf b/terraform/testdata/plan-module-destroy-multivar/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy-multivar/child/main.tf rename to terraform/testdata/plan-module-destroy-multivar/child/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy-multivar/main.tf b/terraform/testdata/plan-module-destroy-multivar/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy-multivar/main.tf rename to terraform/testdata/plan-module-destroy-multivar/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy/child/main.tf b/terraform/testdata/plan-module-destroy/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy/child/main.tf rename to terraform/testdata/plan-module-destroy/child/main.tf diff --git a/terraform/test-fixtures/plan-module-destroy/main.tf b/terraform/testdata/plan-module-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-destroy/main.tf rename to terraform/testdata/plan-module-destroy/main.tf diff --git a/terraform/test-fixtures/plan-module-input-computed/child/main.tf b/terraform/testdata/plan-module-input-computed/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input-computed/child/main.tf rename to terraform/testdata/plan-module-input-computed/child/main.tf diff --git a/terraform/test-fixtures/plan-module-input-computed/main.tf b/terraform/testdata/plan-module-input-computed/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input-computed/main.tf rename to terraform/testdata/plan-module-input-computed/main.tf diff --git a/terraform/test-fixtures/plan-module-input-var/child/main.tf b/terraform/testdata/plan-module-input-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input-var/child/main.tf rename to terraform/testdata/plan-module-input-var/child/main.tf diff --git a/terraform/test-fixtures/plan-module-input-var/main.tf b/terraform/testdata/plan-module-input-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input-var/main.tf rename to terraform/testdata/plan-module-input-var/main.tf diff --git a/terraform/test-fixtures/plan-module-input/child/main.tf b/terraform/testdata/plan-module-input/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input/child/main.tf rename to terraform/testdata/plan-module-input/child/main.tf diff --git a/terraform/test-fixtures/plan-module-input/main.tf b/terraform/testdata/plan-module-input/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-input/main.tf rename to terraform/testdata/plan-module-input/main.tf diff --git a/terraform/test-fixtures/plan-module-map-literal/child/main.tf b/terraform/testdata/plan-module-map-literal/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-map-literal/child/main.tf rename to terraform/testdata/plan-module-map-literal/child/main.tf diff --git a/terraform/test-fixtures/plan-module-map-literal/main.tf b/terraform/testdata/plan-module-map-literal/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-map-literal/main.tf rename to terraform/testdata/plan-module-map-literal/main.tf diff --git a/terraform/test-fixtures/plan-module-multi-var/child/main.tf b/terraform/testdata/plan-module-multi-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-multi-var/child/main.tf rename to terraform/testdata/plan-module-multi-var/child/main.tf diff --git a/terraform/test-fixtures/plan-module-multi-var/main.tf b/terraform/testdata/plan-module-multi-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-multi-var/main.tf rename to terraform/testdata/plan-module-multi-var/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-defaults-var/child/main.tf b/terraform/testdata/plan-module-provider-defaults-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-defaults-var/child/main.tf rename to terraform/testdata/plan-module-provider-defaults-var/child/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-defaults-var/main.tf b/terraform/testdata/plan-module-provider-defaults-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-defaults-var/main.tf rename to terraform/testdata/plan-module-provider-defaults-var/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-defaults/child/main.tf b/terraform/testdata/plan-module-provider-defaults/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-defaults/child/main.tf rename to terraform/testdata/plan-module-provider-defaults/child/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-defaults/main.tf b/terraform/testdata/plan-module-provider-defaults/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-defaults/main.tf rename to terraform/testdata/plan-module-provider-defaults/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit-deep/A/main.tf b/terraform/testdata/plan-module-provider-inherit-deep/A/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit-deep/A/main.tf rename to terraform/testdata/plan-module-provider-inherit-deep/A/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit-deep/B/main.tf b/terraform/testdata/plan-module-provider-inherit-deep/B/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit-deep/B/main.tf rename to terraform/testdata/plan-module-provider-inherit-deep/B/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit-deep/C/main.tf b/terraform/testdata/plan-module-provider-inherit-deep/C/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit-deep/C/main.tf rename to terraform/testdata/plan-module-provider-inherit-deep/C/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit-deep/main.tf b/terraform/testdata/plan-module-provider-inherit-deep/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit-deep/main.tf rename to terraform/testdata/plan-module-provider-inherit-deep/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit/child/main.tf b/terraform/testdata/plan-module-provider-inherit/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit/child/main.tf rename to terraform/testdata/plan-module-provider-inherit/child/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-inherit/main.tf b/terraform/testdata/plan-module-provider-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-inherit/main.tf rename to terraform/testdata/plan-module-provider-inherit/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-var/child/main.tf b/terraform/testdata/plan-module-provider-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-var/child/main.tf rename to terraform/testdata/plan-module-provider-var/child/main.tf diff --git a/terraform/test-fixtures/plan-module-provider-var/main.tf b/terraform/testdata/plan-module-provider-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-provider-var/main.tf rename to terraform/testdata/plan-module-provider-var/main.tf diff --git a/terraform/test-fixtures/plan-module-var-computed/child/main.tf b/terraform/testdata/plan-module-var-computed/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var-computed/child/main.tf rename to terraform/testdata/plan-module-var-computed/child/main.tf diff --git a/terraform/test-fixtures/plan-module-var-computed/main.tf b/terraform/testdata/plan-module-var-computed/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var-computed/main.tf rename to terraform/testdata/plan-module-var-computed/main.tf diff --git a/terraform/test-fixtures/plan-module-var-with-default-value/inner/main.tf b/terraform/testdata/plan-module-var-with-default-value/inner/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var-with-default-value/inner/main.tf rename to terraform/testdata/plan-module-var-with-default-value/inner/main.tf diff --git a/terraform/test-fixtures/plan-module-var-with-default-value/main.tf b/terraform/testdata/plan-module-var-with-default-value/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var-with-default-value/main.tf rename to terraform/testdata/plan-module-var-with-default-value/main.tf diff --git a/terraform/test-fixtures/plan-module-var/child/main.tf b/terraform/testdata/plan-module-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var/child/main.tf rename to terraform/testdata/plan-module-var/child/main.tf diff --git a/terraform/test-fixtures/plan-module-var/main.tf b/terraform/testdata/plan-module-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-var/main.tf rename to terraform/testdata/plan-module-var/main.tf diff --git a/terraform/test-fixtures/plan-module-variable-from-splat/main.tf b/terraform/testdata/plan-module-variable-from-splat/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-variable-from-splat/main.tf rename to terraform/testdata/plan-module-variable-from-splat/main.tf diff --git a/terraform/test-fixtures/plan-module-variable-from-splat/mod/main.tf b/terraform/testdata/plan-module-variable-from-splat/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-variable-from-splat/mod/main.tf rename to terraform/testdata/plan-module-variable-from-splat/mod/main.tf diff --git a/terraform/test-fixtures/plan-module-wrong-var-type-nested/inner/main.tf b/terraform/testdata/plan-module-wrong-var-type-nested/inner/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-wrong-var-type-nested/inner/main.tf rename to terraform/testdata/plan-module-wrong-var-type-nested/inner/main.tf diff --git a/terraform/test-fixtures/plan-module-wrong-var-type-nested/main.tf b/terraform/testdata/plan-module-wrong-var-type-nested/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-wrong-var-type-nested/main.tf rename to terraform/testdata/plan-module-wrong-var-type-nested/main.tf diff --git a/terraform/test-fixtures/plan-module-wrong-var-type-nested/middle/main.tf b/terraform/testdata/plan-module-wrong-var-type-nested/middle/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-wrong-var-type-nested/middle/main.tf rename to terraform/testdata/plan-module-wrong-var-type-nested/middle/main.tf diff --git a/terraform/test-fixtures/plan-module-wrong-var-type/inner/main.tf b/terraform/testdata/plan-module-wrong-var-type/inner/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-wrong-var-type/inner/main.tf rename to terraform/testdata/plan-module-wrong-var-type/inner/main.tf diff --git a/terraform/test-fixtures/plan-module-wrong-var-type/main.tf b/terraform/testdata/plan-module-wrong-var-type/main.tf similarity index 100% rename from terraform/test-fixtures/plan-module-wrong-var-type/main.tf rename to terraform/testdata/plan-module-wrong-var-type/main.tf diff --git a/terraform/test-fixtures/plan-modules-remove-provisioners/main.tf b/terraform/testdata/plan-modules-remove-provisioners/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules-remove-provisioners/main.tf rename to terraform/testdata/plan-modules-remove-provisioners/main.tf diff --git a/terraform/test-fixtures/plan-modules-remove-provisioners/parent/child/main.tf b/terraform/testdata/plan-modules-remove-provisioners/parent/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules-remove-provisioners/parent/child/main.tf rename to terraform/testdata/plan-modules-remove-provisioners/parent/child/main.tf diff --git a/terraform/test-fixtures/plan-modules-remove-provisioners/parent/main.tf b/terraform/testdata/plan-modules-remove-provisioners/parent/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules-remove-provisioners/parent/main.tf rename to terraform/testdata/plan-modules-remove-provisioners/parent/main.tf diff --git a/terraform/test-fixtures/plan-modules-remove/main.tf b/terraform/testdata/plan-modules-remove/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules-remove/main.tf rename to terraform/testdata/plan-modules-remove/main.tf diff --git a/terraform/test-fixtures/plan-modules/child/main.tf b/terraform/testdata/plan-modules/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules/child/main.tf rename to terraform/testdata/plan-modules/child/main.tf diff --git a/terraform/test-fixtures/plan-modules/main.tf b/terraform/testdata/plan-modules/main.tf similarity index 100% rename from terraform/test-fixtures/plan-modules/main.tf rename to terraform/testdata/plan-modules/main.tf diff --git a/terraform/test-fixtures/plan-orphan/main.tf b/terraform/testdata/plan-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/plan-orphan/main.tf rename to terraform/testdata/plan-orphan/main.tf diff --git a/terraform/test-fixtures/plan-path-var/main.tf b/terraform/testdata/plan-path-var/main.tf similarity index 100% rename from terraform/test-fixtures/plan-path-var/main.tf rename to terraform/testdata/plan-path-var/main.tf diff --git a/terraform/test-fixtures/plan-prevent-destroy-bad/main.tf b/terraform/testdata/plan-prevent-destroy-bad/main.tf similarity index 100% rename from terraform/test-fixtures/plan-prevent-destroy-bad/main.tf rename to terraform/testdata/plan-prevent-destroy-bad/main.tf diff --git a/terraform/test-fixtures/plan-prevent-destroy-count-bad/main.tf b/terraform/testdata/plan-prevent-destroy-count-bad/main.tf similarity index 100% rename from terraform/test-fixtures/plan-prevent-destroy-count-bad/main.tf rename to terraform/testdata/plan-prevent-destroy-count-bad/main.tf diff --git a/terraform/test-fixtures/plan-prevent-destroy-count-good/main.tf b/terraform/testdata/plan-prevent-destroy-count-good/main.tf similarity index 100% rename from terraform/test-fixtures/plan-prevent-destroy-count-good/main.tf rename to terraform/testdata/plan-prevent-destroy-count-good/main.tf diff --git a/terraform/test-fixtures/plan-prevent-destroy-good/main.tf b/terraform/testdata/plan-prevent-destroy-good/main.tf similarity index 100% rename from terraform/test-fixtures/plan-prevent-destroy-good/main.tf rename to terraform/testdata/plan-prevent-destroy-good/main.tf diff --git a/terraform/test-fixtures/plan-provider-init/main.tf b/terraform/testdata/plan-provider-init/main.tf similarity index 100% rename from terraform/test-fixtures/plan-provider-init/main.tf rename to terraform/testdata/plan-provider-init/main.tf diff --git a/terraform/test-fixtures/plan-provider/main.tf b/terraform/testdata/plan-provider/main.tf similarity index 100% rename from terraform/test-fixtures/plan-provider/main.tf rename to terraform/testdata/plan-provider/main.tf diff --git a/terraform/test-fixtures/plan-provisioner-cycle/main.tf b/terraform/testdata/plan-provisioner-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/plan-provisioner-cycle/main.tf rename to terraform/testdata/plan-provisioner-cycle/main.tf diff --git a/terraform/test-fixtures/plan-required-output/main.tf b/terraform/testdata/plan-required-output/main.tf similarity index 100% rename from terraform/test-fixtures/plan-required-output/main.tf rename to terraform/testdata/plan-required-output/main.tf diff --git a/terraform/test-fixtures/plan-required-output/mod/main.tf b/terraform/testdata/plan-required-output/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-required-output/mod/main.tf rename to terraform/testdata/plan-required-output/mod/main.tf diff --git a/terraform/test-fixtures/plan-required-whole-mod/main.tf b/terraform/testdata/plan-required-whole-mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-required-whole-mod/main.tf rename to terraform/testdata/plan-required-whole-mod/main.tf diff --git a/terraform/test-fixtures/plan-required-whole-mod/mod/main.tf b/terraform/testdata/plan-required-whole-mod/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-required-whole-mod/mod/main.tf rename to terraform/testdata/plan-required-whole-mod/mod/main.tf diff --git a/terraform/test-fixtures/plan-self-ref-multi-all/main.tf b/terraform/testdata/plan-self-ref-multi-all/main.tf similarity index 100% rename from terraform/test-fixtures/plan-self-ref-multi-all/main.tf rename to terraform/testdata/plan-self-ref-multi-all/main.tf diff --git a/terraform/test-fixtures/plan-self-ref-multi/main.tf b/terraform/testdata/plan-self-ref-multi/main.tf similarity index 100% rename from terraform/test-fixtures/plan-self-ref-multi/main.tf rename to terraform/testdata/plan-self-ref-multi/main.tf diff --git a/terraform/test-fixtures/plan-self-ref/main.tf b/terraform/testdata/plan-self-ref/main.tf similarity index 100% rename from terraform/test-fixtures/plan-self-ref/main.tf rename to terraform/testdata/plan-self-ref/main.tf diff --git a/terraform/test-fixtures/plan-shadow-uuid/main.tf b/terraform/testdata/plan-shadow-uuid/main.tf similarity index 100% rename from terraform/test-fixtures/plan-shadow-uuid/main.tf rename to terraform/testdata/plan-shadow-uuid/main.tf diff --git a/terraform/test-fixtures/plan-taint-ignore-changes/main.tf b/terraform/testdata/plan-taint-ignore-changes/main.tf similarity index 100% rename from terraform/test-fixtures/plan-taint-ignore-changes/main.tf rename to terraform/testdata/plan-taint-ignore-changes/main.tf diff --git a/terraform/test-fixtures/plan-taint-interpolated-count/main.tf b/terraform/testdata/plan-taint-interpolated-count/main.tf similarity index 100% rename from terraform/test-fixtures/plan-taint-interpolated-count/main.tf rename to terraform/testdata/plan-taint-interpolated-count/main.tf diff --git a/terraform/test-fixtures/plan-taint/main.tf b/terraform/testdata/plan-taint/main.tf similarity index 100% rename from terraform/test-fixtures/plan-taint/main.tf rename to terraform/testdata/plan-taint/main.tf diff --git a/terraform/test-fixtures/plan-targeted-cross-module/A/main.tf b/terraform/testdata/plan-targeted-cross-module/A/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-cross-module/A/main.tf rename to terraform/testdata/plan-targeted-cross-module/A/main.tf diff --git a/terraform/test-fixtures/plan-targeted-cross-module/B/main.tf b/terraform/testdata/plan-targeted-cross-module/B/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-cross-module/B/main.tf rename to terraform/testdata/plan-targeted-cross-module/B/main.tf diff --git a/terraform/test-fixtures/plan-targeted-cross-module/main.tf b/terraform/testdata/plan-targeted-cross-module/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-cross-module/main.tf rename to terraform/testdata/plan-targeted-cross-module/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-orphan/main.tf b/terraform/testdata/plan-targeted-module-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-orphan/main.tf rename to terraform/testdata/plan-targeted-module-orphan/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-untargeted-variable/child/main.tf b/terraform/testdata/plan-targeted-module-untargeted-variable/child/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-untargeted-variable/child/main.tf rename to terraform/testdata/plan-targeted-module-untargeted-variable/child/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-untargeted-variable/main.tf b/terraform/testdata/plan-targeted-module-untargeted-variable/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-untargeted-variable/main.tf rename to terraform/testdata/plan-targeted-module-untargeted-variable/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-with-provider/child1/main.tf b/terraform/testdata/plan-targeted-module-with-provider/child1/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-with-provider/child1/main.tf rename to terraform/testdata/plan-targeted-module-with-provider/child1/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-with-provider/child2/main.tf b/terraform/testdata/plan-targeted-module-with-provider/child2/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-with-provider/child2/main.tf rename to terraform/testdata/plan-targeted-module-with-provider/child2/main.tf diff --git a/terraform/test-fixtures/plan-targeted-module-with-provider/main.tf b/terraform/testdata/plan-targeted-module-with-provider/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-module-with-provider/main.tf rename to terraform/testdata/plan-targeted-module-with-provider/main.tf diff --git a/terraform/test-fixtures/plan-targeted-orphan/main.tf b/terraform/testdata/plan-targeted-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-orphan/main.tf rename to terraform/testdata/plan-targeted-orphan/main.tf diff --git a/terraform/test-fixtures/plan-targeted-over-ten/main.tf b/terraform/testdata/plan-targeted-over-ten/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-over-ten/main.tf rename to terraform/testdata/plan-targeted-over-ten/main.tf diff --git a/terraform/test-fixtures/plan-targeted-with-tainted/main.tf b/terraform/testdata/plan-targeted-with-tainted/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted-with-tainted/main.tf rename to terraform/testdata/plan-targeted-with-tainted/main.tf diff --git a/terraform/test-fixtures/plan-targeted/main.tf b/terraform/testdata/plan-targeted/main.tf similarity index 100% rename from terraform/test-fixtures/plan-targeted/main.tf rename to terraform/testdata/plan-targeted/main.tf diff --git a/terraform/test-fixtures/plan-untargeted-resource-output/main.tf b/terraform/testdata/plan-untargeted-resource-output/main.tf similarity index 100% rename from terraform/test-fixtures/plan-untargeted-resource-output/main.tf rename to terraform/testdata/plan-untargeted-resource-output/main.tf diff --git a/terraform/test-fixtures/plan-untargeted-resource-output/mod/main.tf b/terraform/testdata/plan-untargeted-resource-output/mod/main.tf similarity index 100% rename from terraform/test-fixtures/plan-untargeted-resource-output/mod/main.tf rename to terraform/testdata/plan-untargeted-resource-output/mod/main.tf diff --git a/terraform/test-fixtures/plan-var-list-err/main.tf b/terraform/testdata/plan-var-list-err/main.tf similarity index 100% rename from terraform/test-fixtures/plan-var-list-err/main.tf rename to terraform/testdata/plan-var-list-err/main.tf diff --git a/terraform/test-fixtures/provider-with-locals/main.tf b/terraform/testdata/provider-with-locals/main.tf similarity index 100% rename from terraform/test-fixtures/provider-with-locals/main.tf rename to terraform/testdata/provider-with-locals/main.tf diff --git a/terraform/test-fixtures/refresh-basic/main.tf b/terraform/testdata/refresh-basic/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-basic/main.tf rename to terraform/testdata/refresh-basic/main.tf diff --git a/terraform/test-fixtures/refresh-config-orphan/main.tf b/terraform/testdata/refresh-config-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-config-orphan/main.tf rename to terraform/testdata/refresh-config-orphan/main.tf diff --git a/terraform/test-fixtures/refresh-data-count/refresh-data-count.tf b/terraform/testdata/refresh-data-count/refresh-data-count.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-count/refresh-data-count.tf rename to terraform/testdata/refresh-data-count/refresh-data-count.tf diff --git a/terraform/test-fixtures/refresh-data-module-var/child/main.tf b/terraform/testdata/refresh-data-module-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-module-var/child/main.tf rename to terraform/testdata/refresh-data-module-var/child/main.tf diff --git a/terraform/test-fixtures/refresh-data-module-var/main.tf b/terraform/testdata/refresh-data-module-var/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-module-var/main.tf rename to terraform/testdata/refresh-data-module-var/main.tf diff --git a/terraform/test-fixtures/refresh-data-ref-data/main.tf b/terraform/testdata/refresh-data-ref-data/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-ref-data/main.tf rename to terraform/testdata/refresh-data-ref-data/main.tf diff --git a/terraform/test-fixtures/refresh-data-resource-basic/main.tf b/terraform/testdata/refresh-data-resource-basic/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-resource-basic/main.tf rename to terraform/testdata/refresh-data-resource-basic/main.tf diff --git a/terraform/test-fixtures/refresh-data-scale-inout/main.tf b/terraform/testdata/refresh-data-scale-inout/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-data-scale-inout/main.tf rename to terraform/testdata/refresh-data-scale-inout/main.tf diff --git a/terraform/test-fixtures/refresh-dynamic/main.tf b/terraform/testdata/refresh-dynamic/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-dynamic/main.tf rename to terraform/testdata/refresh-dynamic/main.tf diff --git a/terraform/test-fixtures/refresh-module-computed-var/child/main.tf b/terraform/testdata/refresh-module-computed-var/child/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-computed-var/child/main.tf rename to terraform/testdata/refresh-module-computed-var/child/main.tf diff --git a/terraform/test-fixtures/refresh-module-computed-var/main.tf b/terraform/testdata/refresh-module-computed-var/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-computed-var/main.tf rename to terraform/testdata/refresh-module-computed-var/main.tf diff --git a/terraform/test-fixtures/refresh-module-input-computed-output/child/main.tf b/terraform/testdata/refresh-module-input-computed-output/child/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-input-computed-output/child/main.tf rename to terraform/testdata/refresh-module-input-computed-output/child/main.tf diff --git a/terraform/test-fixtures/refresh-module-input-computed-output/main.tf b/terraform/testdata/refresh-module-input-computed-output/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-input-computed-output/main.tf rename to terraform/testdata/refresh-module-input-computed-output/main.tf diff --git a/terraform/test-fixtures/refresh-module-orphan/child/grandchild/main.tf b/terraform/testdata/refresh-module-orphan/child/grandchild/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-orphan/child/grandchild/main.tf rename to terraform/testdata/refresh-module-orphan/child/grandchild/main.tf diff --git a/terraform/test-fixtures/refresh-module-orphan/child/main.tf b/terraform/testdata/refresh-module-orphan/child/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-orphan/child/main.tf rename to terraform/testdata/refresh-module-orphan/child/main.tf diff --git a/terraform/test-fixtures/refresh-module-orphan/main.tf b/terraform/testdata/refresh-module-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-orphan/main.tf rename to terraform/testdata/refresh-module-orphan/main.tf diff --git a/terraform/test-fixtures/refresh-module-var-module/bar/main.tf b/terraform/testdata/refresh-module-var-module/bar/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-var-module/bar/main.tf rename to terraform/testdata/refresh-module-var-module/bar/main.tf diff --git a/terraform/test-fixtures/refresh-module-var-module/foo/main.tf b/terraform/testdata/refresh-module-var-module/foo/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-var-module/foo/main.tf rename to terraform/testdata/refresh-module-var-module/foo/main.tf diff --git a/terraform/test-fixtures/refresh-module-var-module/main.tf b/terraform/testdata/refresh-module-var-module/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-module-var-module/main.tf rename to terraform/testdata/refresh-module-var-module/main.tf diff --git a/terraform/test-fixtures/refresh-modules/child/main.tf b/terraform/testdata/refresh-modules/child/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-modules/child/main.tf rename to terraform/testdata/refresh-modules/child/main.tf diff --git a/terraform/test-fixtures/refresh-modules/main.tf b/terraform/testdata/refresh-modules/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-modules/main.tf rename to terraform/testdata/refresh-modules/main.tf diff --git a/terraform/test-fixtures/refresh-no-state/main.tf b/terraform/testdata/refresh-no-state/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-no-state/main.tf rename to terraform/testdata/refresh-no-state/main.tf diff --git a/terraform/test-fixtures/refresh-output-partial/main.tf b/terraform/testdata/refresh-output-partial/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-output-partial/main.tf rename to terraform/testdata/refresh-output-partial/main.tf diff --git a/terraform/test-fixtures/refresh-output/main.tf b/terraform/testdata/refresh-output/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-output/main.tf rename to terraform/testdata/refresh-output/main.tf diff --git a/terraform/test-fixtures/refresh-resource-scale-inout/main.tf b/terraform/testdata/refresh-resource-scale-inout/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-resource-scale-inout/main.tf rename to terraform/testdata/refresh-resource-scale-inout/main.tf diff --git a/terraform/test-fixtures/refresh-targeted-count/main.tf b/terraform/testdata/refresh-targeted-count/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-targeted-count/main.tf rename to terraform/testdata/refresh-targeted-count/main.tf diff --git a/terraform/test-fixtures/refresh-targeted/main.tf b/terraform/testdata/refresh-targeted/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-targeted/main.tf rename to terraform/testdata/refresh-targeted/main.tf diff --git a/terraform/test-fixtures/refresh-unknown-provider/main.tf b/terraform/testdata/refresh-unknown-provider/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-unknown-provider/main.tf rename to terraform/testdata/refresh-unknown-provider/main.tf diff --git a/terraform/test-fixtures/refresh-vars/main.tf b/terraform/testdata/refresh-vars/main.tf similarity index 100% rename from terraform/test-fixtures/refresh-vars/main.tf rename to terraform/testdata/refresh-vars/main.tf diff --git a/terraform/test-fixtures/smc-uservars/main.tf b/terraform/testdata/smc-uservars/main.tf similarity index 100% rename from terraform/test-fixtures/smc-uservars/main.tf rename to terraform/testdata/smc-uservars/main.tf diff --git a/terraform/test-fixtures/state-module-orphans/bar/main.tf b/terraform/testdata/state-module-orphans/bar/main.tf similarity index 100% rename from terraform/test-fixtures/state-module-orphans/bar/main.tf rename to terraform/testdata/state-module-orphans/bar/main.tf diff --git a/terraform/test-fixtures/state-module-orphans/main.tf b/terraform/testdata/state-module-orphans/main.tf similarity index 100% rename from terraform/test-fixtures/state-module-orphans/main.tf rename to terraform/testdata/state-module-orphans/main.tf diff --git a/terraform/test-fixtures/state-upgrade/v1-to-v2-empty-path.tfstate b/terraform/testdata/state-upgrade/v1-to-v2-empty-path.tfstate similarity index 100% rename from terraform/test-fixtures/state-upgrade/v1-to-v2-empty-path.tfstate rename to terraform/testdata/state-upgrade/v1-to-v2-empty-path.tfstate diff --git a/terraform/test-fixtures/static-validate-refs/static-validate-refs.tf b/terraform/testdata/static-validate-refs/static-validate-refs.tf similarity index 100% rename from terraform/test-fixtures/static-validate-refs/static-validate-refs.tf rename to terraform/testdata/static-validate-refs/static-validate-refs.tf diff --git a/terraform/test-fixtures/transform-config-mode-data/main.tf b/terraform/testdata/transform-config-mode-data/main.tf similarity index 100% rename from terraform/test-fixtures/transform-config-mode-data/main.tf rename to terraform/testdata/transform-config-mode-data/main.tf diff --git a/terraform/test-fixtures/transform-create-before-destroy-basic/main.tf b/terraform/testdata/transform-create-before-destroy-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-create-before-destroy-basic/main.tf rename to terraform/testdata/transform-create-before-destroy-basic/main.tf diff --git a/terraform/test-fixtures/transform-create-before-destroy-twice/main.tf b/terraform/testdata/transform-create-before-destroy-twice/main.tf similarity index 100% rename from terraform/test-fixtures/transform-create-before-destroy-twice/main.tf rename to terraform/testdata/transform-create-before-destroy-twice/main.tf diff --git a/terraform/test-fixtures/transform-destroy-basic/main.tf b/terraform/testdata/transform-destroy-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-basic/main.tf rename to terraform/testdata/transform-destroy-basic/main.tf diff --git a/terraform/test-fixtures/transform-destroy-depends-on/main.tf b/terraform/testdata/transform-destroy-depends-on/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-depends-on/main.tf rename to terraform/testdata/transform-destroy-depends-on/main.tf diff --git a/terraform/test-fixtures/transform-destroy-deps/main.tf b/terraform/testdata/transform-destroy-deps/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-deps/main.tf rename to terraform/testdata/transform-destroy-deps/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-basic/main.tf b/terraform/testdata/transform-destroy-edge-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-basic/main.tf rename to terraform/testdata/transform-destroy-edge-basic/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-module-only/child/main.tf b/terraform/testdata/transform-destroy-edge-module-only/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-module-only/child/main.tf rename to terraform/testdata/transform-destroy-edge-module-only/child/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-module-only/main.tf b/terraform/testdata/transform-destroy-edge-module-only/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-module-only/main.tf rename to terraform/testdata/transform-destroy-edge-module-only/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-module/child/main.tf b/terraform/testdata/transform-destroy-edge-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-module/child/main.tf rename to terraform/testdata/transform-destroy-edge-module/child/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-module/main.tf b/terraform/testdata/transform-destroy-edge-module/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-module/main.tf rename to terraform/testdata/transform-destroy-edge-module/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-multi/main.tf b/terraform/testdata/transform-destroy-edge-multi/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-multi/main.tf rename to terraform/testdata/transform-destroy-edge-multi/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-self-ref/main.tf b/terraform/testdata/transform-destroy-edge-self-ref/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-self-ref/main.tf rename to terraform/testdata/transform-destroy-edge-self-ref/main.tf diff --git a/terraform/test-fixtures/transform-destroy-edge-splat/main.tf b/terraform/testdata/transform-destroy-edge-splat/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-edge-splat/main.tf rename to terraform/testdata/transform-destroy-edge-splat/main.tf diff --git a/terraform/test-fixtures/transform-destroy-prefix/main.tf b/terraform/testdata/transform-destroy-prefix/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-prefix/main.tf rename to terraform/testdata/transform-destroy-prefix/main.tf diff --git a/terraform/test-fixtures/transform-destroy-prune-count/main.tf b/terraform/testdata/transform-destroy-prune-count/main.tf similarity index 100% rename from terraform/test-fixtures/transform-destroy-prune-count/main.tf rename to terraform/testdata/transform-destroy-prune-count/main.tf diff --git a/terraform/test-fixtures/transform-diff-basic/main.tf b/terraform/testdata/transform-diff-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-diff-basic/main.tf rename to terraform/testdata/transform-diff-basic/main.tf diff --git a/terraform/test-fixtures/transform-flat-config-basic/child/main.tf b/terraform/testdata/transform-flat-config-basic/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-flat-config-basic/child/main.tf rename to terraform/testdata/transform-flat-config-basic/child/main.tf diff --git a/terraform/test-fixtures/transform-flat-config-basic/main.tf b/terraform/testdata/transform-flat-config-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-flat-config-basic/main.tf rename to terraform/testdata/transform-flat-config-basic/main.tf diff --git a/terraform/test-fixtures/transform-flatten/child/main.tf b/terraform/testdata/transform-flatten/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-flatten/child/main.tf rename to terraform/testdata/transform-flatten/child/main.tf diff --git a/terraform/test-fixtures/transform-flatten/main.tf b/terraform/testdata/transform-flatten/main.tf similarity index 100% rename from terraform/test-fixtures/transform-flatten/main.tf rename to terraform/testdata/transform-flatten/main.tf diff --git a/terraform/test-fixtures/transform-module-var-basic/child/main.tf b/terraform/testdata/transform-module-var-basic/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-module-var-basic/child/main.tf rename to terraform/testdata/transform-module-var-basic/child/main.tf diff --git a/terraform/test-fixtures/transform-module-var-basic/main.tf b/terraform/testdata/transform-module-var-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-module-var-basic/main.tf rename to terraform/testdata/transform-module-var-basic/main.tf diff --git a/terraform/test-fixtures/transform-module-var-nested/child/child/main.tf b/terraform/testdata/transform-module-var-nested/child/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-module-var-nested/child/child/main.tf rename to terraform/testdata/transform-module-var-nested/child/child/main.tf diff --git a/terraform/test-fixtures/transform-module-var-nested/child/main.tf b/terraform/testdata/transform-module-var-nested/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-module-var-nested/child/main.tf rename to terraform/testdata/transform-module-var-nested/child/main.tf diff --git a/terraform/test-fixtures/transform-module-var-nested/main.tf b/terraform/testdata/transform-module-var-nested/main.tf similarity index 100% rename from terraform/test-fixtures/transform-module-var-nested/main.tf rename to terraform/testdata/transform-module-var-nested/main.tf diff --git a/terraform/test-fixtures/transform-orphan-basic/main.tf b/terraform/testdata/transform-orphan-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-orphan-basic/main.tf rename to terraform/testdata/transform-orphan-basic/main.tf diff --git a/terraform/test-fixtures/transform-orphan-count-empty/main.tf b/terraform/testdata/transform-orphan-count-empty/main.tf similarity index 100% rename from terraform/test-fixtures/transform-orphan-count-empty/main.tf rename to terraform/testdata/transform-orphan-count-empty/main.tf diff --git a/terraform/test-fixtures/transform-orphan-count/main.tf b/terraform/testdata/transform-orphan-count/main.tf similarity index 100% rename from terraform/test-fixtures/transform-orphan-count/main.tf rename to terraform/testdata/transform-orphan-count/main.tf diff --git a/terraform/test-fixtures/transform-orphan-modules/main.tf b/terraform/testdata/transform-orphan-modules/main.tf similarity index 100% rename from terraform/test-fixtures/transform-orphan-modules/main.tf rename to terraform/testdata/transform-orphan-modules/main.tf diff --git a/terraform/test-fixtures/transform-orphan-output-basic/main.tf b/terraform/testdata/transform-orphan-output-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-orphan-output-basic/main.tf rename to terraform/testdata/transform-orphan-output-basic/main.tf diff --git a/terraform/test-fixtures/transform-provider-basic/main.tf b/terraform/testdata/transform-provider-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-basic/main.tf rename to terraform/testdata/transform-provider-basic/main.tf diff --git a/terraform/test-fixtures/transform-provider-disable-keep/child/main.tf b/terraform/testdata/transform-provider-disable-keep/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-disable-keep/child/main.tf rename to terraform/testdata/transform-provider-disable-keep/child/main.tf diff --git a/terraform/test-fixtures/transform-provider-disable-keep/main.tf b/terraform/testdata/transform-provider-disable-keep/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-disable-keep/main.tf rename to terraform/testdata/transform-provider-disable-keep/main.tf diff --git a/terraform/test-fixtures/transform-provider-disable/child/main.tf b/terraform/testdata/transform-provider-disable/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-disable/child/main.tf rename to terraform/testdata/transform-provider-disable/child/main.tf diff --git a/terraform/test-fixtures/transform-provider-disable/main.tf b/terraform/testdata/transform-provider-disable/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-disable/main.tf rename to terraform/testdata/transform-provider-disable/main.tf diff --git a/terraform/test-fixtures/transform-provider-grandchild-inherit/child/grandchild/main.tf b/terraform/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-grandchild-inherit/child/grandchild/main.tf rename to terraform/testdata/transform-provider-grandchild-inherit/child/grandchild/main.tf diff --git a/terraform/test-fixtures/transform-provider-grandchild-inherit/child/main.tf b/terraform/testdata/transform-provider-grandchild-inherit/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-grandchild-inherit/child/main.tf rename to terraform/testdata/transform-provider-grandchild-inherit/child/main.tf diff --git a/terraform/test-fixtures/transform-provider-grandchild-inherit/main.tf b/terraform/testdata/transform-provider-grandchild-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-grandchild-inherit/main.tf rename to terraform/testdata/transform-provider-grandchild-inherit/main.tf diff --git a/terraform/test-fixtures/transform-provider-implicit-module/main.tf b/terraform/testdata/transform-provider-implicit-module/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-implicit-module/main.tf rename to terraform/testdata/transform-provider-implicit-module/main.tf diff --git a/terraform/test-fixtures/transform-provider-implicit-module/mod/main.tf b/terraform/testdata/transform-provider-implicit-module/mod/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-implicit-module/mod/main.tf rename to terraform/testdata/transform-provider-implicit-module/mod/main.tf diff --git a/terraform/test-fixtures/transform-provider-inherit/child/main.tf b/terraform/testdata/transform-provider-inherit/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-inherit/child/main.tf rename to terraform/testdata/transform-provider-inherit/child/main.tf diff --git a/terraform/test-fixtures/transform-provider-inherit/main.tf b/terraform/testdata/transform-provider-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-inherit/main.tf rename to terraform/testdata/transform-provider-inherit/main.tf diff --git a/terraform/test-fixtures/transform-provider-invalid/main.tf b/terraform/testdata/transform-provider-invalid/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-invalid/main.tf rename to terraform/testdata/transform-provider-invalid/main.tf diff --git a/terraform/test-fixtures/transform-provider-invalid/mod/main.tf b/terraform/testdata/transform-provider-invalid/mod/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-invalid/mod/main.tf rename to terraform/testdata/transform-provider-invalid/mod/main.tf diff --git a/terraform/test-fixtures/transform-provider-missing-grandchild/main.tf b/terraform/testdata/transform-provider-missing-grandchild/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-missing-grandchild/main.tf rename to terraform/testdata/transform-provider-missing-grandchild/main.tf diff --git a/terraform/test-fixtures/transform-provider-missing-grandchild/sub/main.tf b/terraform/testdata/transform-provider-missing-grandchild/sub/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-missing-grandchild/sub/main.tf rename to terraform/testdata/transform-provider-missing-grandchild/sub/main.tf diff --git a/terraform/test-fixtures/transform-provider-missing-grandchild/sub/subsub/main.tf b/terraform/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-missing-grandchild/sub/subsub/main.tf rename to terraform/testdata/transform-provider-missing-grandchild/sub/subsub/main.tf diff --git a/terraform/test-fixtures/transform-provider-missing/main.tf b/terraform/testdata/transform-provider-missing/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-missing/main.tf rename to terraform/testdata/transform-provider-missing/main.tf diff --git a/terraform/test-fixtures/transform-provider-prune/main.tf b/terraform/testdata/transform-provider-prune/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provider-prune/main.tf rename to terraform/testdata/transform-provider-prune/main.tf diff --git a/terraform/test-fixtures/transform-provisioner-basic/main.tf b/terraform/testdata/transform-provisioner-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provisioner-basic/main.tf rename to terraform/testdata/transform-provisioner-basic/main.tf diff --git a/terraform/test-fixtures/transform-provisioner-module/child/main.tf b/terraform/testdata/transform-provisioner-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provisioner-module/child/main.tf rename to terraform/testdata/transform-provisioner-module/child/main.tf diff --git a/terraform/test-fixtures/transform-provisioner-module/main.tf b/terraform/testdata/transform-provisioner-module/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provisioner-module/main.tf rename to terraform/testdata/transform-provisioner-module/main.tf diff --git a/terraform/test-fixtures/transform-provisioner-prune/main.tf b/terraform/testdata/transform-provisioner-prune/main.tf similarity index 100% rename from terraform/test-fixtures/transform-provisioner-prune/main.tf rename to terraform/testdata/transform-provisioner-prune/main.tf diff --git a/terraform/test-fixtures/transform-resource-count-basic/main.tf b/terraform/testdata/transform-resource-count-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-resource-count-basic/main.tf rename to terraform/testdata/transform-resource-count-basic/main.tf diff --git a/terraform/test-fixtures/transform-resource-count-deps/main.tf b/terraform/testdata/transform-resource-count-deps/main.tf similarity index 100% rename from terraform/test-fixtures/transform-resource-count-deps/main.tf rename to terraform/testdata/transform-resource-count-deps/main.tf diff --git a/terraform/test-fixtures/transform-resource-count-negative/main.tf b/terraform/testdata/transform-resource-count-negative/main.tf similarity index 100% rename from terraform/test-fixtures/transform-resource-count-negative/main.tf rename to terraform/testdata/transform-resource-count-negative/main.tf diff --git a/terraform/test-fixtures/transform-root-basic/main.tf b/terraform/testdata/transform-root-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-root-basic/main.tf rename to terraform/testdata/transform-root-basic/main.tf diff --git a/terraform/test-fixtures/transform-tainted-basic/main.tf b/terraform/testdata/transform-tainted-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-tainted-basic/main.tf rename to terraform/testdata/transform-tainted-basic/main.tf diff --git a/terraform/test-fixtures/transform-targets-basic/main.tf b/terraform/testdata/transform-targets-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-targets-basic/main.tf rename to terraform/testdata/transform-targets-basic/main.tf diff --git a/terraform/test-fixtures/transform-targets-destroy/main.tf b/terraform/testdata/transform-targets-destroy/main.tf similarity index 100% rename from terraform/test-fixtures/transform-targets-destroy/main.tf rename to terraform/testdata/transform-targets-destroy/main.tf diff --git a/terraform/test-fixtures/transform-targets-downstream/child/child.tf b/terraform/testdata/transform-targets-downstream/child/child.tf similarity index 100% rename from terraform/test-fixtures/transform-targets-downstream/child/child.tf rename to terraform/testdata/transform-targets-downstream/child/child.tf diff --git a/terraform/test-fixtures/transform-targets-downstream/child/grandchild/grandchild.tf b/terraform/testdata/transform-targets-downstream/child/grandchild/grandchild.tf similarity index 100% rename from terraform/test-fixtures/transform-targets-downstream/child/grandchild/grandchild.tf rename to terraform/testdata/transform-targets-downstream/child/grandchild/grandchild.tf diff --git a/terraform/test-fixtures/transform-targets-downstream/main.tf b/terraform/testdata/transform-targets-downstream/main.tf similarity index 100% rename from terraform/test-fixtures/transform-targets-downstream/main.tf rename to terraform/testdata/transform-targets-downstream/main.tf diff --git a/terraform/test-fixtures/transform-trans-reduce-basic/main.tf b/terraform/testdata/transform-trans-reduce-basic/main.tf similarity index 100% rename from terraform/test-fixtures/transform-trans-reduce-basic/main.tf rename to terraform/testdata/transform-trans-reduce-basic/main.tf diff --git a/terraform/test-fixtures/update-resource-provider/main.tf b/terraform/testdata/update-resource-provider/main.tf similarity index 100% rename from terraform/test-fixtures/update-resource-provider/main.tf rename to terraform/testdata/update-resource-provider/main.tf diff --git a/terraform/test-fixtures/uservars-map/main.tf b/terraform/testdata/uservars-map/main.tf similarity index 100% rename from terraform/test-fixtures/uservars-map/main.tf rename to terraform/testdata/uservars-map/main.tf diff --git a/terraform/test-fixtures/validate-bad-count/main.tf b/terraform/testdata/validate-bad-count/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-count/main.tf rename to terraform/testdata/validate-bad-count/main.tf diff --git a/terraform/test-fixtures/validate-bad-module-output/child/main.tf b/terraform/testdata/validate-bad-module-output/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-module-output/child/main.tf rename to terraform/testdata/validate-bad-module-output/child/main.tf diff --git a/terraform/test-fixtures/validate-bad-module-output/main.tf b/terraform/testdata/validate-bad-module-output/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-module-output/main.tf rename to terraform/testdata/validate-bad-module-output/main.tf diff --git a/terraform/test-fixtures/validate-bad-pc-empty/main.tf b/terraform/testdata/validate-bad-pc-empty/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-pc-empty/main.tf rename to terraform/testdata/validate-bad-pc-empty/main.tf diff --git a/terraform/test-fixtures/validate-bad-pc/main.tf b/terraform/testdata/validate-bad-pc/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-pc/main.tf rename to terraform/testdata/validate-bad-pc/main.tf diff --git a/terraform/test-fixtures/validate-bad-prov-conf/main.tf b/terraform/testdata/validate-bad-prov-conf/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-prov-conf/main.tf rename to terraform/testdata/validate-bad-prov-conf/main.tf diff --git a/terraform/test-fixtures/validate-bad-prov-connection/main.tf b/terraform/testdata/validate-bad-prov-connection/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-prov-connection/main.tf rename to terraform/testdata/validate-bad-prov-connection/main.tf diff --git a/terraform/test-fixtures/validate-bad-rc/main.tf b/terraform/testdata/validate-bad-rc/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-rc/main.tf rename to terraform/testdata/validate-bad-rc/main.tf diff --git a/terraform/test-fixtures/validate-bad-resource-connection/main.tf b/terraform/testdata/validate-bad-resource-connection/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-resource-connection/main.tf rename to terraform/testdata/validate-bad-resource-connection/main.tf diff --git a/terraform/test-fixtures/validate-bad-var/main.tf b/terraform/testdata/validate-bad-var/main.tf similarity index 100% rename from terraform/test-fixtures/validate-bad-var/main.tf rename to terraform/testdata/validate-bad-var/main.tf diff --git a/terraform/test-fixtures/validate-computed-in-function/main.tf b/terraform/testdata/validate-computed-in-function/main.tf similarity index 100% rename from terraform/test-fixtures/validate-computed-in-function/main.tf rename to terraform/testdata/validate-computed-in-function/main.tf diff --git a/terraform/test-fixtures/validate-computed-module-var-ref/dest/main.tf b/terraform/testdata/validate-computed-module-var-ref/dest/main.tf similarity index 100% rename from terraform/test-fixtures/validate-computed-module-var-ref/dest/main.tf rename to terraform/testdata/validate-computed-module-var-ref/dest/main.tf diff --git a/terraform/test-fixtures/validate-computed-module-var-ref/main.tf b/terraform/testdata/validate-computed-module-var-ref/main.tf similarity index 100% rename from terraform/test-fixtures/validate-computed-module-var-ref/main.tf rename to terraform/testdata/validate-computed-module-var-ref/main.tf diff --git a/terraform/test-fixtures/validate-computed-module-var-ref/source/main.tf b/terraform/testdata/validate-computed-module-var-ref/source/main.tf similarity index 100% rename from terraform/test-fixtures/validate-computed-module-var-ref/source/main.tf rename to terraform/testdata/validate-computed-module-var-ref/source/main.tf diff --git a/terraform/test-fixtures/validate-computed-var/main.tf b/terraform/testdata/validate-computed-var/main.tf similarity index 100% rename from terraform/test-fixtures/validate-computed-var/main.tf rename to terraform/testdata/validate-computed-var/main.tf diff --git a/terraform/test-fixtures/validate-count-computed/main.tf b/terraform/testdata/validate-count-computed/main.tf similarity index 100% rename from terraform/test-fixtures/validate-count-computed/main.tf rename to terraform/testdata/validate-count-computed/main.tf diff --git a/terraform/test-fixtures/validate-count-negative/main.tf b/terraform/testdata/validate-count-negative/main.tf similarity index 100% rename from terraform/test-fixtures/validate-count-negative/main.tf rename to terraform/testdata/validate-count-negative/main.tf diff --git a/terraform/test-fixtures/validate-count-variable/main.tf b/terraform/testdata/validate-count-variable/main.tf similarity index 100% rename from terraform/test-fixtures/validate-count-variable/main.tf rename to terraform/testdata/validate-count-variable/main.tf diff --git a/terraform/test-fixtures/validate-cycle/main.tf b/terraform/testdata/validate-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/validate-cycle/main.tf rename to terraform/testdata/validate-cycle/main.tf diff --git a/terraform/test-fixtures/validate-good-module/child/main.tf b/terraform/testdata/validate-good-module/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-good-module/child/main.tf rename to terraform/testdata/validate-good-module/child/main.tf diff --git a/terraform/test-fixtures/validate-good-module/main.tf b/terraform/testdata/validate-good-module/main.tf similarity index 100% rename from terraform/test-fixtures/validate-good-module/main.tf rename to terraform/testdata/validate-good-module/main.tf diff --git a/terraform/test-fixtures/validate-good/main.tf b/terraform/testdata/validate-good/main.tf similarity index 100% rename from terraform/test-fixtures/validate-good/main.tf rename to terraform/testdata/validate-good/main.tf diff --git a/terraform/test-fixtures/validate-module-bad-rc/child/main.tf b/terraform/testdata/validate-module-bad-rc/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-bad-rc/child/main.tf rename to terraform/testdata/validate-module-bad-rc/child/main.tf diff --git a/terraform/test-fixtures/validate-module-bad-rc/main.tf b/terraform/testdata/validate-module-bad-rc/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-bad-rc/main.tf rename to terraform/testdata/validate-module-bad-rc/main.tf diff --git a/terraform/test-fixtures/validate-module-deps-cycle/a/main.tf b/terraform/testdata/validate-module-deps-cycle/a/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-deps-cycle/a/main.tf rename to terraform/testdata/validate-module-deps-cycle/a/main.tf diff --git a/terraform/test-fixtures/validate-module-deps-cycle/b/main.tf b/terraform/testdata/validate-module-deps-cycle/b/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-deps-cycle/b/main.tf rename to terraform/testdata/validate-module-deps-cycle/b/main.tf diff --git a/terraform/test-fixtures/validate-module-deps-cycle/main.tf b/terraform/testdata/validate-module-deps-cycle/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-deps-cycle/main.tf rename to terraform/testdata/validate-module-deps-cycle/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-inherit-orphan/main.tf b/terraform/testdata/validate-module-pc-inherit-orphan/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-inherit-orphan/main.tf rename to terraform/testdata/validate-module-pc-inherit-orphan/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-inherit-unused/child/main.tf b/terraform/testdata/validate-module-pc-inherit-unused/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-inherit-unused/child/main.tf rename to terraform/testdata/validate-module-pc-inherit-unused/child/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-inherit-unused/main.tf b/terraform/testdata/validate-module-pc-inherit-unused/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-inherit-unused/main.tf rename to terraform/testdata/validate-module-pc-inherit-unused/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-inherit/child/main.tf b/terraform/testdata/validate-module-pc-inherit/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-inherit/child/main.tf rename to terraform/testdata/validate-module-pc-inherit/child/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-inherit/main.tf b/terraform/testdata/validate-module-pc-inherit/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-inherit/main.tf rename to terraform/testdata/validate-module-pc-inherit/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-vars/child/main.tf b/terraform/testdata/validate-module-pc-vars/child/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-vars/child/main.tf rename to terraform/testdata/validate-module-pc-vars/child/main.tf diff --git a/terraform/test-fixtures/validate-module-pc-vars/main.tf b/terraform/testdata/validate-module-pc-vars/main.tf similarity index 100% rename from terraform/test-fixtures/validate-module-pc-vars/main.tf rename to terraform/testdata/validate-module-pc-vars/main.tf diff --git a/terraform/test-fixtures/validate-required-var/main.tf b/terraform/testdata/validate-required-var/main.tf similarity index 100% rename from terraform/test-fixtures/validate-required-var/main.tf rename to terraform/testdata/validate-required-var/main.tf diff --git a/terraform/test-fixtures/validate-resource-name-symbol/main.tf b/terraform/testdata/validate-resource-name-symbol/main.tf similarity index 100% rename from terraform/test-fixtures/validate-resource-name-symbol/main.tf rename to terraform/testdata/validate-resource-name-symbol/main.tf diff --git a/terraform/test-fixtures/validate-targeted/main.tf b/terraform/testdata/validate-targeted/main.tf similarity index 100% rename from terraform/test-fixtures/validate-targeted/main.tf rename to terraform/testdata/validate-targeted/main.tf diff --git a/terraform/test-fixtures/validate-var-map-override-old/main.tf b/terraform/testdata/validate-var-map-override-old/main.tf similarity index 100% rename from terraform/test-fixtures/validate-var-map-override-old/main.tf rename to terraform/testdata/validate-var-map-override-old/main.tf diff --git a/terraform/test-fixtures/validate-var-no-default-explicit-type/main.tf b/terraform/testdata/validate-var-no-default-explicit-type/main.tf similarity index 100% rename from terraform/test-fixtures/validate-var-no-default-explicit-type/main.tf rename to terraform/testdata/validate-var-no-default-explicit-type/main.tf diff --git a/terraform/test-fixtures/validate-variable-ref/main.tf b/terraform/testdata/validate-variable-ref/main.tf similarity index 100% rename from terraform/test-fixtures/validate-variable-ref/main.tf rename to terraform/testdata/validate-variable-ref/main.tf diff --git a/terraform/test-fixtures/vars-basic-bool/main.tf b/terraform/testdata/vars-basic-bool/main.tf similarity index 100% rename from terraform/test-fixtures/vars-basic-bool/main.tf rename to terraform/testdata/vars-basic-bool/main.tf diff --git a/terraform/test-fixtures/vars-basic/main.tf b/terraform/testdata/vars-basic/main.tf similarity index 100% rename from terraform/test-fixtures/vars-basic/main.tf rename to terraform/testdata/vars-basic/main.tf diff --git a/terraform/variables_test.go b/terraform/variables_test.go index 0aaed3aa65..0a3d5f4022 100644 --- a/terraform/variables_test.go +++ b/terraform/variables_test.go @@ -24,7 +24,7 @@ func TestVariables(t *testing.T) { Value: cty.StringVal("foo"), SourceType: ValueFromConfig, SourceRange: tfdiags.SourceRange{ - Filename: "test-fixtures/vars-basic/main.tf", + Filename: "testdata/vars-basic/main.tf", Start: tfdiags.SourcePos{Line: 1, Column: 1, Byte: 0}, End: tfdiags.SourcePos{Line: 1, Column: 13, Byte: 12}, }, @@ -33,7 +33,7 @@ func TestVariables(t *testing.T) { Value: cty.ListValEmpty(cty.DynamicPseudoType), SourceType: ValueFromConfig, SourceRange: tfdiags.SourceRange{ - Filename: "test-fixtures/vars-basic/main.tf", + Filename: "testdata/vars-basic/main.tf", Start: tfdiags.SourcePos{Line: 6, Column: 1, Byte: 58}, End: tfdiags.SourcePos{Line: 6, Column: 13, Byte: 70}, }, @@ -42,7 +42,7 @@ func TestVariables(t *testing.T) { Value: cty.MapValEmpty(cty.DynamicPseudoType), SourceType: ValueFromConfig, SourceRange: tfdiags.SourceRange{ - Filename: "test-fixtures/vars-basic/main.tf", + Filename: "testdata/vars-basic/main.tf", Start: tfdiags.SourcePos{Line: 11, Column: 1, Byte: 111}, End: tfdiags.SourcePos{Line: 11, Column: 13, Byte: 123}, }, @@ -91,7 +91,7 @@ func TestVariables(t *testing.T) { Value: cty.True, SourceType: ValueFromConfig, SourceRange: tfdiags.SourceRange{ - Filename: "test-fixtures/vars-basic-bool/main.tf", + Filename: "testdata/vars-basic-bool/main.tf", Start: tfdiags.SourcePos{Line: 4, Column: 1, Byte: 177}, End: tfdiags.SourcePos{Line: 4, Column: 13, Byte: 189}, }, @@ -100,7 +100,7 @@ func TestVariables(t *testing.T) { Value: cty.False, SourceType: ValueFromConfig, SourceRange: tfdiags.SourceRange{ - Filename: "test-fixtures/vars-basic-bool/main.tf", + Filename: "testdata/vars-basic-bool/main.tf", Start: tfdiags.SourcePos{Line: 8, Column: 1, Byte: 214}, End: tfdiags.SourcePos{Line: 8, Column: 13, Byte: 226}, }, diff --git a/test-fixtures/config b/testdata/config similarity index 100% rename from test-fixtures/config rename to testdata/config diff --git a/test-fixtures/config-env b/testdata/config-env similarity index 100% rename from test-fixtures/config-env rename to testdata/config-env diff --git a/test-fixtures/credentials b/testdata/credentials similarity index 100% rename from test-fixtures/credentials rename to testdata/credentials diff --git a/test-fixtures/hosts b/testdata/hosts similarity index 100% rename from test-fixtures/hosts rename to testdata/hosts diff --git a/tools/terraform-bundle/e2etest/package_test.go b/tools/terraform-bundle/e2etest/package_test.go index 104553bc70..fa920cabfc 100644 --- a/tools/terraform-bundle/e2etest/package_test.go +++ b/tools/terraform-bundle/e2etest/package_test.go @@ -18,7 +18,7 @@ func TestPackage_empty(t *testing.T) { // is to test the interaction with the real repository. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "empty") + fixturePath := filepath.Join("testdata", "empty") tfBundle := e2e.NewBinary(bundleBin, fixturePath) defer tfBundle.Close() @@ -52,7 +52,7 @@ func TestPackage_manyProviders(t *testing.T) { // is to test the interaction with the real repository. skipIfCannotAccessNetwork(t) - fixturePath := filepath.Join("test-fixtures", "many-providers") + fixturePath := filepath.Join("testdata", "many-providers") tfBundle := e2e.NewBinary(bundleBin, fixturePath) defer tfBundle.Close() diff --git a/tools/terraform-bundle/e2etest/test-fixtures/empty/terraform-bundle.hcl b/tools/terraform-bundle/e2etest/testdata/empty/terraform-bundle.hcl similarity index 100% rename from tools/terraform-bundle/e2etest/test-fixtures/empty/terraform-bundle.hcl rename to tools/terraform-bundle/e2etest/testdata/empty/terraform-bundle.hcl diff --git a/tools/terraform-bundle/e2etest/test-fixtures/many-providers/terraform-bundle.hcl b/tools/terraform-bundle/e2etest/testdata/many-providers/terraform-bundle.hcl similarity index 100% rename from tools/terraform-bundle/e2etest/test-fixtures/many-providers/terraform-bundle.hcl rename to tools/terraform-bundle/e2etest/testdata/many-providers/terraform-bundle.hcl