ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25861 from hashicorp/alisdair/builtin-provider-legacy-string 

addrs: Fix LegacyString for builtin providers
This commit is contained in:
Alisdair McDiarmid 2020-08-17 11:22:20 -04:00 committed by GitHub
parent 95eca06782 e02e53ed4d
commit eb9e32d7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 103 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addrs/provider.go
View File

@ -156,8 +156,8 @@ func (pt Provider) LegacyString() string {
if pt.IsZero() {
panic("called LegacyString on zero-value addrs.Provider")
}
if pt.Namespace != LegacyProviderNamespace {
panic(pt.String() + " is not a legacy addrs.Provider")
if pt.Namespace != LegacyProviderNamespace && pt.Namespace != BuiltInProviderNamespace {
panic(pt.String() + " cannot be represented as a legacy string")
}
return pt.Type
}

31
addrs/provider_test.go
View File

@ -54,6 +54,37 @@ func TestProviderString(t *testing.T) {
}
}
func TestProviderLegacyString(t *testing.T) {
tests := []struct {
Input Provider
Want string
}{
{
Provider{
Type: "test",
Hostname: DefaultRegistryHost,
Namespace: LegacyProviderNamespace,
},
"test",
},
{
Provider{
Type: "terraform",
Hostname: BuiltInProviderHost,
Namespace: BuiltInProviderNamespace,
},
"terraform",
},
}
for _, test := range tests {
got := test.Input.LegacyString()
if got != test.Want {
t.Errorf("wrong result for %s\ngot: %s\nwant: %s", test.Input.String(), got, test.Want)
}
}
}
func TestProviderDisplay(t *testing.T) {
tests := []struct {
Input Provider

39
states/statefile/testdata/roundtrip/v3-builtin.in.tfstate vendored Normal file
View File

@ -0,0 +1,39 @@
{
"version": 3,
"terraform_version": "0.11.14",
"serial": 1,
"lineage": "b707851e-4209-9792-e752-bc0dd6c81fcf",
"modules": [
{
"path": [
"root"
],
"outputs": {},
"resources": {
"data.terraform_remote_state.test": {
"type": "terraform_remote_state",
"depends_on": [],
"primary": {
"id": "2020-08-14 19:13:36.875081 +0000 UTC",
"attributes": {
"backend": "remote",
"config.#": "1",
"config.345861710.organization": "hashicorp",
"config.345861710.workspaces.#": "1",
"config.345861710.workspaces.0.%": "1",
"config.345861710.workspaces.0.name": "test",
"environment": "default",
"id": "2020-08-14 19:13:36.875081 +0000 UTC",
"workspace": "default"
},
"meta": {},
"tainted": false
},
"deposed": [],
"provider": "provider.terraform"
}
},
"depends_on": []
}
]
}

31
states/statefile/testdata/roundtrip/v3-builtin.out.tfstate vendored Normal file
View File

@ -0,0 +1,31 @@
{
"version": 4,
"terraform_version": "0.12.28",
"serial": 1,
"lineage": "b707851e-4209-9792-e752-bc0dd6c81fcf",
"outputs": {},
"resources": [
{
"mode": "data",
"type": "terraform_remote_state",
"name": "test",
"provider": "provider.terraform",
"instances": [
{
"schema_version": 0,
"attributes_flat": {
"backend": "remote",
"config.#": "1",
"config.345861710.organization": "hashicorp",
"config.345861710.workspaces.#": "1",
"config.345861710.workspaces.0.%": "1",
"config.345861710.workspaces.0.name": "test",
"environment": "default",
"id": "2020-08-14 19:13:36.875081 +0000 UTC",
"workspace": "default"
}
}
]
}
]
}