Diff
1diff --git a/server/config/config_test.go b/server/config/config_test.go
2index 6a8eb7e4890f4ff535b7523491936a6273590755..b3685209546af8797855750b6c23a415bd1a46d2 100644
3--- a/server/config/config_test.go
4+++ b/server/config/config_test.go
5@@ -9,8 +9,8 @@ import (
6
7 func TestParseMultipleKeys(t *testing.T) {
8 is := is.New(t)
9- is.NoErr(os.Setenv("SOFT_SERVE_INITIAL_ADMIN_KEY", "testdata/k1.pub\ntestdata/k2.pub"))
10- t.Cleanup(func() { is.NoErr(os.Unsetenv("SOFT_SERVE_INITIAL_ADMIN_KEY")) })
11+ is.NoErr(os.Setenv("SOFT_SERVE_INITIAL_ADMIN_KEYS", "testdata/k1.pub\ntestdata/k2.pub"))
12+ t.Cleanup(func() { is.NoErr(os.Unsetenv("SOFT_SERVE_INITIAL_ADMIN_KEYS")) })
13 cfg := DefaultConfig()
14 is.Equal(cfg.InitialAdminKeys, []string{
15 "testdata/k1.pub",
16diff --git a/server/server_test.go b/server/server_test.go
17index 55c614bf8f39ca669561f4b4c399bc66e2382644..a3986b2d3b985ad49ce9c91bbf555e5d00f89bed 100644
18--- a/server/server_test.go
19+++ b/server/server_test.go
20@@ -46,11 +46,10 @@ func createKeyPair(tb testing.TB) (ssh.PublicKey, string) {
21 tb.Helper()
22 is := is.New(tb)
23 keyDir := tb.TempDir()
24- kp, err := keygen.NewWithWrite(filepath.Join(keyDir, "id"), nil, keygen.Ed25519)
25+ fp := filepath.Join(keyDir, "id_ed25519")
26+ kp, err := keygen.New(fp, keygen.WithKeyType(keygen.Ed25519), keygen.WithWrite())
27 is.NoErr(err)
28- pubkey, _, _, _, err := ssh.ParseAuthorizedKey(kp.PublicKey())
29- is.NoErr(err)
30- return pubkey, filepath.Join(keyDir, "id_ed25519")
31+ return kp.PublicKey(), fp
32 }
33
34 func authorizedKey(pk ssh.PublicKey) string {