Add missing changes

Signed-off-by: Jorge Turrado <[email protected]>

pkg/scalers/azure/azure_azidentity_chain.go

@@ -10,7 +10,7 @@ import (
 	"github.com/kedacore/keda/v2/apis/keda/v1alpha1"
 )
 
-func NewChainedCredential(logger logr.Logger, identityID, identityTenantID string, podIdentity v1alpha1.PodIdentityProvider) (*azidentity.ChainedTokenCredential, error) {
+func NewChainedCredential(logger logr.Logger, podIdentity v1alpha1.AuthPodIdentity) (*azidentity.ChainedTokenCredential, error) {
 	var creds []azcore.TokenCredential
 
 	// Used for local debug based on az-cli user
@@ -31,18 +31,18 @@ func NewChainedCredential(logger logr.Logger, identityID, identityTenantID strin
 	// with 2 different permissions. They could set workload-identity with the identity A, but KEDA would use
 	// aad-pod-identity with the identity B. If both identities are differents or have different permissions, this blocks
 	// workload identity
-	switch podIdentity {
+	switch podIdentity.Provider {
 	case v1alpha1.PodIdentityProviderAzure:
 		// Used for aad-pod-identity
-		msiCred, err := ManagedIdentityWrapperCredential(identityID)
+		msiCred, err := ManagedIdentityWrapperCredential(podIdentity.GetIdentityID())
 		if err != nil {
 			logger.Error(err, "error starting aad-pod-identity token provider")
 		} else {
 			logger.V(1).Info("aad-pod-identity token provider registered")
 			creds = append(creds, msiCred)
 		}
 	case v1alpha1.PodIdentityProviderAzureWorkload:
-		wiCred, err := NewADWorkloadIdentityCredential(identityID, identityTenantID)
+		wiCred, err := NewADWorkloadIdentityCredential(podIdentity.GetIdentityID(), podIdentity.GetIdentityTenantID())
 		if err != nil {
 			logger.Error(err, "error starting azure workload-identity token provider")
 		} else {

pkg/scalers/azure/azure_data_explorer.go

@@ -91,7 +91,7 @@ func getDataExplorerAuthConfig(metadata *DataExplorerMetadata) (*kusto.Connectio
 
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
 		azureDataExplorerLogger.V(1).Info(fmt.Sprintf("Creating Azure Data Explorer Client using podIdentity %s", metadata.PodIdentity.Provider))
-		creds, chainedErr := NewChainedCredential(azureDataExplorerLogger, metadata.PodIdentity.GetIdentityID(), metadata.PodIdentity.GetIdentityTenantID(), metadata.PodIdentity.Provider)
+		creds, chainedErr := NewChainedCredential(azureDataExplorerLogger, metadata.PodIdentity)
 		if chainedErr != nil {
 			return nil, chainedErr
 		}

pkg/scalers/azure/azure_eventhub.go

@@ -39,7 +39,7 @@ func GetEventHubClient(info EventHubInfo, logger logr.Logger) (*azeventhubs.Prod
 		}
 		return hub, nil
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, chainedErr := NewChainedCredential(logger, info.PodIdentity.GetIdentityID(), info.PodIdentity.Provider)
+		creds, chainedErr := NewChainedCredential(logger, info.PodIdentity)
 		if chainedErr != nil {
 			return nil, chainedErr
 		}

pkg/scalers/azure/azure_managed_prometheus_http_round_tripper.go

@@ -40,7 +40,7 @@ func TryAndGetAzureManagedPrometheusHTTPRoundTripper(logger logr.Logger, podIden
 			return nil, fmt.Errorf("trigger metadata cannot be nil")
 		}
 
-		chainedCred, err := NewChainedCredential(logger, podIdentity.GetIdentityID(), podIdentity.GetIdentityTenantID(), podIdentity.Provider)
+		chainedCred, err := NewChainedCredential(logger, podIdentity)
 		if err != nil {
 			return nil, err
 		}

pkg/scalers/azure/azure_storage.go

@@ -98,7 +98,7 @@ func GetStorageBlobClient(logger logr.Logger, podIdentity kedav1alpha1.AuthPodId
 		}
 		return blobClient, nil
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, chainedErr := NewChainedCredential(logger, podIdentity.GetIdentityID(), podIdentity.Provider)
+		creds, chainedErr := NewChainedCredential(logger, podIdentity)
 		if chainedErr != nil {
 			return nil, chainedErr
 		}
@@ -125,7 +125,7 @@ func GetStorageQueueClient(logger logr.Logger, podIdentity kedav1alpha1.AuthPodI
 		}
 		return queueClient, nil
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, chainedErr := NewChainedCredential(logger, podIdentity.GetIdentityID(), podIdentity.Provider)
+		creds, chainedErr := NewChainedCredential(logger, podIdentity)
 		if chainedErr != nil {
 			return nil, chainedErr
 		}

pkg/scalers/azure_log_analytics_scaler.go

@@ -96,7 +96,7 @@ func CreateAzureLogsClient(config *scalersconfig.ScalerConfig, meta *azureLogAna
 	case "", kedav1alpha1.PodIdentityProviderNone:
 		creds, err = azidentity.NewClientSecretCredential(meta.tenantID, meta.clientID, meta.clientSecret, nil)
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, err = azure.NewChainedCredential(logger, config.PodIdentity.GetIdentityID(), config.PodIdentity.Provider)
+		creds, err = azure.NewChainedCredential(logger, config.PodIdentity)
 	default:
 		return nil, fmt.Errorf("azure monitor does not support pod identity provider - %s", config.PodIdentity.Provider)
 	}

pkg/scalers/azure_monitor_scaler.go

@@ -121,7 +121,7 @@ func CreateAzureMetricsClient(config *scalersconfig.ScalerConfig, meta *azureMon
 	case "", kedav1alpha1.PodIdentityProviderNone:
 		creds, err = azidentity.NewClientSecretCredential(meta.azureMonitorInfo.TenantID, meta.azureMonitorInfo.ClientID, meta.azureMonitorInfo.ClientPassword, nil)
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, err = azure.NewChainedCredential(logger, config.PodIdentity.GetIdentityID(), config.PodIdentity.Provider)
+		creds, err = azure.NewChainedCredential(logger, config.PodIdentity)
 	default:
 		return nil, fmt.Errorf("azure monitor does not support pod identity provider - %s", config.PodIdentity.Provider)
 	}

pkg/scalers/azure_pipelines_scaler.go

@@ -194,7 +194,7 @@ func getAuthMethod(logger logr.Logger, config *scalersconfig.ScalerConfig) (stri
 		case "", kedav1alpha1.PodIdentityProviderNone:
 			return "", nil, kedav1alpha1.AuthPodIdentity{}, fmt.Errorf("no personalAccessToken given or PodIdentity provider configured")
 		case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-			cred, err := azure.NewChainedCredential(logger, config.PodIdentity.GetIdentityID(), config.PodIdentity.GetIdentityTenantID(), config.PodIdentity.Provider)
+			cred, err := azure.NewChainedCredential(logger, config.PodIdentity)
 			if err != nil {
 				return "", nil, kedav1alpha1.AuthPodIdentity{}, err
 			}

pkg/scalers/azure_servicebus_scaler.go

@@ -308,7 +308,7 @@ func (s *azureServiceBusScaler) getServiceBusAdminClient() (*admin.Client, error
 	case "", kedav1alpha1.PodIdentityProviderNone:
 		client, err = admin.NewClientFromConnectionString(s.metadata.connection, opts)
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		creds, chainedErr := azure.NewChainedCredential(s.logger, s.podIdentity.GetIdentityID(), s.podIdentity.GetIdentityTenantID(), s.podIdentity.Provider)
+		creds, chainedErr := azure.NewChainedCredential(s.logger, s.podIdentity)
 		if chainedErr != nil {
 			return nil, chainedErr
 		}

pkg/scaling/resolver/azure_keyvault_handler.go

@@ -92,7 +92,7 @@ func (vh *AzureKeyVaultHandler) getCredentials(ctx context.Context, client clien
 
 		return azidentity.NewClientSecretCredential(tenantID, clientID, clientSecret, nil)
 	case kedav1alpha1.PodIdentityProviderAzure, kedav1alpha1.PodIdentityProviderAzureWorkload:
-		return azure.NewChainedCredential(logger, podIdentity.GetIdentityID(), podIdentity.Provider)
+		return azure.NewChainedCredential(logger, *podIdentity)
 	default:
 		return nil, fmt.Errorf("key vault does not support pod identity provider - %s", podIdentity.Provider)
 	}