From d66efa6aa94b7707d2e7efd9f6d4574e9b2b0951 Mon Sep 17 00:00:00 2001 From: Wesley Pattison Date: Wed, 19 Oct 2022 12:04:01 +0200 Subject: [PATCH] PR Feedback Signed-off-by: Wesley Pattison --- plugins/azure-sites/api-report.md | 3 - .../src/api/AzureSitesApiBackendClient.ts | 80 ++++++++----------- plugins/azure-sites/src/plugin.ts | 7 +- 3 files changed, 37 insertions(+), 53 deletions(-) diff --git a/plugins/azure-sites/api-report.md b/plugins/azure-sites/api-report.md index 2e9b81376a..38ca6a8fe2 100644 --- a/plugins/azure-sites/api-report.md +++ b/plugins/azure-sites/api-report.md @@ -54,9 +54,6 @@ export const azureSitesPlugin: BackstagePlugin< // @public (undocumented) export const EntityAzureSitesOverviewWidget: () => JSX.Element; -// @public (undocumented) -export const entityContentRouteRef: RouteRef; - // @public (undocumented) export const isAzureWebSiteNameAvailable: ( entity: Entity, diff --git a/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts b/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts index 5b1da009b5..fc622e786b 100644 --- a/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts +++ b/plugins/azure-sites/src/api/AzureSitesApiBackendClient.ts @@ -35,56 +35,44 @@ export class AzureSitesApiBackendClient implements AzureSitesApi { } async stop(request: AzureSiteStartStopRequest): Promise { - try { - const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ - request.subscription - }/${request.resourceGroup}/${request.name}/stop`; - const { token: accessToken } = await this.identityApi.getCredentials(); - await fetch(url, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - ...(accessToken && { Authorization: `Bearer ${accessToken}` }), - }, - }); - } catch (e: any) { - throw new Error(e); - } + const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ + request.subscription + }/${request.resourceGroup}/${request.name}/stop`; + const { token: accessToken } = await this.identityApi.getCredentials(); + await fetch(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + ...(accessToken && { Authorization: `Bearer ${accessToken}` }), + }, + }); } async start(request: AzureSiteStartStopRequest): Promise { - try { - const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ - request.subscription - }/${request.resourceGroup}/${request.name}/start`; - const { token: accessToken } = await this.identityApi.getCredentials(); - await fetch(url, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - ...(accessToken && { Authorization: `Bearer ${accessToken}` }), - }, - }); - } catch (e: any) { - throw new Error(e); - } + const url = `${await this.discoveryApi.getBaseUrl('azure-functions')}/${ + request.subscription + }/${request.resourceGroup}/${request.name}/start`; + const { token: accessToken } = await this.identityApi.getCredentials(); + await fetch(url, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + ...(accessToken && { Authorization: `Bearer ${accessToken}` }), + }, + }); } async list(request: AzureSiteListRequest): Promise { - try { - const url = `${await this.discoveryApi.getBaseUrl('azure-sites')}/list/${ - request.name - }`; - const { token: accessToken } = await this.identityApi.getCredentials(); - const response = await fetch(url, { - method: 'GET', - headers: { - 'Content-Type': 'application/json', - ...(accessToken && { Authorization: `Bearer ${accessToken}` }), - }, - }); - return await response.json(); - } catch (e: any) { - throw new Error(e); - } + const url = `${await this.discoveryApi.getBaseUrl('azure-sites')}/list/${ + request.name + }`; + const { token: accessToken } = await this.identityApi.getCredentials(); + const response = await fetch(url, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + ...(accessToken && { Authorization: `Bearer ${accessToken}` }), + }, + }); + return await response.json(); } } diff --git a/plugins/azure-sites/src/plugin.ts b/plugins/azure-sites/src/plugin.ts index 6a5272e21a..f54f121ea1 100644 --- a/plugins/azure-sites/src/plugin.ts +++ b/plugins/azure-sites/src/plugin.ts @@ -24,14 +24,13 @@ import { } from '@backstage/core-plugin-api'; import { azureSiteApiRef, AzureSitesApiBackendClient } from './api'; -/** @public */ -export const entityContentRouteRef = createRouteRef({ - id: 'Azure Entity Content', +const entityContentRouteRef = createRouteRef({ + id: 'Azure Sites Entity Content', }); /** @public */ export const azureSitesPlugin = createPlugin({ - id: 'azureFunctions', + id: 'azureSites', apis: [ createApiFactory({ api: azureSiteApiRef,