From 18fd392c1358fccdac0905e29ae957b2ddcd213a Mon Sep 17 00:00:00 2001 From: Haowei Cai Date: Tue, 8 May 2018 17:27:17 -0700 Subject: [PATCH] generated --- .../Godeps/Godeps.json | 10 ++++----- .../k8s.io/apimachinery/Godeps/Godeps.json | 2 +- .../src/k8s.io/apiserver/Godeps/Godeps.json | 10 ++++----- .../src/k8s.io/client-go/Godeps/Godeps.json | 2 +- .../k8s.io/code-generator/Godeps/Godeps.json | 4 ++-- .../k8s.io/kube-aggregator/Godeps/Godeps.json | 12 +++++----- .../sample-apiserver/Godeps/Godeps.json | 10 ++++----- .../sample-controller/Godeps/Godeps.json | 2 +- .../kube-openapi/pkg/aggregator/aggregator.go | 22 +++++++++++++++++++ 9 files changed, 48 insertions(+), 26 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index 1b63f1b678f..2ddedec440f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -2008,23 +2008,23 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", diff --git a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json index 404a6cb6e26..0607ae6e038 100644 --- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json +++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json @@ -180,7 +180,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 0b581a1f2b8..96636d0a63e 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -1736,23 +1736,23 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/client-go/discovery", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 6e33ada2b22..0b96e3b1d73 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -580,7 +580,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/staging/src/k8s.io/code-generator/Godeps/Godeps.json b/staging/src/k8s.io/code-generator/Godeps/Godeps.json index 4c96df28aa1..ad8da9bbe1e 100644 --- a/staging/src/k8s.io/code-generator/Godeps/Godeps.json +++ b/staging/src/k8s.io/code-generator/Godeps/Godeps.json @@ -260,11 +260,11 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/generators", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index ee3fe313481..20a8b234d85 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -1652,27 +1652,27 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/aggregator", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 51aabfc8622..32a49981f55 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -1616,23 +1616,23 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/builder", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/common", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/handler", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index 16888629a82..b767271e22c 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -916,7 +916,7 @@ }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "f08db293d3ef80052d6513ece19792642a289fea" + "Rev": "61db125d227fc9d4e373819a059516f32f7f23c7" } ] } diff --git a/vendor/k8s.io/kube-openapi/pkg/aggregator/aggregator.go b/vendor/k8s.io/kube-openapi/pkg/aggregator/aggregator.go index e453a27bdbd..f05b5017252 100644 --- a/vendor/k8s.io/kube-openapi/pkg/aggregator/aggregator.go +++ b/vendor/k8s.io/kube-openapi/pkg/aggregator/aggregator.go @@ -61,6 +61,10 @@ func (s *referenceWalker) walkRef(ref spec.Ref) spec.Ref { k := refStr[len(definitionPrefix):] def := s.root.Definitions[k] s.walkSchema(&def) + // Make sure we don't assign to nil map + if s.root.Definitions == nil { + s.root.Definitions = spec.Definitions{} + } s.root.Definitions[k] = def } return s.walkRefCallback(ref) @@ -147,6 +151,9 @@ func (s *referenceWalker) walkOperation(op *spec.Operation) { } func (s *referenceWalker) Start() { + if s.root.Paths == nil { + return + } for _, pathItem := range s.root.Paths.Paths { s.walkParams(pathItem.Parameters) s.walkOperation(pathItem.Delete) @@ -220,6 +227,10 @@ func renameDefinition(s *spec.Swagger, old, new string) { } return ref }, s) + // Make sure we don't assign to nil map + if s.Definitions == nil { + s.Definitions = spec.Definitions{} + } s.Definitions[new] = s.Definitions[old] delete(s.Definitions, old) } @@ -244,6 +255,13 @@ func MergeSpecs(dest, source *spec.Swagger) error { func mergeSpecs(dest, source *spec.Swagger, renameModelConflicts, ignorePathConflicts bool) (err error) { specCloned := false + // Paths may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering). + if source.Paths == nil { + source.Paths = &spec.Paths{} + } + if dest.Paths == nil { + dest.Paths = &spec.Paths{} + } if ignorePathConflicts { keepPaths := []string{} hasConflictingPath := false @@ -346,6 +364,10 @@ func mergeSpecs(dest, source *spec.Swagger, renameModelConflicts, ignorePathConf if _, found := dest.Paths.Paths[k]; found { return fmt.Errorf("unable to merge: duplicated path %s", k) } + // PathItem may be empty, due to [ACL constraints](http://goo.gl/8us55a#securityFiltering). + if dest.Paths.Paths == nil { + dest.Paths.Paths = map[string]spec.PathItem{} + } dest.Paths.Paths[k] = v } return nil