Merge pull request #4 from emilgelman/fix-list-of-objects

fix terraform list of objects
emilgelman · Oct 28, 2021 · 5298943 · 5298943
2 parents a7857d6 + 0ebfc33
commit 5298943
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go
@@ -69,7 +69,9 @@ func (m *Mapper) parseDefinition(rootName, name string, openapiSchema *spec.Sche
 			}
 			path := prop.SchemaProps.Items.Schema.Ref.Ref.GetURL().Path
 			ss := schemas[strings.ToLower(path)]
-			tfSchema[i] = &schema.Schema{Type: schema.TypeList, Elem: &ss}
+			tfSchema[i] = &schema.Schema{Type: schema.TypeList, Elem: &schema.Resource{
+				Schema: ss,
+			}}
 			continue
 		}
 		m.parseDefinition(rootName, i, &prop, tfSchema, schemas)

diff --git a/pkg/mapper/mapper_test.go b/pkg/mapper/mapper_test.go
@@ -140,10 +140,12 @@ func TestMapArrayOfObject(t *testing.T) {
 			"cylinders": &schema.Schema{
 				Type:     schema.TypeList,
 				Required: true,
-				Elem: &map[string]*schema.Schema{
-					"number": {
-						Type:     schema.TypeString,
-						Required: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"number": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
 					},
 				},
 			},

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -18,10 +18,12 @@ var expectedSchemas = map[string]map[string]*schema.Schema{
 		"cylinders": &schema.Schema{
 			Type:     schema.TypeList,
 			Required: true,
-			Elem: &map[string]*schema.Schema{"number": {
-				Type:     schema.TypeString,
-				Required: true,
-			}},
+			Elem: &schema.Resource{
+				Schema: map[string]*schema.Schema{"number": {
+					Type:     schema.TypeString,
+					Required: true,
+				}},
+			},
 		},
 	},
 	"GetcarSchema": {
@@ -33,10 +35,12 @@ var expectedSchemas = map[string]map[string]*schema.Schema{
 				"cylinders": {
 					Type:     schema.TypeList,
 					Required: true,
-					Elem: &map[string]*schema.Schema{"number": {
-						Type:     schema.TypeString,
-						Required: true,
-					}},
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{"number": {
+							Type:     schema.TypeString,
+							Required: true,
+						}},
+					},
 				},
 			}},
 		},