From 21e239fb82e7e81dfed9bfddc4e95ff8201c52fa Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Sun, 16 Apr 2017 11:55:31 -0700 Subject: [PATCH] kubectl OpenAPI bazel updates --- pkg/kubectl/cmd/testing/BUILD | 1 + pkg/kubectl/cmd/util/BUILD | 4 ++ pkg/kubectl/cmd/util/openapi/BUILD | 69 +++++++++++++++++++ staging/src/k8s.io/client-go/discovery/BUILD | 3 + .../src/k8s.io/client-go/discovery/fake/BUILD | 1 + 5 files changed, 78 insertions(+) create mode 100644 pkg/kubectl/cmd/util/openapi/BUILD diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index e5dd13aa7dd..d03414078ab 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -19,6 +19,7 @@ go_library( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", + "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/resource:go_default_library", "//pkg/printers:go_default_library", "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 0328ecfb14a..a51ab0c68f9 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -37,6 +37,7 @@ go_library( "//pkg/client/unversioned:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubectl:go_default_library", + "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/resource:go_default_library", "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", @@ -44,6 +45,7 @@ go_library( "//pkg/version:go_default_library", "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", "//vendor/github.com/evanphx/json-patch:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", @@ -102,6 +104,7 @@ go_test( "//pkg/kubectl/resource:go_default_library", "//pkg/util/exec:go_default_library", "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -137,6 +140,7 @@ filegroup( ":package-srcs", "//pkg/kubectl/cmd/util/editor:all-srcs", "//pkg/kubectl/cmd/util/jsonmerge:all-srcs", + "//pkg/kubectl/cmd/util/openapi:all-srcs", "//pkg/kubectl/cmd/util/sanity:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/util/openapi/BUILD b/pkg/kubectl/cmd/util/openapi/BUILD new file mode 100644 index 00000000000..cb01f0de6f0 --- /dev/null +++ b/pkg/kubectl/cmd/util/openapi/BUILD @@ -0,0 +1,69 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", + "go_test", +) + +go_test( + name = "go_default_test", + srcs = [ + "openapi_cache_test.go", + "openapi_getter_test.go", + "openapi_test.go", + ], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//vendor/github.com/go-openapi/loads:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + ], +) + +go_library( + name = "go_default_library", + srcs = [ + "doc.go", + "openapi.go", + "openapi_cache.go", + "openapi_getter.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/version:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", + "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", + "//vendor/k8s.io/client-go/discovery:go_default_library", + ], +) + +go_test( + name = "go_default_xtest", + srcs = ["openapi_suite_test.go"], + tags = ["automanaged"], + deps = [ + "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/gomega:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/staging/src/k8s.io/client-go/discovery/BUILD b/staging/src/k8s.io/client-go/discovery/BUILD index 810b2b219ed..921ddaedd74 100644 --- a/staging/src/k8s.io/client-go/discovery/BUILD +++ b/staging/src/k8s.io/client-go/discovery/BUILD @@ -19,6 +19,8 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", + "//vendor/github.com/go-openapi/loads:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -44,6 +46,7 @@ go_test( tags = ["automanaged"], deps = [ "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/client-go/discovery/fake/BUILD b/staging/src/k8s.io/client-go/discovery/fake/BUILD index ec665e0e133..c8f646c0163 100644 --- a/staging/src/k8s.io/client-go/discovery/fake/BUILD +++ b/staging/src/k8s.io/client-go/discovery/fake/BUILD @@ -13,6 +13,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor/github.com/emicklei/go-restful/swagger:go_default_library", + "//vendor/github.com/go-openapi/spec:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",