From 92e2abeeb6a2404755ffc08fb908ecaf6f67e5f6 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Wed, 17 Nov 2021 14:16:30 -0300 Subject: [PATCH 1/6] improve (azure-pipelines): log url on error Co-authored-by: Jorge Turrado Ferrero Signed-off-by: Enderson Menezes --- pkg/scalers/azure_pipelines_scaler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/scalers/azure_pipelines_scaler.go b/pkg/scalers/azure_pipelines_scaler.go index c088ab9059e..f5ba1c7268c 100644 --- a/pkg/scalers/azure_pipelines_scaler.go +++ b/pkg/scalers/azure_pipelines_scaler.go @@ -139,7 +139,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) r.Body.Close() if !(r.StatusCode >= 200 && r.StatusCode <= 299) { - return -1, fmt.Errorf("azure Devops REST api returned error. status: %d response: %s", r.StatusCode, string(b)) + return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", string(url, r.StatusCode, string(b)) } var result map[string]interface{} @@ -152,7 +152,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) jobs, ok := result["value"].([]interface{}) if !ok { - return -1, fmt.Errorf("api result returned no value data") + return -1, fmt.Errorf("api (%s) result returned no value data", string(url)) } for _, value := range jobs { From 18f9898db07058cc0bd028855ed6206987eab474 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Wed, 17 Nov 2021 16:06:51 -0300 Subject: [PATCH 2/6] typo: missing ) on string() Signed-off-by: Enderson Menezes --- pkg/scalers/azure_pipelines_scaler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scalers/azure_pipelines_scaler.go b/pkg/scalers/azure_pipelines_scaler.go index f5ba1c7268c..5f41d0bb8ef 100644 --- a/pkg/scalers/azure_pipelines_scaler.go +++ b/pkg/scalers/azure_pipelines_scaler.go @@ -139,7 +139,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) r.Body.Close() if !(r.StatusCode >= 200 && r.StatusCode <= 299) { - return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", string(url, r.StatusCode, string(b)) + return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", string(url), r.StatusCode, string(b)) } var result map[string]interface{} From 6e24ea8f9e35cbd0144b3fdd7faca7c7a1d21023 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Wed, 17 Nov 2021 17:03:39 -0300 Subject: [PATCH 3/6] fixing: unnecessary conversion Signed-off-by: Enderson Menezes --- pkg/scalers/azure_pipelines_scaler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/scalers/azure_pipelines_scaler.go b/pkg/scalers/azure_pipelines_scaler.go index 5f41d0bb8ef..77bada76c44 100644 --- a/pkg/scalers/azure_pipelines_scaler.go +++ b/pkg/scalers/azure_pipelines_scaler.go @@ -139,7 +139,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) r.Body.Close() if !(r.StatusCode >= 200 && r.StatusCode <= 299) { - return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", string(url), r.StatusCode, string(b)) + return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", url, r.StatusCode, string(b)) } var result map[string]interface{} @@ -152,7 +152,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) jobs, ok := result["value"].([]interface{}) if !ok { - return -1, fmt.Errorf("api (%s) result returned no value data", string(url)) + return -1, fmt.Errorf("api (%s) result returned no value data", url) } for _, value := range jobs { From ef5bfc6993e8aba1996c8a2f557a2ae4071e5dc2 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Wed, 17 Nov 2021 17:33:23 -0300 Subject: [PATCH 4/6] fixing: ST1005 Go Convention Signed-off-by: Enderson Menezes --- pkg/scalers/azure_pipelines_scaler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scalers/azure_pipelines_scaler.go b/pkg/scalers/azure_pipelines_scaler.go index 77bada76c44..2bba7ebf563 100644 --- a/pkg/scalers/azure_pipelines_scaler.go +++ b/pkg/scalers/azure_pipelines_scaler.go @@ -139,7 +139,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) r.Body.Close() if !(r.StatusCode >= 200 && r.StatusCode <= 299) { - return -1, fmt.Errorf("Azure DevOps REST api returned error. url: %s status: %d response: %s", url, r.StatusCode, string(b)) + return -1, fmt.Errorf("api REST of Azure DevOps returned error. url: %s status: %d response: %s", url, r.StatusCode, string(b)) } var result map[string]interface{} From dc7dfe8231270f603899f346e2213740aae7ac84 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Thu, 18 Nov 2021 11:07:05 -0300 Subject: [PATCH 5/6] docs: update CHANGELOG.md Signed-off-by: Enderson Menezes --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050667a147a..0ac4bd2f096 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - Cleanup metric names inside scalers ([#2260](https://github.com/kedacore/keda/pull/2260)) - Validating values length in prometheus query response ([#2264](https://github.com/kedacore/keda/pull/2264)) - Add `unsafeSsl` parameter in SeleniumGrid scaler ([#2157](https://github.com/kedacore/keda/pull/2157)) +- Improve logs of Azure Pipelines Scaler. ([#2297](https://github.com/kedacore/keda/pull/2297)) ### Breaking Changes From 6fd43fec6402973d450b469e4c9bdfcd1bd28e82 Mon Sep 17 00:00:00 2001 From: Enderson Menezes Date: Fri, 19 Nov 2021 13:55:33 -0300 Subject: [PATCH 6/6] typo: adjust the first word on both logs and standardize the messages Signed-off-by: Enderson Menezes --- pkg/scalers/azure_pipelines_scaler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/scalers/azure_pipelines_scaler.go b/pkg/scalers/azure_pipelines_scaler.go index 2bba7ebf563..1ff89cae864 100644 --- a/pkg/scalers/azure_pipelines_scaler.go +++ b/pkg/scalers/azure_pipelines_scaler.go @@ -139,7 +139,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) r.Body.Close() if !(r.StatusCode >= 200 && r.StatusCode <= 299) { - return -1, fmt.Errorf("api REST of Azure DevOps returned error. url: %s status: %d response: %s", url, r.StatusCode, string(b)) + return -1, fmt.Errorf("the Azure DevOps REST API returned error. url: %s status: %d response: %s", url, r.StatusCode, string(b)) } var result map[string]interface{} @@ -152,7 +152,7 @@ func (s *azurePipelinesScaler) GetAzurePipelinesQueueLength(ctx context.Context) jobs, ok := result["value"].([]interface{}) if !ok { - return -1, fmt.Errorf("api (%s) result returned no value data", url) + return -1, fmt.Errorf("the Azure DevOps REST API result returned no value data. url: %s status: %d", url, r.StatusCode) } for _, value := range jobs {