wip

Author: JakeDawkins

packages/apollo-language-server/src/engine/index.ts

@@ -73,6 +73,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
   }
 
   public async checkSchema(variables: CheckSchemaVariables) {
+    // throw new Error(JSON.stringify({ ...variables, schema: "REDACTED" }));
     return this.execute<CheckSchema>({
       query: CHECK_SCHEMA,
       variables

packages/apollo/src/commands/service/__tests__/check.test.ts

@@ -214,114 +214,100 @@ View full details at: https://engine-dev.apollographql.com/service/engine/checks
 // });
 
 // // this is because of herkou-cli-utils hacky mocking system on their console logger
-// import { stdout, mockConsole } from "heroku-cli-util";
-// import path from "path";
-// import fs from "fs";
-// import { test as setup } from "apollo-cli-test";
-// import { introspectionQuery, print, execute, buildSchema } from "graphql";
-// import gql from "graphql-tag";
-// import { ENGINE_URI } from "../../../engine";
-// import { VALIDATE_SCHEMA } from "../../../operations/validateSchema";
+import { stdout, mockConsole } from "heroku-cli-util";
+import path from "path";
+import fs from "fs";
+import { test as setup } from "apollo-cli-test";
+import { introspectionQuery, print, execute, buildSchema } from "graphql";
+import gql from "graphql-tag";
+import { CHECK_SCHEMA } from "../../../../../apollo-language-server/src/engine/operations/checkSchema";
 
 // import { vol, fs as mockFS } from "apollo-codegen-core/lib/localfs";
 
-// const test = setup.do(() => mockConsole());
-// const ENGINE_API_KEY = "service:test:1234";
-// const hash = "12345";
-// const schemaContents = fs.readFileSync(
-//   path.resolve(__dirname, "./fixtures/schema.graphql"),
-//   {
-//     encoding: "utf-8"
-//   }
-// );
-
-// const fullSchema = execute(buildSchema(schemaContents), gql(introspectionQuery))
-//   .data;
-
-// const localSuccess = nock => {
-//   nock
-//     .post("/graphql", {
-//       query: print(gql(introspectionQuery)),
-//       operationName: "IntrospectionQuery",
-//       variables: {}
-//     })
-//     .reply(200, { data: fullSchema });
-// };
-
-// const engineSuccess = ({ schema, tag, results } = {}) => nock => {
-//   nock
-//     .matchHeader("x-api-key", ENGINE_API_KEY)
-//     .post("/", {
-//       operationName: "CheckSchema",
-//       variables: {
-//         id: "test",
-//         schema: schema || fullSchema.__schema,
-//         tag: tag || "current",
-//         gitContext: {
-//           commit: /.+/i,
-//           remoteUrl: /apollo-tooling/i,
-//           committer: /@/i
-//         }
-//       },
-//       query: print(VALIDATE_SCHEMA)
-//     })
-//     .reply(200, {
-//       data: {
-//         service: {
-//           schema: {
-//             checkSchema: {
-//               changes: results || [
-//                 {
-//                   type: "NOTICE",
-//                   code: "DEPRECATION_ADDED",
-//                   description: "Field `User.lastName` was deprecated"
-//                 },
-//                 {
-//                   type: "WARNING",
-//                   code: "FIELD_REMOVED",
-//                   description: "Field `User.firstName` removed"
-//                 },
-//                 {
-//                   type: "FAILURE",
-//                   code: "ARG_CHANGE_TYPE",
-//                   description: "Argument id on `Query.user` changed to ID!"
-//                 },
-//                 {
-//                   type: "NOTICE",
-//                   code: "FIELD_ADDED",
-//                   description: "Field `User.fullName` was added"
-//                 }
-//               ]
-//             }
-//           }
-//         }
-//       }
-//     });
-// };
-
-// jest.setTimeout(25000);
-
-// beforeEach(() => {
-//   vol.reset();
-//   vol.fromJSON({
-//     __blankFileSoDirectoryExists: ""
-//   });
-// });
-
-// describe("successful checks", () => {
-//   test
-//     .nock("http://localhost:4000", localSuccess)
-//     .nock(ENGINE_URI, engineSuccess())
-//     .env({ ENGINE_API_KEY })
-//     .stdout()
-//     .command(["schema:check"])
-//     .exit(1)
-//     .it("compares against the latest uploaded schema", () => {
-//       expect(stdout).toContain("FAILURE");
-//       expect(stdout).toContain("NOTICE");
-//       expect(stdout).toContain("WARNING");
-//     });
-
+const test = setup.do(() => mockConsole());
+const ENGINE_URI = "https://engine-graphql.apollographql.com/api/graphql";
+const ENGINE_API_KEY = "service:test:1234";
+const hash = "12345";
+const schemaContents = fs.readFileSync(
+  path.resolve(__dirname, "./fixtures/schema.graphql"),
+  {
+    encoding: "utf-8"
+  }
+);
+
+const fullSchema = execute(buildSchema(schemaContents), gql(introspectionQuery))
+  .data;
+
+const localSuccess = nock => {
+  nock
+    .post("/graphql", {
+      query: print(gql(introspectionQuery)),
+      operationName: "IntrospectionQuery",
+      variables: {}
+    })
+    .reply(200, { data: fullSchema });
+};
+
+const engineSuccess = ({
+  schema,
+  tag,
+  results,
+  resultFilter = () => true
+} = {}) => nock => {
+  nock
+    .matchHeader("x-api-key", ENGINE_API_KEY)
+    .post(
+      /.*/,
+      // this is a matcher function
+      ({
+        operationName,
+        query,
+        variables: { id, schema, gitContext, frontend }
+      }) =>
+        operationName === "CheckSchema" &&
+        query === print(CHECK_SCHEMA) &&
+        id === "test" &&
+        gitContext &&
+        JSON.stringify(schema) === JSON.stringify(fullSchema.__schema) &&
+        frontend === "https://engine.apollographql.com"
+    )
+    .reply(200, {
+      data: {
+        service: {
+          checkSchema: {
+            ...checkSchemaResult,
+            diffToPrevious: {
+              ...checkSchemaResult.diffToPrevious,
+              changes: (
+                results || checkSchemaResult.diffToPrevious.changes
+              ).filter(resultFilter)
+            }
+          }
+        }
+      }
+    });
+};
+
+jest.setTimeout(25000);
+
+describe("successful checks", () => {
+  const noFailures = change => change.type !== "FAILURE";
+
+  test
+    .fs({ "my.config.js": "module.exports = { }" })
+    .nock("http://localhost:4000", localSuccess)
+    .nock(ENGINE_URI, engineSuccess({ resultFilter: noFailures }))
+    .env({ ENGINE_API_KEY })
+    .stdout()
+    .command(["service:check", "--config=my.config.js"])
+    // .exit(1)
+    .it("compares against the latest uploaded schema", () => {
+      // throw new Error(stdout);
+      expect(stdout).toContain("FAIL");
+      // expect(stdout).toContain("NOTICE");
+      // expect(stdout).toContain("WARNING");
+    });
+});
 //   test
 //     .nock("http://localhost:4000", localSuccess)
 //     .nock(ENGINE_URI, engineSuccess())

packages/apollo/src/commands/service/check.ts

@@ -348,6 +348,8 @@ export default class ServiceCheck extends ProjectCommand {
                   "compatible change"
                 )}`;
 
+                throw new Error(task.title);
+
                 if (breakingSchemaChangeCount) {
                   // Throw an error here to produce a red X in the list of steps being taken. We're going to
                   // `catch` this error below and proceed with the reporting.