From 41d11ca579c8281c02896fded41633b58c9c78c1 Mon Sep 17 00:00:00 2001 From: Neemys <36508659+Neemys@users.noreply.github.com> Date: Thu, 28 Jul 2022 17:45:36 +0200 Subject: [PATCH] Change `SonarqubeInfoProvider.getBaseUrl`'s signature To make future changes to the API easier Signed-off-by: Neemys <36508659+Neemys@users.noreply.github.com> --- plugins/sonarqube-backend/src/service/router.ts | 4 +++- .../sonarqube-backend/src/service/sonarqubeInfoProvider.ts | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/sonarqube-backend/src/service/router.ts b/plugins/sonarqube-backend/src/service/router.ts index c1f672a2c4..2d15f3d0aa 100644 --- a/plugins/sonarqube-backend/src/service/router.ts +++ b/plugins/sonarqube-backend/src/service/router.ts @@ -92,7 +92,9 @@ export async function createRouter( ); } response.send({ - instanceUrl: sonarqubeInfoProvider.getBaseUrl(requestedInstanceKey), + instanceUrl: sonarqubeInfoProvider.getBaseUrl({ + instanceName: requestedInstanceKey, + }).baseUrl, }); }) as RequestHandler); diff --git a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts index 0939abaed0..17cd08472b 100644 --- a/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts +++ b/plugins/sonarqube-backend/src/service/sonarqubeInfoProvider.ts @@ -30,7 +30,7 @@ export interface SonarqubeInfoProvider { * @param instanceName - Name of the sonarqube instance to get the info from * @returns the url of the instance */ - getBaseUrl(instanceName: string): string; + getBaseUrl({ instanceName }: { instanceName: string }): { baseUrl: string }; /** * Query the sonarqube instance corresponding to the instanceName to get all @@ -295,9 +295,9 @@ export class DefaultSonarqubeInfoProvider implements SonarqubeInfoProvider { * {@inheritDoc SonarqubeInfoProvider.getBaseUrl} * @throws Error If configuration can't be retrieved. */ - getBaseUrl(instanceName: string): string { + getBaseUrl({ instanceName }: { instanceName: string }): { baseUrl: string } { const instanceConfig = this.config.getInstanceConfig(instanceName ?? ''); - return instanceConfig.baseUrl; + return { baseUrl: instanceConfig.baseUrl }; } /**