mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-18 11:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: unmarshal the data read from file

Browse Source 
if are reading the kms data from the file.
than only we need to unmarshal. If we are reading
from the configmap it already returns the unmarshal
data.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2021-02-03 16:49:03 +05:30 committed by mergify[bot]
parent 50a720f13d
commit b370d9afb6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/util/crypto.go
View File

@ -145,11 +145,11 @@ func GetKMS(tenant, kmsID string, secrets map[string]string) (EncryptionKMS, err
return nil, fmt.Errorf("failed to read kms configuration from configmap %s in namespace %s: %w", return nil, fmt.Errorf("failed to read kms configuration from configmap %s in namespace %s: %w",
namespace, name, err) namespace, name, err)
} }
} } else {
err = json.Unmarshal(content, &config)
err = json.Unmarshal(content, &config) if err != nil {
if err != nil { return nil, fmt.Errorf("failed to parse kms configuration: %w", err)
return nil, fmt.Errorf("failed to parse kms configuration: %w", err) }
} }
kmsConfig, ok := config[kmsID].(map[string]interface{}) kmsConfig, ok := config[kmsID].(map[string]interface{})