From 8091a30b5972614796e7d22bf533bd3a61272ee2 Mon Sep 17 00:00:00 2001
From: radekfojtik <68660951+radekfojtik@users.noreply.github.com>
Date: Tue, 31 Oct 2023 15:24:04 +0100
Subject: [PATCH] TriggerAuth-podIdentity.identityId - validation removed
 (operator)

Signed-off-by: radekfojtik <68660951+radekfojtik@users.noreply.github.com>
---
 .../v1alpha1/triggerauthentication_webhook.go | 24 ++++++++++++++-----
 pkg/scaling/resolver/scale_resolvers.go       |  3 ---
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/apis/keda/v1alpha1/triggerauthentication_webhook.go b/apis/keda/v1alpha1/triggerauthentication_webhook.go
index 72b14e1b388..76b774dcd33 100644
--- a/apis/keda/v1alpha1/triggerauthentication_webhook.go
+++ b/apis/keda/v1alpha1/triggerauthentication_webhook.go
@@ -107,15 +107,27 @@ 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)
+	if err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
+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 \"\"")
 			}
 		default:
-			return nil, nil
+			return nil
 		}
 	}
-	return nil, nil
+	return nil
 }
+
+func isEmptyString(str *string) bool {
+	return str != nil && *str == ""
+}
\ No newline at end of file
diff --git a/pkg/scaling/resolver/scale_resolvers.go b/pkg/scaling/resolver/scale_resolvers.go
index 99eb4e9fb1f..6b0444f83d4 100644
--- a/pkg/scaling/resolver/scale_resolvers.go
+++ b/pkg/scaling/resolver/scale_resolvers.go
@@ -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