From 05fcc6b56a6402a7349de6e41fbe6fbd172127ba Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Sat, 22 Oct 2016 14:31:56 +0200 Subject: [PATCH] Update bazel --- cmd/kube-apiserver/app/BUILD | 1 - federation/cmd/federation-apiserver/app/BUILD | 1 - pkg/genericapiserver/BUILD | 6 +++--- pkg/genericapiserver/openapi/BUILD | 1 + pkg/genericapiserver/routes/BUILD | 18 ++++++++++++++++++ pkg/master/BUILD | 1 - 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index a147069f86a..28f744b3823 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/apiserver/authenticator:go_default_library", - "//pkg/apiserver/openapi:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/capabilities:go_default_library", diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 4a7da024ce3..c4e7cf62c9e 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -37,7 +37,6 @@ go_library( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apiserver/authenticator:go_default_library", - "//pkg/apiserver/openapi:go_default_library", "//pkg/auth/authorizer/union:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/cloudprovider/providers:go_default_library", diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index 9cd378429ab..6fcf55a8e90 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -34,6 +34,7 @@ go_library( "//pkg/apimachinery/registered:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/apiserver/filters:go_default_library", + "//pkg/apiserver/openapi:go_default_library", "//pkg/apiserver/request:go_default_library", "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authorizer:go_default_library", @@ -42,7 +43,6 @@ go_library( "//pkg/cloudprovider:go_default_library", "//pkg/genericapiserver/filters:go_default_library", "//pkg/genericapiserver/mux:go_default_library", - "//pkg/genericapiserver/openapi:go_default_library", "//pkg/genericapiserver/openapi/common:go_default_library", "//pkg/genericapiserver/options:go_default_library", "//pkg/genericapiserver/routes:go_default_library", @@ -64,7 +64,6 @@ go_library( "//pkg/version:go_default_library", "//vendor:github.com/coreos/go-systemd/daemon", "//vendor:github.com/emicklei/go-restful", - "//vendor:github.com/emicklei/go-restful/swagger", "//vendor:github.com/go-openapi/spec", "//vendor:github.com/golang/glog", "//vendor:github.com/prometheus/client_golang/prometheus", @@ -96,7 +95,7 @@ go_test( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/auth/authorizer:go_default_library", "//pkg/auth/user:go_default_library", - "//pkg/genericapiserver/mux:go_default_library", + "//pkg/generated/openapi:go_default_library", "//pkg/genericapiserver/options:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/storage/etcd/testing:go_default_library", @@ -104,6 +103,7 @@ go_test( "//pkg/util/clock:go_default_library", "//pkg/util/sets:go_default_library", "//pkg/version:go_default_library", + "//vendor:github.com/go-openapi/spec", "//vendor:github.com/stretchr/testify/assert", ], ) diff --git a/pkg/genericapiserver/openapi/BUILD b/pkg/genericapiserver/openapi/BUILD index 00b86b744ed..29e5f2aab5f 100644 --- a/pkg/genericapiserver/openapi/BUILD +++ b/pkg/genericapiserver/openapi/BUILD @@ -19,6 +19,7 @@ go_library( ], tags = ["automanaged"], deps = [ + "//pkg/genericapiserver/mux:go_default_library", "//pkg/genericapiserver/openapi/common:go_default_library", "//pkg/util:go_default_library", "//pkg/util/json:go_default_library", diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/routes/BUILD index 7015011e5d7..8f6dff3d1ef 100644 --- a/pkg/genericapiserver/routes/BUILD +++ b/pkg/genericapiserver/routes/BUILD @@ -15,7 +15,9 @@ go_library( srcs = [ "doc.go", "index.go", + "openapi.go", "profiling.go", + "swagger.go", "swaggerui.go", "version.go", ], @@ -24,9 +26,25 @@ go_library( "//pkg/api/unversioned:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/genericapiserver/mux:go_default_library", + "//pkg/genericapiserver/openapi:go_default_library", + "//pkg/genericapiserver/openapi/common:go_default_library", "//pkg/genericapiserver/routes/data/swagger:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/elazarl/go-bindata-assetfs", "//vendor:github.com/emicklei/go-restful", + "//vendor:github.com/emicklei/go-restful/swagger", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/golang/glog", + ], +) + +go_test( + name = "go_default_test", + srcs = ["swagger_test.go"], + library = "go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/genericapiserver/mux:go_default_library", + "//vendor:github.com/stretchr/testify/assert", ], ) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 4208149e927..0d64305027d 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -122,7 +122,6 @@ go_test( "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apiserver/openapi:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library",