Update main repo references to new kube-openapi repo

cmd/kube-apiserver/app/server.go

@@ -38,7 +38,6 @@ import (
 	"github.com/spf13/pflag"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
@@ -53,6 +52,7 @@ import (
 	serverstorage "k8s.io/apiserver/pkg/server/storage"
 	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
 	//aggregatorinformers "k8s.io/kube-aggregator/pkg/client/informers/internalversion"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	clientgoinformers "k8s.io/client-go/informers"
 	clientgoclientset "k8s.io/client-go/kubernetes"

federation/cmd/federation-apiserver/app/server.go

@@ -32,7 +32,6 @@ import (
 
 	apiv1 "k8s.io/api/core/v1"
 	extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1"
-	apimachineryopenapi "k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -40,6 +39,7 @@ import (
 	"k8s.io/apiserver/pkg/server/filters"
 	serverstorage "k8s.io/apiserver/pkg/server/storage"
 	clientset "k8s.io/client-go/kubernetes"
+	openapicommon "k8s.io/kube-openapi/pkg/common"
 	federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
 	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/api"
@@ -452,7 +452,7 @@ func postProcessOpenAPISpecForBackwardCompatibility(s *spec.Swagger) (*spec.Swag
 		}
 		s.Definitions[k] = spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Ref:         spec.MustCreateRef("#/definitions/" + apimachineryopenapi.EscapeJsonPointer(v)),
+				Ref:         spec.MustCreateRef("#/definitions/" + openapicommon.EscapeJsonPointer(v)),
 				Description: fmt.Sprintf("Deprecated. Please use %s instead.", v),
 			},
 		}

hack/.golint_failures

@@ -582,7 +582,6 @@ staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1
 staging/src/k8s.io/apimachinery/pkg/conversion
 staging/src/k8s.io/apimachinery/pkg/conversion/unstructured
 staging/src/k8s.io/apimachinery/pkg/labels
-staging/src/k8s.io/apimachinery/pkg/openapi
 staging/src/k8s.io/apimachinery/pkg/runtime/schema
 staging/src/k8s.io/apimachinery/pkg/runtime/serializer
 staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf
@@ -654,7 +653,6 @@ staging/src/k8s.io/apiserver/pkg/registry/rest/resttest
 staging/src/k8s.io/apiserver/pkg/server
 staging/src/k8s.io/apiserver/pkg/server/healthz
 staging/src/k8s.io/apiserver/pkg/server/httplog
-staging/src/k8s.io/apiserver/pkg/server/openapi
 staging/src/k8s.io/apiserver/pkg/server/options
 staging/src/k8s.io/apiserver/pkg/server/routes/data/swagger
 staging/src/k8s.io/apiserver/pkg/server/storage
@@ -674,7 +672,6 @@ staging/src/k8s.io/apiserver/pkg/util/feature
 staging/src/k8s.io/apiserver/pkg/util/flag
 staging/src/k8s.io/apiserver/pkg/util/proxy
 staging/src/k8s.io/apiserver/pkg/util/trace
-staging/src/k8s.io/apiserver/pkg/util/trie
 staging/src/k8s.io/apiserver/pkg/util/webhook
 staging/src/k8s.io/apiserver/pkg/util/wsstream
 staging/src/k8s.io/apiserver/plugin/pkg/audit/log
@@ -782,7 +779,6 @@ staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators
 staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf
 staging/src/k8s.io/kube-gen/cmd/informer-gen/generators
 staging/src/k8s.io/kube-gen/cmd/lister-gen/generators
-staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators
 staging/src/k8s.io/metrics/pkg/apis/custom_metrics
 staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1
 staging/src/k8s.io/metrics/pkg/apis/metrics

hack/verify-staging-imports.sh

@@ -65,15 +65,16 @@ function print_forbidden_imports () {
 }
 
 RC=0
-print_forbidden_imports apimachinery should_be_leaf || RC=1
+print_forbidden_imports apimachinery k8s.io/kube-openapi || RC=1
 print_forbidden_imports api k8s.io/apimachinery || RC=1
-print_forbidden_imports kube-gen k8s.io/apimachinery k8s.io/client-go k8s.io/gengo || RC=1
+print_forbidden_imports kube-gen k8s.io/apimachinery k8s.io/client-go k8s.io/gengo k8s.io/kube-openapi || RC=1
 print_forbidden_imports client-go k8s.io/apimachinery k8s.io/api || RC=1
-print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
+print_forbidden_imports apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/api k8s.io/kube-openapi || RC=1
 print_forbidden_imports metrics k8s.io/apimachinery k8s.io/client-go k8s.io/api || RC=1
-print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
+print_forbidden_imports kube-aggregator k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api k8s.io/kube-openapi || RC=1
 print_forbidden_imports sample-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
 print_forbidden_imports apiextensions-apiserver k8s.io/apimachinery k8s.io/client-go k8s.io/apiserver k8s.io/api || RC=1
+print_forbidden_imports kube-openapi k8s.io/gengo || RC=1
 if [ ${RC} != 0 ]; then
     exit ${RC}
 fi

pkg/api/unversioned/time.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	"github.com/go-openapi/spec"
 	"github.com/google/gofuzz"

pkg/apis/meta/v1/time.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	"github.com/go-openapi/spec"
 	"github.com/google/gofuzz"

pkg/generated/openapi/def.bzl

@@ -4,7 +4,7 @@ load("@io_kubernetes_build//defs:go.bzl", "go_genrule")
 def openapi_library(name, tags, srcs, openapi_targets=[], vendor_targets=[]):
   deps = [
       "//vendor/github.com/go-openapi/spec:go_default_library",
-      "//vendor/k8s.io/apimachinery/pkg/openapi:go_default_library",
+      "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
   ] + ["//%s:go_default_library" % target for target in openapi_targets] + ["//vendor/%s:go_default_library" % target for target in vendor_targets]
   go_library(
       name=name,

staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/go-openapi/spec"
 	inf "gopkg.in/inf.v0"
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 )
 
 // Quantity is a fixed-point representation of a number.

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	"github.com/go-openapi/spec"
 	"github.com/google/gofuzz"

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	"github.com/go-openapi/spec"
 	"github.com/google/gofuzz"

staging/src/k8s.io/apimachinery/pkg/openapi/common.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package openapi
-
-import (
-	"github.com/emicklei/go-restful"
-	"github.com/go-openapi/spec"
-	"strings"
-)
-
-// OpenAPIDefinition describes single type. Normally these definitions are auto-generated using gen-openapi.
-type OpenAPIDefinition struct {
-	Schema       spec.Schema
-	Dependencies []string
-}
-
-type ReferenceCallback func(path string) spec.Ref
-
-// OpenAPIDefinitions is collection of all definitions.
-type GetOpenAPIDefinitions func(ReferenceCallback) map[string]OpenAPIDefinition
-
-// OpenAPIDefinitionGetter gets openAPI definitions for a given type. If a type implements this interface,
-// the definition returned by it will be used, otherwise the auto-generated definitions will be used. See
-// GetOpenAPITypeFormat for more information about trade-offs of using this interface or GetOpenAPITypeFormat method when
-// possible.
-type OpenAPIDefinitionGetter interface {
-	OpenAPIDefinition() *OpenAPIDefinition
-}
-
-// Config is set of configuration for openAPI spec generation.
-type Config struct {
-	// List of supported protocols such as https, http, etc.
-	ProtocolList []string
-
-	// Info is general information about the API.
-	Info *spec.Info
-
-	// DefaultResponse will be used if an operation does not have any responses listed. It
-	// will show up as ... "responses" : {"default" : $DefaultResponse} in the spec.
-	DefaultResponse *spec.Response
-
-	// CommonResponses will be added as a response to all operation specs. This is a good place to add common
-	// responses such as authorization failed.
-	CommonResponses map[int]spec.Response
-
-	// List of webservice's path prefixes to ignore
-	IgnorePrefixes []string
-
-	// OpenAPIDefinitions should provide definition for all models used by routes. Failure to provide this map
-	// or any of the models will result in spec generation failure.
-	GetDefinitions GetOpenAPIDefinitions
-
-	// GetOperationIDAndTags returns operation id and tags for a restful route. It is an optional function to customize operation IDs.
-	GetOperationIDAndTags func(r *restful.Route) (string, []string, error)
-
-	// GetDefinitionName returns a friendly name for a definition base on the serving path. parameter `name` is the full name of the definition.
-	// It is an optional function to customize model names.
-	GetDefinitionName func(name string) (string, spec.Extensions)
-
-	// PostProcessSpec runs after the spec is ready to serve. It allows a final modification to the spec before serving.
-	PostProcessSpec func(*spec.Swagger) (*spec.Swagger, error)
-
-	// SecurityDefinitions is list of all security definitions for OpenAPI service. If this is not nil, the user of config
-	// is responsible to provide DefaultSecurity and (maybe) add unauthorized response to CommonResponses.
-	SecurityDefinitions *spec.SecurityDefinitions
-
-	// DefaultSecurity for all operations. This will pass as spec.SwaggerProps.Security to OpenAPI.
-	// For most cases, this will be list of acceptable definitions in SecurityDefinitions.
-	DefaultSecurity []map[string][]string
-}
-
-// This function is a reference for converting go (or any custom type) to a simple open API type,format pair. There are
-// two ways to customize spec for a type. If you add it here, a type will be converted to a simple type and the type
-// comment (the comment that is added before type definition) will be lost. The spec will still have the property
-// comment. The second way is to implement OpenAPIDefinitionGetter interface. That function can customize the spec (so
-// the spec does not need to be simple type,format) or can even return a simple type,format (e.g. IntOrString). For simple
-// type formats, the benefit of adding OpenAPIDefinitionGetter interface is to keep both type and property documentation.
-// Example:
-// type Sample struct {
-//      ...
-//      // port of the server
-//      port IntOrString
-//      ...
-// }
-// // IntOrString documentation...
-// type IntOrString { ... }
-//
-// Adding IntOrString to this function:
-// "port" : {
-//           format:      "string",
-//           type:        "int-or-string",
-//           Description: "port of the server"
-// }
-//
-// Implement OpenAPIDefinitionGetter for IntOrString:
-//
-// "port" : {
-//           $Ref:    "#/definitions/IntOrString"
-//           Description: "port of the server"
-// }
-// ...
-// definitions:
-// {
-//           "IntOrString": {
-//                     format:      "string",
-//                     type:        "int-or-string",
-//                     Description: "IntOrString documentation..."    // new
-//           }
-// }
-//
-func GetOpenAPITypeFormat(typeName string) (string, string) {
-	schemaTypeFormatMap := map[string][]string{
-		"uint":        {"integer", "int32"},
-		"uint8":       {"integer", "byte"},
-		"uint16":      {"integer", "int32"},
-		"uint32":      {"integer", "int64"},
-		"uint64":      {"integer", "int64"},
-		"int":         {"integer", "int32"},
-		"int8":        {"integer", "byte"},
-		"int16":       {"integer", "int32"},
-		"int32":       {"integer", "int32"},
-		"int64":       {"integer", "int64"},
-		"byte":        {"integer", "byte"},
-		"float64":     {"number", "double"},
-		"float32":     {"number", "float"},
-		"bool":        {"boolean", ""},
-		"time.Time":   {"string", "date-time"},
-		"string":      {"string", ""},
-		"integer":     {"integer", ""},
-		"number":      {"number", ""},
-		"boolean":     {"boolean", ""},
-		"[]byte":      {"string", "byte"}, // base64 encoded characters
-		"interface{}": {"object", ""},
-	}
-	mapped, ok := schemaTypeFormatMap[typeName]
-	if !ok {
-		return "", ""
-	}
-	return mapped[0], mapped[1]
-}
-
-func EscapeJsonPointer(p string) string {
-	// Escaping reference name using rfc6901
-	p = strings.Replace(p, "~", "~0", -1)
-	p = strings.Replace(p, "/", "~1", -1)
-	return p
-}

staging/src/k8s.io/apimachinery/pkg/openapi/doc.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// package openapi holds shared codes and types between open API code generator and spec generator.
-package openapi

staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"k8s.io/apimachinery/pkg/openapi"
+	openapi "k8s.io/kube-openapi/pkg/common"
 
 	"github.com/go-openapi/spec"
 	"github.com/golang/glog"

staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go

@@ -30,10 +30,10 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apiserver/pkg/util/trie"
+	"k8s.io/kube-openapi/pkg/util"
 )
 
