From 224625378a8e5c102b6f0b545c7d1f18c7651558 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Thu, 13 Feb 2025 15:49:37 +0100 Subject: [PATCH 1/3] AllowOverride for writeVaultSecretIDToStore --- cmd/vaultRotateSecretId.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/vaultRotateSecretId.go b/cmd/vaultRotateSecretId.go index f46387a850..83c5413cdf 100644 --- a/cmd/vaultRotateSecretId.go +++ b/cmd/vaultRotateSecretId.go @@ -134,6 +134,7 @@ func writeVaultSecretIDToStore(config *vaultRotateSecretIdOptions, secretID stri Name: config.VaultAppRoleSecretTokenCredentialsID, Value: secretID, IsSecret: true, + AllowOverride: true, }, } if err := adoBuildClient.UpdateVariables(variables); err != nil { From 211f384146eeeea8c8ac97e1a31aed215c7b46e2 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Thu, 27 Feb 2025 16:30:11 +0100 Subject: [PATCH 2/3] go fmt --- cmd/vaultRotateSecretId.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/vaultRotateSecretId.go b/cmd/vaultRotateSecretId.go index 83c5413cdf..d81562dd48 100644 --- a/cmd/vaultRotateSecretId.go +++ b/cmd/vaultRotateSecretId.go @@ -131,9 +131,9 @@ func writeVaultSecretIDToStore(config *vaultRotateSecretIdOptions, secretID stri } variables := []ado.Variable{ { - Name: config.VaultAppRoleSecretTokenCredentialsID, - Value: secretID, - IsSecret: true, + Name: config.VaultAppRoleSecretTokenCredentialsID, + Value: secretID, + IsSecret: true, AllowOverride: true, }, } From af93ec6718e34bafc60790fd3e68f6e1da57b367 Mon Sep 17 00:00:00 2001 From: Ivan Nikiforov Date: Tue, 4 Mar 2025 17:48:07 +0100 Subject: [PATCH 3/3] Add temp debug logs --- cmd/vaultRotateSecretId.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/vaultRotateSecretId.go b/cmd/vaultRotateSecretId.go index d81562dd48..b84ab6b8a2 100644 --- a/cmd/vaultRotateSecretId.go +++ b/cmd/vaultRotateSecretId.go @@ -89,6 +89,11 @@ func runVaultRotateSecretID(utils vaultRotateSecretIDUtils) error { log.Entry().Infof("Your secret ID is about to expire in %.0f days", ttl.Round(time.Hour*24).Hours()/24) } + // TODO: remove after testing + log.Entry().Debugf("%T, %v", ttl, ttl) + log.Entry().Debugf("%T, %v", time.Duration(config.DaysBeforeExpiry)*24*time.Hour, time.Duration(config.DaysBeforeExpiry)*24*time.Hour) + log.Entry().Debugf("%v", ttl > time.Duration(config.DaysBeforeExpiry)*24*time.Hour) + if ttl > time.Duration(config.DaysBeforeExpiry)*24*time.Hour { log.Entry().Info("Secret ID TTL valid.") return nil @@ -112,6 +117,10 @@ func runVaultRotateSecretID(utils vaultRotateSecretIDUtils) error { } func writeVaultSecretIDToStore(config *vaultRotateSecretIdOptions, secretID string) error { + // TODO: remove after testing + log.Entry().Debugf("Secret ID: %s", secretID) + log.Entry().Debugf("Secret Store: %s", config.SecretStore) + switch config.SecretStore { case "jenkins": ctx := context.Background()