Out of an abundance of caution, unset the var if it never existed

hashicorp · Feb 28, 2025 · dfb84ab · dfb84ab
1 parent 59a8c11
commit dfb84ab
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/wrappers/azurekeyvault/azurekeyvault.go b/wrappers/azurekeyvault/azurekeyvault.go
@@ -306,9 +306,13 @@ func (v *Wrapper) getKeyVaultClient(withCertPool *x509.CertPool) (*azkeys.Client
 		// Some hoops to jump through to make sure two wrappers being setup at the same time don't step on the
 		// env var
 		managedClientIdLock.Lock()
-		oldVal := os.Getenv(EnvAzureClientId)
+		oldVal, found := os.LookupEnv(EnvAzureClientId)
 		unlock := func() {
-			os.Setenv(EnvAzureClientId, oldVal)
+			if found {
+				os.Setenv(EnvAzureClientId, oldVal)
+			} else {
+				os.Unsetenv(EnvAzureClientId)
+			}
 			managedClientIdLock.Unlock()
 		}