Merge pull request #49055 from mbohlool/bugfix2

Automatic merge from submit-queue (batch tested with PRs 49055, 49128, 49132, 49134, 49110) OpenAPI bug: Array/Map Ptr Elements' handing was incorrect If you have an array of map of pointers, OpenAPI spec generation would fail. fixes: #49074

Merge pull request #49055 from mbohlool/bugfix2
effcdda0 · Kubernetes Submit Queue · GitHub · 32580b89 · 4a7e1df8 · effcdda0
Commit effcdda0 authored Jul 18, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

openapi.go cmd/libs/go2idl/openapi-gen/generators/openapi.go +2 -2

No files found.
--- a/cmd/libs/go2idl/openapi-gen/generators/openapi.go
+++ b/cmd/libs/go2idl/openapi-gen/generators/openapi.go
@@ -579,7 +579,7 @@ func (g openAPITypeWriter) generateMapProperty(t *types.Type) error {
 	case types.Builtin:
 		return fmt.Errorf("please add type %v to getOpenAPITypeFormat function.", elemType)
 	case types.Struct:
-		g.generateReferenceProperty(t.Elem)
+		g.generateReferenceProperty(elemType)
 	case types.Slice, types.Array:
 		g.generateSliceProperty(elemType)
 	default:
@@ -603,7 +603,7 @@ func (g openAPITypeWriter) generateSliceProperty(t *types.Type) error {
 	case types.Builtin:
 		return fmt.Errorf("please add type %v to getOpenAPITypeFormat function.", elemType)
 	case types.Struct:
-		g.generateReferenceProperty(t.Elem)
+		g.generateReferenceProperty(elemType)
 	default:
 		return fmt.Errorf("slice Element kind %v is not supported in %v", elemType.Kind, t)
 	}