From 27a794062e86cf43c845b483b04685e375552be3 Mon Sep 17 00:00:00 2001 From: Kristin Laemmert Date: Thu, 2 Apr 2020 12:58:44 -0400 Subject: [PATCH] Mildwonkey/command tests (#24535) * command: refactor testBackendState to write states.State testBackendState was using the older terraform.State format, which is no longer sufficient for most tests since the state upgrader does not encode provider FQNs automatically. Users will run `terraform 0.13upgrade` to update their state to include provider FQNs in resources, but tests need to use the modern state format instead of relying on the automatic upgrade. * plan tests passing * graph tests passing * json packages test update * command test updates * update show test fixtures * state show tests passing --- command/command_test.go | 6 +-- command/format/state.go | 2 +- command/graph_test.go | 6 +-- command/jsonplan/plan.go | 2 +- command/jsonplan/values.go | 2 +- command/jsonplan/values_test.go | 8 ++-- command/jsonprovider/provider.go | 2 +- command/jsonstate/state.go | 2 +- command/jsonstate/state_test.go | 36 ++++++++--------- command/plan_test.go | 39 +++++++++---------- command/refresh_test.go | 4 +- command/show_test.go | 4 +- command/state_show_test.go | 10 ++--- .../providers-schema/basic/output.json | 2 +- .../show-json-state/basic/terraform.tfstate | 2 +- .../show-json-state/modules/output.json | 4 +- .../show-json-state/modules/terraform.tfstate | 4 +- .../show-json/basic-create/output.json | 14 +++---- .../show-json/basic-delete/output.json | 12 +++--- .../show-json/basic-delete/terraform.tfstate | 4 +- .../show-json/basic-update/output.json | 8 ++-- .../show-json/basic-update/terraform.tfstate | 2 +- .../testdata/show-json/modules/output.json | 18 ++++----- .../multi-resource-update/output.json | 10 ++--- .../multi-resource-update/terraform.tfstate | 2 +- .../show-json/nested-modules/output.json | 6 +-- 26 files changed, 104 insertions(+), 107 deletions(-) diff --git a/command/command_test.go b/command/command_test.go index 781f544a5..5679fb5db 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -701,7 +701,7 @@ func testInputMap(t *testing.T, answers map[string]string) func() { // be returned about the backend configuration having changed and that // "terraform init" must be run, since the test backend config cache created // by this function contains the hash for an empty configuration. -func testBackendState(t *testing.T, s *terraform.State, c int) (*terraform.State, *httptest.Server) { +func testBackendState(t *testing.T, s *states.State, c int) (*terraform.State, *httptest.Server) { t.Helper() var b64md5 string @@ -723,8 +723,8 @@ func testBackendState(t *testing.T, s *terraform.State, c int) (*terraform.State // If a state was given, make sure we calculate the proper b64md5 if s != nil { - enc := json.NewEncoder(buf) - if err := enc.Encode(s); err != nil { + err := statefile.Write(&statefile.File{State: s}, buf) + if err != nil { t.Fatalf("err: %v", err) } md5 := md5.Sum(buf.Bytes()) diff --git a/command/format/state.go b/command/format/state.go index 949fc6e17..4c245cfb9 100644 --- a/command/format/state.go +++ b/command/format/state.go @@ -147,7 +147,7 @@ func formatStateModule(p blockBodyDiffPrinter, m *states.Module, schemas *terraf // loaded all of the schemas and checked things prior to this // point. We can't return errors here, but since this is UI code // we will try to do _something_ reasonable. - p.buf.WriteString(fmt.Sprintf("# missing schema for provider %q\n\n", provider.LegacyString())) + p.buf.WriteString(fmt.Sprintf("# missing schema for provider %q\n\n", provider.String())) continue } diff --git a/command/graph_test.go b/command/graph_test.go index bea2d3925..6600a7eab 100644 --- a/command/graph_test.go +++ b/command/graph_test.go @@ -33,7 +33,7 @@ func TestGraph(t *testing.T) { } output := ui.OutputWriter.String() - if !strings.Contains(output, `provider["registry.terraform.io/-/test"]`) { + if !strings.Contains(output, `provider["registry.terraform.io/hashicorp/test"]`) { t.Fatalf("doesn't look like digraph: %s", output) } } @@ -80,7 +80,7 @@ func TestGraph_noArgs(t *testing.T) { } output := ui.OutputWriter.String() - if !strings.Contains(output, `provider["registry.terraform.io/-/test"]`) { + if !strings.Contains(output, `provider["registry.terraform.io/hashicorp/test"]`) { t.Fatalf("doesn't look like digraph: %s", output) } } @@ -161,7 +161,7 @@ func TestGraph_plan(t *testing.T) { } output := ui.OutputWriter.String() - if !strings.Contains(output, `provider["registry.terraform.io/-/test"]`) { + if !strings.Contains(output, `provider["registry.terraform.io/hashicorp/test"]`) { t.Fatalf("doesn't look like digraph: %s", output) } } diff --git a/command/jsonplan/plan.go b/command/jsonplan/plan.go index 063267275..7a8bf0efd 100644 --- a/command/jsonplan/plan.go +++ b/command/jsonplan/plan.go @@ -252,7 +252,7 @@ func (p *plan) marshalResourceChanges(changes *plans.Changes, schemas *terraform r.ModuleAddress = addr.Module.String() r.Name = addr.Resource.Resource.Name r.Type = addr.Resource.Resource.Type - r.ProviderName = rc.ProviderAddr.Provider.LegacyString() + r.ProviderName = rc.ProviderAddr.Provider.String() p.ResourceChanges = append(p.ResourceChanges, r) diff --git a/command/jsonplan/values.go b/command/jsonplan/values.go index 263d2b5b9..99d26cfde 100644 --- a/command/jsonplan/values.go +++ b/command/jsonplan/values.go @@ -164,7 +164,7 @@ func marshalPlanResources(changes *plans.Changes, ris []addrs.AbsResourceInstanc Address: r.Addr.String(), Type: r.Addr.Resource.Resource.Type, Name: r.Addr.Resource.Resource.Name, - ProviderName: r.ProviderAddr.Provider.LegacyString(), + ProviderName: r.ProviderAddr.Provider.String(), Index: r.Addr.Resource.Key, } diff --git a/command/jsonplan/values_test.go b/command/jsonplan/values_test.go index 15084e2d9..f77cca3b5 100644 --- a/command/jsonplan/values_test.go +++ b/command/jsonplan/values_test.go @@ -198,7 +198,7 @@ func TestMarshalPlanResources(t *testing.T) { Type: "test_thing", Name: "example", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{}, }}, @@ -227,7 +227,7 @@ func TestMarshalPlanResources(t *testing.T) { Type: "test_thing", Name: "example", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{ @@ -259,7 +259,7 @@ func TestMarshalPlanResources(t *testing.T) { Name: "example", }.Instance(addrs.NoKey).Absolute(addrs.RootModuleInstance), ProviderAddr: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ChangeSrc: plans.ChangeSrc{ @@ -294,7 +294,7 @@ func TestMarshalPlanResources(t *testing.T) { func testSchemas() *terraform.Schemas { return &terraform.Schemas{ Providers: map[addrs.Provider]*terraform.ProviderSchema{ - addrs.NewLegacyProvider("test"): &terraform.ProviderSchema{ + addrs.NewDefaultProvider("test"): &terraform.ProviderSchema{ ResourceTypes: map[string]*configschema.Block{ "test_thing": { Attributes: map[string]*configschema.Attribute{ diff --git a/command/jsonprovider/provider.go b/command/jsonprovider/provider.go index 7f331e7e0..c5d6734f7 100644 --- a/command/jsonprovider/provider.go +++ b/command/jsonprovider/provider.go @@ -35,7 +35,7 @@ func Marshal(s *terraform.Schemas) ([]byte, error) { providers := newProviders() for k, v := range s.Providers { - providers.Schemas[k.LegacyString()] = marshalProvider(v) + providers.Schemas[k.String()] = marshalProvider(v) } ret, err := json.Marshal(providers) diff --git a/command/jsonstate/state.go b/command/jsonstate/state.go index b2432e6e6..1af503c1b 100644 --- a/command/jsonstate/state.go +++ b/command/jsonstate/state.go @@ -261,7 +261,7 @@ func marshalResources(resources map[string]*states.Resource, module addrs.Module Address: r.Addr.Instance(k).String(), Type: resAddr.Type, Name: resAddr.Name, - ProviderName: r.ProviderConfig.Provider.LegacyString(), + ProviderName: r.ProviderConfig.Provider.String(), } switch resAddr.Mode { diff --git a/command/jsonstate/state_test.go b/command/jsonstate/state_test.go index 6d9e87ede..f5b47fe05 100644 --- a/command/jsonstate/state_test.go +++ b/command/jsonstate/state_test.go @@ -204,7 +204,7 @@ func TestMarshalResources(t *testing.T) { }, }, ProviderConfig: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, }, @@ -217,7 +217,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -248,7 +248,7 @@ func TestMarshalResources(t *testing.T) { }, }, ProviderConfig: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, }, @@ -261,7 +261,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.IntKey(0), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -292,7 +292,7 @@ func TestMarshalResources(t *testing.T) { }, }, ProviderConfig: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, }, @@ -305,7 +305,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.StringKey("rockhopper"), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -338,7 +338,7 @@ func TestMarshalResources(t *testing.T) { }, }, ProviderConfig: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, }, @@ -351,7 +351,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", DeposedKey: deposedKey.String(), AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -389,7 +389,7 @@ func TestMarshalResources(t *testing.T) { }, }, ProviderConfig: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, }, @@ -402,7 +402,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", SchemaVersion: 1, AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -415,7 +415,7 @@ func TestMarshalResources(t *testing.T) { Type: "test_thing", Name: "bar", Index: addrs.InstanceKey(nil), - ProviderName: "test", + ProviderName: "registry.terraform.io/hashicorp/test", DeposedKey: deposedKey.String(), AttributeValues: attributeValues{ "foozles": json.RawMessage(`null`), @@ -461,7 +461,7 @@ func TestMarshalModules_basic(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -476,7 +476,7 @@ func TestMarshalModules_basic(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: childModule.Module(), }, ) @@ -491,7 +491,7 @@ func TestMarshalModules_basic(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: subModule.Module(), }, ) @@ -530,7 +530,7 @@ func TestMarshalModules_nested(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -545,7 +545,7 @@ func TestMarshalModules_nested(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: childModule.Module(), }, ) @@ -560,7 +560,7 @@ func TestMarshalModules_nested(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: subModule.Module(), }, ) @@ -591,7 +591,7 @@ func TestMarshalModules_nested(t *testing.T) { func testSchemas() *terraform.Schemas { return &terraform.Schemas{ Providers: map[addrs.Provider]*terraform.ProviderSchema{ - addrs.NewLegacyProvider("test"): &terraform.ProviderSchema{ + addrs.NewDefaultProvider("test"): &terraform.ProviderSchema{ ResourceTypes: map[string]*configschema.Block{ "test_thing": { Attributes: map[string]*configschema.Attribute{ diff --git a/command/plan_test.go b/command/plan_test.go index db0402702..d7b3463cf 100644 --- a/command/plan_test.go +++ b/command/plan_test.go @@ -125,7 +125,7 @@ func TestPlan_destroy(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -244,7 +244,7 @@ func TestPlan_outPathNoChange(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -286,26 +286,23 @@ func TestPlan_outBackend(t *testing.T) { defer os.RemoveAll(td) defer testChdir(t, td)() - // Our state - originalState := &terraform.State{ - Modules: []*terraform.ModuleState{ - &terraform.ModuleState{ - Path: []string{"root"}, - Resources: map[string]*terraform.ResourceState{ - "test_instance.foo": &terraform.ResourceState{ - Type: "test_instance", - Primary: &terraform.InstanceState{ - ID: "bar", - Attributes: map[string]string{ - "ami": "bar", - }, - }, - }, - }, + originalState := states.BuildState(func(s *states.SyncState) { + s.SetResourceInstanceCurrent( + addrs.Resource{ + Mode: addrs.ManagedResourceMode, + Type: "test_instance", + Name: "foo", + }.Instance(addrs.NoKey).Absolute(addrs.RootModuleInstance), + &states.ResourceInstanceObjectSrc{ + AttrsJSON: []byte(`{"id":"bar","ami":"bar"}`), + Status: states.ObjectReady, }, - }, - } - originalState.Init() + addrs.AbsProviderConfig{ + Provider: addrs.NewDefaultProvider("test"), + Module: addrs.RootModule, + }, + ) + }) // Setup our backend state dataState, srv := testBackendState(t, originalState, 200) diff --git a/command/refresh_test.go b/command/refresh_test.go index 1ccaa8360..4e5e2ae7d 100644 --- a/command/refresh_test.go +++ b/command/refresh_test.go @@ -757,10 +757,10 @@ foo = "bar" const testRefreshStr = ` test_instance.foo: ID = yes - provider = provider["registry.terraform.io/-/test"] + provider = provider["registry.terraform.io/hashicorp/test"] ` const testRefreshCwdStr = ` test_instance.foo: ID = yes - provider = provider["registry.terraform.io/-/test"] + provider = provider["registry.terraform.io/hashicorp/test"] ` diff --git a/command/show_test.go b/command/show_test.go index f1a637221..de3a7a6a7 100644 --- a/command/show_test.go +++ b/command/show_test.go @@ -85,7 +85,7 @@ func TestShow_aliasedProvider(t *testing.T) { Dependencies: []addrs.ConfigResource{}, DependsOn: []addrs.Referenceable{}, }, - addrs.RootModuleInstance.ProviderConfigAliased(addrs.NewLegacyProvider("test"), "alias"), + addrs.RootModuleInstance.ProviderConfigAliased(addrs.NewDefaultProvider("test"), "alias"), ) }) @@ -486,7 +486,7 @@ func showFixturePlanFile(t *testing.T, action plans.Action) string { Name: "foo", }.Instance(addrs.NoKey).Absolute(addrs.RootModuleInstance), ProviderAddr: addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ChangeSrc: plans.ChangeSrc{ diff --git a/command/state_show_test.go b/command/state_show_test.go index d3dff9b2d..0f649cb78 100644 --- a/command/state_show_test.go +++ b/command/state_show_test.go @@ -26,7 +26,7 @@ func TestStateShow(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -84,7 +84,7 @@ func TestStateShow_multi(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: addrs.RootModule, }, ) @@ -99,7 +99,7 @@ func TestStateShow_multi(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test"), + Provider: addrs.NewDefaultProvider("test"), Module: submod.Module(), }, ) @@ -205,7 +205,7 @@ func TestStateShow_configured_provider(t *testing.T) { Status: states.ObjectReady, }, addrs.AbsProviderConfig{ - Provider: addrs.NewLegacyProvider("test-beta"), + Provider: addrs.NewDefaultProvider("test-beta"), Module: addrs.RootModule, }, ) @@ -230,7 +230,7 @@ func TestStateShow_configured_provider(t *testing.T) { Meta: Meta{ testingOverrides: &testingOverrides{ Providers: map[addrs.Provider]providers.Factory{ - addrs.NewLegacyProvider("test-beta"): providers.FactoryFixed(p), + addrs.NewDefaultProvider("test-beta"): providers.FactoryFixed(p), }, }, Ui: ui, diff --git a/command/testdata/providers-schema/basic/output.json b/command/testdata/providers-schema/basic/output.json index bc32d8493..ebb06f9d9 100644 --- a/command/testdata/providers-schema/basic/output.json +++ b/command/testdata/providers-schema/basic/output.json @@ -1,7 +1,7 @@ { "format_version": "0.1", "provider_schemas": { - "test": { + "registry.terraform.io/hashicorp/test": { "resource_schemas": { "test_instance": { "version": 0, diff --git a/command/testdata/show-json-state/basic/terraform.tfstate b/command/testdata/show-json-state/basic/terraform.tfstate index 61983c6b0..046c1967e 100644 --- a/command/testdata/show-json-state/basic/terraform.tfstate +++ b/command/testdata/show-json-state/basic/terraform.tfstate @@ -10,7 +10,7 @@ "type": "test_instance", "name": "example", "each": "list", - "provider": "provider.test", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "index_key": 0, diff --git a/command/testdata/show-json-state/modules/output.json b/command/testdata/show-json-state/modules/output.json index 77d53b238..321705389 100644 --- a/command/testdata/show-json-state/modules/output.json +++ b/command/testdata/show-json-state/modules/output.json @@ -17,7 +17,7 @@ "mode": "managed", "type": "test_instance", "name": "example", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar-var", @@ -35,7 +35,7 @@ "type": "test_instance", "name": "example", "index": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "foo-var", diff --git a/command/testdata/show-json-state/modules/terraform.tfstate b/command/testdata/show-json-state/modules/terraform.tfstate index bee640952..88f52a67b 100644 --- a/command/testdata/show-json-state/modules/terraform.tfstate +++ b/command/testdata/show-json-state/modules/terraform.tfstate @@ -16,7 +16,7 @@ "type": "test_instance", "name": "example", "each": "list", - "provider": "provider.test", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "index_key": 0, @@ -33,7 +33,7 @@ "mode": "managed", "type": "test_instance", "name": "example", - "provider": "provider.test", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "schema_version": 0, diff --git a/command/testdata/show-json/basic-create/output.json b/command/testdata/show-json/basic-create/output.json index 8c4295f83..0aef81763 100644 --- a/command/testdata/show-json/basic-create/output.json +++ b/command/testdata/show-json/basic-create/output.json @@ -20,7 +20,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar" @@ -32,7 +32,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar" @@ -44,7 +44,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar" @@ -71,7 +71,7 @@ "index": 0, "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "change": { "actions": [ @@ -91,7 +91,7 @@ "index": 1, "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "change": { "actions": [ @@ -111,7 +111,7 @@ "index": 2, "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "change": { "actions": [ @@ -175,4 +175,4 @@ } } } -} \ No newline at end of file +} diff --git a/command/testdata/show-json/basic-delete/output.json b/command/testdata/show-json/basic-delete/output.json index 5c9d9e8c6..f9580b401 100644 --- a/command/testdata/show-json/basic-delete/output.json +++ b/command/testdata/show-json/basic-delete/output.json @@ -19,7 +19,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar", @@ -34,7 +34,7 @@ "address": "test_instance.test", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "change": { "actions": [ @@ -55,7 +55,7 @@ "address": "test_instance.test-delete", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test-delete", "change": { "actions": [ @@ -97,7 +97,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "values": { "ami": "foo", "id": "placeholder" @@ -109,7 +109,7 @@ "mode": "managed", "type": "test_instance", "name": "test-delete", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "values": { "ami": "foo", "id": "placeholder" @@ -154,4 +154,4 @@ } } } -} \ No newline at end of file +} diff --git a/command/testdata/show-json/basic-delete/terraform.tfstate b/command/testdata/show-json/basic-delete/terraform.tfstate index 4a3b3612c..ac865b864 100644 --- a/command/testdata/show-json/basic-delete/terraform.tfstate +++ b/command/testdata/show-json/basic-delete/terraform.tfstate @@ -9,7 +9,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider": "provider[\"registry.terraform.io/-/test\"]", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "schema_version": 0, @@ -24,7 +24,7 @@ "mode": "managed", "type": "test_instance", "name": "test-delete", - "provider": "provider[\"registry.terraform.io/-/test\"]", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "schema_version": 0, diff --git a/command/testdata/show-json/basic-update/output.json b/command/testdata/show-json/basic-update/output.json index a7b69cad1..120491d45 100644 --- a/command/testdata/show-json/basic-update/output.json +++ b/command/testdata/show-json/basic-update/output.json @@ -19,7 +19,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar", @@ -34,7 +34,7 @@ "address": "test_instance.test", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "change": { "actions": [ @@ -79,7 +79,7 @@ "type": "test_instance", "name": "test", "schema_version": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "values": { "ami": "bar", "id": "placeholder" @@ -124,4 +124,4 @@ } } } -} \ No newline at end of file +} diff --git a/command/testdata/show-json/basic-update/terraform.tfstate b/command/testdata/show-json/basic-update/terraform.tfstate index f68865a9b..b57f60f84 100644 --- a/command/testdata/show-json/basic-update/terraform.tfstate +++ b/command/testdata/show-json/basic-update/terraform.tfstate @@ -9,7 +9,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider": "provider[\"registry.terraform.io/-/test\"]", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "schema_version": 0, diff --git a/command/testdata/show-json/modules/output.json b/command/testdata/show-json/modules/output.json index 13a8702ab..898763aad 100644 --- a/command/testdata/show-json/modules/output.json +++ b/command/testdata/show-json/modules/output.json @@ -16,7 +16,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar-var" @@ -33,7 +33,7 @@ "type": "test_instance", "name": "test", "index": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "baz" @@ -45,7 +45,7 @@ "type": "test_instance", "name": "test", "index": 1, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "baz" @@ -57,7 +57,7 @@ "type": "test_instance", "name": "test", "index": 2, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "baz" @@ -88,7 +88,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "change": { "actions": [ "create" @@ -107,7 +107,7 @@ "module_address": "module.module_test_foo", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "index": 0, "change": { @@ -128,7 +128,7 @@ "module_address": "module.module_test_foo", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "index": 1, "change": { @@ -149,7 +149,7 @@ "module_address": "module.module_test_foo", "mode": "managed", "type": "test_instance", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "name": "test", "index": 2, "change": { @@ -280,4 +280,4 @@ } } } -} \ No newline at end of file +} diff --git a/command/testdata/show-json/multi-resource-update/output.json b/command/testdata/show-json/multi-resource-update/output.json index a5a3a5b3d..cc8f6d1ed 100644 --- a/command/testdata/show-json/multi-resource-update/output.json +++ b/command/testdata/show-json/multi-resource-update/output.json @@ -21,7 +21,7 @@ "type": "test_instance", "name": "test", "index": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar", @@ -34,7 +34,7 @@ "type": "test_instance", "name": "test", "index": 1, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar" @@ -50,7 +50,7 @@ "type": "test_instance", "name": "test", "index": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "change": { "actions": [ "no-op" @@ -72,7 +72,7 @@ "type": "test_instance", "name": "test", "index": 1, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "change": { "actions": [ "create" @@ -115,7 +115,7 @@ "type": "test_instance", "name": "test", "index": 0, - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar", diff --git a/command/testdata/show-json/multi-resource-update/terraform.tfstate b/command/testdata/show-json/multi-resource-update/terraform.tfstate index f68865a9b..b57f60f84 100644 --- a/command/testdata/show-json/multi-resource-update/terraform.tfstate +++ b/command/testdata/show-json/multi-resource-update/terraform.tfstate @@ -9,7 +9,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider": "provider[\"registry.terraform.io/-/test\"]", + "provider": "provider[\"registry.terraform.io/hashicorp/test\"]", "instances": [ { "schema_version": 0, diff --git a/command/testdata/show-json/nested-modules/output.json b/command/testdata/show-json/nested-modules/output.json index d4304dff5..369a58a4d 100644 --- a/command/testdata/show-json/nested-modules/output.json +++ b/command/testdata/show-json/nested-modules/output.json @@ -13,7 +13,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "schema_version": 0, "values": { "ami": "bar-var" @@ -34,7 +34,7 @@ "mode": "managed", "type": "test_instance", "name": "test", - "provider_name": "test", + "provider_name": "registry.terraform.io/hashicorp/test", "change": { "actions": [ "create" @@ -89,4 +89,4 @@ } } } -} \ No newline at end of file +}