From 96a7f36e08db8317d04801498035a58e9cb86d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Maciejewski?= <rafaljestsuper@gmail.com>
Date: Sun, 25 Jul 2021 03:30:47 +0200
Subject: [PATCH] [Sonar] Fix invalid fetch query to sonarqube >=6.6 (#6636)

* fix(sonar): fix invalid fetch query to sonarqube >=6.6

* fix(sonar): reverse comparison to preserve default behavior

Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
---
 services/sonar/sonar-base.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/sonar/sonar-base.js b/services/sonar/sonar-base.js
index 4e13f25e24..72139f14f9 100644
--- a/services/sonar/sonar-base.js
+++ b/services/sonar/sonar-base.js
@@ -68,8 +68,11 @@ export default class SonarBase extends BaseJsonService {
     } else {
       schema = modernSchema
       url = `${server}/api/measures/component`
+      // componentKey query param was renamed in version 6.6
+      const componentKey =
+        parseFloat(sonarVersion) >= 6.6 ? 'component' : 'componentKey'
       qs = {
-        componentKey: component,
+        [componentKey]: component,
         metricKeys: metricName,
       }
     }
-- 
GitLab