ENG-5593: Allow users to push non-logical changes (#278)

The CLI disallowed pushing if there were no logical changes unless --force was set, but it's perfectly reasonable to push formatting and comment changes only. Now this will be allowed. I tested this manually. Here're samples of the workflow: $ fauna schema push --dir=$HOME/fsl Proposed diff: foo.fsl add collection Bar foo.fsl add collection Foo Accept and push changes? [no]: yes $ fauna schema push --dir=$HOME/fsl # Added a comment to Bar. No logical changes. Push file contents anyway? [no]: yes $ fauna schema push --dir=$HOME/fsl No logical changes. Push file contents anyway? [no]: no Push cancelled Co-authored-by: Will Berkeley <[email protected]>
fauna · Oct 10, 2023 · c8d33ca · c8d33ca
1 parent 6735e96
commit c8d33ca
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/commands/schema/push.js b/src/commands/schema/push.js
@@ -11,8 +11,8 @@ class PushSchemaCommand extends SchemaCommand {
     }),
   };
 
-  async confirm() {
-    const resp = await ux.prompt("Accept and push the changes?", {
+  async confirm(msg) {
+    const resp = await ux.prompt(msg, {
       default: "no",
     });
     if (["yes", "y"].includes(resp.toLowerCase())) {
@@ -22,7 +22,7 @@ class PushSchemaCommand extends SchemaCommand {
       return false;
     }
     console.log("Please type 'yes' or 'no'");
-    return this.confirm();
+    return this.confirm(msg);
   }
 
   async run() {
@@ -52,13 +52,15 @@ class PushSchemaCommand extends SchemaCommand {
         if (json.error) {
           this.error(json.error.message);
         }
-        if (!json.diff) {
-          this.log("No changes to push");
-          this.exit(0);
+        let msg = "Accept and push changes?"
+        if (json.diff) {
+          this.log(`Proposed diff:\n`);
+          this.log(json.diff);
+        } else {
+          this.log("No logical changes.");
+          msg = "Push file contents anyway?"
         }
-        this.log(`Proposed diff:\n`);
-        this.log(json.diff);
-        if (await this.confirm()) {
+        if (await this.confirm(msg)) {
           const res = await fetch(
             `${urlbase}/schema/1/update?version=${json.version}`,
             {
@@ -72,7 +74,7 @@ class PushSchemaCommand extends SchemaCommand {
             this.error(json0.error.message);
           }
         } else {
-          this.log("Change cancelled");
+          this.log("Push cancelled");
         }
       }
     } catch (err) {