genericapiserver: get rid of pkg/genericapiserver/server/openapi/common

pkg/apis/meta/v1/BUILD

@@ -12,9 +12,9 @@ go_library(
     srcs = ["time.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/genericapiserver/server/openapi/common:go_default_library",
         "//vendor:github.com/go-openapi/spec",
         "//vendor:github.com/google/gofuzz",
+        "//vendor:k8s.io/apimachinery/pkg/openapi",
     ],
 )
 

pkg/apis/meta/v1/time.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"k8s.io/kubernetes/pkg/genericapiserver/server/openapi/common"
+	"k8s.io/apimachinery/pkg/openapi"
 
 	"github.com/go-openapi/spec"
 	"github.com/google/gofuzz"
@@ -145,8 +145,8 @@ func (t Time) MarshalJSON() ([]byte, error) {
 	return json.Marshal(t.UTC().Format(time.RFC3339))
 }
 
-func (_ Time) OpenAPIDefinition() common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
+func (_ Time) OpenAPIDefinition() openapi.OpenAPIDefinition {
+	return openapi.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
 				Type:   []string{"string"},

pkg/genericapiserver/server/openapi/BUILD

@@ -48,9 +48,6 @@ filegroup(
 
 filegroup(
     name = "all-srcs",
-    srcs = [
-        ":package-srcs",
-        "//pkg/genericapiserver/server/openapi/common:all-srcs",
-    ],
+    srcs = [":package-srcs"],
     tags = ["automanaged"],
 )

pkg/genericapiserver/server/openapi/common/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 = [
-        "common.go",
-        "doc.go",
-    ],
-    tags = ["automanaged"],
-    deps = [
-        "//vendor:github.com/emicklei/go-restful",
-        "//vendor:github.com/go-openapi/spec",
-    ],
-)
-
-filegroup(
-    name = "package-srcs",
-    srcs = glob(["**"]),
-    tags = ["automanaged"],
-    visibility = ["//visibility:private"],
-)
-
-filegroup(
-    name = "all-srcs",
-    srcs = [":package-srcs"],
-    tags = ["automanaged"],
-)

pkg/genericapiserver/server/openapi/common/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 common
-
-import (
-	"github.com/emicklei/go-restful"
-	"github.com/go-openapi/spec"
-)
-
-// OpenAPIDefinition describes single type. Normally these definitions are auto-generated using gen-openapi.
-type OpenAPIDefinition struct {
-	Schema       spec.Schema
-	Dependencies []string
-}
-
-// OpenAPIDefinitions is collection of all definitions.
-type OpenAPIDefinitions 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.
-	Definitions *OpenAPIDefinitions
-
-	// GetOperationIDAndTags returns operation id and tags for a restful route. It is an optional function to customize operation IDs.
-	GetOperationIDAndTags func(servePath string, r *restful.Route) (string, []string, 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
-	}
-	mapped, ok := schemaTypeFormatMap[typeName]
-	if !ok {
-		return "", ""
-	}
-	return mapped[0], mapped[1]
-}

pkg/genericapiserver/server/openapi/common/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 common holds shared codes and types between open API code generator and spec generator.
-package common