fix: server tests

Ayman Bagabas created 2 years ago

Change summary

server/config/config_test.go | 4 ++--
server/server_test.go        | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)

Detailed changes

server/config/config_test.go

@@ -9,8 +9,8 @@ import (
 
 func TestParseMultipleKeys(t *testing.T) {
 	is := is.New(t)
-	is.NoErr(os.Setenv("SOFT_SERVE_INITIAL_ADMIN_KEY", "testdata/k1.pub\ntestdata/k2.pub"))
-	t.Cleanup(func() { is.NoErr(os.Unsetenv("SOFT_SERVE_INITIAL_ADMIN_KEY")) })
+	is.NoErr(os.Setenv("SOFT_SERVE_INITIAL_ADMIN_KEYS", "testdata/k1.pub\ntestdata/k2.pub"))
+	t.Cleanup(func() { is.NoErr(os.Unsetenv("SOFT_SERVE_INITIAL_ADMIN_KEYS")) })
 	cfg := DefaultConfig()
 	is.Equal(cfg.InitialAdminKeys, []string{
 		"testdata/k1.pub",

server/server_test.go

@@ -46,11 +46,10 @@ func createKeyPair(tb testing.TB) (ssh.PublicKey, string) {
 	tb.Helper()
 	is := is.New(tb)
 	keyDir := tb.TempDir()
-	kp, err := keygen.NewWithWrite(filepath.Join(keyDir, "id"), nil, keygen.Ed25519)
+	fp := filepath.Join(keyDir, "id_ed25519")
+	kp, err := keygen.New(fp, keygen.WithKeyType(keygen.Ed25519), keygen.WithWrite())
 	is.NoErr(err)
-	pubkey, _, _, _, err := ssh.ParseAuthorizedKey(kp.PublicKey())
-	is.NoErr(err)
-	return pubkey, filepath.Join(keyDir, "id_ed25519")
+	return kp.PublicKey(), fp
 }
 
 func authorizedKey(pk ssh.PublicKey) string {