From 071ce44254f8c1d55a9bb3993c20f61a3082f5bb Mon Sep 17 00:00:00 2001
From: Dominik Henneke <dominik.henneke@sda-se.com>
Date: Mon, 1 Mar 2021 15:09:31 +0100
Subject: [PATCH] Fix review comments

Signed-off-by: Dominik Henneke <dominik.henneke@sda-se.com>
---
 plugins/sonarqube/package.json                |  1 -
 .../sonarqube/src/api/SonarQubeClient.test.ts |  4 ++--
 plugins/sonarqube/src/api/SonarQubeClient.ts  | 21 ++++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json
index 440ede4d54..ba6c173a59 100644
--- a/plugins/sonarqube/package.json
+++ b/plugins/sonarqube/package.json
@@ -41,7 +41,6 @@
     "@material-ui/lab": "4.0.0-alpha.45",
     "@material-ui/styles": "^4.10.0",
     "cross-fetch": "^3.0.6",
-    "qs": "^6.9.4",
     "rc-progress": "^3.0.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.test.ts b/plugins/sonarqube/src/api/SonarQubeClient.test.ts
index eb3dc8a8b9..3d488aa9a5 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.test.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.test.ts
@@ -53,7 +53,7 @@ describe('SonarQubeClient', () => {
           return res(
             ctx.json({
               metrics: metricKeys.slice(0, 5).map(k => ({ key: k })),
-              total: 2,
+              total: metricKeys.length,
             }),
           );
         }
@@ -63,7 +63,7 @@ describe('SonarQubeClient', () => {
         return res(
           ctx.json({
             metrics: metricKeys.slice(5).map(k => ({ key: k })),
-            total: 2,
+            total: metricKeys.length,
           }),
         );
       }),
diff --git a/plugins/sonarqube/src/api/SonarQubeClient.ts b/plugins/sonarqube/src/api/SonarQubeClient.ts
index 20292d94e3..4f149d8d1f 100644
--- a/plugins/sonarqube/src/api/SonarQubeClient.ts
+++ b/plugins/sonarqube/src/api/SonarQubeClient.ts
@@ -16,7 +16,6 @@
 
 import { DiscoveryApi } from '@backstage/core';
 import fetch from 'cross-fetch';
-import qs from 'qs';
 import { FindingSummary, Metrics, SonarQubeApi } from './SonarQubeApi';
 import { ComponentWrapper, MeasuresWrapper } from './types';
 
@@ -37,11 +36,12 @@ export class SonarQubeClient implements SonarQubeApi {
 
   private async callApi<T>(
     path: string,
-    query?: { [key in string]: any },
+    query: { [key in string]: any },
   ): Promise<T | undefined> {
-    const queryString = query ? `?${qs.stringify(query)}` : '';
     const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/sonarqube`;
-    const response = await fetch(`${apiUrl}/${path}${queryString}`);
+    const response = await fetch(
+      `${apiUrl}/${path}?${new URLSearchParams(query).toString()}`,
+    );
     if (response.status === 200) {
       return (await response.json()) as T;
     }
@@ -50,10 +50,9 @@ export class SonarQubeClient implements SonarQubeApi {
 
   private async getSupportedMetrics(): Promise<string[]> {
     const metrics: string[] = [];
-    let pageSize: number | undefined;
     let nextPage: number = 1;
 
-    do {
+    for (;;) {
       const result = await this.callApi<{
         metrics: Array<{ key: string }>;
         total: number;
@@ -61,11 +60,13 @@ export class SonarQubeClient implements SonarQubeApi {
 
       metrics.push(...(result?.metrics?.map(m => m.key) ?? []));
 
-      pageSize = result?.total;
-      nextPage++;
-    } while (pageSize && nextPage <= pageSize);
+      if (result && metrics.length < result.total) {
+        nextPage++;
+        continue;
+      }
 
-    return metrics;
+      return metrics;
+    }
   }
 
   async getFindingSummary(