From 300acd6fb9bbaec5fdff0028ab1e87f3ab376726 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 29 Apr 2025 12:15:48 +0200 Subject: [PATCH] cleanup: address golangci 'testifylint' issues The new 'testify' linter complains about incorrect usage of Equal() and similar calls. When comparing to an empty value, Empty() should be used instead. Signed-off-by: Niels de Vos --- internal/kms/secretskms_test.go | 6 +++--- internal/kms/vault_test.go | 2 +- internal/util/crypto_test.go | 14 +++++++------- pkg/util/crypto/types_test.go | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/kms/secretskms_test.go b/internal/kms/secretskms_test.go index 698c6a72c..4a9b732a6 100644 --- a/internal/kms/secretskms_test.go +++ b/internal/kms/secretskms_test.go @@ -113,19 +113,19 @@ func TestWorkflowSecretsMetadataKMS(t *testing.T) { encryptedDEK, err := kms.EncryptDEK(ctx, volumeID, plainDEK) require.NoError(t, err) - require.NotEqual(t, "", encryptedDEK) + require.NotEmpty(t, encryptedDEK) require.NotEqual(t, plainDEK, encryptedDEK) // with an incorrect volumeID, decrypting should fail decryptedDEK, err := kms.DecryptDEK(ctx, "incorrect-volumeID", encryptedDEK) require.Error(t, err) - require.Equal(t, "", decryptedDEK) + require.Empty(t, decryptedDEK) require.NotEqual(t, plainDEK, decryptedDEK) // with the right volumeID, decrypting should return the plainDEK decryptedDEK, err = kms.DecryptDEK(ctx, volumeID, encryptedDEK) require.NoError(t, err) - require.NotEqual(t, "", decryptedDEK) + require.NotEmpty(t, decryptedDEK) require.Equal(t, plainDEK, decryptedDEK) } diff --git a/internal/kms/vault_test.go b/internal/kms/vault_test.go index b1408b3b3..cc0422cef 100644 --- a/internal/kms/vault_test.go +++ b/internal/kms/vault_test.go @@ -94,7 +94,7 @@ func TestDefaultVaultDestroyKeys(t *testing.T) { require.NoError(t, err) keyContext := vc.getDeleteKeyContext() destroySecret, ok := keyContext[loss.DestroySecret] - require.NotEqual(t, "", destroySecret) + require.NotEmpty(t, destroySecret) require.True(t, ok) // setting vaultDestroyKeys to !true should remove the loss.DestroySecret entry diff --git a/internal/util/crypto_test.go b/internal/util/crypto_test.go index 778aab79c..e51976ad7 100644 --- a/internal/util/crypto_test.go +++ b/internal/util/crypto_test.go @@ -68,15 +68,15 @@ func TestKMSWorkflow(t *testing.T) { func TestFetchEncryptionType(t *testing.T) { t.Parallel() volOpts := map[string]string{} - require.EqualValues(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeBlock)) - require.EqualValues(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeFile)) - require.EqualValues(t, crypto.EncryptionTypeNone, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) + require.Equal(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeBlock)) + require.Equal(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeFile)) + require.Equal(t, crypto.EncryptionTypeNone, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) volOpts["encryptionType"] = "" - require.EqualValues(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) + require.Equal(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) volOpts["encryptionType"] = "block" - require.EqualValues(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) + require.Equal(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) volOpts["encryptionType"] = "file" - require.EqualValues(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) + require.Equal(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) volOpts["encryptionType"] = "INVALID" - require.EqualValues(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) + require.Equal(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) } diff --git a/pkg/util/crypto/types_test.go b/pkg/util/crypto/types_test.go index 0fcf731da..e0a500832 100644 --- a/pkg/util/crypto/types_test.go +++ b/pkg/util/crypto/types_test.go @@ -24,15 +24,15 @@ import ( func TestEncryptionType(t *testing.T) { t.Parallel() - require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("wat?")) - require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("both")) - require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("file,block")) - require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("block,file")) - require.EqualValues(t, EncryptionTypeBlock, ParseEncryptionType("block")) - require.EqualValues(t, EncryptionTypeFile, ParseEncryptionType("file")) - require.EqualValues(t, EncryptionTypeNone, ParseEncryptionType("")) + require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("wat?")) + require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("both")) + require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("file,block")) + require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("block,file")) + require.Equal(t, EncryptionTypeBlock, ParseEncryptionType("block")) + require.Equal(t, EncryptionTypeFile, ParseEncryptionType("file")) + require.Equal(t, EncryptionTypeNone, ParseEncryptionType("")) for _, s := range []string{"file", "block", ""} { - require.EqualValues(t, s, ParseEncryptionType(s).String()) + require.Equal(t, s, ParseEncryptionType(s).String()) } }