From 6fc99059372325bb328b0dbd4a39845b2db90031 Mon Sep 17 00:00:00 2001
From: Steven Clark <steven.clark@hashicorp.com>
Date: Mon, 11 Sep 2023 11:22:24 -0400
Subject: [PATCH] Only initialize the KMS config map if env map contains values
 (#22959)

- This protects against a test in ENT and a use-case in which
   we would force a migration for stored configs that had been
   written with a nil configuration
---
 internalshared/configutil/kms.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internalshared/configutil/kms.go b/internalshared/configutil/kms.go
index 282aad514e..f3f34bf341 100644
--- a/internalshared/configutil/kms.go
+++ b/internalshared/configutil/kms.go
@@ -216,7 +216,7 @@ func configureWrapper(configKMS *KMS, infoKeys *[]string, info *map[string]strin
 	var err error
 
 	envConfig := GetEnvConfigFunc(configKMS)
-	if configKMS.Config == nil {
+	if len(envConfig) > 0 && configKMS.Config == nil {
 		configKMS.Config = make(map[string]string)
 	}
 	// transit is a special case, because some config values take precedence over env vars