sundowndev
/
driftctl
mirror of https://github.com/sundowndev/driftctl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1139 from cloudskiff/fix/providerConfigure 

Run provider gRPC configure anyway
main
Elie 2021-10-18 16:16:59 +02:00 committed by GitHub
parent 18850b3719 a6a5017724
commit 91145d888f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/remote/terraform/provider.go
View File

@ -111,19 +111,23 @@ func (p *TerraformProvider) configure(alias string) error {
p.schemas = schema.ResourceTypes p.schemas = schema.ResourceTypes
} }
// This value is optional. It'll be overridden by the provider config.
config := cty.NullVal(cty.DynamicPseudoType)
if p.Config.GetProviderConfig != nil { if p.Config.GetProviderConfig != nil {
configType := schema.Provider.Block.ImpliedType() configType := schema.Provider.Block.ImpliedType()
val, err := gocty.ToCtyValue(p.Config.GetProviderConfig(alias), configType) config, err = gocty.ToCtyValue(p.Config.GetProviderConfig(alias), configType)
if err != nil { if err != nil {
return err return err
} }
}
resp := p.grpcProviders[alias].Configure(providers.ConfigureRequest{ resp := p.grpcProviders[alias].Configure(providers.ConfigureRequest{
Config: val, Config: config,
}) })
if resp.Diagnostics.HasErrors() { if resp.Diagnostics.HasErrors() {
return resp.Diagnostics.Err() return resp.Diagnostics.Err()
} }
}
logrus.WithFields(logrus.Fields{ logrus.WithFields(logrus.Fields{
"alias": alias, "alias": alias,