Fix expansions to be nested under oneOf

stripe · Jun 23, 2017 · e7b8e14 · e7b8e14
1 parent 0bdbfc5
commit e7b8e14
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/generator.go b/generator.go
@@ -99,7 +99,7 @@ func (g *DataGenerator) generateInternal(schema *JSONSchema, requestPath string,
 				var ok bool
 				subExpansions, ok = expansions.expansions[key]
 				if ok {
-					subSchema = property.XExpansionResources[0]
+					subSchema = property.XExpansionResources.OneOf[0]
 				}
 			}
 

diff --git a/main_test.go b/main_test.go
@@ -31,8 +31,10 @@ func init() {
 					// customer resource
 					"customer": {
 						Type: []string{"string"},
-						XExpansionResources: []*JSONSchema{
-							&JSONSchema{Ref: "#/definitions/customer"},
+						XExpansionResources: &JSONSchema{
+							OneOf: []*JSONSchema{
+								&JSONSchema{Ref: "#/definitions/customer"},
+							},
 						},
 					},
 				},

diff --git a/spec.go b/spec.go
@@ -9,16 +9,17 @@ type HTTPVerb string
 type JSONSchema struct {
 	Enum       []string               `json:"enum"`
 	Items      *JSONSchema            `json:"items"`
+	OneOf      []*JSONSchema          `json:"oneOf"`
 	Properties map[string]*JSONSchema `json:"properties"`
 	Type       []string               `json:"type"`
 
 	// Ref is populated if this JSON Schema is actually a JSON reference, and
 	// it defines the location of the actual schema definition.
 	Ref string `json:"$ref"`
 
-	XExpandableFields   []string      `json:"x-expandableFields"`
-	XExpansionResources []*JSONSchema `json:"x-expansionResources"`
-	XResourceID         string        `json:"x-resourceId"`
+	XExpandableFields   []string    `json:"x-expandableFields"`
+	XExpansionResources *JSONSchema `json:"x-expansionResources"`
+	XResourceID         string      `json:"x-resourceId"`
 }
 
 type OpenAPIParameter struct {