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

Merge pull request #20137 from hashicorp/f/tf-version 

Copy TF version to helper/schema provider
This commit is contained in:
Paul Tyng 2019-01-28 14:58:21 -05:00 committed by GitHub
parent 2383a2de59 bb9ae50279
commit 50e2b1856e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helper/plugin/grpc_provider.go
View File

@ -390,6 +390,8 @@ func (s *GRPCProviderServer) Configure(_ context.Context, req *proto.Configure_R
return resp, nil return resp, nil
} }
s.provider.TerraformVersion = req.TerraformVersion
config := terraform.NewResourceConfigShimmed(configVal, block) config := terraform.NewResourceConfigShimmed(configVal, block)
err = s.provider.Configure(config) err = s.provider.Configure(config)
resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err) resp.Diagnostics = convert.AppendProtoDiag(resp.Diagnostics, err)

2
helper/schema/provider.go
View File

@ -64,6 +64,8 @@ type Provider struct {
stopCtx context.Context stopCtx context.Context
stopCtxCancel context.CancelFunc stopCtxCancel context.CancelFunc
stopOnce sync.Once stopOnce sync.Once
TerraformVersion string
} }
// ConfigureFunc is the function used to configure a Provider. // ConfigureFunc is the function used to configure a Provider.