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

rpc: use a transport that supports nil pointers

This commit is contained in:
Mitchell Hashimoto 2014-06-12 23:22:28 -07:00
parent c10eed752f
commit 7980aa96a8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpc/resource_provider.go
View File

@ -15,7 +15,11 @@ type ResourceProvider struct {
func (p *ResourceProvider) Validate(c *terraform.ResourceConfig) ([]string, []error) { func (p *ResourceProvider) Validate(c *terraform.ResourceConfig) ([]string, []error) {
var resp ResourceProviderValidateResponse var resp ResourceProviderValidateResponse
err := p.Client.Call(p.Name+".Validate", c, &resp) args := ResourceProviderValidateArgs{
Config: c,
}
err := p.Client.Call(p.Name+".Validate", &args, &resp)
if err != nil { if err != nil {
return nil, []error{err} return nil, []error{err}
} }
@ -95,15 +99,19 @@ type ResourceProviderDiffResponse struct {
Error *BasicError Error *BasicError
} }
type ResourceProviderValidateArgs struct {
Config *terraform.ResourceConfig
}
type ResourceProviderValidateResponse struct { type ResourceProviderValidateResponse struct {
Warnings []string Warnings []string
Errors []*BasicError Errors []*BasicError
} }
func (s *ResourceProviderServer) Validate( func (s *ResourceProviderServer) Validate(
config *terraform.ResourceConfig, args *ResourceProviderValidateArgs,
reply *ResourceProviderValidateResponse) error { reply *ResourceProviderValidateResponse) error {
warns, errs := s.Provider.Validate(config) warns, errs := s.Provider.Validate(args.Config)
berrs := make([]*BasicError, len(errs)) berrs := make([]*BasicError, len(errs))
for i, err := range errs { for i, err := range errs {
berrs[i] = NewBasicError(err) berrs[i] = NewBasicError(err)