Put some string variables into consts for re-use

Author: julianKatz

pkg/parameters/parameters_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
 )
 
@@ -283,11 +284,11 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 		},
 		{
 			name:       "confidential compute enabled with valid KMS key",
-			parameters: map[string]string{ParameterKeyEnableConfidentialCompute: "true", ParameterKeyDiskEncryptionKmsKey: validRegionalKmsKey},
+			parameters: map[string]string{ParameterKeyEnableConfidentialCompute: "true", ParameterKeyDiskEncryptionKmsKey: validKmsKeyRegional},
 			expectParams: DiskParameters{
 				DiskType:                  "pd-standard",
 				ReplicationType:           "none",
-				DiskEncryptionKMSKey:      validRegionalKmsKey,
+				DiskEncryptionKMSKey:      validKmsKeyRegional,
 				EnableConfidentialCompute: true,
 				Tags:                      map[string]string{},
 				Labels:                    map[string]string{},
@@ -551,7 +552,7 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 				return
 			}
 
-			if diff := cmp.Diff(tc.expectParams, p); diff != "" {
+			if diff := cmp.Diff(tc.expectParams, p, cmpopts.IgnoreUnexported(DiskParameters{})); diff != "" {
 				t.Errorf("ExtractAndDefaultParameters(%+v): -want, +got \n%s", tc.parameters, diff)
 			}
 

pkg/parameters/utils_test.go

@@ -6,6 +6,12 @@ import (
 	"testing"
 )
 
+const (
+	validKmsKeyRegional = "projects/my-project/locations/us-central1/keyRings/TestKeyRing/cryptoKeys/test-key"
+	validKmsKeyGlobal   = "projects/my-project/locations/global/keyRings/TestKeyRing/cryptoKeys/test-key"
+	invalidKmsKey       = "projects/my-project/locations/keyRings/TestKeyRing/cryptoKeys/test-key"
+)
+
 func TestSnapshotStorageLocations(t *testing.T) {
 	tests := []struct {
 		desc                        string
@@ -161,15 +167,15 @@ func TestIsValidDiskEncryptionKmsKey(t *testing.T) {
 		expectedIsValid      bool
 	}{
 		{
-			diskEncryptionKmsKey: "projects/my-project/locations/us-central1/keyRings/TestKeyRing/cryptoKeys/test-key",
+			diskEncryptionKmsKey: validKmsKeyRegional,
 			expectedIsValid:      true,
 		},
 		{
-			diskEncryptionKmsKey: "projects/my-project/locations/global/keyRings/TestKeyRing/cryptoKeys/test-key",
+			diskEncryptionKmsKey: validKmsKeyGlobal,
 			expectedIsValid:      true,
 		},
 		{
-			diskEncryptionKmsKey: "projects/my-project/locations/keyRings/TestKeyRing/cryptoKeys/test-key",
+			diskEncryptionKmsKey: invalidKmsKey,
 			expectedIsValid:      false,
 		},
 	}