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

Jump to bottom

TriggerAuth-podIdentity.identityId - validation removed (operator) #5142

Closed
wants to merge 5 commits into from
Closed

TriggerAuth-podIdentity.identityId - validation removed (operator) #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8091a30
TriggerAuth-podIdentity.identityId - validation removed (operator)
radekfojtik Oct 31, 2023
4befa5f
TriggerAuthWebhook-superfluous nil err check before return (fix)
radekfojtik Oct 31, 2023
357fd70
TriggerAuthWebhook-ci static check (fix)
radekfojtik Oct 31, 2023
ecbd6a7
Changelog added
radekfojtik Nov 1, 2023
d7b49c5
Merge branch 'main' into feature/rfo-main-triggerauth-validation
radekfojtik Nov 1, 2023
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 @@ -72,6 +72,7 @@ Here is an overview of all new **experimental** features:

- **General**: Fix CVE-2023-39325 in golang.org/x/net ([#5122](https://github.com/kedacore/keda/issues/5122))
- **General**: Prevented stuck status due to timeouts during scalers generation ([#5083](https://github.com/kedacore/keda/issues/5083))
- **General**: TriggerAuthentication - validation `identityId` removed from the operator ([#5109](https://github.com/kedacore/keda/issues/5109))
- **Azure Pipelines**: No more HTTP 400 errors produced by poolName with spaces ([#5107](https://github.com/kedacore/keda/issues/5107))
- **ScaledJobs**: Copy ScaledJob annotations to child Jobs ([#4594](https://github.com/kedacore/keda/issues/4594))

Expand Down
21 changes: 15 additions & 6 deletions apis/keda/v1alpha1/triggerauthentication_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,24 @@ func isTriggerAuthenticationRemovingFinalizer(om metav1.ObjectMeta, oldOm metav1
}

func validateSpec(spec *TriggerAuthenticationSpec) (admission.Warnings, error) {
if spec.PodIdentity != nil {
switch spec.PodIdentity.Provider {
err := validatePodIdentityID(spec.PodIdentity)
return nil, err
}

func validatePodIdentityID(podIdentity *AuthPodIdentity) error {
if podIdentity != nil {
switch podIdentity.Provider {
case PodIdentityProviderAzure, PodIdentityProviderAzureWorkload:
if spec.PodIdentity.IdentityID != nil && *spec.PodIdentity.IdentityID == "" {
return nil, fmt.Errorf("identityid of PodIdentity should not be empty. If it's set, identityId has to be different than \"\"")
if isEmptyString(podIdentity.IdentityID) {
return fmt.Errorf("identityid of PodIdentity should not be empty. If it's set, identityId has to be different than \"\"")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return fmt.Errorf("identityid of PodIdentity should not be empty. If it's set, identityId has to be different than \"\"")
return fmt.Errorf("identityId of PodIdentity should not be empty. If it's set, identityId has to be different than \"\"")

}
default:
return nil, nil
return nil
}
}
return nil, nil
return nil
}

func isEmptyString(str *string) bool {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Util functions like this one have a high potential for code duplicity. Can you add a new file to pkg/util and move the function there? Ideally with generics, something like

func IsDefaultValue[T comparable](value *T) bool {
	var def T
	return value != nil && *value == def
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this is a good feedback ❤️

return str != nil && *str == ""
}
3 changes: 0 additions & 3 deletions pkg/scaling/resolver/scale_resolvers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,6 @@ func ResolveAuthRefAndPodIdentity(ctx context.Context, client client.Client, log
// FIXME: Delete this for v2.15
logger.Info("WARNING: Azure AD Pod Identity has been archived (https://github.com/Azure/aad-pod-identity#-announcement) and will be removed from KEDA on v2.15")
}
if podIdentity.IdentityID != nil && *podIdentity.IdentityID == "" {
return nil, kedav1alpha1.AuthPodIdentity{Provider: kedav1alpha1.PodIdentityProviderNone}, fmt.Errorf("IdentityID of PodIdentity should not be empty")
}
default:
}
return authParams, podIdentity, nil
Expand Down