Merge branch 'mes/vendored-sdk-integration' into mes/vendored-sdk-helpers

Parkreiner · Parkreiner · commit 26baf17a1d83 · 2024-06-03T13:50:16.000Z
diff --git a/plugins/backstage-plugin-coder/src/api/CoderClient.ts b/plugins/backstage-plugin-coder/src/api/CoderClient.ts
@@ -100,7 +100,7 @@ export class CoderClient implements CoderClientApi {
     this.cleanupController = new AbortController();
     this.trackedEjectionIds = new Set();
 
-    this.sdk = this.getBackstageCoderSdk();
+    this.sdk = this.createBackstageCoderSdk();
     this.addBaseRequestInterceptors();
   }
 
@@ -181,7 +181,7 @@ export class CoderClient implements CoderClientApi {
     this.addRequestInterceptor(baseRequestInterceptor, baseErrorInterceptor);
   }
 
-  private getBackstageCoderSdk(): BackstageCoderSdk {
+  private createBackstageCoderSdk(): BackstageCoderSdk {
     const baseSdk = makeCoderSdk();
 
     const getWorkspaces: (typeof baseSdk)['getWorkspaces'] = async request => {
diff --git a/plugins/backstage-plugin-coder/src/api/UrlSync.ts b/plugins/backstage-plugin-coder/src/api/UrlSync.ts
@@ -42,14 +42,10 @@ const PROXY_URL_KEY_FOR_DISCOVERY_API = 'proxy';
 
 type UrlPrefixes = Readonly<{
   proxyPrefix: string;
-  apiRoutePrefix: string;
-  assetsRoutePrefix: string;
 }>;
 
 export const defaultUrlPrefixes = {
   proxyPrefix: `/api/proxy`,
-  apiRoutePrefix: '', // Left as empty string because code assumes that CoderSdk will add /api/v2
-  assetsRoutePrefix: '', // Deliberately left as empty string
 } as const satisfies UrlPrefixes;
 
 export type UrlSyncSnapshot = Readonly<{
@@ -104,12 +100,10 @@ export class UrlSync implements UrlSyncApi {
   }
 
   private prepareNewSnapshot(newProxyUrl: string): UrlSyncSnapshot {
-    const { assetsRoutePrefix, apiRoutePrefix } = this.urlPrefixes;
-
     return {
       baseUrl: newProxyUrl.replace(proxyRouteReplacer, ''),
-      assetsRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}${assetsRoutePrefix}`,
-      apiRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}${apiRoutePrefix}`,
+      assetsRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}`,
+      apiRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}`,
     };
   }
 
diff --git a/plugins/backstage-plugin-coder/src/testHelpers/mockBackstageData.ts b/plugins/backstage-plugin-coder/src/testHelpers/mockBackstageData.ts
@@ -75,7 +75,7 @@ export const mockBackstageUrlRoot = 'http://localhost:7007';
  * the final result is.
  */
 export const mockBackstageApiEndpointWithoutSdkPath =
-  `${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}${defaultUrlPrefixes.apiRoutePrefix}` as const;
+  `${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}` as const;
 
 /**
  * The API endpoint to use with the mock server during testing. Adds additional
@@ -94,7 +94,7 @@ export const mockBackstageApiEndpoint =
  * the final result is.
  */
 export const mockBackstageAssetsEndpoint =
-  `${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}${defaultUrlPrefixes.assetsRoutePrefix}` as const;
+  `${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}` as const;
 
 export const mockBearerToken = 'This-is-an-opaque-value-by-design';
 export const mockCoderAuthToken = 'ZG0HRy2gGN-mXljc1s5FqtE8WUJ4sUc5X';

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ export class CoderClient implements CoderClientApi {`
`100`	`100`	`this.cleanupController = new AbortController();`
`101`	`101`	`this.trackedEjectionIds = new Set();`
`102`	`102`
`103`		`- this.sdk = this.getBackstageCoderSdk();`
	`103`	`+ this.sdk = this.createBackstageCoderSdk();`
`104`	`104`	`this.addBaseRequestInterceptors();`
`105`	`105`	`}`
`106`	`106`
`@@ -181,7 +181,7 @@ export class CoderClient implements CoderClientApi {`
`181`	`181`	`this.addRequestInterceptor(baseRequestInterceptor, baseErrorInterceptor);`
`182`	`182`	`}`
`183`	`183`
`184`		`- private getBackstageCoderSdk(): BackstageCoderSdk {`
	`184`	`+ private createBackstageCoderSdk(): BackstageCoderSdk {`
`185`	`185`	`const baseSdk = makeCoderSdk();`
`186`	`186`
`187`	`187`	`const getWorkspaces: (typeof baseSdk)['getWorkspaces'] = async request => {`