Update usage of the schema API for push, status, and diff (#502)

Co-authored-by: E. Cooper <[email protected]>

src/commands/schema/diff.mjs

@@ -87,7 +87,7 @@ async function doDiff(argv) {
   } else {
     const { diff } = await makeFaunaRequest({
       argv,
-      path: "/schema/1/validate",
+      path: "/schema/1/diff",
       params: buildValidateParams(argv, version),
       body: files,
       method: "POST",

src/commands/schema/push.mjs

@@ -31,16 +31,14 @@ async function doPush(argv) {
       secret,
     });
   } else {
-    // Confirm diff, then push it. `force` is set on `validate` so we don't
-    // need to pass the last known schema version through.
+    // Confirm diff, then push it.
     const params = new URLSearchParams({
-      force: "true",
       staged: argv.active ? "false" : "true",
     });
 
     const response = await makeFaunaRequest({
       argv,
-      path: "/schema/1/validate",
+      path: "/schema/1/diff",
       params,
       body: fsl,
       method: "POST",

src/commands/schema/status.mjs

@@ -36,7 +36,7 @@ async function doStatus(argv) {
 
   const validationResponse = await makeFaunaRequest({
     argv,
-    path: "/schema/1/validate",
+    path: "/schema/1/diff",
     params,
     method: "POST",
     body: fsl,

src/lib/db.mjs

@@ -5,7 +5,7 @@ import { CommandError } from "./command-helpers.mjs";
 import { retryInvalidCredsOnce } from "./fauna-client.mjs";
 
 function buildParamsString({ argv, params, path }) {
-  const routesWithColor = ["/schema/1/staged/status", "/schema/1/validate"];
+  const routesWithColor = ["/schema/1/staged/status", "/schema/1/diff"];
   if (params && argv.color && routesWithColor.includes(path))
     params.set("color", "ansi");
   if (params && params.sort) params.sort();

test/schema/diff.mjs

@@ -45,7 +45,7 @@ describe("schema diff", function () {
       { ...commonFetchParams, method: "GET" },
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         color: "ansi",
         diff: "semantic",
         force: "true",
@@ -72,7 +72,7 @@ describe("schema diff", function () {
       { ...commonFetchParams, method: "GET" },
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         color: "ansi",
         diff: "semantic",
         force: "true",
@@ -99,7 +99,7 @@ describe("schema diff", function () {
       method: "GET",
     });
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         force: "true",
         staged: "true",
         diff: "semantic",
@@ -125,7 +125,7 @@ describe("schema diff", function () {
       { ...commonFetchParams, method: "GET" },
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         force: "true",
         color: "ansi",
         staged: "true",

test/schema/push.mjs

@@ -71,8 +71,7 @@ describe("schema push", function () {
     await run(`schema push --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
-        force: "true",
+      buildUrl("/schema/1/diff", {
         staged: "true",
         color: "ansi",
       }),
@@ -125,8 +124,7 @@ describe("schema push", function () {
     await run(`schema push --secret "secret" --active`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
-        force: "true",
+      buildUrl("/schema/1/diff", {
         staged: "false",
         color: "ansi",
       }),
@@ -172,8 +170,7 @@ describe("schema push", function () {
     await run(`schema push --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
-        force: "true",
+      buildUrl("/schema/1/diff", {
         staged: "true",
         color: "ansi",
       }),
@@ -215,8 +212,7 @@ describe("schema push", function () {
     await run(`schema push --secret "secret"`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
-        force: "true",
+      buildUrl("/schema/1/diff", {
         staged: "true",
         color: "ansi",
       }),
@@ -261,8 +257,7 @@ describe("schema push", function () {
     await run(`schema push --secret "secret" --active`, container);
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
-        force: "true",
+      buildUrl("/schema/1/diff", {
         staged: "false",
         color: "ansi",
       }),

test/schema/status.mjs

@@ -92,7 +92,7 @@ describe("schema status", function () {
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         diff: "summary",
         staged: "true",
         version: "0",
@@ -135,7 +135,7 @@ describe("schema status", function () {
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         diff: "summary",
         staged: "true",
         version: "0",
@@ -184,7 +184,7 @@ describe("schema status", function () {
     );
 
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         diff: "summary",
         staged: "true",
         version: "0",
@@ -230,7 +230,7 @@ describe("schema status", function () {
       commonFetchParams,
     );
     expect(fetch).to.have.been.calledWith(
-      buildUrl("/schema/1/validate", {
+      buildUrl("/schema/1/diff", {
         diff: "summary",
         staged: "true",
         version: "0",