From be837b7b361965aee91becb5e56ed2bda5127291 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 21 Aug 2020 14:28:23 +0200
Subject: [PATCH] plugins/scaffolder: switch ScaffolderApi to use DiscoveryApi

---
 packages/app/src/apis.ts      |  8 +-------
 plugins/scaffolder/src/api.ts | 24 ++++++++----------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index c787ffc589..72dad858c7 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -180,13 +180,7 @@ export const apis = (config: ConfigApi) => {
 
   builder.add(catalogApiRef, new CatalogClient({ discoveryApi }));
 
-  builder.add(
-    scaffolderApiRef,
-    new ScaffolderApi({
-      apiOrigin: backendUrl,
-      basePath: '/scaffolder/v1',
-    }),
-  );
+  builder.add(scaffolderApiRef, new ScaffolderApi({ discoveryApi }));
 
   builder.add(gitOpsApiRef, new GitOpsRestApi('http://localhost:3008'));
 
diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 4a0d508a2b..3c42ed2ca4 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { createApiRef } from '@backstage/core';
+import { createApiRef, DiscoveryApi } from '@backstage/core';
 import { TemplateEntityV1alpha1 } from '@backstage/catalog-model';
 
 export const scaffolderApiRef = createApiRef<ScaffolderApi>({
@@ -23,18 +23,10 @@ export const scaffolderApiRef = createApiRef<ScaffolderApi>({
 });
 
 export class ScaffolderApi {
-  private apiOrigin: string;
-  private basePath: string;
+  private readonly discoveryApi: DiscoveryApi;
 
-  constructor({
-    apiOrigin,
-    basePath,
-  }: {
-    apiOrigin: string;
-    basePath: string;
-  }) {
-    this.apiOrigin = apiOrigin;
-    this.basePath = basePath;
+  constructor(options: { discoveryApi: DiscoveryApi }) {
+    this.discoveryApi = options.discoveryApi;
   }
 
   /**
@@ -46,7 +38,7 @@ export class ScaffolderApi {
     template: TemplateEntityV1alpha1,
     values: Record<string, any>,
   ) {
-    const url = `${this.apiOrigin}${this.basePath}/jobs`;
+    const url = `${await this.discoveryApi.getBaseUrl('scaffolder')}/v1/jobs`;
     const response = await fetch(url, {
       method: 'POST',
       headers: {
@@ -65,9 +57,9 @@ export class ScaffolderApi {
   }
 
   async getJob(jobId: string) {
-    const url = `${this.apiOrigin}${this.basePath}/job/${encodeURIComponent(
-      jobId,
-    )}`;
+    const url = `${await this.discoveryApi.getBaseUrl(
+      'scaffolder',
+    )}/v1/job/${encodeURIComponent(jobId)}`;
     return fetch(url).then(x => x.json());
   }
 }