fix(config): server config tests

Ayman Bagabas created 2 years ago

Change summary

server/config/config.go      |  5 ++---
server/config/config_test.go | 10 +++++-----
2 files changed, 7 insertions(+), 8 deletions(-)

Detailed changes

server/config/config.go

@@ -288,12 +288,11 @@ func (c *Config) validate() error {
 func parseAuthKeys(aks []string) []ssh.PublicKey {
 	pks := make([]ssh.PublicKey, 0)
 	for _, key := range aks {
-		var ak string
 		if bts, err := os.ReadFile(key); err == nil {
 			// key is a file
-			ak = strings.TrimSpace(string(bts))
+			key = strings.TrimSpace(string(bts))
 		}
-		if pk, _, err := backend.ParseAuthorizedKey(ak); err == nil {
+		if pk, _, err := backend.ParseAuthorizedKey(key); err == nil {
 			pks = append(pks, pk)
 		}
 	}

server/config/config_test.go

@@ -20,8 +20,8 @@ func TestParseMultipleKeys(t *testing.T) {
 	})
 	cfg := DefaultConfig()
 	is.Equal(cfg.InitialAdminKeys, []string{
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b",
+		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
+		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
 	})
 }
 
@@ -39,8 +39,8 @@ func TestMergeInitAdminKeys(t *testing.T) {
 	cfg, err := ParseConfig(fp)
 	is.NoErr(err)
 	is.Equal(cfg.InitialAdminKeys, []string{
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8 a@b",
+		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
+		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFxIobhwtfdwN7m1TFt9wx3PsfvcAkISGPxmbmbauST8",
 	})
 }
 
@@ -60,6 +60,6 @@ func TestValidateInitAdminKeys(t *testing.T) {
 	cfg, err := ParseConfig(fp)
 	is.NoErr(err)
 	is.Equal(cfg.InitialAdminKeys, []string{
-		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH a@b",
+		"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINMwLvyV3ouVrTysUYGoJdl5Vgn5BACKov+n9PlzfPwH",
 	})
 }