Merge pull request #4193 from hashicorp/phinze/provider-dont-prompt-deprecated

helper/schema: skip provider input for deprecated fields

helper/schema/schema.go

@@ -398,6 +398,11 @@ func (m schemaMap) Input(
 			continue
 		}
 
+		// Deprecated fields should never prompt
+		if v.Deprecated != "" {
+			continue
+		}
+
 		// Skip things that have a value of some sort already
 		if _, ok := c.Raw[k]; ok {
 			continue

helper/schema/schema_test.go

@@ -2567,6 +2567,40 @@ func TestSchemaMap_InputDefault(t *testing.T) {
 	}
 }
 
+func TestSchemaMap_InputDeprecated(t *testing.T) {
+	emptyConfig := make(map[string]interface{})
+	c, err := config.NewRawConfig(emptyConfig)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	rc := terraform.NewResourceConfig(c)
+	rc.Config = make(map[string]interface{})
+
+	input := new(terraform.MockUIInput)
+	input.InputFn = func(opts *terraform.InputOpts) (string, error) {
+		t.Fatalf("InputFn should not be called on: %#v", opts)
+		return "", nil
+	}
+
+	schema := map[string]*Schema{
+		"availability_zone": &Schema{
+			Type:       TypeString,
+			Deprecated: "long gone",
+			Optional:   true,
+		},
+	}
+	actual, err := schemaMap(schema).Input(input, rc)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	expected := map[string]interface{}{}
+
+	if !reflect.DeepEqual(expected, actual.Config) {
+		t.Fatalf("got: %#v\nexpected: %#v", actual.Config, expected)
+	}
+}
+
 func TestSchemaMap_InternalValidate(t *testing.T) {
 	cases := map[string]struct {
 		In  map[string]*Schema