From abe993a808ede4f0ad96d4341e553ea3e1c7011d Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 2 Feb 2017 10:08:41 +0100 Subject: [PATCH] Mechanical move: pkg/storage -> k8s.io/apiserver --- pkg/storage/etcd/BUILD | 86 -------------- pkg/storage/etcd/etcdtest/BUILD | 30 ----- pkg/storage/etcd/testing/BUILD | 47 -------- pkg/storage/etcd/util/BUILD | 43 ------- pkg/storage/etcd3/BUILD | 77 ------------- pkg/storage/storagebackend/factory/BUILD | 63 ---------- pkg/storage/testing/BUILD | 41 ------- pkg/storage/tests/BUILD | 62 ---------- .../apiserver/pkg/storage/errors}/BUILD | 11 +- .../apiserver/pkg/storage/errors/doc.go | 18 +++ .../apiserver/pkg/storage/errors/storage.go | 108 ++++++++++++++++++ .../k8s.io/apiserver/pkg}/storage/etcd/OWNERS | 0 .../pkg}/storage/etcd/api_object_versioner.go | 0 .../storage/etcd/api_object_versioner_test.go | 0 .../k8s.io/apiserver/pkg}/storage/etcd/doc.go | 0 .../pkg}/storage/etcd/etcd_helper.go | 0 .../pkg}/storage/etcd/etcd_helper_test.go | 0 .../pkg}/storage/etcd/etcd_watcher.go | 0 .../pkg}/storage/etcd/etcd_watcher_test.go | 0 .../pkg}/storage/etcd/etcdtest/doc.go | 0 .../pkg}/storage/etcd/etcdtest/etcdtest.go | 0 .../etcd/testing/testingcert/certificates.go | 0 .../pkg}/storage/etcd/testing/utils.go | 0 .../apiserver/pkg}/storage/etcd/util/doc.go | 0 .../pkg}/storage/etcd/util/etcd_util.go | 0 .../pkg}/storage/etcd/util/etcd_util_test.go | 0 .../apiserver/pkg}/storage/etcd3/OWNERS | 0 .../apiserver/pkg}/storage/etcd3/compact.go | 0 .../pkg}/storage/etcd3/compact_test.go | 0 .../apiserver/pkg}/storage/etcd3/event.go | 0 .../apiserver/pkg}/storage/etcd3/store.go | 0 .../pkg}/storage/etcd3/store_test.go | 0 .../apiserver/pkg}/storage/etcd3/watcher.go | 0 .../pkg}/storage/etcd3/watcher_test.go | 0 .../storage/storagebackend/factory/etcd2.go | 0 .../storage/storagebackend/factory/etcd3.go | 0 .../storage/storagebackend/factory/factory.go | 0 .../storagebackend/factory/tls_test.go | 0 .../apiserver/pkg}/storage/testing/OWNERS | 0 .../pkg}/storage/testing/types.generated.go | 0 .../apiserver/pkg}/storage/testing/types.go | 0 .../apiserver/pkg}/storage/testing/utils.go | 0 .../pkg}/storage/tests/cacher_test.go | 0 .../apiserver/pkg}/storage/tests/utils.go | 0 44 files changed, 127 insertions(+), 459 deletions(-) delete mode 100644 pkg/storage/etcd/BUILD delete mode 100644 pkg/storage/etcd/etcdtest/BUILD delete mode 100644 pkg/storage/etcd/testing/BUILD delete mode 100644 pkg/storage/etcd/util/BUILD delete mode 100644 pkg/storage/etcd3/BUILD delete mode 100644 pkg/storage/storagebackend/factory/BUILD delete mode 100644 pkg/storage/testing/BUILD delete mode 100644 pkg/storage/tests/BUILD rename {pkg/storage/etcd/testing/testingcert => staging/src/k8s.io/apiserver/pkg/storage/errors}/BUILD (64%) create mode 100644 staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go create mode 100644 staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/OWNERS (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/api_object_versioner.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/api_object_versioner_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/doc.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcd_helper.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcd_helper_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcd_watcher.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcd_watcher_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcdtest/doc.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/etcdtest/etcdtest.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/testing/testingcert/certificates.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/testing/utils.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/util/doc.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/util/etcd_util.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd/util/etcd_util_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/OWNERS (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/compact.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/compact_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/event.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/store.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/store_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/watcher.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/etcd3/watcher_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/factory/etcd2.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/factory/etcd3.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/factory/factory.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/storagebackend/factory/tls_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/testing/OWNERS (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/testing/types.generated.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/testing/types.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/testing/utils.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/tests/cacher_test.go (100%) rename {pkg => staging/src/k8s.io/apiserver/pkg}/storage/tests/utils.go (100%) diff --git a/pkg/storage/etcd/BUILD b/pkg/storage/etcd/BUILD deleted file mode 100644 index 19f7668a8ae..00000000000 --- a/pkg/storage/etcd/BUILD +++ /dev/null @@ -1,86 +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 = [ - "api_object_versioner.go", - "doc.go", - "etcd_helper.go", - "etcd_watcher.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/util:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/etcd/metrics", - "//vendor:k8s.io/apiserver/pkg/util/cache", - "//vendor:k8s.io/apiserver/pkg/util/trace", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "api_object_versioner_test.go", - "etcd_helper_test.go", - "etcd_watcher_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/testing:go_default_library", - "//pkg/storage/tests:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/storage/etcd/etcdtest:all-srcs", - "//pkg/storage/etcd/testing:all-srcs", - "//pkg/storage/etcd/util:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/etcdtest/BUILD b/pkg/storage/etcd/etcdtest/BUILD deleted file mode 100644 index 4a0207e32b0..00000000000 --- a/pkg/storage/etcd/etcdtest/BUILD +++ /dev/null @@ -1,30 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "etcdtest.go", - ], - 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/storage/etcd/testing/BUILD b/pkg/storage/etcd/testing/BUILD deleted file mode 100644 index 030a7b7e2da..00000000000 --- a/pkg/storage/etcd/testing/BUILD +++ /dev/null @@ -1,47 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["utils.go"], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver", - "//vendor:github.com/coreos/etcd/etcdserver/api/v2http", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:github.com/coreos/etcd/pkg/testutil", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:github.com/coreos/etcd/pkg/types", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/storage/etcd/testing/testingcert:all-srcs", - ], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd/util/BUILD b/pkg/storage/etcd/util/BUILD deleted file mode 100644 index 303a5a4d783..00000000000 --- a/pkg/storage/etcd/util/BUILD +++ /dev/null @@ -1,43 +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 = [ - "doc.go", - "etcd_util.go", - ], - tags = ["automanaged"], - deps = ["//vendor:github.com/coreos/etcd/client"], -) - -go_test( - name = "go_default_test", - srcs = ["etcd_util_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/stretchr/testify/assert", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/etcd3/BUILD b/pkg/storage/etcd3/BUILD deleted file mode 100644 index 82fcd9a15ef..00000000000 --- a/pkg/storage/etcd3/BUILD +++ /dev/null @@ -1,77 +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 = [ - "compact.go", - "event.go", - "store.go", - "watcher.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", - "//vendor:github.com/coreos/etcd/mvcc/mvccpb", - "//vendor:github.com/golang/glog", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/conversion", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/util/trace", - ], -) - -go_test( - name = "go_default_test", - srcs = [ - "compact_test.go", - "store_test.go", - "watcher_test.go", - ], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/storagebackend/factory/BUILD b/pkg/storage/storagebackend/factory/BUILD deleted file mode 100644 index aa335532b0e..00000000000 --- a/pkg/storage/storagebackend/factory/BUILD +++ /dev/null @@ -1,63 +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 = [ - "etcd2.go", - "etcd3.go", - "factory.go", - ], - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd3:go_default_library", - "//vendor:github.com/coreos/etcd/client", - "//vendor:github.com/coreos/etcd/clientv3", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/util/net", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -go_test( - name = "go_default_test", - srcs = ["tls_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd/testing/testingcert:go_default_library", - "//vendor:github.com/coreos/etcd/integration", - "//vendor:github.com/coreos/etcd/pkg/transport", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/testing/BUILD b/pkg/storage/testing/BUILD deleted file mode 100644 index 89dac7c6c1d..00000000000 --- a/pkg/storage/testing/BUILD +++ /dev/null @@ -1,41 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = [ - "types.generated.go", - "types.go", - "utils.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/ugorji/go/codec", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apimachinery/pkg/types", - "//vendor:k8s.io/apiserver/pkg/storage", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/storage/tests/BUILD b/pkg/storage/tests/BUILD deleted file mode 100644 index 54951d0e08e..00000000000 --- a/pkg/storage/tests/BUILD +++ /dev/null @@ -1,62 +0,0 @@ -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 = ["cacher_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/etcd:go_default_library", - "//pkg/storage/etcd/etcdtest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/etcd3:go_default_library", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/api/equality", - "//vendor:k8s.io/apimachinery/pkg/api/errors", - "//vendor:k8s.io/apimachinery/pkg/api/meta", - "//vendor:k8s.io/apimachinery/pkg/api/testing", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/fields", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", - "//vendor:k8s.io/apimachinery/pkg/util/sets", - "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/apimachinery/pkg/watch", - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/v1", - "//vendor:k8s.io/apiserver/pkg/storage", - "//vendor:k8s.io/client-go/pkg/api/install", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) - -go_library( - name = "go_default_library", - srcs = ["utils.go"], - tags = ["automanaged"], - deps = [ - "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/client-go/pkg/api/install", - ], -) diff --git a/pkg/storage/etcd/testing/testingcert/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/errors/BUILD similarity index 64% rename from pkg/storage/etcd/testing/testingcert/BUILD rename to staging/src/k8s.io/apiserver/pkg/storage/errors/BUILD index 74c28551b8b..a7403fd473c 100644 --- a/pkg/storage/etcd/testing/testingcert/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/BUILD @@ -2,16 +2,7 @@ package(default_visibility = ["//visibility:public"]) licenses(["notice"]) -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["certificates.go"], - tags = ["automanaged"], -) +load("@io_bazel_rules_go//go:def.bzl") filegroup( name = "package-srcs", diff --git a/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go new file mode 100644 index 00000000000..3d3150c5690 --- /dev/null +++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/doc.go @@ -0,0 +1,18 @@ +/* +Copyright 2014 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 etcd provides conversion of etcd errors to API errors. +package storage // import "k8s.io/apiserver/pkg/storage/errors" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go b/staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go new file mode 100644 index 00000000000..84f8d857727 --- /dev/null +++ b/staging/src/k8s.io/apiserver/pkg/storage/errors/storage.go @@ -0,0 +1,108 @@ +/* +Copyright 2014 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 storage + +import ( + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apiserver/pkg/storage" +) + +// InterpretListError converts a generic error on a retrieval +// operation into the appropriate API error. +func InterpretListError(err error, qualifiedResource schema.GroupResource) error { + switch { + case storage.IsNotFound(err): + return errors.NewNotFound(qualifiedResource, "") + case storage.IsUnreachable(err): + return errors.NewServerTimeout(qualifiedResource, "list", 2) // TODO: make configurable or handled at a higher level + default: + return err + } +} + +// InterpretGetError converts a generic error on a retrieval +// operation into the appropriate API error. +func InterpretGetError(err error, qualifiedResource schema.GroupResource, name string) error { + switch { + case storage.IsNotFound(err): + return errors.NewNotFound(qualifiedResource, name) + case storage.IsUnreachable(err): + return errors.NewServerTimeout(qualifiedResource, "get", 2) // TODO: make configurable or handled at a higher level + default: + return err + } +} + +// InterpretCreateError converts a generic error on a create +// operation into the appropriate API error. +func InterpretCreateError(err error, qualifiedResource schema.GroupResource, name string) error { + switch { + case storage.IsNodeExist(err): + return errors.NewAlreadyExists(qualifiedResource, name) + case storage.IsUnreachable(err): + return errors.NewServerTimeout(qualifiedResource, "create", 2) // TODO: make configurable or handled at a higher level + default: + return err + } +} + +// InterpretUpdateError converts a generic error on an update +// operation into the appropriate API error. +func InterpretUpdateError(err error, qualifiedResource schema.GroupResource, name string) error { + switch { + case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): + return errors.NewConflict(qualifiedResource, name, err) + case storage.IsUnreachable(err): + return errors.NewServerTimeout(qualifiedResource, "update", 2) // TODO: make configurable or handled at a higher level + case storage.IsNotFound(err): + return errors.NewNotFound(qualifiedResource, name) + case storage.IsInternalError(err): + return errors.NewInternalError(err) + default: + return err + } +} + +// InterpretDeleteError converts a generic error on a delete +// operation into the appropriate API error. +func InterpretDeleteError(err error, qualifiedResource schema.GroupResource, name string) error { + switch { + case storage.IsNotFound(err): + return errors.NewNotFound(qualifiedResource, name) + case storage.IsUnreachable(err): + return errors.NewServerTimeout(qualifiedResource, "delete", 2) // TODO: make configurable or handled at a higher level + case storage.IsConflict(err), storage.IsNodeExist(err), storage.IsInvalidObj(err): + return errors.NewConflict(qualifiedResource, name, err) + case storage.IsInternalError(err): + return errors.NewInternalError(err) + default: + return err + } +} + +// InterpretWatchError converts a generic error on a watch +// operation into the appropriate API error. +func InterpretWatchError(err error, resource schema.GroupResource, name string) error { + switch { + case storage.IsInvalidError(err): + invalidError, _ := err.(storage.InvalidError) + return errors.NewInvalid(schema.GroupKind{Group: resource.Group, Kind: resource.Resource}, name, invalidError.Errs) + default: + return err + } +} diff --git a/pkg/storage/etcd/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/etcd/OWNERS similarity index 100% rename from pkg/storage/etcd/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/OWNERS diff --git a/pkg/storage/etcd/api_object_versioner.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go similarity index 100% rename from pkg/storage/etcd/api_object_versioner.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner.go diff --git a/pkg/storage/etcd/api_object_versioner_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go similarity index 100% rename from pkg/storage/etcd/api_object_versioner_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go diff --git a/pkg/storage/etcd/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go similarity index 100% rename from pkg/storage/etcd/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go diff --git a/pkg/storage/etcd/etcd_helper.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go similarity index 100% rename from pkg/storage/etcd/etcd_helper.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go diff --git a/pkg/storage/etcd/etcd_helper_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go similarity index 100% rename from pkg/storage/etcd/etcd_helper_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go diff --git a/pkg/storage/etcd/etcd_watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go similarity index 100% rename from pkg/storage/etcd/etcd_watcher.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go diff --git a/pkg/storage/etcd/etcd_watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go similarity index 100% rename from pkg/storage/etcd/etcd_watcher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go diff --git a/pkg/storage/etcd/etcdtest/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go similarity index 100% rename from pkg/storage/etcd/etcdtest/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go diff --git a/pkg/storage/etcd/etcdtest/etcdtest.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/etcdtest.go similarity index 100% rename from pkg/storage/etcd/etcdtest/etcdtest.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/etcdtest.go diff --git a/pkg/storage/etcd/testing/testingcert/certificates.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/testingcert/certificates.go similarity index 100% rename from pkg/storage/etcd/testing/testingcert/certificates.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/testingcert/certificates.go diff --git a/pkg/storage/etcd/testing/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go similarity index 100% rename from pkg/storage/etcd/testing/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go diff --git a/pkg/storage/etcd/util/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go similarity index 100% rename from pkg/storage/etcd/util/doc.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go diff --git a/pkg/storage/etcd/util/etcd_util.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util.go similarity index 100% rename from pkg/storage/etcd/util/etcd_util.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util.go diff --git a/pkg/storage/etcd/util/etcd_util_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util_test.go similarity index 100% rename from pkg/storage/etcd/util/etcd_util_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd/util/etcd_util_test.go diff --git a/pkg/storage/etcd3/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS similarity index 100% rename from pkg/storage/etcd3/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS diff --git a/pkg/storage/etcd3/compact.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go similarity index 100% rename from pkg/storage/etcd3/compact.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go diff --git a/pkg/storage/etcd3/compact_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go similarity index 100% rename from pkg/storage/etcd3/compact_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go diff --git a/pkg/storage/etcd3/event.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go similarity index 100% rename from pkg/storage/etcd3/event.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/event.go diff --git a/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go similarity index 100% rename from pkg/storage/etcd3/store.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go diff --git a/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go similarity index 100% rename from pkg/storage/etcd3/store_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go diff --git a/pkg/storage/etcd3/watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go similarity index 100% rename from pkg/storage/etcd3/watcher.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go diff --git a/pkg/storage/etcd3/watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go similarity index 100% rename from pkg/storage/etcd3/watcher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go diff --git a/pkg/storage/storagebackend/factory/etcd2.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go similarity index 100% rename from pkg/storage/storagebackend/factory/etcd2.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go diff --git a/pkg/storage/storagebackend/factory/etcd3.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go similarity index 100% rename from pkg/storage/storagebackend/factory/etcd3.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go diff --git a/pkg/storage/storagebackend/factory/factory.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go similarity index 100% rename from pkg/storage/storagebackend/factory/factory.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/factory.go diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go similarity index 100% rename from pkg/storage/storagebackend/factory/tls_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go diff --git a/pkg/storage/testing/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/testing/OWNERS similarity index 100% rename from pkg/storage/testing/OWNERS rename to staging/src/k8s.io/apiserver/pkg/storage/testing/OWNERS diff --git a/pkg/storage/testing/types.generated.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/types.generated.go similarity index 100% rename from pkg/storage/testing/types.generated.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/types.generated.go diff --git a/pkg/storage/testing/types.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/types.go similarity index 100% rename from pkg/storage/testing/types.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/types.go diff --git a/pkg/storage/testing/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/testing/utils.go similarity index 100% rename from pkg/storage/testing/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/testing/utils.go diff --git a/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go similarity index 100% rename from pkg/storage/tests/cacher_test.go rename to staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go diff --git a/pkg/storage/tests/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go similarity index 100% rename from pkg/storage/tests/utils.go rename to staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go