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

terraform: Remove some addrs.Provider.LegacyString uses 

These are cases where we were using the legacy string only to produce a
message to the user or to write to the log. It's enough to make some
basic Terraform commands like "terraform validate" not panic and get far
enough along to see that provider startup is working.
This commit is contained in:
Martin Atkins 2020-03-30 15:32:31 -07:00
parent 549aede792
commit a4280caf57
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
terraform/context_components.go
View File

@ -32,7 +32,7 @@ type basicComponentFactory struct {
func (c *basicComponentFactory) ResourceProviders() []string {
var result []string
for k := range c.providers {
result = append(result, k.LegacyString())
result = append(result, k.String())
}
return result
}
@ -49,7 +49,7 @@ func (c *basicComponentFactory) ResourceProvisioners() []string {
func (c *basicComponentFactory) ResourceProvider(typ addrs.Provider) (providers.Interface, error) {
f, ok := c.providers[typ]
if !ok {
return nil, fmt.Errorf("unknown provider %q", typ.LegacyString())
return nil, fmt.Errorf("unknown provider %q", typ.String())
}
return f()

15
terraform/schemas.go
View File

@ -93,21 +93,20 @@ func loadProviderSchemas(schemas map[addrs.Provider]*ProviderSchema, config *con
var diags tfdiags.Diagnostics
ensure := func(fqn addrs.Provider) {
// TODO: LegacyString() will be removed in an upcoming release
typeName := fqn.LegacyString()
name := fqn.String()
if _, exists := schemas[fqn]; exists {
return
}
log.Printf("[TRACE] LoadSchemas: retrieving schema for provider type %q", fqn.LegacyString())
log.Printf("[TRACE] LoadSchemas: retrieving schema for provider type %q", name)
provider, err := components.ResourceProvider(fqn)
if err != nil {
// We'll put a stub in the map so we won't re-attempt this on
// future calls.
schemas[fqn] = &ProviderSchema{}
diags = diags.Append(
fmt.Errorf("Failed to instantiate provider %q to obtain schema: %s", typeName, err),
fmt.Errorf("Failed to instantiate provider %q to obtain schema: %s", name, err),
)
return
}
@ -121,7 +120,7 @@ func loadProviderSchemas(schemas map[addrs.Provider]*ProviderSchema, config *con
// future calls.
schemas[fqn] = &ProviderSchema{}
diags = diags.Append(
fmt.Errorf("Failed to retrieve schema from provider %q: %s", typeName, resp.Diagnostics.Err()),
fmt.Errorf("Failed to retrieve schema from provider %q: %s", name, resp.Diagnostics.Err()),
)
return
}
@ -138,7 +137,7 @@ func loadProviderSchemas(schemas map[addrs.Provider]*ProviderSchema, config *con
// We're not using the version numbers here yet, but we'll check
// for validity anyway in case we start using them in future.
diags = diags.Append(
fmt.Errorf("invalid negative schema version provider configuration for provider %q", typeName),
fmt.Errorf("invalid negative schema version provider configuration for provider %q", name),
)
}
@ -147,7 +146,7 @@ func loadProviderSchemas(schemas map[addrs.Provider]*ProviderSchema, config *con
s.ResourceTypeSchemaVersions[t] = uint64(r.Version)
if r.Version < 0 {
diags = diags.Append(
fmt.Errorf("invalid negative schema version for resource type %s in provider %q", t, typeName),
fmt.Errorf("invalid negative schema version for resource type %s in provider %q", t, name),
)
}
}
@ -158,7 +157,7 @@ func loadProviderSchemas(schemas map[addrs.Provider]*ProviderSchema, config *con
// We're not using the version numbers here yet, but we'll check
// for validity anyway in case we start using them in future.
diags = diags.Append(
fmt.Errorf("invalid negative schema version for data source %s in provider %q", t, typeName),
fmt.Errorf("invalid negative schema version for data source %s in provider %q", t, name),
)
}
}