chore: update data explorer scaler to fix deprecation (#2991)

kedacore · May 3, 2022 · ea3b2e1 · ea3b2e1
1 parent 92fe72f
commit ea3b2e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -75,10 +75,6 @@ issues:
     - path: azure/azure_app_insights.go
       linters:
         - bodyclose
-  # remove once https://github.com/kedacore/keda/issues/2989 is fixed
-    - path: azure/azure_data_explorer.go
-      linters:
-        - staticcheck
 
 linters-settings:
   funlen:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -94,6 +94,7 @@ To learn more about our roadmap, we recommend reading [this document](ROADMAP.md
 - **AWS Kinesis Stream:** Adding e2e test ([#1526](https://github.com/kedacore/keda/issues/1526))
 - **AWS SQS Queue:** Adding e2e test ([#1527](https://github.com/kedacore/keda/issues/1527))
 - **Azure Data Explorer:** Adding e2e test ([#2841](https://github.com/kedacore/keda/issues/2841))
+- **Azure Data Explorer:** Replace deprecated function `iter.Next()` in favour of `iter.NextRowOrError()` ([#2989](https://github.com/kedacore/keda/issues/2989))
 - **Azure Service Bus:** Adding e2e test ([#2731](https://github.com/kedacore/keda/issues/2731)|[#2732](https://github.com/kedacore/keda/issues/2732))
 - **External Scaler:** Adding e2e test. ([#2697](https://github.com/kedacore/keda/issues/2697))
 - **External Scaler:** Fix issue with internal KEDA core prefix being passed to external scaler. ([#2640](https://github.com/kedacore/keda/issues/2640))

diff --git a/pkg/mock/mock_client/mock_interfaces.go b/pkg/mock/mock_client/mock_interfaces.go
diff --git a/pkg/mock/mock_scale/mock_interfaces.go b/pkg/mock/mock_scale/mock_interfaces.go
diff --git a/pkg/scalers/azure/azure_data_explorer.go b/pkg/scalers/azure/azure_data_explorer.go
@@ -92,7 +92,10 @@ func GetAzureDataExplorerMetricValue(ctx context.Context, client *kusto.Client,
 	}
 	defer iter.Stop()
 
-	row, err := iter.Next()
+	row, inlineError, err := iter.NextRowOrError()
+	if inlineError != nil {
+		return -1, fmt.Errorf("failed to get query %s result: %v", query, inlineError)
+	}
 	if err != nil {
 		return -1, fmt.Errorf("failed to get query %s result: %v", query, err)
 	}
@@ -102,7 +105,7 @@ func GetAzureDataExplorerMetricValue(ctx context.Context, client *kusto.Client,
 	}
 
 	// Return error if there is more than one row.
-	_, err = iter.Next()
+	_, _, err = iter.NextRowOrError()
 	if err != io.EOF {
 		return -1, fmt.Errorf("query %s result had more than a single result row", query)
 	}