diff --git a/src/commands/frameworks-backends-get.ts b/src/commands/frameworks-backends-get.ts index f547035bec9..33f4294677d 100644 --- a/src/commands/frameworks-backends-get.ts +++ b/src/commands/frameworks-backends-get.ts @@ -1,21 +1,15 @@ +import * as gcp from "../gcp/frameworks"; import { Command } from "../command"; import { Options } from "../options"; import { needProjectId } from "../projectUtils"; -import * as gcp from "../gcp/frameworks"; import { FirebaseError } from "../error"; import { logger } from "../logger"; import { ensureApiEnabled } from "../gcp/frameworks"; +import { logWarning } from "../utils"; const Table = require("cli-table"); const COLUMN_LENGTH = 20; -const TABLE_HEAD = [ - "Backend Id", - "Repository Name", - "Location", - "URL", - "Created Date", - "Updated Date", -]; +const TABLE_HEAD = ["Backend Id", "Repository", "Location", "URL", "Created Date", "Updated Date"]; export const command = new Command("backends:get ") .description("Get backend details of a Firebase project") .option("-l, --location ", "App Backend location", "-") @@ -36,25 +30,23 @@ export const command = new Command("backends:get ") backendsList.push(backendInRegion); populateTable(backendInRegion, table); } else { - const allBackend = await gcp.listBackends(projectId, location); - backendsList = allBackend.backends.filter((bkd) => bkd.name.split("/").pop() === backendId); + const resp = await gcp.listBackends(projectId, "-"); + const allBackends = resp.backends || []; + backendsList = allBackends.filter((bkd) => bkd.name.split("/").pop() === backendId); backendsList.forEach((bkd) => populateTable(bkd, table)); } - - if (backendsList.length !== 0) { - logger.info(table.toString()); - } else { - logger.info(); - logger.info(`There are no backends with id: ${backendId}`); - } } catch (err: any) { throw new FirebaseError( `Failed to get backend: ${backendId}. Please check the parameters you have provided.`, { original: err } ); } - - return backendsList; + if (backendsList.length === 0) { + logWarning(`Found no backend with id: ${backendId}`); + return; + } + logger.info(table.toString()); + return backendsList[0]; }); function populateTable(backend: gcp.Backend, table: any) { diff --git a/src/commands/frameworks-backends-list.ts b/src/commands/frameworks-backends-list.ts index 6f15c9219c9..d7b8518239f 100644 --- a/src/commands/frameworks-backends-list.ts +++ b/src/commands/frameworks-backends-list.ts @@ -4,7 +4,6 @@ import { needProjectId } from "../projectUtils"; import * as gcp from "../gcp/frameworks"; import { FirebaseError } from "../error"; import { logger } from "../logger"; -import { bold } from "colorette"; import { ensureApiEnabled } from "../gcp/frameworks"; const Table = require("cli-table"); @@ -25,12 +24,8 @@ export const command = new Command("backends:list") const backendsList: gcp.Backend[] = []; try { const backendsPerRegion = await gcp.listBackends(projectId, location); - backendsList.push(...backendsPerRegion.backends); + backendsList.push(...(backendsPerRegion.backends || [])); populateTable(backendsList, table); - - logger.info(); - logger.info(`Backends for project ${bold(projectId)}`); - logger.info(); logger.info(table.toString()); } catch (err: any) { throw new FirebaseError(