Fix failing unit tests for headers

shadaj · shadaj · commit 202d3f5a3aee · 2018-07-17T13:28:12.000-07:00
diff --git a/packages/apollo-cli/src/commands/codegen/generate.ts b/packages/apollo-cli/src/commands/codegen/generate.ts
@@ -220,6 +220,7 @@ export default class Generate extends Command {
       loadSchemaStep(
         pullFromEngine,
         apiKey,
+        flags.engine,
         "Loading GraphQL schema",
         async ctx => {
           if (flags.schema) {
diff --git a/packages/apollo-cli/src/commands/queries/check.ts b/packages/apollo-cli/src/commands/queries/check.ts
@@ -3,10 +3,7 @@ import { Command, flags } from "@oclif/command";
 import { table, styledJSON } from "heroku-cli-util";
 import * as Listr from "listr";
 import { toPromise, execute } from "apollo-link";
-import {
-  print,
-  GraphQLError
-} from "graphql";
+import { print, GraphQLError } from "graphql";
 
 import * as fg from "glob";
 import { withGlobalFS } from "apollo-codegen-core/lib/localfs";
@@ -19,6 +16,11 @@ import { gitInfo } from "../../git";
 import { VALIDATE_OPERATIONS } from "../../operations/validateOperations";
 import { ChangeType } from "../../printer/ast";
 import { format } from "../schema/check";
+import {
+  ApolloConfig,
+  loadConfigFromFile,
+  findAndLoadConfig
+} from "../../config";
 
 export default class CheckQueries extends Command {
   static description =
@@ -29,6 +31,9 @@ export default class CheckQueries extends Command {
       char: "h",
       description: "Show command help"
     }),
+    config: flags.string({
+      description: "Path to your Apollo config file"
+    }),
     queries: flags.string({
       description:
         "Path to your GraphQL queries, can include search tokens like **",
@@ -49,19 +54,37 @@ export default class CheckQueries extends Command {
   async run() {
     const { flags } = this.parse(CheckQueries);
 
-    const apiKey = flags.key;
-    if (!apiKey) {
-      this.error(
-        "No API key was specified. Set an Apollo Engine API key using the `--key` flag or the `ENGINE_API_KEY` environment variable."
-      );
-      return;
-    }
     const tasks: Listr = new Listr([
+      {
+        title: "Loading Apollo config",
+        task: async ctx => {
+          if (flags.config) {
+            ctx.config = loadConfigFromFile(flags.config) || {};
+          } else {
+            ctx.config = findAndLoadConfig(__dirname) || {};
+          }
+
+          ctx.config = {
+            ...ctx.config,
+            operations: flags.queries
+              ? flags.queries.split("\n")
+              : ctx.config.operations,
+            engineKey: flags.key || ctx.config.engineKey
+          };
+
+          if (!ctx.config.engineKey) {
+            this.error(
+              "No API key was specified. Set an Apollo Engine API key using the `--key` flag or the `ENGINE_API_KEY` environment variable."
+            );
+            return;
+          }
+        }
+      },
       {
         title: "Scanning for GraphQL queries",
         task: async (ctx, task) => {
           const paths = withGlobalFS(() => {
-            return (flags.queries ? flags.queries.split("\n") : []).flatMap(p =>
+            return (ctx.config as ApolloConfig).operations.flatMap(p =>
               fg.sync(p)
             );
           });
@@ -76,11 +99,11 @@ export default class CheckQueries extends Command {
       },
       {
         title: "Checking query compatibility with schema",
-        task: async (ctx) => {
+        task: async ctx => {
           const gitContext = await gitInfo();
 
           const variables = {
-            id: getIdFromKey(apiKey),
+            id: getIdFromKey(ctx.config.engineKey),
             // XXX hardcoded for now
             tag: "current",
             gitContext,
@@ -92,7 +115,7 @@ export default class CheckQueries extends Command {
               query: VALIDATE_OPERATIONS,
               variables,
               context: {
-                headers: { ["x-api-key"]: apiKey },
+                headers: { ["x-api-key"]: ctx.config.engineKey },
                 ...(flags.engine && { uri: flags.engine })
               }
             })
diff --git a/packages/apollo-cli/src/commands/schema/check.ts b/packages/apollo-cli/src/commands/schema/check.ts
@@ -63,9 +63,13 @@ export default class SchemaCheck extends Command {
       {
         title: "Fetching local schema",
         task: async ctx => {
+          const headers = header
+            .filter(x => Boolean(x))
+            .map(x => JSON.parse(x))
+            .reduce((a, b) => Object.assign(a, b), {});
           ctx.schema = await fetchSchema({
             url: flags.endpoint,
-            headers: header.filter(x => Boolean(x)).map(x => JSON.parse(x))
+            headers
           });
         }
       },
diff --git a/packages/apollo-cli/src/commands/schema/download.ts b/packages/apollo-cli/src/commands/schema/download.ts
@@ -56,6 +56,7 @@ export default class SchemaDownload extends Command {
       loadSchemaStep(
         pullFromEngine,
         apiKey,
+        flags.engine,
         "Fetching local schema",
         async ctx => {
           ctx.schema = await fetchSchema({
diff --git a/packages/apollo-cli/src/commands/schema/publish.ts b/packages/apollo-cli/src/commands/schema/publish.ts
@@ -55,9 +55,13 @@ export default class SchemaPublish extends Command {
       {
         title: "Fetching current schema",
         task: async ctx => {
+          const headers = header
+            .filter(x => !!x)
+            .map(x => JSON.parse(x))
+            .reduce((a, b) => Object.assign(a, b), {});
           ctx.schema = await fetchSchema({
             url: flags.endpoint,
-            headers: header.filter(x => !!x).map(x => JSON.parse(x))
+            headers
           }).catch(this.error);
         }
       },
diff --git a/packages/apollo-cli/src/config.ts b/packages/apollo-cli/src/config.ts
@@ -12,7 +12,7 @@ export interface ApolloConfig {
   projectName?: string;
   schema?: string; // path to JSON introspection, if not provided endpoint will be used
   endpoint?: EndpointConfig; // GraphQL endpoint URL, used to run queries and grab schema
-  operations?: string[]; // glob path(s) to GraphQL operations (default: '**/*.graphql')
+  operations: string[]; // glob path(s) to GraphQL operations (default: '**/*.graphql')
   excludedOperations?: string[]; // glob path(s) to GraphQL operation paths to ignore (default: 'node_modules/**')
   engineKey?: string; // Apollo Engine key
 }
@@ -62,20 +62,28 @@ export function loadConfig(obj: any, configFilePath: string): ApolloConfig {
   };
 }
 
-export function findAndLoadConfig(dir: string): ApolloConfig | undefined {
-  if (fs.existsSync(join(dir, "apollo.config.js"))) {
-    const configFile = join(dir, "apollo.config.js");
-    delete require.cache[require.resolve(configFile)];
-    return loadConfig(require(configFile), configFile);
-  } else if (fs.existsSync(join(dir, "package.json"))) {
-    const configFile = join(dir, "package.json");
-    const apolloKey = JSON.parse(readFileSync(configFile).toString()).apollo;
+export function loadConfigFromFile(file: string): ApolloConfig | undefined {
+  if (file.endsWith(".js")) {
+    delete require.cache[require.resolve(file)];
+    return loadConfig(require(file), file);
+  } else if (file.endsWith("package.json")) {
+    const apolloKey = JSON.parse(readFileSync(file).toString()).apollo;
     if (apolloKey) {
-      return loadConfig(apolloKey, configFile);
+      return loadConfig(apolloKey, file);
     } else {
       return undefined;
     }
   } else {
     return undefined;
   }
 }
+
+export function findAndLoadConfig(dir: string): ApolloConfig | undefined {
+  if (fs.existsSync(join(dir, "apollo.config.js"))) {
+    return loadConfigFromFile(join(dir, "apollo.config.js"));
+  } else if (fs.existsSync(join(dir, "package.json"))) {
+    return loadConfigFromFile(join(dir, "package.json"));
+  } else {
+    return undefined;
+  }
+}
diff --git a/packages/apollo-cli/src/fetch-schema.ts b/packages/apollo-cli/src/fetch-schema.ts
@@ -52,11 +52,6 @@ export async function fromFile(file: string) {
   }
 }
 
-export interface FetchParams {
-  endpoint: string | undefined;
-  header?: Object[];
-}
-
 export const fetchSchema = async ({ url, headers }: EndpointConfig) => {
   if (!url) throw new Error("No endpoint provided when fetching schema");
   if (fs.existsSync(url)) return fromFile(url);
@@ -74,7 +69,10 @@ export const fetchSchema = async ({ url, headers }: EndpointConfig) => {
   });
 };
 
-export async function fetchSchemaFromEngine(apiKey: string) {
+export async function fetchSchemaFromEngine(
+  apiKey: string,
+  customEngine: string | undefined
+) {
   const variables = {
     id: getIdFromKey(apiKey as string),
     tag: "current"
@@ -85,7 +83,8 @@ export async function fetchSchemaFromEngine(apiKey: string) {
       query: SCHEMA_QUERY,
       variables,
       context: {
-        headers: { ["x-api-key"]: apiKey }
+        headers: { ["x-api-key"]: apiKey },
+        ...(customEngine && { uri: customEngine })
       }
     })
   );
diff --git a/packages/apollo-cli/src/load-schema.ts b/packages/apollo-cli/src/load-schema.ts
@@ -7,7 +7,7 @@ export async function loadSchema(config: ApolloConfig) {
   } else if (config.endpoint) {
     return await fetchSchema(config.endpoint);
   } else if (config.engineKey) {
-    return await fetchSchemaFromEngine(config.engineKey);
+    return await fetchSchemaFromEngine(config.engineKey, undefined);
   } else {
     throw new Error("No methods of getting the schema found");
   }
@@ -16,6 +16,7 @@ export async function loadSchema(config: ApolloConfig) {
 export function loadSchemaStep(
   pullFromEngine: boolean,
   apiKey: string | undefined,
+  customEngine: string | undefined,
   notEngineTitle: string,
   notEngine: (ctx: any) => Promise<void>
 ) {
@@ -25,7 +26,10 @@ export function loadSchemaStep(
       : notEngineTitle,
     task: async (ctx: any) => {
       if (pullFromEngine) {
-        ctx.schema = await fetchSchemaFromEngine(apiKey as string);
+        ctx.schema = await fetchSchemaFromEngine(
+          apiKey as string,
+          customEngine
+        );
       } else {
         await notEngine(ctx);
       }
diff --git a/packages/apollo-codegen-core/package.json b/packages/apollo-codegen-core/package.json
@@ -38,8 +38,7 @@
     "@babel/generator": "7.0.0-beta.38",
     "@babel/types": "7.0.0-beta.38",
     "common-tags": "^1.5.1",
-    "core-js": "^2.5.3",
-    "graphql-config": "^2.0.1"
+    "core-js": "^2.5.3"
   },
   "peerDependencies": {
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0"
diff --git a/packages/apollo-codegen-core/src/loading.ts b/packages/apollo-codegen-core/src/loading.ts
