From a8f75bc554e0a10efb34461cc9e52d22a6158eaf Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Thu, 18 Oct 2018 12:45:55 -0400
Subject: [PATCH] don't set defaults for deprecated or removed

These may still have defaults set, even if they are not intended to be
used.
---
 helper/plugin/grpc_provider.go      |  6 ++++++
 helper/plugin/grpc_provider_test.go | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/helper/plugin/grpc_provider.go b/helper/plugin/grpc_provider.go
index 5cac34c35..c8f329268 100644
--- a/helper/plugin/grpc_provider.go
+++ b/helper/plugin/grpc_provider.go
@@ -115,6 +115,11 @@ func (s *GRPCProviderServer) PrepareProviderConfig(_ context.Context, req *proto
 			return val, nil
 		}
 
+		// this is deprecated, so don't set it
+		if attrSchema.Deprecated != "" || attrSchema.Removed != "" {
+			return val, nil
+		}
+
 		// find a default value if it exists
 		def, err := attrSchema.DefaultValue()
 		if err != nil {
@@ -129,6 +134,7 @@ func (s *GRPCProviderServer) PrepareProviderConfig(_ context.Context, req *proto
 		// create a cty.Value and make sure it's the correct type
 		tmpVal := hcl2shim.HCL2ValueFromConfigValue(def)
 		val, err = ctyconvert.Convert(tmpVal, val.Type())
+
 		return val, err
 	})
 
diff --git a/helper/plugin/grpc_provider_test.go b/helper/plugin/grpc_provider_test.go
index 7b4f3c4d4..5162d7d57 100644
--- a/helper/plugin/grpc_provider_test.go
+++ b/helper/plugin/grpc_provider_test.go
@@ -533,6 +533,23 @@ func TestPrepareProviderConfig(t *testing.T) {
 				"foo": cty.StringVal("true"),
 			}),
 		},
+		{
+			Name: "test deprecated default",
+			Schema: map[string]*schema.Schema{
+				"foo": &schema.Schema{
+					Type:     schema.TypeString,
+					Required: true,
+					Default:  "do not use",
+					Removed:  "don't use this",
+				},
+			},
+			ConfigVal: cty.ObjectVal(map[string]cty.Value{
+				"foo": cty.NullVal(cty.String),
+			}),
+			ExpectConfig: cty.ObjectVal(map[string]cty.Value{
+				"foo": cty.NullVal(cty.String),
+			}),
+		},
 	} {
 		t.Run(tc.Name, func(t *testing.T) {
 			server := &GRPCProviderServer{