Skip to content

Commit 7be5342

Browse files
inteonmaelvls
authored andcommitted
uploader_id: unconditionally show a log line when venafi-cloud.uploader_id is set
Co-authored-by: Tim Ramlot <[email protected]>
1 parent 2801ca7 commit 7be5342

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

pkg/agent/config.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,8 @@ func ValidateAndCombineConfig(log *log.Logger, cfg Config, flags AgentCmdFlags)
437437
// TODO(mael): Remove the arbitrary `/no` path parameter from the Agent once
438438
// https://venafi.atlassian.net/browse/VC-35385 is done.
439439
{
440-
if res.AuthMode == VenafiCloudVenafiConnection || res.AuthMode == VenafiCloudKeypair {
441-
if cfg.VenafiCloud != nil && cfg.VenafiCloud.UploaderID != "" {
442-
log.Printf(`ignoring the venafi-cloud.uploader_id field in the config file. This field is not needed in %s mode.`, res.AuthMode)
443-
}
440+
if cfg.VenafiCloud != nil && cfg.VenafiCloud.UploaderID != "" {
441+
log.Printf(`ignoring the venafi-cloud.uploader_id field in the config file. This field is not needed in %s mode.`, res.AuthMode)
444442
}
445443
}
446444

0 commit comments

Comments
 (0)