From c6fd6941a1052124f886a7e9aa807a0fcf50166f Mon Sep 17 00:00:00 2001 From: deads2k Date: Thu, 26 Jan 2017 14:38:21 -0500 Subject: [PATCH] move pkg/api/validation/path to apimachinery --- .../pkg/apis/apiregistration/validation/BUILD | 2 +- .../apiregistration/validation/validation.go | 2 +- pkg/api/validation/BUILD | 1 - pkg/api/validation/path/BUILD | 35 ------------------- pkg/apis/autoscaling/validation/BUILD | 2 +- pkg/apis/autoscaling/validation/validation.go | 2 +- pkg/apis/rbac/validation/BUILD | 2 +- pkg/apis/rbac/validation/validation.go | 2 +- .../registry/generic/registry/BUILD | 2 +- .../registry/generic/registry/store.go | 2 +- pkg/genericapiserver/registry/rest/BUILD | 2 +- pkg/genericapiserver/registry/rest/create.go | 2 +- .../registry/rest/resttest/BUILD | 2 +- .../registry/rest/resttest/resttest.go | 2 +- pkg/storage/BUILD | 2 +- pkg/storage/util.go | 2 +- .../pkg}/api/validation/path/name.go | 0 .../pkg}/api/validation/path/name_test.go | 0 vendor/BUILD | 13 +++++++ 19 files changed, 27 insertions(+), 50 deletions(-) delete mode 100644 pkg/api/validation/path/BUILD rename {pkg => staging/src/k8s.io/apimachinery/pkg}/api/validation/path/name.go (100%) rename {pkg => staging/src/k8s.io/apimachinery/pkg}/api/validation/path/name_test.go (100%) diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD index ee14ac9e415..b361b08642f 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/BUILD @@ -14,7 +14,7 @@ go_library( deps = [ "//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library", "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], diff --git a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go index a951eebe3c9..25fb483b575 100644 --- a/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go +++ b/cmd/kube-aggregator/pkg/apis/apiregistration/validation/validation.go @@ -19,10 +19,10 @@ package validation import ( "fmt" + "k8s.io/apimachinery/pkg/api/validation/path" utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/api/validation/path" discoveryapi "k8s.io/kubernetes/cmd/kube-aggregator/pkg/apis/apiregistration" ) diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index 605c86fe53b..aefb6171ce5 100644 --- a/pkg/api/validation/BUILD +++ b/pkg/api/validation/BUILD @@ -100,7 +100,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/api/validation/genericvalidation:all-srcs", - "//pkg/api/validation/path:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/api/validation/path/BUILD b/pkg/api/validation/path/BUILD deleted file mode 100644 index bbdf6356fbe..00000000000 --- a/pkg/api/validation/path/BUILD +++ /dev/null @@ -1,35 +0,0 @@ -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 = ["name.go"], - tags = ["automanaged"], -) - -go_test( - name = "go_default_test", - srcs = ["name_test.go"], - library = ":go_default_library", - tags = ["automanaged"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/apis/autoscaling/validation/BUILD b/pkg/apis/autoscaling/validation/BUILD index ec72afaf8de..aad269da053 100644 --- a/pkg/apis/autoscaling/validation/BUILD +++ b/pkg/apis/autoscaling/validation/BUILD @@ -14,10 +14,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/controller/podautoscaler:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/autoscaling/validation/validation.go b/pkg/apis/autoscaling/validation/validation.go index 141bbddd5b1..526423aba7a 100644 --- a/pkg/apis/autoscaling/validation/validation.go +++ b/pkg/apis/autoscaling/validation/validation.go @@ -19,9 +19,9 @@ package validation import ( "encoding/json" + pathvalidation "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/util/validation/field" apivalidation "k8s.io/kubernetes/pkg/api/validation" - pathvalidation "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/podautoscaler" diff --git a/pkg/apis/rbac/validation/BUILD b/pkg/apis/rbac/validation/BUILD index eeb39a6fc06..f55a59617d3 100644 --- a/pkg/apis/rbac/validation/BUILD +++ b/pkg/apis/rbac/validation/BUILD @@ -14,8 +14,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/validation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/apis/rbac:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", ], ) diff --git a/pkg/apis/rbac/validation/validation.go b/pkg/apis/rbac/validation/validation.go index 948396c21d6..482511c5bb4 100644 --- a/pkg/apis/rbac/validation/validation.go +++ b/pkg/apis/rbac/validation/validation.go @@ -17,9 +17,9 @@ limitations under the License. package validation import ( + "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/apis/rbac" ) diff --git a/pkg/genericapiserver/registry/generic/registry/BUILD b/pkg/genericapiserver/registry/generic/registry/BUILD index 7ed3d8a6ff6..6762727aeaf 100644 --- a/pkg/genericapiserver/registry/generic/registry/BUILD +++ b/pkg/genericapiserver/registry/generic/registry/BUILD @@ -20,7 +20,6 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors/storage:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/genericapiserver/registry/generic:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/registry/cachesize:go_default_library", @@ -32,6 +31,7 @@ go_library( "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", diff --git a/pkg/genericapiserver/registry/generic/registry/store.go b/pkg/genericapiserver/registry/generic/registry/store.go index 0e96c3f8401..67a174e3d3a 100644 --- a/pkg/genericapiserver/registry/generic/registry/store.go +++ b/pkg/genericapiserver/registry/generic/registry/store.go @@ -25,6 +25,7 @@ import ( kubeerr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/api/validation/path" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" @@ -37,7 +38,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/pkg/genericapiserver/registry/rest/BUILD b/pkg/genericapiserver/registry/rest/BUILD index 4626913c2bb..f63eabde2b8 100644 --- a/pkg/genericapiserver/registry/rest/BUILD +++ b/pkg/genericapiserver/registry/rest/BUILD @@ -23,9 +23,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/validation/genericvalidation:go_default_library", - "//pkg/api/validation/path:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", diff --git a/pkg/genericapiserver/registry/rest/create.go b/pkg/genericapiserver/registry/rest/create.go index f73621bd921..2dc7f20c669 100644 --- a/pkg/genericapiserver/registry/rest/create.go +++ b/pkg/genericapiserver/registry/rest/create.go @@ -18,6 +18,7 @@ package rest import ( "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/validation/path" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -25,7 +26,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage/names" "k8s.io/kubernetes/pkg/api/validation/genericvalidation" - "k8s.io/kubernetes/pkg/api/validation/path" ) // RESTCreateStrategy defines the minimum validation, accepted input, and diff --git a/pkg/genericapiserver/registry/rest/resttest/BUILD b/pkg/genericapiserver/registry/rest/resttest/BUILD index bb32202c29c..c462770f832 100644 --- a/pkg/genericapiserver/registry/rest/resttest/BUILD +++ b/pkg/genericapiserver/registry/rest/resttest/BUILD @@ -13,9 +13,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", diff --git a/pkg/genericapiserver/registry/rest/resttest/resttest.go b/pkg/genericapiserver/registry/rest/resttest/resttest.go index e99956e8b2f..86cfd0d4eee 100644 --- a/pkg/genericapiserver/registry/rest/resttest/resttest.go +++ b/pkg/genericapiserver/registry/rest/resttest/resttest.go @@ -24,6 +24,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/api/validation/path" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" @@ -34,7 +35,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" ) diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD index e253284edd2..a39a5086895 100644 --- a/pkg/storage/BUILD +++ b/pkg/storage/BUILD @@ -23,12 +23,12 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/validation/path:go_default_library", "//pkg/util:go_default_library", "//vendor:github.com/golang/glog", "//vendor:golang.org/x/net/context", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/meta", + "//vendor:k8s.io/apimachinery/pkg/api/validation/path", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/fields", diff --git a/pkg/storage/util.go b/pkg/storage/util.go index 70dd1aed1fa..3e0b7211b95 100644 --- a/pkg/storage/util.go +++ b/pkg/storage/util.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/api/meta" + "k8s.io/apimachinery/pkg/api/validation/path" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kubernetes/pkg/api/validation/path" ) type SimpleUpdateFunc func(runtime.Object) (runtime.Object, error) diff --git a/pkg/api/validation/path/name.go b/staging/src/k8s.io/apimachinery/pkg/api/validation/path/name.go similarity index 100% rename from pkg/api/validation/path/name.go rename to staging/src/k8s.io/apimachinery/pkg/api/validation/path/name.go diff --git a/pkg/api/validation/path/name_test.go b/staging/src/k8s.io/apimachinery/pkg/api/validation/path/name_test.go similarity index 100% rename from pkg/api/validation/path/name_test.go rename to staging/src/k8s.io/apimachinery/pkg/api/validation/path/name_test.go diff --git a/vendor/BUILD b/vendor/BUILD index 2d19a2f0915..bcacc0e7f29 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -13761,3 +13761,16 @@ go_library( "//vendor:k8s.io/client-go/kubernetes/typed/authorization/v1beta1", ], ) + +go_test( + name = "k8s.io/apimachinery/pkg/api/validation/path_test", + srcs = ["k8s.io/apimachinery/pkg/api/validation/path/name_test.go"], + library = ":k8s.io/apimachinery/pkg/api/validation/path", + tags = ["automanaged"], +) + +go_library( + name = "k8s.io/apimachinery/pkg/api/validation/path", + srcs = ["k8s.io/apimachinery/pkg/api/validation/path/name.go"], + tags = ["automanaged"], +)