Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(az key vault): Raise an error instead of panic if authentication not provided #4017

Merged
merged 1 commit into from
Dec 15, 2022
Merged

fix(az key vault): Raise an error instead of panic if authentication not provided #4017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Here is an overview of all new **experimental** features:
### Fixes

- **General**: Properly retrieve and close scalers cache ([#4011](https://github.com/kedacore/keda/issues/4011))
- **Azure Key Vault:** Raise an error if authentication mechanism not provided ([#4010](https://github.com/kedacore/keda/issues/4010))

### Deprecations

Expand Down
7 changes: 6 additions & 1 deletion pkg/scaling/resolver/azure_keyvault_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,11 @@ func (vh *AzureKeyVaultHandler) getAuthConfig(ctx context.Context, client client
}
switch podIdentity.Provider {
case "", kedav1alpha1.PodIdentityProviderNone:
missingErr := fmt.Errorf("clientID, tenantID and clientSecret are expected when not using a pod identity provider")
if vh.vault.Credentials == nil {
return nil, missingErr
}

clientID := vh.vault.Credentials.ClientID
tenantID := vh.vault.Credentials.TenantID

Expand All @@ -117,7 +122,7 @@ func (vh *AzureKeyVaultHandler) getAuthConfig(ctx context.Context, client client
clientSecret := resolveAuthSecret(ctx, client, logger, clientSecretName, triggerNamespace, clientSecretKey, secretsLister)

if clientID == "" || tenantID == "" || clientSecret == "" {
return nil, fmt.Errorf("clientID, tenantID and clientSecret are expected when not using a pod identity provider")
return nil, missingErr
}

config := auth.NewClientCredentialsConfig(clientID, clientSecret, tenantID)
Expand Down