converge on -f and --force (#3648)

* -y -> -f

* fix client integration test

Author: bkendall

CHANGELOG.md

@@ -1,4 +1,5 @@
-- **BREAKING:** drops support for running the CLI on Node 10.
+- **BREAKING** Drops support for running the CLI on Node 10.
+- **BREAKING** Replaces all usages of `-y`, `--yes`, or `--confirm` with `-f` and `--force`.
 - Fixes issue when installing a Firebase Extension where secrets would be created before validation.
 - Fixes issue with filtering on a specific storage bucket using functions in the emulator (#3893)
 - Fixes check in Cloud Functions for Firebase initialization to check for API enablement before trying to enable them. (#2574)

scripts/client-integration-tests/tests.ts

@@ -98,7 +98,7 @@ describe("database:set|get|remove", () => {
 
     await client.database.set(
       path,
-      Object.assign({ data: JSON.stringify(data), confirm: true }, opts)
+      Object.assign({ data: JSON.stringify(data), force: true }, opts)
     );
 
     // Have to read to a file in order to get data.
@@ -107,7 +107,7 @@ describe("database:set|get|remove", () => {
     await client.database.get(path, Object.assign({ output: file.name }, opts));
     expect(JSON.parse(readFileSync(file.name).toString())).to.deep.equal(data);
 
-    await client.database.remove(path, Object.assign({ confirm: true }, opts));
+    await client.database.remove(path, Object.assign({ force: true }, opts));
 
     await client.database.get(path, Object.assign({ output: file.name }, opts));
     expect(JSON.parse(readFileSync(file.name, "utf-8"))).to.equal(null);

src/commands/database-remove.ts

@@ -13,7 +13,7 @@ import * as _ from "lodash";
 
 module.exports = new Command("database:remove <path>")
   .description("remove data from your Firebase at the specified path")
-  .option("-y, --confirm", "pass this option to bypass confirmation prompt")
+  .option("-f, --force", "pass this option to bypass confirmation prompt")
   .option(
     "--instance <instance>",
     "use the database <instance>.firebaseio.com (if omitted, use default database instance)"
@@ -31,7 +31,7 @@ module.exports = new Command("database:remove <path>")
     const confirm = await promptOnce(
       {
         type: "confirm",
-        name: "confirm",
+        name: "force",
         default: false,
         message: "You are about to remove all data at " + clc.cyan(databaseUrl) + ". Are you sure?",
       },

src/commands/database-set.ts

@@ -19,7 +19,7 @@ import * as utils from "../utils";
 export default new Command("database:set <path> [infile]")
   .description("store JSON data at the specified path via STDIN, arg, or file")
   .option("-d, --data <data>", "specify escaped JSON directly")
-  .option("-y, --confirm", "pass this option to bypass confirmation prompt")
+  .option("-f, --force", "pass this option to bypass confirmation prompt")
   .option(
     "--instance <instance>",
     "use the database <instance>.firebaseio.com (if omitted, use default database instance)"
@@ -39,7 +39,7 @@ export default new Command("database:set <path> [infile]")
     const confirm = await promptOnce(
       {
         type: "confirm",
-        name: "confirm",
+        name: "force",
         default: false,
         message: "You are about to overwrite all data at " + clc.cyan(dbPath) + ". Are you sure?",
       },

src/commands/database-update.ts

@@ -18,7 +18,7 @@ import * as utils from "../utils";
 export default new Command("database:update <path> [infile]")
   .description("update some of the keys for the defined path in your Firebase")
   .option("-d, --data <data>", "specify escaped JSON directly")
-  .option("-y, --confirm", "pass this option to bypass confirmation prompt")
+  .option("-f, --force", "pass this option to bypass confirmation prompt")
   .option(
     "--instance <instance>",
     "use the database <instance>.firebaseio.com (if omitted, use default database instance)"
@@ -36,7 +36,7 @@ export default new Command("database:update <path> [infile]")
     const confirmed = await promptOnce(
       {
         type: "confirm",
-        name: "confirm",
+        name: "force",
         default: false,
         message: `You are about to modify data at ${clc.cyan(url)}. Are you sure?`,
       },

src/commands/firestore-delete.ts

@@ -83,7 +83,7 @@ module.exports = new Command("firestore:delete [path]")
     "Delete all. Deletes the entire Firestore database, " +
       "including all collections and documents. Any other flags or arguments will be ignored."
   )
-  .option("-y, --yes", "No confirmation. Otherwise, a confirmation prompt will appear.")
+  .option("-f, --force", "No confirmation. Otherwise, a confirmation prompt will appear.")
   .before(printNoticeIfEmulated, Emulators.FIRESTORE)
   .before(requirePermissions, ["datastore.entities.list", "datastore.entities.delete"])
   .action(async (path: string | undefined, options: any) => {
@@ -101,7 +101,7 @@ module.exports = new Command("firestore:delete [path]")
     const confirm = await promptOnce(
       {
         type: "confirm",
-        name: "yes",
+        name: "force",
         default: false,
         message: getConfirmationMessage(deleteOp, options),
       },

src/commands/hosting-disable.ts

@@ -10,20 +10,23 @@ import * as utils from "../utils";
 
 export default new Command("hosting:disable")
   .description("stop serving web traffic to your Firebase Hosting site")
-  .option("-y, --confirm", "skip confirmation")
+  .option("-f, --force", "skip confirmation")
   .option("-s, --site <siteName>", "the site to disable")
   .before(requirePermissions, ["firebasehosting.sites.update"])
   .before(requireHostingSite)
   .action(async (options) => {
     const siteToDisable: string = options.site;
 
-    const confirm = await promptOnce({
-      type: "confirm",
-      name: "confirm",
-      message: `Are you sure you want to disable Firebase Hosting for the site ${clc.underline(
-        siteToDisable
-      )}\n${clc.underline("This will immediately make your site inaccessible!")}`,
-    });
+    const confirm = await promptOnce(
+      {
+        type: "confirm",
+        name: "force",
+        message: `Are you sure you want to disable Firebase Hosting for the site ${clc.underline(
+          siteToDisable
+        )}\n${clc.underline("This will immediately make your site inaccessible!")}`,
+      },
+      options
+    );
 
     if (!confirm) {
       return;