fix: rename package to encryptionatrest

nutanix-cloud-native · May 14, 2024 · 6bb4236 · 6bb4236
1 parent 4b5cfde
commit 6bb4236
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/...ion/encryption/encryptionprovider_test.go → ...cryptionatrest/encryptionprovider_test.go b/...ion/encryption/encryptionprovider_test.go → ...cryptionatrest/encryptionprovider_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package encryption
+package encryptionatrest
 
 import (
 	"encoding/base64"
@@ -77,7 +77,7 @@ func Test_encryptionConfigForSecretsAndConfigMaps(t *testing.T) {
 
 	for _, tt := range testcases {
 		t.Run(tt.name, func(t *testing.T) {
-			got, gErr := encryptionConfigForSecretsAndConfigMaps(
+			got, gErr := defaultEncryptionConfiguration(
 				tt.providers,
 				testTokenGenerator)
 			assert.Equal(t, tt.wantErr, gErr)

diff --git a/...ers/generic/mutation/encryption/inject.go → ...neric/mutation/encryptionatrest/inject.go b/...ers/generic/mutation/encryption/inject.go → ...neric/mutation/encryptionatrest/inject.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package encryption
+package encryptionatrest
 
 import (
 	"context"
@@ -100,7 +100,7 @@ func (h *encryptionPatchHandler) Mutate(
 				return err
 			}
 
-			found, err := h.DefaultEncryptionSecretExists(ctx, cluster)
+			found, err := h.defaultEncryptionSecretExists(ctx, cluster)
 			if err != nil {
 				log.WithValues(
 					"defaultEncryptionSecret", defaultEncryptionSecretName(cluster.Name),
@@ -110,11 +110,13 @@ func (h *encryptionPatchHandler) Mutate(
 
 			// we do not rotate or override the secret keys for encryption configuration
 			if !found {
-				encConfig, err := h.generateEncryptionConfiguration(encryptionVariable.Providers)
+				encryptionConfig, err := h.generateEncryptionConfiguration(
+					encryptionVariable.Providers,
+				)
 				if err != nil {
 					return err
 				}
-				if err := h.CreateEncryptionConfigurationSecret(ctx, encConfig, cluster); err != nil {
+				if err := h.createEncryptionConfigurationSecret(ctx, encryptionConfig, cluster); err != nil {
 					return err
 				}
 			}
@@ -163,7 +165,7 @@ func (h *encryptionPatchHandler) generateEncryptionConfiguration(
 	resourceConfigs := []apiserverv1.ResourceConfiguration{}
 	for _, encProvider := range providers {
 		provider := encProvider
-		resourceConfig, err := encryptionConfigForSecretsAndConfigMaps(
+		resourceConfig, err := defaultEncryptionConfiguration(
 			&provider,
 			h.keyGenerator,
 		)
@@ -183,7 +185,7 @@ func (h *encryptionPatchHandler) generateEncryptionConfiguration(
 	}, nil
 }
 
-func (h *encryptionPatchHandler) DefaultEncryptionSecretExists(
+func (h *encryptionPatchHandler) defaultEncryptionSecretExists(
 	ctx context.Context,
 	cluster *clusterv1.Cluster,
 ) (bool, error) {
@@ -208,7 +210,7 @@ func (h *encryptionPatchHandler) DefaultEncryptionSecretExists(
 	return true, nil
 }
 
-func (h *encryptionPatchHandler) CreateEncryptionConfigurationSecret(
+func (h *encryptionPatchHandler) createEncryptionConfigurationSecret(
 	ctx context.Context,
 	encryptionConfig *apiserverv1.EncryptionConfiguration,
 	cluster *clusterv1.Cluster,
@@ -251,7 +253,7 @@ func (h *encryptionPatchHandler) CreateEncryptionConfigurationSecret(
 }
 
 // We only support encryption for "secrets" and "configmaps".
-func encryptionConfigForSecretsAndConfigMaps(
+func defaultEncryptionConfiguration(
 	providers *carenv1.EncryptionProviders,
 	secretGenerator TokenGenerator,
 ) (*apiserverv1.ResourceConfiguration, error) {

diff --git a/...eneric/mutation/encryption/inject_test.go → .../mutation/encryptionatrest/inject_test.go b/...eneric/mutation/encryption/inject_test.go → .../mutation/encryptionatrest/inject_test.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package encryption
+package encryptionatrest
 
 import (
 	"testing"

diff --git a/...ric/mutation/encryption/tokengenerator.go → ...tation/encryptionatrest/tokengenerator.go b/...ric/mutation/encryption/tokengenerator.go → ...tation/encryptionatrest/tokengenerator.go
@@ -1,7 +1,7 @@
 // Copyright 2024 Nutanix. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package encryption
+package encryptionatrest
 
 import "crypto/rand"
 

diff --git a/pkg/handlers/generic/mutation/handlers.go b/pkg/handlers/generic/mutation/handlers.go
@@ -11,7 +11,7 @@ import (
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/auditpolicy"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/containerdapplypatchesandrestart"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/containerdmetrics"
-	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/encryption"
+	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/encryptionatrest"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/etcd"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/extraapiservercertsans"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/httpproxy"
@@ -34,7 +34,7 @@ func MetaMutators(mgr manager.Manager) []mutation.MetaMutator {
 		calico.NewPatch(),
 		users.NewPatch(),
 		containerdmetrics.NewPatch(),
-		encryption.NewPatch(mgr.GetClient(), encryption.RandomTokenGenerator),
+		encryptionatrest.NewPatch(mgr.GetClient(), encryptionatrest.RandomTokenGenerator),
 
 		// Some patches may have changed containerd configuration.
 		// We write the configuration changes to disk, and must run a command