From 99603cdee9f870393e815ed46dc32170f046bec7 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <26137398+CCFenner@users.noreply.github.com>
Date: Tue, 11 Apr 2023 23:15:00 +0200
Subject: [PATCH] chore(tests): correct test assertions (#4276)

---
 pkg/config/vault_test.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkg/config/vault_test.go b/pkg/config/vault_test.go
index f486e4e4a..0f41352fd 100644
--- a/pkg/config/vault_test.go
+++ b/pkg/config/vault_test.go
@@ -132,7 +132,7 @@ func TestVaultConfigLoad(t *testing.T) {
 		stepConfig := StepConfig{Config: map[string]interface{}{}}
 		stepParams := []StepParameters{stepParam(secretName, "vaultSecret", secretNameOverrideKey, secretName)}
 		resolveAllVaultReferences(&stepConfig, vaultMock, stepParams)
-		assert.Equal(t, nil, stepConfig.Config[secretName])
+		assert.Nil(t, stepConfig.Config[secretName])
 		vaultMock.AssertNotCalled(t, "GetKvSecret", mock.AnythingOfType("string"))
 	})
 }
@@ -154,7 +154,7 @@ func TestVaultSecretFiles(t *testing.T) {
 		contentByte, err := ioutil.ReadFile(path)
 		assert.NoError(t, err)
 		content := string(contentByte)
-		assert.Equal(t, content, "value1")
+		assert.Equal(t, "value1", content)
 	})
 
 	os.RemoveAll(VaultSecretFileDirectory)
@@ -248,10 +248,10 @@ func TestResolveVaultTestCredentials(t *testing.T) {
 		resolveVaultTestCredentials(&stepConfig, vaultMock)
 
 		// assert
-		for k, v := range vaultData {
+		for k, expectedValue := range vaultData {
 			env := envPrefix + strings.ToUpper(k)
 			assert.NotEmpty(t, os.Getenv(env))
-			assert.Equal(t, os.Getenv(env), v)
+			assert.Equal(t, expectedValue, os.Getenv(env))
 		}
 	})
 
@@ -283,13 +283,13 @@ func TestResolveVaultTestCredentials(t *testing.T) {
 			resolveVaultCredentials(&stepConfig, vaultMock)
 
 			// assert
-			for k, v := range vaultData {
+			for k, expectedValue := range vaultData {
 				env := envPrefix + strings.ToUpper(k)
 				assert.NotEmpty(t, os.Getenv(env))
-				assert.Equal(t, os.Getenv(env), v)
+				assert.Equal(t, expectedValue, os.Getenv(env))
 				standardEnv := standardEnvPrefix + strings.ToUpper(k)
 				assert.NotEmpty(t, os.Getenv(standardEnv))
-				assert.Equal(t, os.Getenv(standardEnv), v)
+				assert.Equal(t, expectedValue, os.Getenv(standardEnv))
 			}
 		})
 	}
@@ -317,10 +317,10 @@ func TestResolveVaultTestCredentials(t *testing.T) {
 		resolveVaultTestCredentials(&stepConfig, vaultMock)
 
 		// assert
-		for k, v := range vaultData {
+		for k, expectedValue := range vaultData {
 			env := envPrefix + strings.ToUpper(k)
 			assert.NotEmpty(t, os.Getenv(env))
-			assert.Equal(t, os.Getenv(env), v)
+			assert.Equal(t, expectedValue, os.Getenv(env))
 		}
 	})
 }