From c39bc4bc724a8bb75155e496ccf2481fdbd1a1bb Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 11 Oct 2023 15:59:54 +0100 Subject: [PATCH 1/3] increase randomness in names generated by server dbcrypt --- enterprise/cli/server_dbcrypt_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/enterprise/cli/server_dbcrypt_test.go b/enterprise/cli/server_dbcrypt_test.go index a61dbc58f3f62..d0527895faf2e 100644 --- a/enterprise/cli/server_dbcrypt_test.go +++ b/enterprise/cli/server_dbcrypt_test.go @@ -218,6 +218,7 @@ func genData(t *testing.T, db database.Store) []database.User { for _, loginType := range database.AllLoginTypeValues() { for _, deleted := range []bool{false, true} { usr := dbgen.User(t, db, database.User{ + Username: mustString(t, 32), LoginType: loginType, Status: status, Deleted: deleted, From f0fe4d61ea13b1ca69bb9625176c56576557d2b7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 11 Oct 2023 15:17:20 +0000 Subject: [PATCH 2/3] more randomness --- enterprise/cli/server_dbcrypt_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/enterprise/cli/server_dbcrypt_test.go b/enterprise/cli/server_dbcrypt_test.go index d0527895faf2e..837e6754c1a44 100644 --- a/enterprise/cli/server_dbcrypt_test.go +++ b/enterprise/cli/server_dbcrypt_test.go @@ -217,8 +217,10 @@ func genData(t *testing.T, db database.Store) []database.User { for _, status := range database.AllUserStatusValues() { for _, loginType := range database.AllLoginTypeValues() { for _, deleted := range []bool{false, true} { + randName := mustString(t, 32) usr := dbgen.User(t, db, database.User{ - Username: mustString(t, 32), + Username: randName, + Email: randName + "@notcoder.com", LoginType: loginType, Status: status, Deleted: deleted, From c35b3d5237cf67f99b93cc60d388b10015028442 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 11 Oct 2023 15:20:52 +0000 Subject: [PATCH 3/3] close PTYs when we are done with them --- enterprise/cli/server_dbcrypt_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/enterprise/cli/server_dbcrypt_test.go b/enterprise/cli/server_dbcrypt_test.go index 837e6754c1a44..8b1bbffa52b9f 100644 --- a/enterprise/cli/server_dbcrypt_test.go +++ b/enterprise/cli/server_dbcrypt_test.go @@ -79,6 +79,7 @@ func TestServerDBCrypt(t *testing.T) { inv.Stdout = pty.Output() err = inv.Run() require.NoError(t, err) + require.NoError(t, pty.Close()) // Validate that all existing data has been encrypted with cipher A. for _, usr := range users { @@ -101,6 +102,7 @@ func TestServerDBCrypt(t *testing.T) { inv.Stdout = pty.Output() err = inv.Run() require.NoError(t, err) + require.NoError(t, pty.Close()) // Validate that all data has been re-encrypted with cipher B. for _, usr := range users { @@ -142,6 +144,7 @@ func TestServerDBCrypt(t *testing.T) { inv.Stdout = pty.Output() err = inv.Run() require.NoError(t, err) + require.NoError(t, pty.Close()) // Validate that both keys have been revoked. keys, err = db.GetDBCryptKeys(ctx) @@ -172,6 +175,7 @@ func TestServerDBCrypt(t *testing.T) { inv.Stdout = pty.Output() err = inv.Run() require.NoError(t, err) + require.NoError(t, pty.Close()) // Validate that all data has been re-encrypted with cipher C. for _, usr := range users { @@ -189,6 +193,7 @@ func TestServerDBCrypt(t *testing.T) { inv.Stdout = pty.Output() err = inv.Run() require.NoError(t, err) + require.NoError(t, pty.Close()) // Assert that no user links remain. for _, usr := range users {