From 16a08c6d8bb29724247150979bf31ad1e51398ea Mon Sep 17 00:00:00 2001
From: Ben Drucker <bvdrucker@gmail.com>
Date: Thu, 7 May 2020 20:26:42 -0700
Subject: [PATCH] validate: ignore providers with no configuration

---
 terraform/eval_validate.go      |   6 ++
 terraform/eval_validate_test.go | 115 ++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/terraform/eval_validate.go b/terraform/eval_validate.go
index 00b80d37b..5cfa2f46d 100644
--- a/terraform/eval_validate.go
+++ b/terraform/eval_validate.go
@@ -78,6 +78,12 @@ func (n *EvalValidateProvider) Eval(ctx EvalContext) (interface{}, error) {
 
 	configBody := buildProviderConfig(ctx, n.Addr, n.Config)
 
+	emptySchema := providers.Schema{}.Block
+	_, _, evalDiags := ctx.EvaluateBlock(configBody, emptySchema, nil, EvalDataForNoInstanceKey)
+	if !evalDiags.HasErrors() {
+		return nil, nil
+	}
+
 	resp := provider.GetSchema()
 	diags = diags.Append(resp.Diagnostics)
 	if diags.HasErrors() {
diff --git a/terraform/eval_validate_test.go b/terraform/eval_validate_test.go
index 6adfeab92..fd2bffa97 100644
--- a/terraform/eval_validate_test.go
+++ b/terraform/eval_validate_test.go
@@ -520,3 +520,118 @@ func TestEvalValidateProvisioner_connectionInvalid(t *testing.T) {
 		t.Fatalf("wrong errors %q; want something about each of our invalid connInfo keys", errStr)
 	}
 }
+
+func TestEvalValidateProvider_empty(t *testing.T) {
+	mp := simpleMockProvider()
+	mp.GetSchemaReturn = &ProviderSchema{
+		Provider: &configschema.Block{
+			Attributes: map[string]*configschema.Attribute{
+				"required": {
+					Required: true,
+				},
+			},
+		},
+	}
+
+	p := providers.Interface(mp)
+	rc := &configs.Provider{
+		Name:   "foo",
+		Config: hcl.EmptyBody(),
+	}
+
+	node := &EvalValidateProvider{
+		Provider: &p,
+		Config:   rc,
+	}
+
+	ctx := &MockEvalContext{}
+	ctx.installSimpleEval()
+
+	_, err := node.Eval(ctx)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestEvalValidateProvider_nonempty_invalid(t *testing.T) {
+	mp := simpleMockProvider()
+	mp.GetSchemaReturn = &ProviderSchema{
+		Provider: &configschema.Block{
+			Attributes: map[string]*configschema.Attribute{
+				"required_a": {
+					Type:     cty.String,
+					Required: true,
+				},
+				"required_b": {
+					Type:     cty.String,
+					Required: true,
+				},
+			},
+		},
+	}
+
+	p := providers.Interface(mp)
+	rc := &configs.Provider{
+		Name: "foo",
+		Config: configs.SynthBody("", map[string]cty.Value{
+			"required_a": cty.StringVal("set"),
+		}),
+	}
+
+	node := &EvalValidateProvider{
+		Provider: &p,
+		Config:   rc,
+	}
+
+	ctx := &MockEvalContext{}
+	ctx.installSimpleEval()
+
+	_, err := node.Eval(ctx)
+	if err == nil {
+		t.Fatalf("expected error, got nil")
+	}
+
+	if !strings.Contains(err.Error(), "required_b") || strings.Contains(err.Error(), "required_a") {
+		t.Fatalf("expected only attribute 'required_b' is required error, got %v", err)
+	}
+}
+
+func TestEvalValidateProvider_nonempty_valid(t *testing.T) {
+	mp := simpleMockProvider()
+	mp.GetSchemaReturn = &ProviderSchema{
+		Provider: &configschema.Block{
+			Attributes: map[string]*configschema.Attribute{
+				"required_a": {
+					Type:     cty.String,
+					Required: true,
+				},
+				"required_b": {
+					Type:     cty.String,
+					Required: true,
+				},
+			},
+		},
+	}
+
+	p := providers.Interface(mp)
+	rc := &configs.Provider{
+		Name: "foo",
+		Config: configs.SynthBody("", map[string]cty.Value{
+			"required_a": cty.StringVal("set"),
+			"required_b": cty.StringVal("set"),
+		}),
+	}
+
+	node := &EvalValidateProvider{
+		Provider: &p,
+		Config:   rc,
+	}
+
+	ctx := &MockEvalContext{}
+	ctx.installSimpleEval()
+
+	_, err := node.Eval(ctx)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}