Merge pull request #969 from evankanderson/cleanup-function-name

Remove GetCryptoConfigWithDefaults, use DefaultConfigForTest
mindersec · Sep 15, 2023 · 0d82d74 · 0d82d74
2 parents 172f54d + 588d853
commit 0d82d74
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 22 deletions.
diff --git a/internal/config/crypto.go b/internal/config/crypto.go
@@ -23,9 +23,3 @@ type CryptoConfig struct {
 	SaltLength  uint32 `mapstructure:"salt_length" default:"16"`
 	KeyLength   uint32 `mapstructure:"key_length" default:"32"`
 }
-
-// GetCryptoConfigWithDefaults returns a CryptoConfig with default values
-// TODO: extract from struct default tags
-func GetCryptoConfigWithDefaults() CryptoConfig {
-	return DefaultConfigForTest().Salt
-}
diff --git a/internal/controlplane/handlers_auth_test.go b/internal/controlplane/handlers_auth_test.go
@@ -41,7 +41,7 @@ func TestLogin_gRPC(t *testing.T) {
 
 	seed := time.Now().UnixNano()
 	password := util.RandomPassword(8, seed)
-	cryptcfg := config.GetCryptoConfigWithDefaults()
+	cryptcfg := config.DefaultConfigForTest().Salt
 	hash, err := mcrypto.GeneratePasswordHash(password, &cryptcfg)
 	if err != nil {
 		t.Fatalf("Error generating password hash: %v", err)

diff --git a/internal/controlplane/handlers_keys_test.go b/internal/controlplane/handlers_keys_test.go
@@ -75,7 +75,7 @@ func TestKeysHandler(t *testing.T) {
 	s := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 	}
 
@@ -168,7 +168,7 @@ func TestKeysHandler_gRPC(t *testing.T) {
 			server := &Server{
 				store: mockStore,
 				cfg: &config.Config{
-					Salt: config.GetCryptoConfigWithDefaults(),
+					Salt: config.DefaultConfigForTest().Salt,
 				},
 			}
 

diff --git a/internal/controlplane/handlers_user_test.go b/internal/controlplane/handlers_user_test.go
@@ -96,7 +96,7 @@ func TestCreateUserDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -214,7 +214,7 @@ func TestCreateUser_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},
@@ -257,7 +257,7 @@ func TestUpdatePasswordDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -340,7 +340,7 @@ func TestUpdatePassword_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},
@@ -381,7 +381,7 @@ func TestUpdateProfileDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -466,7 +466,7 @@ func TestUpdateProfile_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},
@@ -522,7 +522,7 @@ func TestDeleteUserDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -608,7 +608,7 @@ func TestDeleteUser_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},
@@ -665,7 +665,7 @@ func TestGetUsersDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -780,7 +780,7 @@ func TestGetUsers_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},
@@ -829,7 +829,7 @@ func TestGetUserDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -875,7 +875,7 @@ func TestGetNonExistingUserDBMock(t *testing.T) {
 	server := &Server{
 		store: mockStore,
 		cfg: &config.Config{
-			Salt: config.GetCryptoConfigWithDefaults(),
+			Salt: config.DefaultConfigForTest().Salt,
 		},
 		cryptoEngine: crypeng,
 	}
@@ -974,7 +974,7 @@ func TestGetUser_gRPC(t *testing.T) {
 			evt, err := events.Setup()
 			require.NoError(t, err, "failed to setup eventer")
 			server, err := NewServer(mockStore, evt, &config.Config{
-				Salt: config.GetCryptoConfigWithDefaults(),
+				Salt: config.DefaultConfigForTest().Salt,
 				Auth: config.AuthConfig{
 					TokenKey: generateTokenKey(t),
 				},