From c9b8ad6a55aaf7d95ce6fbc06ec4afba905e86c0 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Tue, 21 Feb 2023 19:49:09 +0000 Subject: [PATCH] [KMSv2] restructure kms staging dir Signed-off-by: Anish Ramasekar --- .../apiserver/pkg/server/options/encryptionconfig/config.go | 2 +- .../pkg/server/options/encryptionconfig/config_test.go | 2 +- .../pkg/storage/value/encrypt/envelope/kmsv2/envelope.go | 2 +- .../storage/value/encrypt/envelope/kmsv2/envelope_test.go | 2 +- .../storage/value/encrypt/envelope/kmsv2/grpc_service.go | 2 +- .../value/encrypt/envelope/kmsv2/grpc_service_unix_test.go | 2 +- .../{encryption/service.go => pkg/hierarchy/hierarchy.go} | 4 ++-- .../service_test.go => pkg/hierarchy/hierarchy_test.go} | 4 ++-- staging/src/k8s.io/kms/{ => pkg}/service/grpc_service.go | 6 +++--- .../src/k8s.io/kms/{ => pkg}/service/grpc_service_test.go | 0 staging/src/k8s.io/kms/{ => pkg}/service/interface.go | 0 .../transformation/kmsv2_transformation_test.go | 2 +- vendor/modules.txt | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) rename staging/src/k8s.io/kms/{encryption/service.go => pkg/hierarchy/hierarchy.go} (99%) rename staging/src/k8s.io/kms/{encryption/service_test.go => pkg/hierarchy/hierarchy_test.go} (99%) rename staging/src/k8s.io/kms/{ => pkg}/service/grpc_service.go (95%) rename staging/src/k8s.io/kms/{ => pkg}/service/grpc_service_test.go (100%) rename staging/src/k8s.io/kms/{ => pkg}/service/interface.go (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go index 7b15de0d01e..3f73a3d5426 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go @@ -51,7 +51,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/secretbox" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go index 8eb8d74c4f8..d0f5ab38102 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go @@ -40,7 +40,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go index 3c9f3068882..ae37f178b9e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go @@ -34,7 +34,7 @@ import ( kmstypes "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1" "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" "k8s.io/klog/v2" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" "k8s.io/utils/clock" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go index 2c9b64e618c..49e0370e755 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" "k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/testutil" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" testingclock "k8s.io/utils/clock/testing" ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go index b56bbd512e9..1ebdfe34f36 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util" "k8s.io/klog/v2" kmsapi "k8s.io/kms/apis/v2alpha1" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go index 290e3d55324..92be4d45728 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service_unix_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/component-base/metrics/testutil" "k8s.io/apimachinery/pkg/util/uuid" - kmsservice "k8s.io/kms/service" + kmsservice "k8s.io/kms/pkg/service" ) const ( diff --git a/staging/src/k8s.io/kms/encryption/service.go b/staging/src/k8s.io/kms/pkg/hierarchy/hierarchy.go similarity index 99% rename from staging/src/k8s.io/kms/encryption/service.go rename to staging/src/k8s.io/kms/pkg/hierarchy/hierarchy.go index 864cbafa49f..62a55516eff 100644 --- a/staging/src/k8s.io/kms/encryption/service.go +++ b/staging/src/k8s.io/kms/pkg/hierarchy/hierarchy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package encryption +package hierarchy import ( "bytes" @@ -32,8 +32,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog/v2" aestransformer "k8s.io/kms/pkg/encrypt/aes" + "k8s.io/kms/pkg/service" "k8s.io/kms/pkg/value" - "k8s.io/kms/service" "k8s.io/utils/clock" "k8s.io/utils/lru" ) diff --git a/staging/src/k8s.io/kms/encryption/service_test.go b/staging/src/k8s.io/kms/pkg/hierarchy/hierarchy_test.go similarity index 99% rename from staging/src/k8s.io/kms/encryption/service_test.go rename to staging/src/k8s.io/kms/pkg/hierarchy/hierarchy_test.go index 68343413e2c..297fb074738 100644 --- a/staging/src/k8s.io/kms/encryption/service_test.go +++ b/staging/src/k8s.io/kms/pkg/hierarchy/hierarchy_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package encryption +package hierarchy import ( "bytes" @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/rand" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kms/service" + "k8s.io/kms/pkg/service" testingclock "k8s.io/utils/clock/testing" ) diff --git a/staging/src/k8s.io/kms/service/grpc_service.go b/staging/src/k8s.io/kms/pkg/service/grpc_service.go similarity index 95% rename from staging/src/k8s.io/kms/service/grpc_service.go rename to staging/src/k8s.io/kms/pkg/service/grpc_service.go index d717064b06b..2e0e05be372 100644 --- a/staging/src/k8s.io/kms/service/grpc_service.go +++ b/staging/src/k8s.io/kms/pkg/service/grpc_service.go @@ -27,7 +27,7 @@ import ( kmsapi "k8s.io/kms/apis/v2alpha1" ) -// GRPCService is a gprc server that runs the kms v2 alpha 1 API. +// GRPCService is a grpc server that runs the kms v2 alpha1 API. type GRPCService struct { addr string timeout time.Duration @@ -74,8 +74,8 @@ func (s *GRPCService) ListenAndServe() error { return gs.Serve(ln) } -// Shutdown performs a grafecul shutdown. Doesn't accept new connections and -// blocks until all pending RPCs are finished. +// Shutdown performs a graceful shutdown. Doesn't accept new connections and +// blocks until all pending RPCs are finished. func (s *GRPCService) Shutdown() { klog.V(4).InfoS("kms plugin shutdown", "address", s.addr) if s.server != nil { diff --git a/staging/src/k8s.io/kms/service/grpc_service_test.go b/staging/src/k8s.io/kms/pkg/service/grpc_service_test.go similarity index 100% rename from staging/src/k8s.io/kms/service/grpc_service_test.go rename to staging/src/k8s.io/kms/pkg/service/grpc_service_test.go diff --git a/staging/src/k8s.io/kms/service/interface.go b/staging/src/k8s.io/kms/pkg/service/interface.go similarity index 100% rename from staging/src/k8s.io/kms/service/interface.go rename to staging/src/k8s.io/kms/pkg/service/interface.go diff --git a/test/integration/controlplane/transformation/kmsv2_transformation_test.go b/test/integration/controlplane/transformation/kmsv2_transformation_test.go index 793715ede24..9a2c3e44d2f 100644 --- a/test/integration/controlplane/transformation/kmsv2_transformation_test.go +++ b/test/integration/controlplane/transformation/kmsv2_transformation_test.go @@ -47,7 +47,7 @@ import ( "k8s.io/client-go/dynamic" featuregatetesting "k8s.io/component-base/featuregate/testing" kmsv2api "k8s.io/kms/apis/v2alpha1" - kmsv2svc "k8s.io/kms/service" + kmsv2svc "k8s.io/kms/pkg/service" "k8s.io/kubernetes/test/integration/etcd" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 0344e3797ed..23fa7f68116 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2107,7 +2107,7 @@ k8s.io/klog/v2/test ## explicit; go 1.19 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2alpha1 -k8s.io/kms/service +k8s.io/kms/pkg/service # k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration