Merge pull request #155 from shomron/dont-point-to-range-variable

shomron · web-flow · commit d03da231d6c8 · 2018-11-05T15:27:35.000-05:00
Fix scan for body parameter in ksonnet.parsePaths()
diff --git a/ksonnet-gen/ksonnet/paths.go b/ksonnet-gen/ksonnet/paths.go
@@ -19,17 +19,23 @@ func parsePaths(apiSpec *spec.Swagger) (map[string]Component, error) {
 				continue
 			}
 
-			var body *spec.Parameter
+			var body spec.Parameter
+			var hasBody bool
 			for _, param := range verb.Parameters {
 				if param.Name == "body" {
-					body = &param
+					body = param // shallow copy
+					hasBody = true
+					break
 				}
 			}
 
-			if body == nil {
+			if !hasBody {
 				continue
 			}
 
+			if body.Schema == nil {
+				return nil, errors.Errorf("invalid body parameter - missing required field: schema")
+			}
 			ref := extractRef(*body.Schema)
 
 			component, exists, err := pathExtensionComponent(verb.Extensions)

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,23 @@ func parsePaths(apiSpec *spec.Swagger) (map[string]Component, error) {`
`19`	`19`	`continue`
`20`	`20`	`}`
`21`	`21`
`22`		`- var body *spec.Parameter`
	`22`	`+ var body spec.Parameter`
	`23`	`+ var hasBody bool`
`23`	`24`	`for _, param := range verb.Parameters {`
`24`	`25`	`if param.Name == "body" {`
`25`		`- body = &param`
	`26`	`+ body = param // shallow copy`
	`27`	`+ hasBody = true`
	`28`	`+ break`
`26`	`29`	`}`
`27`	`30`	`}`
`28`	`31`
`29`		`- if body == nil {`
	`32`	`+ if !hasBody {`
`30`	`33`	`continue`
`31`	`34`	`}`
`32`	`35`
	`36`	`+ if body.Schema == nil {`
	`37`	`+ return nil, errors.Errorf("invalid body parameter - missing required field: schema")`
	`38`	`+ }`
`33`	`39`	`ref := extractRef(*body.Schema)`
`34`	`40`
`35`	`41`	`component, exists, err := pathExtensionComponent(verb.Extensions)`