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

rbd: unexport vaultTokenSA struct from KMS implementation

Browse Source 
This commit unexport the vaultTokenSA from the vault KMS
implementation

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-01-24 18:32:51 +05:30 committed by mergify[bot]
parent b75c562217
commit 4058246637
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/kms/vault_tokens.go
View File

@ -202,7 +202,7 @@ type vaultTenantConnection struct {
tenantConfigOptionFilter func(string) bool tenantConfigOptionFilter func(string) bool
} }
type VaultTokensKMS struct { type vaultTokensKMS struct {
vaultTenantConnection vaultTenantConnection
// TokenName is the name of the Secret in the Tenants Kubernetes Namespace // TokenName is the name of the Secret in the Tenants Kubernetes Namespace
@ -228,7 +228,7 @@ func initVaultTokensKMS(args ProviderInitArgs) (EncryptionKMS, error) {
} }
} }
kms := &VaultTokensKMS{} kms := &vaultTokensKMS{}
kms.vaultTenantConnection.init() kms.vaultTenantConnection.init()
err = kms.initConnection(config) err = kms.initConnection(config)
if err != nil { if err != nil {
@ -278,7 +278,7 @@ func initVaultTokensKMS(args ProviderInitArgs) (EncryptionKMS, error) {
return kms, nil return kms, nil
} }
func (kms *VaultTokensKMS) configureTenant(config map[string]interface{}, tenant string) error { func (kms *vaultTokensKMS) configureTenant(config map[string]interface{}, tenant string) error {
kms.Tenant = tenant kms.Tenant = tenant
tenantConfig, found := fetchTenantConfig(config, tenant) tenantConfig, found := fetchTenantConfig(config, tenant)
if found { if found {
@ -340,7 +340,7 @@ func (vtc *vaultTenantConnection) parseConfig(config map[string]interface{}) err
// setTokenName updates the kms.TokenName with the options from config. This // setTokenName updates the kms.TokenName with the options from config. This
// method can be called multiple times, i.e. to override configuration options // method can be called multiple times, i.e. to override configuration options
// from tenants. // from tenants.
func (kms *VaultTokensKMS) setTokenName(config map[string]interface{}) error { func (kms *vaultTokensKMS) setTokenName(config map[string]interface{}) error {
err := setConfigString(&kms.TokenName, config, "tenantTokenName") err := setConfigString(&kms.TokenName, config, "tenantTokenName")
if errors.Is(err, errConfigOptionInvalid) { if errors.Is(err, errConfigOptionInvalid) {
return err return err
@ -501,7 +501,7 @@ func (vtc *vaultTenantConnection) RemoveDEK(key string) error {
return nil return nil
} }
func (kms *VaultTokensKMS) getToken() (string, error) { func (kms *vaultTokensKMS) getToken() (string, error) {
c, err := kms.getK8sClient() c, err := kms.getK8sClient()
if err != nil { if err != nil {
return "", err return "", err