FE-5990 Set argv.secret to 'secret' when --local passed in and --secret is not. Always respect argv.secret when getting a secret with FaunaClient.getSecret.

src/commands/query.mjs

@@ -61,7 +61,7 @@ async function queryCommand(argv) {
 
   // get the query handler and run the query
   try {
-    const secret = await getSecret();
+    const secret = await getSecret({ secretArg: argv.secret });
     const { url, timeout, typecheck, extra, json, apiVersion } = argv;
     const results = await container.resolve("runQueryFromString")(expression, {
       apiVersion,

src/commands/shell.mjs

@@ -91,7 +91,7 @@ async function buildCustomEval(argv) {
 
       let res;
       try {
-        const secret = await getSecret();
+        const secret = await getSecret({ secretArg: argv.secret });
         const { url, timeout, typecheck } = argv;
         res = await runQueryFromString(cmd, {
           apiVersion,

src/lib/auth/accountKeys.mjs

@@ -24,7 +24,7 @@ export class AccountKeys {
     // Let users know if the creds they provided are invalid (empty)
     if (!key && keySource !== "credentials-file") {
       throw new Error(
-        `The account key provided by ${keySource} is invalid. Please provide an updated value.`,
+        `The account key provided by '${keySource}' is invalid. Please provide an updated value.`,
       );
     }
   }
@@ -56,7 +56,7 @@ export class AccountKeys {
    */
   promptLogin() {
     throw new Error(
-      `The requested user ${this.user || ""} is not signed in or has expired.\nPlease re-authenticate\n\n
+      `The requested user '${this.user || ""}' is not signed in or has expired.\nPlease re-authenticate\n\n
       To sign in, run:\n\nfauna login\n
       `,
     );
@@ -69,7 +69,7 @@ export class AccountKeys {
   async onInvalidCreds() {
     if (this.keySource !== "credentials-file") {
       throw new Error(
-        `Account key provided by ${this.keySource} is invalid. Please provide an updated account key.`,
+        `Account key provided by '${this.keySource}' is invalid. Please provide an updated account key.`,
       );
     }
     await this.refreshKey();

src/lib/command-helpers.mjs

@@ -96,14 +96,18 @@ function yargsWithCommonOptions(yargs, options) {
   return yargs
     .options({ ...options, })
     .check((argv) => {
-      // If --local is provided and --url is not, set the default URL for local
+      // If --local is provided and --url is not, set argv.url to "http://localhost:8443"
       if (!argv.url) {
         if (argv.local) {
           argv.url = 'http://localhost:8443';
         } else {
           argv.url = 'https://db.fauna.com';
         }
       }
+      // if --local is provided and --secret is not set argv.secret to "secret"
+      if (!argv.secret && argv.local) {
+        argv.secret = 'secret';
+      }
       return true; // Validation passed
     });
 }

src/lib/fauna-client.mjs

@@ -71,7 +71,17 @@ export default class FaunaClient {
   }
 }
 
-export const getSecret = async () => {
+/**
+ * Gets a secret. Defaults to the secretArg. If the secretArg is undefined
+ * fetches a secret for the current credentials.
+ * @param opts {Object}
+ * @param opts.secretArg {string} The secret passed as an argument, if any.
+ * @return {Promise<string>} the secret
+ */
+export async function getSecret({ secretArg }) {
+  if (secretArg !== undefined) {
+    return secretArg;
+  }
   const credentials = container.resolve("credentials");
   if (!credentials.databaseKeys.key) {
     return await credentials.databaseKeys.getOrRefreshKey();

test/config.mjs

@@ -198,7 +198,7 @@ describe("configuration file", function () {
       });
     });
 
-    it("--local arg sets the url to http://localhost:8443 if no URL is given", async function () {
+    it("--local arg sets the argv.url to http://localhost:8443 if no --url is given", async function () {
       fs.readdirSync.withArgs(process.cwd()).returns([]);
       await runBasicTest({
         cmd: `eval "Database.all()" --secret "no-config" --local`,
@@ -213,7 +213,7 @@ describe("configuration file", function () {
       });
     });
 
-    it("--url arg takes precedence over --local arg for the URL", async function () {
+    it("--url arg takes precedence over --local arg for the argv.url", async function () {
       fs.readdirSync.withArgs(process.cwd()).returns([]);
       await runBasicTest({
         cmd: `eval "Database.all()" --secret "no-config" --local --url http://localhost:hibob`,
@@ -228,6 +228,36 @@ describe("configuration file", function () {
       });
     });
 
+    it("--local sets the argv.secret to 'secret' if no --secret is given", async function () {
+      fs.readdirSync.withArgs(process.cwd()).returns([]);
+      await runBasicTest({
+        cmd: `eval "Database.all()" --local`,
+        argvMatcher: sinon.match({
+          apiVersion: "10",
+          secret: "secret",
+          url: "http://localhost:8443",
+          timeout: 5000,
+          typecheck: undefined,
+        }),
+        objectToReturn: databaseObject,
+      });
+    });
+
+    it("--secret arg takes precedence over --local arg for the argv.secret", async function () {
+      fs.readdirSync.withArgs(process.cwd()).returns([]);
+      await runBasicTest({
+        cmd: `eval "Database.all()" --local --secret "sauce"`,
+        argvMatcher: sinon.match({
+          apiVersion: "10",
+          secret: "sauce",
+          url: "http://localhost:8443",
+          timeout: 5000,
+          typecheck: undefined,
+        }),
+        objectToReturn: databaseObject,
+      });
+    });
+
     it("exits with an error if multiple default files exist", async function () {
       fs.readdirSync
         .withArgs(process.cwd())