From 0e71322e2eb974635697d648a923ee65df9e7712 Mon Sep 17 00:00:00 2001 From: Otto Bittner Date: Thu, 12 Jan 2023 16:22:47 +0100 Subject: [PATCH] keyservice: move kms code to internal/kms Recovery (disk-mapper) and init (bootstrapper) will have to work with multiple external KMSes in the future. --- bootstrapper/internal/initserver/initserver.go | 2 ++ cli/internal/cmd/init.go | 2 +- .../internal => internal/kms}/config/config.go | 0 {keyservice => internal/kms}/kms/aws/aws.go | 8 ++++---- {keyservice => internal/kms}/kms/aws/aws_test.go | 6 +++--- {keyservice => internal/kms}/kms/azure/azure.go | 8 ++++---- .../kms}/kms/azure/azure_test.go | 4 ++-- {keyservice => internal/kms}/kms/azure/hsm.go | 8 ++++---- {keyservice => internal/kms}/kms/azure/hsm_test.go | 4 ++-- .../kms}/kms/cluster/cluster.go | 0 .../kms}/kms/cluster/cluster_test.go | 0 {keyservice => internal/kms}/kms/gcp/gcp.go | 8 ++++---- {keyservice => internal/kms}/kms/gcp/gcp_test.go | 6 +++--- {keyservice => internal/kms}/kms/kms.go | 0 {keyservice => internal/kms}/kms/util/crypto.go | 0 .../kms}/kms/util/crypto_test.go | 0 {keyservice => internal/kms}/setup/setup.go | 14 +++++++------- {keyservice => internal/kms}/setup/setup_test.go | 0 .../kms}/storage/awss3storage.go | 2 +- .../kms}/storage/awss3storage_test.go | 0 .../kms}/storage/azurestorage.go | 2 +- .../kms}/storage/azurestorage_test.go | 0 .../kms}/storage/gcloudstorage.go | 0 .../kms}/storage/gcloudstorage_integration_test.go | 0 .../kms}/storage/gcloudstorage_test.go | 0 .../kms}/storage/memfsstorage.go | 0 .../kms}/storage/memfsstroage_test.go | 0 .../internal => internal/kms}/storage/storage.go | 0 keyservice/cmd/main.go | 2 +- keyservice/internal/server/server.go | 2 +- keyservice/internal/test/aws_test.go | 6 +++--- keyservice/internal/test/azure_test.go | 6 +++--- keyservice/internal/test/gcp_test.go | 6 +++--- 33 files changed, 49 insertions(+), 47 deletions(-) rename {keyservice/internal => internal/kms}/config/config.go (100%) rename {keyservice => internal/kms}/kms/aws/aws.go (97%) rename {keyservice => internal/kms}/kms/aws/aws_test.go (98%) rename {keyservice => internal/kms}/kms/azure/azure.go (95%) rename {keyservice => internal/kms}/kms/azure/azure_test.go (97%) rename {keyservice => internal/kms}/kms/azure/hsm.go (95%) rename {keyservice => internal/kms}/kms/azure/hsm_test.go (97%) rename {keyservice => internal/kms}/kms/cluster/cluster.go (100%) rename {keyservice => internal/kms}/kms/cluster/cluster_test.go (100%) rename {keyservice => internal/kms}/kms/gcp/gcp.go (97%) rename {keyservice => internal/kms}/kms/gcp/gcp_test.go (98%) rename {keyservice => internal/kms}/kms/kms.go (100%) rename {keyservice => internal/kms}/kms/util/crypto.go (100%) rename {keyservice => internal/kms}/kms/util/crypto_test.go (100%) rename {keyservice => internal/kms}/setup/setup.go (92%) rename {keyservice => internal/kms}/setup/setup_test.go (100%) rename {keyservice/internal => internal/kms}/storage/awss3storage.go (97%) rename {keyservice/internal => internal/kms}/storage/awss3storage_test.go (100%) rename {keyservice/internal => internal/kms}/storage/azurestorage.go (98%) rename {keyservice/internal => internal/kms}/storage/azurestorage_test.go (100%) rename {keyservice/internal => internal/kms}/storage/gcloudstorage.go (100%) rename {keyservice/internal => internal/kms}/storage/gcloudstorage_integration_test.go (100%) rename {keyservice/internal => internal/kms}/storage/gcloudstorage_test.go (100%) rename {keyservice/internal => internal/kms}/storage/memfsstorage.go (100%) rename {keyservice/internal => internal/kms}/storage/memfsstroage_test.go (100%) rename {keyservice/internal => internal/kms}/storage/storage.go (100%) diff --git a/bootstrapper/internal/initserver/initserver.go b/bootstrapper/internal/initserver/initserver.go index 4a242cdee..ebd42503f 100644 --- a/bootstrapper/internal/initserver/initserver.go +++ b/bootstrapper/internal/initserver/initserver.go @@ -22,6 +22,8 @@ import ( "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/atlscredentials" "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + kmsSetup "github.com/edgelesssys/constellation/v2/internal/kms/setup" "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/internal/nodestate" "github.com/edgelesssys/constellation/v2/internal/role" diff --git a/cli/internal/cmd/init.go b/cli/internal/cmd/init.go index a06426adc..ab98ab5b1 100644 --- a/cli/internal/cmd/init.go +++ b/cli/internal/cmd/init.go @@ -30,10 +30,10 @@ import ( "github.com/edgelesssys/constellation/v2/internal/file" "github.com/edgelesssys/constellation/v2/internal/grpc/dialer" grpcRetry "github.com/edgelesssys/constellation/v2/internal/grpc/retry" + keyservice "github.com/edgelesssys/constellation/v2/internal/kms/setup" "github.com/edgelesssys/constellation/v2/internal/license" "github.com/edgelesssys/constellation/v2/internal/retry" "github.com/edgelesssys/constellation/v2/internal/versions" - keyservice "github.com/edgelesssys/constellation/v2/keyservice/setup" "github.com/spf13/afero" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/keyservice/internal/config/config.go b/internal/kms/config/config.go similarity index 100% rename from keyservice/internal/config/config.go rename to internal/kms/config/config.go diff --git a/keyservice/kms/aws/aws.go b/internal/kms/kms/aws/aws.go similarity index 97% rename from keyservice/kms/aws/aws.go rename to internal/kms/kms/aws/aws.go index 374e7e0b4..119223102 100644 --- a/keyservice/kms/aws/aws.go +++ b/internal/kms/kms/aws/aws.go @@ -17,10 +17,10 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + kmsInterface "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" ) const ( diff --git a/keyservice/kms/aws/aws_test.go b/internal/kms/kms/aws/aws_test.go similarity index 98% rename from keyservice/kms/aws/aws_test.go rename to internal/kms/kms/aws/aws_test.go index efe77da08..27455433b 100644 --- a/keyservice/kms/aws/aws_test.go +++ b/internal/kms/kms/aws/aws_test.go @@ -22,9 +22,9 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/kms/types" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/v2/keyservice/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + kmsInterface "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/keyservice/kms/azure/azure.go b/internal/kms/kms/azure/azure.go similarity index 95% rename from keyservice/kms/azure/azure.go rename to internal/kms/kms/azure/azure.go index ae6fce686..4e5104f9b 100644 --- a/keyservice/kms/azure/azure.go +++ b/internal/kms/kms/azure/azure.go @@ -17,10 +17,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" ) const ( diff --git a/keyservice/kms/azure/azure_test.go b/internal/kms/kms/azure/azure_test.go similarity index 97% rename from keyservice/kms/azure/azure_test.go rename to internal/kms/kms/azure/azure_test.go index 036a481e0..26ec9a55a 100644 --- a/keyservice/kms/azure/azure_test.go +++ b/internal/kms/kms/azure/azure_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/keyservice/kms/azure/hsm.go b/internal/kms/kms/azure/hsm.go similarity index 95% rename from keyservice/kms/azure/hsm.go rename to internal/kms/kms/azure/hsm.go index a08ba08ab..875fd56d9 100644 --- a/keyservice/kms/azure/hsm.go +++ b/internal/kms/kms/azure/hsm.go @@ -15,10 +15,10 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" ) type hsmClientAPI interface { diff --git a/keyservice/kms/azure/hsm_test.go b/internal/kms/kms/azure/hsm_test.go similarity index 97% rename from keyservice/kms/azure/hsm_test.go rename to internal/kms/kms/azure/hsm_test.go index adb2b7f79..71589b94f 100644 --- a/keyservice/kms/azure/hsm_test.go +++ b/internal/kms/kms/azure/hsm_test.go @@ -13,8 +13,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" "github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/keyservice/kms/cluster/cluster.go b/internal/kms/kms/cluster/cluster.go similarity index 100% rename from keyservice/kms/cluster/cluster.go rename to internal/kms/kms/cluster/cluster.go diff --git a/keyservice/kms/cluster/cluster_test.go b/internal/kms/kms/cluster/cluster_test.go similarity index 100% rename from keyservice/kms/cluster/cluster_test.go rename to internal/kms/kms/cluster/cluster_test.go diff --git a/keyservice/kms/gcp/gcp.go b/internal/kms/kms/gcp/gcp.go similarity index 97% rename from keyservice/kms/gcp/gcp.go rename to internal/kms/kms/gcp/gcp.go index 560d0c878..7b3d8d92f 100644 --- a/keyservice/kms/gcp/gcp.go +++ b/internal/kms/kms/gcp/gcp.go @@ -19,10 +19,10 @@ import ( kms "cloud.google.com/go/kms/apiv1" "cloud.google.com/go/kms/apiv1/kmspb" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + kmsInterface "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/googleapis/gax-go/v2" "google.golang.org/api/option" "google.golang.org/grpc/codes" diff --git a/keyservice/kms/gcp/gcp_test.go b/internal/kms/kms/gcp/gcp_test.go similarity index 98% rename from keyservice/kms/gcp/gcp_test.go rename to internal/kms/kms/gcp/gcp_test.go index f7310a67e..be66aeb91 100644 --- a/keyservice/kms/gcp/gcp_test.go +++ b/internal/kms/kms/gcp/gcp_test.go @@ -12,9 +12,9 @@ import ( "testing" "cloud.google.com/go/kms/apiv1/kmspb" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - kmsInterface "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/util" + kmsInterface "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/util" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" "go.uber.org/goleak" diff --git a/keyservice/kms/kms.go b/internal/kms/kms/kms.go similarity index 100% rename from keyservice/kms/kms.go rename to internal/kms/kms/kms.go diff --git a/keyservice/kms/util/crypto.go b/internal/kms/kms/util/crypto.go similarity index 100% rename from keyservice/kms/util/crypto.go rename to internal/kms/kms/util/crypto.go diff --git a/keyservice/kms/util/crypto_test.go b/internal/kms/kms/util/crypto_test.go similarity index 100% rename from keyservice/kms/util/crypto_test.go rename to internal/kms/kms/util/crypto_test.go diff --git a/keyservice/setup/setup.go b/internal/kms/setup/setup.go similarity index 92% rename from keyservice/setup/setup.go rename to internal/kms/setup/setup.go index c70b87707..b14be4dc9 100644 --- a/keyservice/setup/setup.go +++ b/internal/kms/setup/setup.go @@ -14,12 +14,12 @@ import ( "strconv" "cloud.google.com/go/kms/apiv1/kmspb" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms" - "github.com/edgelesssys/constellation/v2/keyservice/kms/aws" - "github.com/edgelesssys/constellation/v2/keyservice/kms/azure" - "github.com/edgelesssys/constellation/v2/keyservice/kms/cluster" - "github.com/edgelesssys/constellation/v2/keyservice/kms/gcp" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/aws" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/azure" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/cluster" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/gcp" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" ) // Well known endpoints for KMS services. @@ -28,7 +28,7 @@ const ( AzureKMSURI = "kms://azure-kms?name=%s&type=%s" AzureHSMURI = "kms://azure-hsm?name=%s" GCPKMSURI = "kms://gcp?project=%s&location=%s&keyRing=%s&protectionLvl=%s" - ClusterKMSURI = "kms://cluster-kms" + ClusterKMSURI = "kms://cluster-kms?key=%s&salt=%s" AWSS3URI = "storage://aws?bucket=%s" AzureBlobURI = "storage://azure?container=%s&connectionString=%s" GCPStorageURI = "storage://gcp?projects=%s&bucket=%s" diff --git a/keyservice/setup/setup_test.go b/internal/kms/setup/setup_test.go similarity index 100% rename from keyservice/setup/setup_test.go rename to internal/kms/setup/setup_test.go diff --git a/keyservice/internal/storage/awss3storage.go b/internal/kms/storage/awss3storage.go similarity index 97% rename from keyservice/internal/storage/awss3storage.go rename to internal/kms/storage/awss3storage.go index ef656930c..d7ee53289 100644 --- a/keyservice/internal/storage/awss3storage.go +++ b/internal/kms/storage/awss3storage.go @@ -16,7 +16,7 @@ import ( awsconfig "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" + "github.com/edgelesssys/constellation/v2/internal/kms/config" ) type awsS3ClientAPI interface { diff --git a/keyservice/internal/storage/awss3storage_test.go b/internal/kms/storage/awss3storage_test.go similarity index 100% rename from keyservice/internal/storage/awss3storage_test.go rename to internal/kms/storage/awss3storage_test.go diff --git a/keyservice/internal/storage/azurestorage.go b/internal/kms/storage/azurestorage.go similarity index 98% rename from keyservice/internal/storage/azurestorage.go rename to internal/kms/storage/azurestorage.go index f592b73c2..4811b0027 100644 --- a/keyservice/internal/storage/azurestorage.go +++ b/internal/kms/storage/azurestorage.go @@ -16,7 +16,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror" "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" + "github.com/edgelesssys/constellation/v2/internal/kms/config" ) type azureBlobAPI interface { diff --git a/keyservice/internal/storage/azurestorage_test.go b/internal/kms/storage/azurestorage_test.go similarity index 100% rename from keyservice/internal/storage/azurestorage_test.go rename to internal/kms/storage/azurestorage_test.go diff --git a/keyservice/internal/storage/gcloudstorage.go b/internal/kms/storage/gcloudstorage.go similarity index 100% rename from keyservice/internal/storage/gcloudstorage.go rename to internal/kms/storage/gcloudstorage.go diff --git a/keyservice/internal/storage/gcloudstorage_integration_test.go b/internal/kms/storage/gcloudstorage_integration_test.go similarity index 100% rename from keyservice/internal/storage/gcloudstorage_integration_test.go rename to internal/kms/storage/gcloudstorage_integration_test.go diff --git a/keyservice/internal/storage/gcloudstorage_test.go b/internal/kms/storage/gcloudstorage_test.go similarity index 100% rename from keyservice/internal/storage/gcloudstorage_test.go rename to internal/kms/storage/gcloudstorage_test.go diff --git a/keyservice/internal/storage/memfsstorage.go b/internal/kms/storage/memfsstorage.go similarity index 100% rename from keyservice/internal/storage/memfsstorage.go rename to internal/kms/storage/memfsstorage.go diff --git a/keyservice/internal/storage/memfsstroage_test.go b/internal/kms/storage/memfsstroage_test.go similarity index 100% rename from keyservice/internal/storage/memfsstroage_test.go rename to internal/kms/storage/memfsstroage_test.go diff --git a/keyservice/internal/storage/storage.go b/internal/kms/storage/storage.go similarity index 100% rename from keyservice/internal/storage/storage.go rename to internal/kms/storage/storage.go diff --git a/keyservice/cmd/main.go b/keyservice/cmd/main.go index 187b40401..ee540636a 100644 --- a/keyservice/cmd/main.go +++ b/keyservice/cmd/main.go @@ -18,9 +18,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/constants" "github.com/edgelesssys/constellation/v2/internal/crypto" "github.com/edgelesssys/constellation/v2/internal/file" + "github.com/edgelesssys/constellation/v2/internal/kms/setup" "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/keyservice/internal/server" - "github.com/edgelesssys/constellation/v2/keyservice/setup" "github.com/spf13/afero" "go.uber.org/zap" ) diff --git a/keyservice/internal/server/server.go b/keyservice/internal/server/server.go index 084c8cab7..d5e2be573 100644 --- a/keyservice/internal/server/server.go +++ b/keyservice/internal/server/server.go @@ -14,9 +14,9 @@ import ( "github.com/edgelesssys/constellation/v2/internal/crypto" "github.com/edgelesssys/constellation/v2/internal/grpc/grpclog" + "github.com/edgelesssys/constellation/v2/internal/kms/kms" "github.com/edgelesssys/constellation/v2/internal/logger" "github.com/edgelesssys/constellation/v2/keyservice/keyserviceproto" - "github.com/edgelesssys/constellation/v2/keyservice/kms" "go.uber.org/zap" "go.uber.org/zap/zapcore" "google.golang.org/grpc" diff --git a/keyservice/internal/test/aws_test.go b/keyservice/internal/test/aws_test.go index 732f02a98..7145c9ade 100644 --- a/keyservice/internal/test/aws_test.go +++ b/keyservice/internal/test/aws_test.go @@ -19,9 +19,9 @@ import ( "github.com/aws/aws-sdk-go-v2/service/kms" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - kmsconfig "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - awsInterface "github.com/edgelesssys/constellation/v2/keyservice/kms/aws" + kmsconfig "github.com/edgelesssys/constellation/v2/internal/kms/config" + awsInterface "github.com/edgelesssys/constellation/v2/internal/kms/kms/aws" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/keyservice/internal/test/azure_test.go b/keyservice/internal/test/azure_test.go index f0135abe9..3f88a9b36 100644 --- a/keyservice/internal/test/azure_test.go +++ b/keyservice/internal/test/azure_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms/azure" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/azure" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/keyservice/internal/test/gcp_test.go b/keyservice/internal/test/gcp_test.go index 81e046e4c..8d9d6a676 100644 --- a/keyservice/internal/test/gcp_test.go +++ b/keyservice/internal/test/gcp_test.go @@ -14,9 +14,9 @@ import ( "time" "cloud.google.com/go/kms/apiv1/kmspb" - "github.com/edgelesssys/constellation/v2/keyservice/internal/config" - "github.com/edgelesssys/constellation/v2/keyservice/internal/storage" - "github.com/edgelesssys/constellation/v2/keyservice/kms/gcp" + "github.com/edgelesssys/constellation/v2/internal/kms/config" + "github.com/edgelesssys/constellation/v2/internal/kms/kms/gcp" + "github.com/edgelesssys/constellation/v2/internal/kms/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )