From 1f98b49bf3baf14bd2ed2ef098b90e214e5ada27 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Mon, 27 Feb 2023 00:37:48 +0000 Subject: [PATCH] [KMS] move util from envelope to kms package Signed-off-by: Anish Ramasekar --- .../pkg/storage/value/encrypt/envelope/grpc_service.go | 2 +- .../pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go | 2 +- .../pkg/storage/value/encrypt/envelope => kms/pkg}/util/util.go | 2 +- .../value/encrypt/envelope => kms/pkg}/util/util_test.go | 0 vendor/modules.txt | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename staging/src/k8s.io/{apiserver/pkg/storage/value/encrypt/envelope => kms/pkg}/util/util.go (95%) rename staging/src/k8s.io/{apiserver/pkg/storage/value/encrypt/envelope => kms/pkg}/util/util_test.go (100%) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go index 34c8a6706d4..b2a5fd145cd 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go @@ -28,9 +28,9 @@ import ( "google.golang.org/grpc/credentials/insecure" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util" "k8s.io/klog/v2" kmsapi "k8s.io/kms/apis/v1beta1" + "k8s.io/kms/pkg/util" ) const ( 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 1ebdfe34f36..5f905b3deed 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 @@ -28,10 +28,10 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics" - "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util" "k8s.io/klog/v2" kmsapi "k8s.io/kms/apis/v2alpha1" kmsservice "k8s.io/kms/pkg/service" + "k8s.io/kms/pkg/util" ) const ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util/util.go b/staging/src/k8s.io/kms/pkg/util/util.go similarity index 95% rename from staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util/util.go rename to staging/src/k8s.io/kms/pkg/util/util.go index f062370aba2..008c6a5321d 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util/util.go +++ b/staging/src/k8s.io/kms/pkg/util/util.go @@ -27,7 +27,7 @@ const ( unixProtocol = "unix" ) -// Parse the endpoint to extract schema, host or path. +// ParseEndpoint parses the endpoint to extract schema, host or path. func ParseEndpoint(endpoint string) (string, error) { if len(endpoint) == 0 { return "", fmt.Errorf("remote KMS provider can't use empty string as endpoint") diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util/util_test.go b/staging/src/k8s.io/kms/pkg/util/util_test.go similarity index 100% rename from staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util/util_test.go rename to staging/src/k8s.io/kms/pkg/util/util_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 21b4cc8b4a3..2d26f936277 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1577,7 +1577,6 @@ k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1 k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v1beta1 k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v2alpha1 -k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util k8s.io/apiserver/pkg/storage/value/encrypt/identity k8s.io/apiserver/pkg/storage/value/encrypt/secretbox k8s.io/apiserver/pkg/storageversion @@ -2108,6 +2107,7 @@ k8s.io/klog/v2/test k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2alpha1 k8s.io/kms/pkg/service +k8s.io/kms/pkg/util # k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration