Skip to content

Commit a67fbcf

Browse files
committed
chore: removal vestigal endpoint properties
1 parent 3a8accb commit a67fbcf

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

plugins/backstage-plugin-coder/src/api/UrlSync.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,10 @@ const PROXY_URL_KEY_FOR_DISCOVERY_API = 'proxy';
4242

4343
type UrlPrefixes = Readonly<{
4444
proxyPrefix: string;
45-
apiRoutePrefix: string;
46-
assetsRoutePrefix: string;
4745
}>;
4846

4947
export const defaultUrlPrefixes = {
5048
proxyPrefix: `/api/proxy`,
51-
apiRoutePrefix: '', // Left as empty string because code assumes that CoderSdk will add /api/v2
52-
assetsRoutePrefix: '', // Deliberately left as empty string
5349
} as const satisfies UrlPrefixes;
5450

5551
export type UrlSyncSnapshot = Readonly<{
@@ -104,12 +100,10 @@ export class UrlSync implements UrlSyncApi {
104100
}
105101

106102
private prepareNewSnapshot(newProxyUrl: string): UrlSyncSnapshot {
107-
const { assetsRoutePrefix, apiRoutePrefix } = this.urlPrefixes;
108-
109103
return {
110104
baseUrl: newProxyUrl.replace(proxyRouteReplacer, ''),
111-
assetsRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}${assetsRoutePrefix}`,
112-
apiRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}${apiRoutePrefix}`,
105+
assetsRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}`,
106+
apiRoute: `${newProxyUrl}${CODER_PROXY_PREFIX}`,
113107
};
114108
}
115109

plugins/backstage-plugin-coder/src/testHelpers/mockBackstageData.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const mockBackstageUrlRoot = 'http://localhost:7007';
7575
* the final result is.
7676
*/
7777
export const mockBackstageApiEndpointWithoutSdkPath =
78-
`${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}${defaultUrlPrefixes.apiRoutePrefix}` as const;
78+
`${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}` as const;
7979

8080
/**
8181
* The API endpoint to use with the mock server during testing. Adds additional
@@ -94,7 +94,7 @@ export const mockBackstageApiEndpoint =
9494
* the final result is.
9595
*/
9696
export const mockBackstageAssetsEndpoint =
97-
`${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}${defaultUrlPrefixes.assetsRoutePrefix}` as const;
97+
`${mockBackstageUrlRoot}${defaultUrlPrefixes.proxyPrefix}${CODER_PROXY_PREFIX}` as const;
9898

9999
export const mockBearerToken = 'This-is-an-opaque-value-by-design';
100100
export const mockCoderAuthToken = 'ZG0HRy2gGN-mXljc1s5FqtE8WUJ4sUc5X';

0 commit comments

Comments
 (0)