GitHub-Proxy/ceph-csi
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/ceph/ceph-csi.git synced 2025-08-13 03:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: address golangci 'testifylint' issues

Browse Source 
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 <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2025-04-29 12:15:48 +02:00 committed by mergify[bot]
parent 457ffe884a
commit 300acd6fb9
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/kms/secretskms_test.go
View File

@ -113,19 +113,19 @@ func TestWorkflowSecretsMetadataKMS(t *testing.T) {
encryptedDEK, err := kms.EncryptDEK(ctx, volumeID, plainDEK) encryptedDEK, err := kms.EncryptDEK(ctx, volumeID, plainDEK)
require.NoError(t, err) require.NoError(t, err)
require.NotEqual(t, "", encryptedDEK) require.NotEmpty(t, encryptedDEK)
require.NotEqual(t, plainDEK, encryptedDEK) require.NotEqual(t, plainDEK, encryptedDEK)
// with an incorrect volumeID, decrypting should fail // with an incorrect volumeID, decrypting should fail
decryptedDEK, err := kms.DecryptDEK(ctx, "incorrect-volumeID", encryptedDEK) decryptedDEK, err := kms.DecryptDEK(ctx, "incorrect-volumeID", encryptedDEK)
require.Error(t, err) require.Error(t, err)
require.Equal(t, "", decryptedDEK) require.Empty(t, decryptedDEK)
require.NotEqual(t, plainDEK, decryptedDEK) require.NotEqual(t, plainDEK, decryptedDEK)
// with the right volumeID, decrypting should return the plainDEK // with the right volumeID, decrypting should return the plainDEK
decryptedDEK, err = kms.DecryptDEK(ctx, volumeID, encryptedDEK) decryptedDEK, err = kms.DecryptDEK(ctx, volumeID, encryptedDEK)
require.NoError(t, err) require.NoError(t, err)
require.NotEqual(t, "", decryptedDEK) require.NotEmpty(t, decryptedDEK)
require.Equal(t, plainDEK, decryptedDEK) require.Equal(t, plainDEK, decryptedDEK)
} }

2
internal/kms/vault_test.go
View File

@ -94,7 +94,7 @@ func TestDefaultVaultDestroyKeys(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
keyContext := vc.getDeleteKeyContext() keyContext := vc.getDeleteKeyContext()
destroySecret, ok := keyContext[loss.DestroySecret] destroySecret, ok := keyContext[loss.DestroySecret]
require.NotEqual(t, "", destroySecret) require.NotEmpty(t, destroySecret)
require.True(t, ok) require.True(t, ok)
// setting vaultDestroyKeys to !true should remove the loss.DestroySecret entry // setting vaultDestroyKeys to !true should remove the loss.DestroySecret entry

14
internal/util/crypto_test.go
View File

@ -68,15 +68,15 @@ func TestKMSWorkflow(t *testing.T) {
func TestFetchEncryptionType(t *testing.T) { func TestFetchEncryptionType(t *testing.T) {
t.Parallel() t.Parallel()
volOpts := map[string]string{} volOpts := map[string]string{}
require.EqualValues(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeBlock)) require.Equal(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeBlock))
require.EqualValues(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeFile)) require.Equal(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeFile))
require.EqualValues(t, crypto.EncryptionTypeNone, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) require.Equal(t, crypto.EncryptionTypeNone, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone))
volOpts["encryptionType"] = "" volOpts["encryptionType"] = ""
require.EqualValues(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) require.Equal(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone))
volOpts["encryptionType"] = "block" volOpts["encryptionType"] = "block"
require.EqualValues(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) require.Equal(t, crypto.EncryptionTypeBlock, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone))
volOpts["encryptionType"] = "file" volOpts["encryptionType"] = "file"
require.EqualValues(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) require.Equal(t, crypto.EncryptionTypeFile, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone))
volOpts["encryptionType"] = "INVALID" volOpts["encryptionType"] = "INVALID"
require.EqualValues(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone)) require.Equal(t, crypto.EncryptionTypeInvalid, FetchEncryptionType(volOpts, crypto.EncryptionTypeNone))
} }

16
pkg/util/crypto/types_test.go
View File

@ -24,15 +24,15 @@ import (
func TestEncryptionType(t *testing.T) { func TestEncryptionType(t *testing.T) {
t.Parallel() t.Parallel()
require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("wat?")) require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("wat?"))
require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("both")) require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("both"))
require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("file,block")) require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("file,block"))
require.EqualValues(t, EncryptionTypeInvalid, ParseEncryptionType("block,file")) require.Equal(t, EncryptionTypeInvalid, ParseEncryptionType("block,file"))
require.EqualValues(t, EncryptionTypeBlock, ParseEncryptionType("block")) require.Equal(t, EncryptionTypeBlock, ParseEncryptionType("block"))
require.EqualValues(t, EncryptionTypeFile, ParseEncryptionType("file")) require.Equal(t, EncryptionTypeFile, ParseEncryptionType("file"))
require.EqualValues(t, EncryptionTypeNone, ParseEncryptionType("")) require.Equal(t, EncryptionTypeNone, ParseEncryptionType(""))
for _, s := range []string{"file", "block", ""} { for _, s := range []string{"file", "block", ""} {
require.EqualValues(t, s, ParseEncryptionType(s).String()) require.Equal(t, s, ParseEncryptionType(s).String())
} }
} }