upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Initialize seal config map if nil (#22912)

Browse source 
* Initialize seal config map if nil

* Move the function outside if
This commit is contained in:
Divya Pola 2023-09-08 15:01:05 -05:00 committed by GitHub
parent f8ad2da680
commit 1c7716059d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internalshared/configutil/kms.go
View file

@ -216,6 +216,9 @@ func configureWrapper(configKMS *KMS, infoKeys *[]string, info *map[string]strin
var err error
envConfig := GetEnvConfigFunc(configKMS)
if configKMS.Config == nil {
configKMS.Config = make(map[string]string)
}
// transit is a special case, because some config values take precedence over env vars
if configKMS.Type == wrapping.WrapperTypeTransit.String() {
mergeTransitConfig(configKMS.Config, envConfig)