From acc3daa51a9471630f6e4c0f9f0e5f0da210a05d Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Mon, 11 Nov 2019 14:57:18 -0800 Subject: [PATCH 1/9] Adds links to console after ext:install, ext:configure, ext:update --- src/commands/ext-configure.ts | 3 +++ src/commands/ext-install.ts | 3 +++ src/commands/ext-update.ts | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index 2de9f73bab8..efd68fce752 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -4,6 +4,7 @@ import * as marked from "marked"; import * as ora from "ora"; import TerminalRenderer = require("marked-terminal"); +import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import * as getProjectId from "../getProjectId"; @@ -69,6 +70,8 @@ export default new Command("ext:configure ") const res = await extensionsApi.configureInstance(projectId, instanceId, params); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully configured ${clc.bold(instanceId)}.`); + const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` + utils.logLabeledBullet(logPrefix, marked(`You can also view your new configuration on Firebase console: [${consoleLink}](${consoleLink}`)); return res; } catch (err) { spinner.fail(); diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts index 40b55daa383..49da86592df 100644 --- a/src/commands/ext-install.ts +++ b/src/commands/ext-install.ts @@ -7,6 +7,7 @@ import TerminalRenderer = require("marked-terminal"); import { populatePostinstall } from "../extensions/populatePostinstall"; import * as askUserForConsent from "../extensions/askUserForConsent"; import * as checkProjectBilling from "../extensions/checkProjectBilling"; +import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import { getRandomString } from "../extensions/generateInstanceId"; @@ -91,6 +92,8 @@ async function installExtension(options: InstallExtensionOptions): Promise } else { logger.debug("No usage instructions provided."); } + const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` + utils.logLabeledBullet(logPrefix, marked(`You can also view your new instance on Firebase console: [${consoleLink}](${consoleLink}`)); } catch (err) { spinner.fail(); if (err instanceof FirebaseError) { diff --git a/src/commands/ext-update.ts b/src/commands/ext-update.ts index fe3b55ffced..cd7cd737d36 100644 --- a/src/commands/ext-update.ts +++ b/src/commands/ext-update.ts @@ -4,6 +4,7 @@ import * as marked from "marked"; import * as ora from "ora"; import TerminalRenderer = require("marked-terminal"); +import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import * as getProjectId from "../getProjectId"; @@ -82,6 +83,8 @@ export default new Command("ext:update ") await update(updateOptions); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully updated ${clc.bold(instanceId)}.`); + const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` + utils.logLabeledBullet(logPrefix, marked(`You can also view your updated instance on Firebase console: [${consoleLink}](${consoleLink}`)); } catch (err) { spinner.fail(); if (!(err instanceof FirebaseError)) { From f836d3bba01d65875c8115b4ec4ceabf38dc75d9 Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Mon, 11 Nov 2019 16:06:38 -0800 Subject: [PATCH 2/9] refactors to use utils.consoleUrl and to link to the correct tabs --- src/commands/ext-configure.ts | 4 +--- src/commands/ext-install.ts | 4 +--- src/commands/ext-update.ts | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index efd68fce752..6efbfe11499 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -4,7 +4,6 @@ import * as marked from "marked"; import * as ora from "ora"; import TerminalRenderer = require("marked-terminal"); -import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import * as getProjectId from "../getProjectId"; @@ -70,8 +69,7 @@ export default new Command("ext:configure ") const res = await extensionsApi.configureInstance(projectId, instanceId, params); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully configured ${clc.bold(instanceId)}.`); - const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` - utils.logLabeledBullet(logPrefix, marked(`You can also view your new configuration on Firebase console: [${consoleLink}](${consoleLink}`)); + utils.logLabeledBullet(logPrefix, marked(`You can also view your newly configured instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=config`)}`)); return res; } catch (err) { spinner.fail(); diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts index 49da86592df..cb32fdb786a 100644 --- a/src/commands/ext-install.ts +++ b/src/commands/ext-install.ts @@ -7,7 +7,6 @@ import TerminalRenderer = require("marked-terminal"); import { populatePostinstall } from "../extensions/populatePostinstall"; import * as askUserForConsent from "../extensions/askUserForConsent"; import * as checkProjectBilling from "../extensions/checkProjectBilling"; -import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import { getRandomString } from "../extensions/generateInstanceId"; @@ -92,8 +91,7 @@ async function installExtension(options: InstallExtensionOptions): Promise } else { logger.debug("No usage instructions provided."); } - const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` - utils.logLabeledBullet(logPrefix, marked(`You can also view your new instance on Firebase console: [${consoleLink}](${consoleLink}`)); + utils.logLabeledBullet(logPrefix, marked(`You can also view your new instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`)); } catch (err) { spinner.fail(); if (err instanceof FirebaseError) { diff --git a/src/commands/ext-update.ts b/src/commands/ext-update.ts index cd7cd737d36..ea3565a5525 100644 --- a/src/commands/ext-update.ts +++ b/src/commands/ext-update.ts @@ -4,7 +4,6 @@ import * as marked from "marked"; import * as ora from "ora"; import TerminalRenderer = require("marked-terminal"); -import { consoleOrigin } from "../api" import * as Command from "../command"; import { FirebaseError } from "../error"; import * as getProjectId from "../getProjectId"; @@ -83,8 +82,7 @@ export default new Command("ext:update ") await update(updateOptions); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully updated ${clc.bold(instanceId)}.`); - const consoleLink = `${consoleOrigin}/project/${projectId}/extensions/${instanceId}` - utils.logLabeledBullet(logPrefix, marked(`You can also view your updated instance on Firebase console: [${consoleLink}](${consoleLink}`)); + utils.logLabeledBullet(logPrefix, marked(`You can also view your updated instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`)); } catch (err) { spinner.fail(); if (!(err instanceof FirebaseError)) { From cfb954b7938fa9c9d9c419d3fabfe03c17c17d2d Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Mon, 11 Nov 2019 16:40:44 -0800 Subject: [PATCH 3/9] formats --- src/commands/ext-configure.ts | 10 +++++++++- src/commands/ext-install.ts | 10 +++++++++- src/commands/ext-update.ts | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index 6efbfe11499..d502a76d69b 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -69,7 +69,15 @@ export default new Command("ext:configure ") const res = await extensionsApi.configureInstance(projectId, instanceId, params); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully configured ${clc.bold(instanceId)}.`); - utils.logLabeledBullet(logPrefix, marked(`You can also view your newly configured instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=config`)}`)); + utils.logLabeledBullet( + logPrefix, + marked( + `You can also view your newly configured instance on Firebase console: ${utils.consoleUrl( + projectId, + `/extensions/instances/${instanceId}?tab=config` + )}` + ) + ); return res; } catch (err) { spinner.fail(); diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts index cb32fdb786a..b6b44f92112 100644 --- a/src/commands/ext-install.ts +++ b/src/commands/ext-install.ts @@ -91,7 +91,15 @@ async function installExtension(options: InstallExtensionOptions): Promise } else { logger.debug("No usage instructions provided."); } - utils.logLabeledBullet(logPrefix, marked(`You can also view your new instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`)); + utils.logLabeledBullet( + logPrefix, + marked( + `You can also view your new instance on Firebase console: ${utils.consoleUrl( + projectId, + `/extensions/instances/${instanceId}?tab=usage` + )}` + ) + ); } catch (err) { spinner.fail(); if (err instanceof FirebaseError) { diff --git a/src/commands/ext-update.ts b/src/commands/ext-update.ts index ea3565a5525..52249fa881e 100644 --- a/src/commands/ext-update.ts +++ b/src/commands/ext-update.ts @@ -82,7 +82,15 @@ export default new Command("ext:update ") await update(updateOptions); spinner.stop(); utils.logLabeledSuccess(logPrefix, `successfully updated ${clc.bold(instanceId)}.`); - utils.logLabeledBullet(logPrefix, marked(`You can also view your updated instance on Firebase console: ${utils.consoleUrl(projectId, `/extensions/instances/${instanceId}?tab=usage`)}`)); + utils.logLabeledBullet( + logPrefix, + marked( + `You can also view your updated instance on Firebase console: ${utils.consoleUrl( + projectId, + `/extensions/instances/${instanceId}?tab=usage` + )}` + ) + ); } catch (err) { spinner.fail(); if (!(err instanceof FirebaseError)) { From 98cd5d9cc232f3f79219887986ffa4c6e6e9d4c8 Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Tue, 12 Nov 2019 08:32:30 -0800 Subject: [PATCH 4/9] adds changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bd0a8f8980..59c5ea49947 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ * Fixed an issue in Firestore Emulator where batchGet and transactions does not work over REST. +* Print Firebase Console links for Extensions after operations. \ No newline at end of file From 371ae8377bd668f59df083c7c0d500c8c6ceb550 Mon Sep 17 00:00:00 2001 From: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:16:33 -0800 Subject: [PATCH 5/9] on -> in the --- src/commands/ext-configure.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index d502a76d69b..38ac455bc9d 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -72,7 +72,7 @@ export default new Command("ext:configure ") utils.logLabeledBullet( logPrefix, marked( - `You can also view your newly configured instance on Firebase console: ${utils.consoleUrl( + `You can also view your newly configured instance in the Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=config` )}` From aa93643226a0c8fb053a092f3f91be3810f8a70a Mon Sep 17 00:00:00 2001 From: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:17:54 -0800 Subject: [PATCH 6/9] on -> in the --- src/commands/ext-install.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts index b6b44f92112..bb1d26b9879 100644 --- a/src/commands/ext-install.ts +++ b/src/commands/ext-install.ts @@ -94,7 +94,7 @@ async function installExtension(options: InstallExtensionOptions): Promise utils.logLabeledBullet( logPrefix, marked( - `You can also view your new instance on Firebase console: ${utils.consoleUrl( + `You can also view your new instance in the Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=usage` )}` From 3f5f2b69475a4752aae70bbf67f7752875484f09 Mon Sep 17 00:00:00 2001 From: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:18:52 -0800 Subject: [PATCH 7/9] on -> in the --- src/commands/ext-update.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/ext-update.ts b/src/commands/ext-update.ts index 52249fa881e..f73ed93eb60 100644 --- a/src/commands/ext-update.ts +++ b/src/commands/ext-update.ts @@ -85,7 +85,7 @@ export default new Command("ext:update ") utils.logLabeledBullet( logPrefix, marked( - `You can also view your updated instance on Firebase console: ${utils.consoleUrl( + `You can also view your updated instance in the Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=usage` )}` From d7b8759069d7859a04cadd98ea57f533fe1a3f15 Mon Sep 17 00:00:00 2001 From: rachelsaunders <52258509+rachelsaunders@users.noreply.github.com> Date: Tue, 12 Nov 2019 09:20:24 -0800 Subject: [PATCH 8/9] newly configured -> reconfigured --- src/commands/ext-configure.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index 38ac455bc9d..47b7b8d1b3c 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -72,7 +72,7 @@ export default new Command("ext:configure ") utils.logLabeledBullet( logPrefix, marked( - `You can also view your newly configured instance in the Firebase console: ${utils.consoleUrl( + `You can also view your reconfigured instance in the Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=config` )}` From 27cb11434ee35b49dd139482ea2288bb4958a766 Mon Sep 17 00:00:00 2001 From: Joe Hanley Date: Tue, 12 Nov 2019 09:28:04 -0800 Subject: [PATCH 9/9] removes also --- src/commands/ext-configure.ts | 2 +- src/commands/ext-install.ts | 2 +- src/commands/ext-update.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/ext-configure.ts b/src/commands/ext-configure.ts index d502a76d69b..4f8a96d7574 100644 --- a/src/commands/ext-configure.ts +++ b/src/commands/ext-configure.ts @@ -72,7 +72,7 @@ export default new Command("ext:configure ") utils.logLabeledBullet( logPrefix, marked( - `You can also view your newly configured instance on Firebase console: ${utils.consoleUrl( + `You can view your newly configured instance on Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=config` )}` diff --git a/src/commands/ext-install.ts b/src/commands/ext-install.ts index b6b44f92112..665ad44e678 100644 --- a/src/commands/ext-install.ts +++ b/src/commands/ext-install.ts @@ -94,7 +94,7 @@ async function installExtension(options: InstallExtensionOptions): Promise utils.logLabeledBullet( logPrefix, marked( - `You can also view your new instance on Firebase console: ${utils.consoleUrl( + `You can view your new instance on Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=usage` )}` diff --git a/src/commands/ext-update.ts b/src/commands/ext-update.ts index 52249fa881e..d42514b759e 100644 --- a/src/commands/ext-update.ts +++ b/src/commands/ext-update.ts @@ -85,7 +85,7 @@ export default new Command("ext:update ") utils.logLabeledBullet( logPrefix, marked( - `You can also view your updated instance on Firebase console: ${utils.consoleUrl( + `You can view your updated instance on Firebase console: ${utils.consoleUrl( projectId, `/extensions/instances/${instanceId}?tab=usage` )}`