Merge pull request #808 from jetstack/fix

inteon · web-flow · commit 4599e2ec3b30 · 2026-05-18T14:21:44.000+02:00
Fix PR588 merge conflict
diff --git a/pkg/agent/config_test.go b/pkg/agent/config_test.go
@@ -319,7 +319,7 @@ func Test_ValidateAndCombineConfig(t *testing.T) {
 			withCmdLineFlags("--client-id", "5bc7d07c-45da-11ef-a878-523f1e1d7de1", "--private-key-path", privKeyPath, "--venafi-cloud"),
 		)
 		require.NoError(t, err)
-		assert.Equal(t, VenafiCloudKeypair, got.AuthMode)
+		assert.Equal(t, VenafiCloudKeypair, got.OutputMode)
 		assert.IsType(t, &client.VenafiCloudClient{}, cl)
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func Test_ValidateAndCombineConfig(t *testing.T) {`
`319`	`319`	`withCmdLineFlags("--client-id", "5bc7d07c-45da-11ef-a878-523f1e1d7de1", "--private-key-path", privKeyPath, "--venafi-cloud"),`
`320`	`320`	`)`
`321`	`321`	`require.NoError(t, err)`
`322`		`- assert.Equal(t, VenafiCloudKeypair, got.AuthMode)`
	`322`	`+ assert.Equal(t, VenafiCloudKeypair, got.OutputMode)`
`323`	`323`	`assert.IsType(t, &client.VenafiCloudClient{}, cl)`
`324`	`324`	`})`
`325`	`325`