Transfer of provider code

2 files changed, 30 insertions, 4 deletions

diff --git a/vendor/github.com/hashicorp/terraform/helper/schema/provisioner.go b/vendor/github.com/hashicorp/terraform/helper/schema/provisioner.go
index c1564a2..856c675 100644
--- a/vendor/github.com/hashicorp/terraform/helper/schema/provisioner.go
+++ b/vendor/github.com/hashicorp/terraform/helper/schema/provisioner.go
@@ -41,6 +41,10 @@ type Provisioner struct {
         // information.
         ApplyFunc func(ctx context.Context) error
 
+        // ValidateFunc is a function for extended validation. This is optional
+        // and should be used when individual field validation is not enough.
+        ValidateFunc func(*ResourceData) ([]string, []error)
+
         stopCtx       context.Context
         stopCtxCancel context.CancelFunc
         stopOnce      sync.Once
@@ -117,8 +121,30 @@ func (p *Provisioner) Stop() error {
         return nil
 }
 
-func (p *Provisioner) Validate(c *terraform.ResourceConfig) ([]string, []error) {
-        return schemaMap(p.Schema).Validate(c)
+func (p *Provisioner) Validate(config *terraform.ResourceConfig) ([]string, []error) {
+        if err := p.InternalValidate(); err != nil {
+                return nil, []error{fmt.Errorf(
+                        "Internal validation of the provisioner failed! This is always a bug\n"+
+                                "with the provisioner itself, and not a user issue. Please report\n"+
+                                "this bug:\n\n%s", err)}
+        }
+        w := []string{}
+        e := []error{}
+        if p.Schema != nil {
+                w2, e2 := schemaMap(p.Schema).Validate(config)
+                w = append(w, w2...)
+                e = append(e, e2...)
+        }
+        if p.ValidateFunc != nil {
+                data := &ResourceData{
+                        schema: p.Schema,
+                        config: config,
+                }
+                w2, e2 := p.ValidateFunc(data)
+                w = append(w, w2...)
+                e = append(e, e2...)
+        }
+        return w, e
 }
 
 // Apply implementation of terraform.ResourceProvisioner interface.
diff --git a/vendor/github.com/hashicorp/terraform/helper/schema/schema.go b/vendor/github.com/hashicorp/terraform/helper/schema/schema.go
index 32d1721..632672a 100644
--- a/vendor/github.com/hashicorp/terraform/helper/schema/schema.go
+++ b/vendor/github.com/hashicorp/terraform/helper/schema/schema.go
@@ -1373,8 +1373,8 @@ func (m schemaMap) validateObject(
         k string,
         schema map[string]*Schema,
         c *terraform.ResourceConfig) ([]string, []error) {
-        raw, _ := c.GetRaw(k)
-        if _, ok := raw.(map[string]interface{}); !ok {
+        raw, _ := c.Get(k)
+        if _, ok := raw.(map[string]interface{}); !ok && !c.IsComputed(k) {
                 return nil, []error{fmt.Errorf(
                         "%s: expected object, got %s",
                         k, reflect.ValueOf(raw).Kind())}