mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
test: fix use of t.Logf where t.Log would suffice (#16328)
This commit is contained in:
@@ -44,7 +44,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
db := database.New(sqlDB)
|
||||
|
||||
// Populate the database with some unencrypted data.
|
||||
t.Logf("Generating unencrypted data")
|
||||
t.Log("Generating unencrypted data")
|
||||
users := genData(t, db)
|
||||
|
||||
// Setup an initial cipher A
|
||||
@@ -57,7 +57,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// Populate the database with some encrypted data using cipher A.
|
||||
t.Logf("Generating data encrypted with cipher A")
|
||||
t.Log("Generating data encrypted with cipher A")
|
||||
newUsers := genData(t, cryptdb)
|
||||
|
||||
// Validate that newly created users were encrypted with cipher A
|
||||
@@ -67,7 +67,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
users = append(users, newUsers...)
|
||||
|
||||
// Encrypt all the data with the initial cipher.
|
||||
t.Logf("Encrypting all data with cipher A")
|
||||
t.Log("Encrypting all data with cipher A")
|
||||
inv, _ := newCLI(t, "server", "dbcrypt", "rotate",
|
||||
"--postgres-url", connectionURL,
|
||||
"--new-key", base64.StdEncoding.EncodeToString([]byte(keyA)),
|
||||
@@ -89,7 +89,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
cipherBA, err := dbcrypt.NewCiphers([]byte(keyB), []byte(keyA))
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Logf("Enrypting all data with cipher B")
|
||||
t.Log("Enrypting all data with cipher B")
|
||||
inv, _ = newCLI(t, "server", "dbcrypt", "rotate",
|
||||
"--postgres-url", connectionURL,
|
||||
"--new-key", base64.StdEncoding.EncodeToString([]byte(keyB)),
|
||||
@@ -108,7 +108,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
}
|
||||
|
||||
// Assert that we can revoke the old key.
|
||||
t.Logf("Revoking cipher A")
|
||||
t.Log("Revoking cipher A")
|
||||
err = db.RevokeDBCryptKey(ctx, cipherA[0].HexDigest())
|
||||
require.NoError(t, err, "failed to revoke old key")
|
||||
|
||||
@@ -124,7 +124,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
require.Empty(t, oldKey.ActiveKeyDigest.String, "expected the old key to not be active")
|
||||
|
||||
// Revoking the new key should fail.
|
||||
t.Logf("Attempting to revoke cipher B should fail as it is still in use")
|
||||
t.Log("Attempting to revoke cipher B should fail as it is still in use")
|
||||
err = db.RevokeDBCryptKey(ctx, cipherBA[0].HexDigest())
|
||||
require.Error(t, err, "expected to fail to revoke the new key")
|
||||
var pgErr *pq.Error
|
||||
@@ -132,7 +132,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
require.EqualValues(t, "23503", pgErr.Code, "expected a foreign key constraint violation error")
|
||||
|
||||
// Decrypt the data using only cipher B. This should result in the key being revoked.
|
||||
t.Logf("Decrypting with cipher B")
|
||||
t.Log("Decrypting with cipher B")
|
||||
inv, _ = newCLI(t, "server", "dbcrypt", "decrypt",
|
||||
"--postgres-url", connectionURL,
|
||||
"--keys", base64.StdEncoding.EncodeToString([]byte(keyB)),
|
||||
@@ -162,7 +162,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
cipherC, err := dbcrypt.NewCiphers([]byte(keyC))
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Logf("Re-encrypting with cipher C")
|
||||
t.Log("Re-encrypting with cipher C")
|
||||
inv, _ = newCLI(t, "server", "dbcrypt", "rotate",
|
||||
"--postgres-url", connectionURL,
|
||||
"--new-key", base64.StdEncoding.EncodeToString([]byte(keyC)),
|
||||
@@ -181,7 +181,7 @@ func TestServerDBCrypt(t *testing.T) {
|
||||
}
|
||||
|
||||
// Now delete all the encrypted data.
|
||||
t.Logf("Deleting all encrypted data")
|
||||
t.Log("Deleting all encrypted data")
|
||||
inv, _ = newCLI(t, "server", "dbcrypt", "delete",
|
||||
"--postgres-url", connectionURL,
|
||||
"--external-token-encryption-keys", base64.StdEncoding.EncodeToString([]byte(keyC)),
|
||||
|
||||
Reference in New Issue
Block a user