diff --git a/pkg/api/BUILD b/pkg/api/BUILD index 75d3a45dd9c..3eb82eac907 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -29,11 +29,9 @@ go_library( deps = [ "//pkg/api/resource:go_default_library", "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", "//pkg/util/intstr:go_default_library", "//pkg/util/labels:go_default_library", "//pkg/util/rand:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", @@ -88,8 +86,6 @@ go_test( "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/util/uuid:go_default_library", "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/golang/protobuf/proto", diff --git a/pkg/api/rest/BUILD b/pkg/api/rest/BUILD index 4fe769802ac..ea67055744d 100644 --- a/pkg/api/rest/BUILD +++ b/pkg/api/rest/BUILD @@ -5,6 +5,7 @@ licenses(["notice"]) load( "@io_bazel_rules_go//go:def.bzl", "go_library", + "go_test", ) go_library( @@ -14,6 +15,7 @@ go_library( "delete.go", "doc.go", "export.go", + "meta.go", "rest.go", "types.go", "update.go", @@ -25,6 +27,7 @@ go_library( "//pkg/api/validation/genericvalidation:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/util/uuid:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", @@ -49,3 +52,15 @@ filegroup( ], tags = ["automanaged"], ) + +go_test( + name = "go_default_test", + srcs = ["meta_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/util/uuid:go_default_library", + ], +) diff --git a/pkg/apis/abac/v0/BUILD b/pkg/apis/abac/v0/BUILD index ee92953ed32..0e3a00fd48e 100644 --- a/pkg/apis/abac/v0/BUILD +++ b/pkg/apis/abac/v0/BUILD @@ -22,7 +22,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/abac/v1beta1/BUILD b/pkg/apis/abac/v1beta1/BUILD index a88f0a99340..a91ee779800 100644 --- a/pkg/apis/abac/v1beta1/BUILD +++ b/pkg/apis/abac/v1beta1/BUILD @@ -26,7 +26,6 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/conversion", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/apis/rbac/validation/BUILD b/pkg/apis/rbac/validation/BUILD index f9fd6947b5c..44341728113 100644 --- a/pkg/apis/rbac/validation/BUILD +++ b/pkg/apis/rbac/validation/BUILD @@ -10,41 +10,25 @@ load( go_library( name = "go_default_library", - srcs = [ - "policy_comparator.go", - "rulevalidation.go", - "validation.go", - ], + srcs = ["validation.go"], tags = ["automanaged"], deps = [ - "//pkg/api/errors:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/api/validation/path:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/serviceaccount:go_default_library", - "//vendor:github.com/golang/glog", - "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) go_test( name = "go_default_test", - srcs = [ - "policy_comparator_test.go", - "rulevalidation_test.go", - "validation_test.go", - ], + srcs = ["validation_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/util/diff", "//vendor:k8s.io/apimachinery/pkg/util/validation/field", - "//vendor:k8s.io/apiserver/pkg/authentication/user", ], ) diff --git a/pkg/registry/rbac/BUILD b/pkg/registry/rbac/BUILD index f72aae5d8f1..13367f69bd3 100644 --- a/pkg/registry/rbac/BUILD +++ b/pkg/registry/rbac/BUILD @@ -36,6 +36,7 @@ filegroup( "//pkg/registry/rbac/rest:all-srcs", "//pkg/registry/rbac/role:all-srcs", "//pkg/registry/rbac/rolebinding:all-srcs", + "//pkg/registry/rbac/validation:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/rbac/clusterrole/policybased/BUILD b/pkg/registry/rbac/clusterrole/policybased/BUILD index 34c298f4496..eacf4d81d82 100644 --- a/pkg/registry/rbac/clusterrole/policybased/BUILD +++ b/pkg/registry/rbac/clusterrole/policybased/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD index 3e30504e428..3dc66e08af7 100644 --- a/pkg/registry/rbac/clusterrolebinding/policybased/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/policybased/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index b32d88e7588..d73327798e2 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -16,7 +16,6 @@ go_library( "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/generic:go_default_library", @@ -32,6 +31,7 @@ go_library( "//pkg/registry/rbac/rolebinding:go_default_library", "//pkg/registry/rbac/rolebinding/etcd:go_default_library", "//pkg/registry/rbac/rolebinding/policybased:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//plugin/pkg/auth/authorizer/rbac/bootstrappolicy:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/util/runtime", diff --git a/pkg/registry/rbac/role/policybased/BUILD b/pkg/registry/rbac/role/policybased/BUILD index 34c298f4496..eacf4d81d82 100644 --- a/pkg/registry/rbac/role/policybased/BUILD +++ b/pkg/registry/rbac/role/policybased/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", ], ) diff --git a/pkg/registry/rbac/rolebinding/policybased/BUILD b/pkg/registry/rbac/rolebinding/policybased/BUILD index 3e30504e428..3dc66e08af7 100644 --- a/pkg/registry/rbac/rolebinding/policybased/BUILD +++ b/pkg/registry/rbac/rolebinding/policybased/BUILD @@ -15,9 +15,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/rbac:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], diff --git a/pkg/registry/rbac/validation/BUILD b/pkg/registry/rbac/validation/BUILD new file mode 100644 index 00000000000..faa0a203b37 --- /dev/null +++ b/pkg/registry/rbac/validation/BUILD @@ -0,0 +1,56 @@ +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 = [ + "policy_comparator_test.go", + "rule_test.go", + ], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/apis/rbac:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/util/diff", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + ], +) + +go_library( + name = "go_default_library", + srcs = [ + "policy_comparator.go", + "rule.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/errors:go_default_library", + "//pkg/apis/rbac:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/serviceaccount:go_default_library", + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/util/errors", + "//vendor:k8s.io/apiserver/pkg/authentication/user", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/plugin/pkg/auth/authorizer/rbac/BUILD b/plugin/pkg/auth/authorizer/rbac/BUILD index 6f9caf25c81..45ac8441c2b 100644 --- a/plugin/pkg/auth/authorizer/rbac/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/BUILD @@ -17,7 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:github.com/golang/glog", "//vendor:k8s.io/apimachinery/pkg/util/errors", "//vendor:k8s.io/apiserver/pkg/authentication/user", @@ -36,7 +36,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/apis/rbac:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", ], diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD index 5f28e70024f..3de0026db3c 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD @@ -37,7 +37,7 @@ go_test( "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/install:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", - "//pkg/apis/rbac/validation:go_default_library", + "//pkg/registry/rbac/validation:go_default_library", "//plugin/pkg/auth/authorizer/rbac/bootstrappolicy:go_default_library", "//vendor:github.com/ghodss/yaml", "//vendor:k8s.io/apimachinery/pkg/api/meta",