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

Merge pull request #8508 from TimeIncOSS/f-schema-all-validation-errors 

schema: Return all validation errors together from InternalValidate
This commit is contained in:
Mitchell Hashimoto 2016-08-31 10:44:13 -07:00 committed by GitHub
parent fe8922dc13 b90ab0b705
commit aaaed823af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helper/schema/provider.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"sort"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/terraform"
)
@ -69,24 +70,25 @@ func (p *Provider) InternalValidate() error {
return errors.New("provider is nil")
}
var validationErrors error
sm := schemaMap(p.Schema)
if err := sm.InternalValidate(sm); err != nil {
return err
validationErrors = multierror.Append(validationErrors, err)
}
for k, r := range p.ResourcesMap {
if err := r.InternalValidate(nil, true); err != nil {
return fmt.Errorf("resource %s: %s", k, err)
validationErrors = multierror.Append(validationErrors, fmt.Errorf("resource %s: %s", k, err))
}
}
for k, r := range p.DataSourcesMap {
if err := r.InternalValidate(nil, false); err != nil {
return fmt.Errorf("data source %s: %s", k, err)
validationErrors = multierror.Append(validationErrors, fmt.Errorf("data source %s: %s", k, err))
}
}
return nil
return validationErrors
}
// Meta returns the metadata associated with this provider that was