fix TypeCommaIntSlice panic caused by json.Number input (#15072)

* fix TypeCommaIntSlice panic caused by json.Number input * add changelog entry
hashicorp · Apr 24, 2022 · 030dc9b · 030dc9b
1 parent 5aeea9f
commit 030dc9b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/changelog/15072.txt b/changelog/15072.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: Fix panic caused by parsing JSON integers for fields defined as comma-delimited integers
+```
diff --git a/sdk/framework/field_data.go b/sdk/framework/field_data.go
@@ -243,6 +243,12 @@ func (d *FieldData) getPrimitive(k string, schema *FieldSchema) (interface{}, bo
 
 	case TypeCommaIntSlice:
 		var result []int
+
+		jsonIn, ok := raw.(json.Number)
+		if ok {
+			raw = jsonIn.String()
+		}
+
 		config := &mapstructure.DecoderConfig{
 			Result:           &result,
 			WeaklyTypedInput: true,

diff --git a/sdk/framework/field_data_test.go b/sdk/framework/field_data_test.go
@@ -593,6 +593,19 @@ func TestFieldDataGet(t *testing.T) {
 			[]int{},
 			false,
 		},
+
+		"comma int slice type, json number": {
+			map[string]*FieldSchema{
+				"foo": {Type: TypeCommaIntSlice},
+			},
+			map[string]interface{}{
+				"foo": json.Number("1"),
+			},
+			"foo",
+			[]int{1},
+			false,
+		},
+
 		"name string type, valid string": {
 			map[string]*FieldSchema{
 				"foo": {Type: TypeNameString},