remove ProviderConfig Path and Inherited fields
maving all inheritance into core
This commit is contained in:
parent
3297f60d03
commit
57470f6bf5
|
@ -69,15 +69,6 @@ type ProviderConfig struct {
|
||||||
Alias string
|
Alias string
|
||||||
Version string
|
Version string
|
||||||
RawConfig *RawConfig
|
RawConfig *RawConfig
|
||||||
|
|
||||||
// Path records where the Provider was declared in a module tree, so that
|
|
||||||
// it can be copied into child module providers yet still interpolated in
|
|
||||||
// the correct scope.
|
|
||||||
Path []string
|
|
||||||
|
|
||||||
// Inherited is used to skip validation of this config, since any
|
|
||||||
// interpolated variables won't be declared at this level.
|
|
||||||
Inherited bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// A resource represents a single Terraform resource in the configuration.
|
// A resource represents a single Terraform resource in the configuration.
|
||||||
|
@ -817,10 +808,6 @@ func (c *Config) rawConfigs() map[string]*RawConfig {
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, pc := range c.ProviderConfigs {
|
for _, pc := range c.ProviderConfigs {
|
||||||
// this was an inherited config, so we don't validate it at this level.
|
|
||||||
if pc.Inherited {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
source := fmt.Sprintf("provider config '%s'", pc.Name)
|
source := fmt.Sprintf("provider config '%s'", pc.Name)
|
||||||
result[source] = pc.RawConfig
|
result[source] = pc.RawConfig
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue