fixes

Signed-off-by: Rick Brouwer <[email protected]>

CHANGELOG.md

@@ -72,6 +72,7 @@ Here is an overview of all new **experimental** features:
 - **GCP Scalers**: Added custom time horizon in GCP scalers ([#5778](https://github.com/kedacore/keda/issues/5778))
 - **GitHub Scaler**: Fixed pagination, fetching repository list ([#5738](https://github.com/kedacore/keda/issues/5738))
 - **Kafka**: Fix logic to scale to zero on invalid offset even with earliest offsetResetPolicy ([#5689](https://github.com/kedacore/keda/issues/5689))
+- **MSSQL Scaler**: Add Add azure-workload auth ([#6104](https://github.com/kedacore/keda/issues/6104))
 - **RabbitMQ Scaler**: Add connection name for AMQP ([#5958](https://github.com/kedacore/keda/issues/5958))
 - TODO ([#XXX](https://github.com/kedacore/keda/issues/XXX))
 

pkg/scalers/mssql_scaler.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net"
 	"net/url"
-	"strconv"
 
 	// mssql driver required for this scaler
 	_ "github.com/denisenkom/go-mssqldb"
@@ -42,13 +41,13 @@ type mssqlMetadata struct {
 	WorkloadIdentityTenantID      string  `keda:"name=WorkloadIdentityTenantID,order=authParams;triggerMetadata,optional"`
 	WorkloadIdentityAuthorityHost string  `keda:"name=WorkloadIdentityAuthorityHost,order=authParams;triggerMetadata,optional"`
 	WorkloadIdentityResource      string  `keda:"name=WorkloadIdentityResource,order=authParams;triggerMetadata,optional"`
- 
-	TriggerIndex                  int
+
+	TriggerIndex int
 }
 
 func (m *mssqlMetadata) Validate() error {
-	if m.TargetValue == 0 {
-		return errors.New("no targetValue given")
+	if (m.ConnectionstringCloudID == "" && m.Host "")  {
+		return fmt.Errorf("must provide either connectionstring or host")
 	}
 	return nil
 }

pkg/scalers/mssql_scaler_test.go

@@ -5,29 +5,113 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+
 	"github.com/kedacore/keda/v2/apis/keda/v1alpha1"
 	"github.com/kedacore/keda/v2/pkg/scalers/scalersconfig"
 )
 
 type parseMSSQLMetadataTestData struct {
-	name         string
-	metadata     map[string]string
-	resolvedEnv  map[string]string
-	authParams   map[string]string
-	podIdentity  v1alpha1.AuthPodIdentity
-	expectedError string
+	name                     string
+	metadata                 map[string]string
+	resolvedEnv              map[string]string
+	authParams               map[string]string
+	podIdentity              v1alpha1.AuthPodIdentity
+	expectedError            string
+	expectedConnectionString string
+	expectedMetricName       string
 }
 
 var testMSSQLMetadata = []parseMSSQLMetadataTestData{
 	{
-		name:     "Valid metadata",
-		metadata: map[string]string{"query": "SELECT 1", "targetValue": "1", "host": "localhost"},
-		resolvedEnv: map[string]string{},
-		authParams: map[string]string{},
-		expectedError: "",
+		name:                     "Direct connection string input",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"connectionString": "sqlserver://localhost"},
+		expectedConnectionString: "sqlserver://localhost",
+	},
+	{
+		name:                     "Direct connection string input with activationTargetValue",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "activationTargetValue": "20"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"connectionString": "sqlserver://localhost"},
+		expectedConnectionString: "sqlserver://localhost",
+	},
+	{
+		name:                     "Direct connection string input, OLEDB format",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"connectionString": "Server=example.database.windows.net;port=1433;Database=AdventureWorks;Persist Security Info=False;User ID=user1;Password=Password#1;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"},
+		expectedConnectionString: "Server=example.database.windows.net;port=1433;Database=AdventureWorks;Persist Security Info=False;User ID=user1;Password=Password#1;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;",
+	},
+	{
+		name:                     "Connection string input via environment variables",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "connectionStringFromEnv": "test_connection_string"},
+		resolvedEnv:              map[string]string{"test_connection_string": "sqlserver://localhost?database=AdventureWorks"},
+		authParams:               map[string]string{},
+		expectedConnectionString: "sqlserver://localhost?database=AdventureWorks",
+	},
+	{
+		name:                     "Connection string generated from minimal required metadata",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "host": "127.0.0.1"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{},
+		expectedMetricName:       "mssql",
+		expectedConnectionString: "sqlserver://127.0.0.1",
+	},
+	{
+		name:                     "Connection string generated from full metadata",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "host": "example.database.windows.net", "username": "user1", "passwordFromEnv": "test_password", "port": "1433", "database": "AdventureWorks"},
+		resolvedEnv:              map[string]string{"test_password": "Password#1"},
+		authParams:               map[string]string{},
+		expectedConnectionString: "sqlserver://user1:Password%[email protected]:1433?database=AdventureWorks",
+	},
+	{
+		name:                     "Variation of previous: no port, password from authParams, metricName from database name",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "host": "example.database.windows.net", "username": "user2", "database": "AdventureWorks"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"password": "Password#2"},
+		expectedMetricName:       "mssql",
+		expectedConnectionString: "sqlserver://user2:Password%[email protected]?database=AdventureWorks",
+	},
+	{
+		name:                     "Connection string generated from full authParams",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"password": "Password#2", "host": "example.database.windows.net", "username": "user2", "database": "AdventureWorks", "port": "1433"},
+		expectedMetricName:       "mssql",
+		expectedConnectionString: "sqlserver://user2:Password%[email protected]:1433?database=AdventureWorks",
+	},
+	{
+		name:                     "Variation of previous: no database name, metricName from host",
+		metadata:                 map[string]string{"query": "SELECT 1", "targetValue": "1", "host": "example.database.windows.net", "username": "user3"},
+		resolvedEnv:              map[string]string{},
+		authParams:               map[string]string{"password": "Password#3"},
+		expectedMetricName:       "mssql",
+		expectedConnectionString: "sqlserver://user3:Password%[email protected]",
 	},
 	{
-		name:     "Valid metadata with Azure Workload Identity",
+		name:          "Error: missing query",
+		metadata:      map[string]string{"targetValue": "1"},
+		resolvedEnv:   map[string]string{},
+		authParams:    map[string]string{"connectionString": "sqlserver://localhost"},
+		expectedError: "missing required parameter \"query\" in [triggerMetadata]",
+	},
+	{
+		name:          "Error: missing targetValue",
+		metadata:      map[string]string{"query": "SELECT 1"},
+		resolvedEnv:   map[string]string{},
+		authParams:    map[string]string{"connectionString": "sqlserver://localhost"},
+		expectedError: "missing required parameter \"targetValue\"in [triggerMetadata]",
+	},
+	{
+		name:          "Error: missing host",
+		metadata:      map[string]string{"query": "SELECT 1", "targetValue": "1"},
+		resolvedEnv:   map[string]string{},
+		authParams:    map[string]string{},
+		expectedError: "must provide either connectionstring or host",
+	},
+	{
+		name: "Valid metadata with Azure Workload Identity",
 		metadata: map[string]string{
 			"query":       "SELECT COUNT(*) FROM table",
 			"targetValue": "5",
@@ -44,34 +128,6 @@ var testMSSQLMetadata = []parseMSSQLMetadataTestData{
 		},
 		expectedError: "",
 	},
-	{
-		name:     "Missing query",
-		metadata: map[string]string{"targetValue": "1", "host": "localhost"},
-		resolvedEnv: map[string]string{},
-		authParams: map[string]string{},
-		expectedError: "missing required parameter \"query\"",
-	},
-	{
-		name:     "Missing targetValue",
-		metadata: map[string]string{"query": "SELECT 1", "host": "localhost"},
-		resolvedEnv: map[string]string{},
-		authParams: map[string]string{},
-		expectedError: "missing required parameter \"targetValue\"",
-	},
-	{
-		name:     "Invalid targetValue",
-		metadata: map[string]string{"query": "SELECT 1", "targetValue": "invalid", "host": "localhost"},
-		resolvedEnv: map[string]string{},
-		authParams: map[string]string{},
-		expectedError: "error parsing targetValue",
-	},
-	{
-		name:     "Missing host",
-		metadata: map[string]string{"query": "SELECT 1", "targetValue": "1"},
-		resolvedEnv: map[string]string{},
-		authParams: map[string]string{},
-		expectedError: "missing required parameter \"host\"",
-	},
 }
 
 func TestParseMSSQLMetadata(t *testing.T) {
@@ -123,7 +179,7 @@ func TestMSSQLGetMetricSpecForScaling(t *testing.T) {
 			assert.NoError(t, err)
 
 			mockMSSQLScaler := mssqlScaler{
-				metadata: *meta,
+				metadata: meta,
 			}
 
 			metricSpec := mockMSSQLScaler.GetMetricSpecForScaling(context.Background())