-var verbs = trie.New([]string{"get", "log", "read", "replace", "patch", "delete", "deletecollection", "watch", "connect", "proxy", "list", "create", "patch"})
+var verbs = util.NewTrie([]string{"get", "log", "read", "replace", "patch", "delete", "deletecollection", "watch", "connect", "proxy", "list", "create", "patch"})
 
 const (
 	extensionGVK = "x-kubernetes-group-version-kind"

staging/src/k8s.io/apiserver/pkg/server/config.go

@@ -33,7 +33,6 @@ import (
 	"github.com/go-openapi/spec"
 	"github.com/pborman/uuid"
 
-	openapicommon "k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -61,6 +60,7 @@ import (
 	"k8s.io/client-go/informers"
 	restclient "k8s.io/client-go/rest"
 	certutil "k8s.io/client-go/util/cert"
+	openapicommon "k8s.io/kube-openapi/pkg/common"
 
 	_ "k8s.io/apiserver/pkg/apis/apiserver/install"
 )

staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	openapicommon "k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -44,6 +43,7 @@ import (
 	"k8s.io/apiserver/pkg/server/healthz"
 	"k8s.io/apiserver/pkg/server/routes"
 	restclient "k8s.io/client-go/rest"
+	openapicommon "k8s.io/kube-openapi/pkg/common"
 )
 
 // Info about an API group.

staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go

@@ -34,7 +34,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apimachinery"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
@@ -51,6 +50,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	restclient "k8s.io/client-go/rest"
+	openapi "k8s.io/kube-openapi/pkg/common"
 )
 
 const (

staging/src/k8s.io/apiserver/pkg/server/openapi/OWNERS

-reviewers:
-- yujuhong
-- gmarek
-- mbohlool
-- philips
-approvers:
-- mbohlool

staging/src/k8s.io/apiserver/pkg/server/openapi/doc.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package openapi contains code to generate OpenAPI discovery spec (which
-// initial version of it also known as Swagger 2.0).
-// For more details: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md
-package openapi

staging/src/k8s.io/apiserver/pkg/server/openapi/util.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package openapi
-
-import (
-	"sort"
-
-	"github.com/emicklei/go-restful"
-	"github.com/go-openapi/spec"
-)
-
-type parameters []spec.Parameter
-
-func (s parameters) Len() int      { return len(s) }
-func (s parameters) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// byNameIn used in sorting parameters by Name and In fields.
-type byNameIn struct {
-	parameters
-}
-
-func (s byNameIn) Less(i, j int) bool {
-	return s.parameters[i].Name < s.parameters[j].Name || (s.parameters[i].Name == s.parameters[j].Name && s.parameters[i].In < s.parameters[j].In)
-}
-
-// SortParameters sorts parameters by Name and In fields.
-func sortParameters(p []spec.Parameter) {
-	sort.Sort(byNameIn{p})
-}
-
-func groupRoutesByPath(routes []restful.Route) map[string][]restful.Route {
-	pathToRoutes := make(map[string][]restful.Route)
-	for _, r := range routes {
-		pathToRoutes[r.Path] = append(pathToRoutes[r.Path], r)
-	}
-	return pathToRoutes
-}
-
-func mapKeyFromParam(param *restful.Parameter) interface{} {
-	return struct {
-		Name string
-		Kind int
-	}{
-		Name: param.Data().Name,
-		Kind: param.Data().Kind,
-	}
-}

staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go

@@ -18,22 +18,21 @@ package routes
 
 import (
 	"github.com/emicklei/go-restful"
+	"github.com/golang/glog"
 
-	"k8s.io/apimachinery/pkg/openapi"
 	"k8s.io/apiserver/pkg/server/mux"
-	apiserveropenapi "k8s.io/apiserver/pkg/server/openapi"
-
-	"github.com/golang/glog"
+	"k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/handler"
 )
 
 // OpenAPI installs spec endpoints for each web service.
 type OpenAPI struct {
-	Config *openapi.Config
+	Config *common.Config
 }
 
 // Install adds the SwaggerUI webservice to the given mux.
 func (oa OpenAPI) Install(c *restful.Container, mux *mux.PathRecorderMux) {
-	err := apiserveropenapi.RegisterOpenAPIService("/swagger.json", c.RegisteredWebServices(), oa.Config, mux)
+	_, err := handler.BuildAndRegisterOpenAPIService("/swagger.json", c.RegisteredWebServices(), oa.Config, mux)
 	if err != nil {
 		glog.Fatalf("Failed to register open api spec for root: %v", err)
 	}

staging/src/k8s.io/apiserver/pkg/util/trie/BUILD

-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["trie.go"],
-    tags = ["automanaged"],
-)

staging/src/k8s.io/apiserver/pkg/util/trie/trie.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package trie
-
-// A simple trie implementation with Add an HasPrefix methods only.
-type Trie struct {
-	children map[byte]*Trie
-	wordTail bool
-	word     string
-}
-
-// New creates a Trie and add all strings in the provided list to it.
-func New(list []string) Trie {
-	ret := Trie{
-		children: make(map[byte]*Trie),
-		wordTail: false,
-	}
-	for _, v := range list {
-		ret.Add(v)
-	}
-	return ret
-}
-
-// Add adds a word to this trie
-func (t *Trie) Add(v string) {
-	root := t
-	for _, b := range []byte(v) {
-		child, exists := root.children[b]
-		if !exists {
-			child = &Trie{
-				children: make(map[byte]*Trie),
-				wordTail: false,
-			}
-			root.children[b] = child
-		}
-		root = child
-	}
-	root.wordTail = true
-	root.word = v
-}
-
-// HasPrefix returns true of v has any of the prefixes stored in this trie.
-func (t *Trie) HasPrefix(v string) bool {
-	_, has := t.GetPrefix(v)
-	return has
-}
-
-// GetPrefix is like HasPrefix but return the prefix in case of match or empty string otherwise.
-func (t *Trie) GetPrefix(v string) (string, bool) {
-	root := t
-	if root.wordTail {
-		return root.word, true
-	}
-	for _, b := range []byte(v) {
-		child, exists := root.children[b]
-		if !exists {
-			return "", false
-		}
-		if child.wordTail {
-			return child.word, true
-		}
-		root = child
-	}
-	return "", false
-}

staging/src/k8s.io/kube-gen/Godeps/Godeps.json

@@ -207,18 +207,10 @@
 			"Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
 		},
 		{
-			"ImportPath": "github.com/pmezard/go-difflib/difflib",
-			"Rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
-		},
-		{
 			"ImportPath": "github.com/spf13/pflag",
 			"Rev": "9ff6c6923cfffbcd502984b8e0c80539a94968b7"
 		},
 		{
-			"ImportPath": "github.com/stretchr/testify/assert",
-			"Rev": "f6abca593680b2315d2075e0f5e2a9751e3f431a"
-		},
-		{
 			"ImportPath": "github.com/ugorji/go/codec",
 			"Rev": "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
 		},

staging/src/k8s.io/kube-gen/cmd/openapi-gen/BUILD

-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_binary",
-    "go_library",
-)
-
-go_binary(
-    name = "openapi-gen",
-    library = ":go_default_library",
-    tags = ["automanaged"],
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["main.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/k8s.io/gengo/args:go_default_library",
-        "//vendor/k8s.io/kube-gen/cmd/openapi-gen/generators:go_default_library",
-    ],
-)

staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/BUILD

-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
-
-go_library(
-    name = "go_default_library",
-    srcs = ["openapi.go"],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/openapi:go_default_library",
-        "//vendor/k8s.io/gengo/args:go_default_library",
-        "//vendor/k8s.io/gengo/generator:go_default_library",
-        "//vendor/k8s.io/gengo/namer:go_default_library",
-        "//vendor/k8s.io/gengo/types:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["openapi_test.go"],
-    library = ":go_default_library",
-    tags = ["automanaged"],
-    deps = [
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-        "//vendor/k8s.io/gengo/generator:go_default_library",
-        "//vendor/k8s.io/gengo/namer:go_default_library",
-        "//vendor/k8s.io/gengo/parser:go_default_library",
-        "//vendor/k8s.io/gengo/types:go_default_library",
-    ],
-)

staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators/openapi_test.go

-/*
-Copyright 2016 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package generators
-
-import (
-	"bytes"
-	"fmt"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"k8s.io/gengo/generator"
-	"k8s.io/gengo/namer"
-	"k8s.io/gengo/parser"
-	"k8s.io/gengo/types"
-)
-
-func construct(t *testing.T, files map[string]string, testNamer namer.Namer) (*parser.Builder, types.Universe, []*types.Type) {
-	b := parser.New()
-	for name, src := range files {
-		if err := b.AddFileForTest(filepath.Dir(name), name, []byte(src)); err != nil {
-			t.Fatal(err)
-		}
-	}
-	u, err := b.FindTypes()
-	if err != nil {
-		t.Fatal(err)
-	}
-	orderer := namer.Orderer{Namer: testNamer}
-	o := orderer.OrderUniverse(u)
-	return b, u, o
-}
-
-func testOpenAPITypeWritter(t *testing.T, code string) (error, *assert.Assertions, *bytes.Buffer) {
-	assert := assert.New(t)
-	var testFiles = map[string]string{
-		"base/foo/bar.go": code,
-	}
-	rawNamer := namer.NewRawNamer("o", nil)
-	namers := namer.NameSystems{
-		"raw": namer.NewRawNamer("", nil),
-	}
-	builder, universe, _ := construct(t, testFiles, rawNamer)
-	context, err := generator.NewContext(builder, namers, "raw")
-	if err != nil {
-		t.Fatal(err)
-	}
-	buffer := &bytes.Buffer{}
-	sw := generator.NewSnippetWriter(buffer, context, "$", "$")
-	blahT := universe.Type(types.Name{Package: "base/foo", Name: "Blah"})
-	return newOpenAPITypeWriter(sw).generate(blahT), assert, buffer
-}
-
-func TestSimple(t *testing.T) {
-	err, assert, buffer := testOpenAPITypeWritter(t, `
-package foo
-
-// Blah is a test.
-// +k8s:openapi-gen=true
-// +k8s:openapi-gen=x-kubernetes-type-tag:type_test
-type Blah struct {
-	// A simple string
-	String string
-	// A simple int
-	Int int `+"`"+`json:",omitempty"`+"`"+`
-	// An int considered string simple int
-	IntString int `+"`"+`json:",string"`+"`"+`
-	// A simple int64
-	Int64 int64
-	// A simple int32
-	Int32 int32
-	// A simple int16
-	Int16 int16
-	// A simple int8
-	Int8 int8
-	// A simple int
-	Uint uint
-	// A simple int64
-	Uint64 uint64
-	// A simple int32
-	Uint32 uint32
-	// A simple int16
-	Uint16 uint16
-	// A simple int8
-	Uint8 uint8
-	// A simple byte
-	Byte byte
-	// A simple boolean
-	Bool bool
-	// A simple float64
-	Float64 float64
-	// A simple float32
-	Float32 float32
-	// a base64 encoded characters
-	ByteArray []byte
-	// a member with an extension
-	// +k8s:openapi-gen=x-kubernetes-member-tag:member_test
-	WithExtension string
-	// a member with struct tag as extension
-	// +patchStrategy=ps
-	// +patchMergeKey=pmk
-	WithStructTagExtension string `+"`"+`patchStrategy:"ps" patchMergeKey:"pmk"`+"`"+`
-}
-		`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(`"base/foo.Blah": {
-Schema: spec.Schema{
-SchemaProps: spec.SchemaProps{
-Description: "Blah is a test.",
-Properties: map[string]spec.Schema{
-"String": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple string",
-Type: []string{"string"},
-Format: "",
-},
-},
-"Int64": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int64",
-Type: []string{"integer"},
-Format: "int64",
-},
-},
-"Int32": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int32",
-Type: []string{"integer"},
-Format: "int32",
-},
-},
-"Int16": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int16",
-Type: []string{"integer"},
-Format: "int32",
-},
-},
-"Int8": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int8",
-Type: []string{"integer"},
-Format: "byte",
-},
-},
-"Uint": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int",
-Type: []string{"integer"},
-Format: "int32",
-},
-},
-"Uint64": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int64",
-Type: []string{"integer"},
-Format: "int64",
-},
-},
-"Uint32": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int32",
-Type: []string{"integer"},
-Format: "int64",
-},
-},
-"Uint16": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int16",
-Type: []string{"integer"},
-Format: "int32",
-},
-},
-"Uint8": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple int8",
-Type: []string{"integer"},
-Format: "byte",
-},
-},
-"Byte": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple byte",
-Type: []string{"integer"},
-Format: "byte",
-},
-},
-"Bool": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple boolean",
-Type: []string{"boolean"},
-Format: "",
-},
-},
-"Float64": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple float64",
-Type: []string{"number"},
-Format: "double",
-},
-},
-"Float32": {
-SchemaProps: spec.SchemaProps{
-Description: "A simple float32",
-Type: []string{"number"},
-Format: "float",
-},
-},
-"ByteArray": {
-SchemaProps: spec.SchemaProps{
-Description: "a base64 encoded characters",
-Type: []string{"string"},
-Format: "byte",
-},
-},
-"WithExtension": {
-VendorExtensible: spec.VendorExtensible{
-Extensions: spec.Extensions{
-"x-kubernetes-member-tag": "member_test",
-},
-},
-SchemaProps: spec.SchemaProps{
-Description: "a member with an extension",
-Type: []string{"string"},
-Format: "",
-},
-},
-"WithStructTagExtension": {
-VendorExtensible: spec.VendorExtensible{
-Extensions: spec.Extensions{
-"x-kubernetes-patch-merge-key": "pmk",
-"x-kubernetes-patch-strategy": "ps",
-},
-},
-SchemaProps: spec.SchemaProps{
-Description: "a member with struct tag as extension",
-Type: []string{"string"},
-Format: "",
-},
-},
-},
-Required: []string{"String","Int64","Int32","Int16","Int8","Uint","Uint64","Uint32","Uint16","Uint8","Byte","Bool","Float64","Float32","ByteArray","WithExtension","WithStructTagExtension"},
-},
-VendorExtensible: spec.VendorExtensible{
-Extensions: spec.Extensions{
-"x-kubernetes-type-tag": "type_test",
-},
-},
-},
-Dependencies: []string{
-},
-},
-`, buffer.String())
-}
-
-func TestFailingSample1(t *testing.T) {
-	err, assert, _ := testOpenAPITypeWritter(t, `
-package foo
-
-// Map sample tests openAPIGen.generateMapProperty method.
-type Blah struct {
-	// A sample String to String map
-	StringToArray map[string]map[string]string
-}
-	`)
-	if assert.Error(err, "An error was expected") {
-		assert.Equal(err, fmt.Errorf("map Element kind Map is not supported in map[string]map[string]string"))
-	}
-}
-
-func TestFailingSample2(t *testing.T) {
-	err, assert, _ := testOpenAPITypeWritter(t, `
-package foo
-
-// Map sample tests openAPIGen.generateMapProperty method.
-type Blah struct {
-	// A sample String to String map
-	StringToArray map[int]string
-}	`)
-	if assert.Error(err, "An error was expected") {
-		assert.Equal(err, fmt.Errorf("map with non-string keys are not supported by OpenAPI in map[int]string"))
-	}
-}
-
-func TestPointer(t *testing.T) {
-	err, assert, buffer := testOpenAPITypeWritter(t, `
-package foo
-
-// PointerSample demonstrate pointer's properties
-type Blah struct {
-	// A string pointer
-	StringPointer *string
-	// A struct pointer
-	StructPointer *Blah
-	// A slice pointer
-	SlicePointer *[]string
-	// A map pointer
-	MapPointer *map[string]string
-}
-	`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(`"base/foo.Blah": {
-Schema: spec.Schema{
-SchemaProps: spec.SchemaProps{
-Description: "PointerSample demonstrate pointer's properties",
-Properties: map[string]spec.Schema{
-"StringPointer": {
-SchemaProps: spec.SchemaProps{
-Description: "A string pointer",
-Type: []string{"string"},
-Format: "",
-},
-},
-"StructPointer": {
-SchemaProps: spec.SchemaProps{
-Description: "A struct pointer",
-Ref: ref("base/foo.Blah"),
-},
-},
-"SlicePointer": {
-SchemaProps: spec.SchemaProps{
-Description: "A slice pointer",
-Type: []string{"array"},
-Items: &spec.SchemaOrArray{
-Schema: &spec.Schema{
-SchemaProps: spec.SchemaProps{
-Type: []string{"string"},
-Format: "",
-},
-},
-},
-},
-},
-"MapPointer": {
-SchemaProps: spec.SchemaProps{
-Description: "A map pointer",
-Type: []string{"object"},
-AdditionalProperties: &spec.SchemaOrBool{
-Schema: &spec.Schema{
-SchemaProps: spec.SchemaProps{
-Type: []string{"string"},
-Format: "",
-},
-},
-},
-},
-},
-},
-Required: []string{"StringPointer","StructPointer","SlicePointer","MapPointer"},
-},
-},
-Dependencies: []string{
-"base/foo.Blah",},
-},
-`, buffer.String())
-}

staging/src/k8s.io/kube-gen/cmd/openapi-gen/main.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 
 	"k8s.io/gengo/args"
-	"k8s.io/kube-gen/cmd/openapi-gen/generators"
+	"k8s.io/kube-openapi/pkg/generators"
 
 	"github.com/golang/glog"
 )