Merge pull request #1424 from spieglt/vault-namespaces

Add namespace field to VaultCAS JSON config
This commit is contained in:
Mariano Cano 2023-06-07 14:22:32 -07:00 committed by GitHub
commit ccb248394b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -37,6 +37,7 @@ type VaultOptions struct {
PKIRoleEd25519 string `json:"pkiRoleEd25519,omitempty"` PKIRoleEd25519 string `json:"pkiRoleEd25519,omitempty"`
AuthType string `json:"authType,omitempty"` AuthType string `json:"authType,omitempty"`
AuthMountPath string `json:"authMountPath,omitempty"` AuthMountPath string `json:"authMountPath,omitempty"`
Namespace string `json:"namespace,omitempty"`
AuthOptions json.RawMessage `json:"authOptions,omitempty"` AuthOptions json.RawMessage `json:"authOptions,omitempty"`
} }
@ -90,6 +91,10 @@ func New(ctx context.Context, opts apiv1.Options) (*VaultCAS, error) {
return nil, fmt.Errorf("unable to configure %s auth method: %w", vc.AuthType, err) return nil, fmt.Errorf("unable to configure %s auth method: %w", vc.AuthType, err)
} }
if vc.Namespace != "" {
client.SetNamespace(vc.Namespace)
}
authInfo, err := client.Auth().Login(ctx, method) authInfo, err := client.Auth().Login(ctx, method)
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to login to %s auth method: %w", vc.AuthType, err) return nil, fmt.Errorf("unable to login to %s auth method: %w", vc.AuthType, err)