Rename "Engine" to "Apollo Graph Manager" in ouput (#1705)

JakeDawkins · web-flow · commit 01ac32167497 · 2019-12-06T12:08:25.000-05:00
* rename all cli output to say graph manager
* update language server messaging for AGM
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,21 +3,21 @@
 ## Upcoming
 
 - `apollo`
-  - <First `apollo` related entry goes here>
+  - Rename "Engine" to "Apollo Graph Manager" in ouput [#1705](https://github.com/apollographql/apollo-tooling/pull/1705)
 - `apollo-codegen-flow`
   - <First `apollo-codegen-flow` related entry goes here>
 - `apollo-codegen-scala`
   - <First `apollo-codegen-scala` related entry goes here>
 - `apollo-codegen-swift`
-  - Add additional type annotations to improve compile times.  [1638](https://github.com/apollographql/apollo-tooling/pull/1638)
+  - Add additional type annotations to improve compile times. [1638](https://github.com/apollographql/apollo-tooling/pull/1638)
 - `apollo-codegen-typescript`
   - <First `apollo-codegen-typescript` related entry goes here>
 - `apollo-env`
   - <First `apollo-env` related entry goes here>
 - `apollo-graphql`
   - [#1618] Fixes an issue when enums with a value of 0 fail to resolve when using a Federated Schema (https://github.com/apollographql/apollo-tooling/pull/1618)
 - `apollo-language-server`
-  - <First `apollo-language-server` related entry goes here>
+  - Rename "Engine" to "Apollo Graph Manager" in ouput [#1705](https://github.com/apollographql/apollo-tooling/pull/1705)
 - `apollo-tools`
   - <First `apollo-tools` related entry goes here>
 - `vscode-apollo`
diff --git a/packages/apollo-language-server/src/engine/index.ts b/packages/apollo-language-server/src/engine/index.ts
@@ -46,7 +46,7 @@ export type FieldStats = Map<string, Map<string, number | null>>;
 export function noServiceError(service: string | undefined, endpoint?: string) {
   return `Could not find service ${
     service ? service : ""
-  } from Engine at ${endpoint}. Please check your API key and service name`;
+  } from Apollo Graph Manager at ${endpoint}. Please check your API key and service name`;
 }
 
 export class ApolloEngineClient extends GraphQLDataSource {
@@ -98,7 +98,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service;
     });
@@ -121,7 +121,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service.checkSchema;
     });
@@ -144,7 +144,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service.uploadSchema;
     });
@@ -169,7 +169,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service.upsertImplementingServiceAndTriggerComposition;
     });
@@ -194,7 +194,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service.checkPartialSchema;
     });
@@ -212,7 +212,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!data || !data.service) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
 
       return data.service.removeImplementingServiceAndTriggerComposition;
@@ -236,7 +236,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       }
 
       if (!(data && data.service)) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
 
       return data.service.validateOperations.validationResults;
@@ -262,7 +262,7 @@ export class ApolloEngineClient extends GraphQLDataSource {
       if (
         !(data && data.service && data.service.registerOperationsWithResponse)
       ) {
-        throw new Error("Error in request from Engine");
+        throw new Error("Error in request from Apollo Graph Manager");
       }
       return data.service.registerOperationsWithResponse;
     });
diff --git a/packages/apollo-language-server/src/project/client.ts b/packages/apollo-language-server/src/project/client.ts
@@ -339,7 +339,7 @@ export class GraphQLClientProject extends GraphQLProject {
     if (!serviceID) return;
 
     await this.loadingHandler.handle(
-      `Loading Engine data for ${this.displayName}`,
+      `Loading Apollo Graph Manager data for ${this.displayName}`,
       (async () => {
         try {
           const {
diff --git a/packages/apollo-language-server/src/providers/schema/engine.ts b/packages/apollo-language-server/src/providers/schema/engine.ts
@@ -84,13 +84,13 @@ export class EngineSchemaProvider implements GraphQLSchemaProvider {
   onSchemaChange(
     _handler: NotificationHandler<GraphQLSchema>
   ): SchemaChangeUnsubscribeHandler {
-    throw new Error("Polling of Engine not implemented yet");
+    throw new Error("Polling of Apollo Graph Manager not implemented yet");
     return () => {};
   }
 
   async resolveFederatedServiceSDL() {
     Debug.error(
-      "Cannot resolve a federated service's SDL from engine. Use an endpoint or a file instead"
+      "Cannot resolve a federated service's SDL from Apollo Graph Manager. Use an endpoint or a file instead"
     );
     return;
   }
diff --git a/packages/apollo/src/commands/client/check.ts b/packages/apollo/src/commands/client/check.ts
@@ -42,7 +42,7 @@ export default class ClientCheck extends ClientCommand {
           task: async ctx => {
             if (!config.name) {
               throw new Error(
-                "No service found to link to Engine. Engine is required for this command."
+                "No service found to link to Apollo Graph Manager. Graph Manager is required for this command."
               );
             }
             ctx.gitContext = await gitInfo(this.log);
diff --git a/packages/apollo/src/commands/client/codegen.ts b/packages/apollo/src/commands/client/codegen.ts
@@ -26,7 +26,7 @@ const waitForKey = async () => {
 export default class Generate extends ClientCommand {
   static aliases = ["codegen:generate"];
   static description =
-    "Generate static types for GraphQL queries. Can use the published schema in Apollo Engine or a downloaded schema.";
+    "Generate static types for GraphQL queries. Can use the published schema in Apollo Graph Manager or a downloaded schema.";
 
   static flags = {
     ...ClientCommand.flags,
diff --git a/packages/apollo/src/commands/client/download-schema.ts b/packages/apollo/src/commands/client/download-schema.ts
@@ -6,7 +6,7 @@ import { ClientCommand } from "../../Command";
 
 export default class SchemaDownload extends ClientCommand {
   static description =
-    "Download a schema from engine or a GraphQL endpoint in JSON or SDL format";
+    "Download a schema from Apollo Graph Manager or a GraphQL endpoint in JSON or SDL format";
 
   static flags = {
     ...ClientCommand.flags
diff --git a/packages/apollo/src/commands/client/push.ts b/packages/apollo/src/commands/client/push.ts
@@ -61,7 +61,7 @@ export default class ClientPush extends ClientCommand {
             task: async (_, task) => {
               if (!config.name) {
                 throw new Error(
-                  "No service found to link to Engine. Engine is required for this command."
+                  "No service found to link to Apollo Graph Manager. Graph Manager is required for this command."
                 );
               }
 
diff --git a/packages/apollo/src/commands/service/__tests__/check.test.ts b/packages/apollo/src/commands/service/__tests__/check.test.ts
@@ -19,13 +19,13 @@ const localURL = "http://localhost:4000";
 /**
  * Default API key. This is not an actual API key but a randomly generated string.
  *
- * If you need to use the `nock` recorder, then this will not work because we won't be able to access engine
+ * If you need to use the `nock` recorder, then this will not work because we won't be able to access graph manager
  * with a fake API key.
  */
 const fakeApiKey = "service:engine:9YC5AooMa2yO11eFlZat11";
 
 /**
- * Engine API key we're using.
+ * Graph Manager API key we're using.
  *
  * This is hard-coded to `fakeApiKey` because this is out day-to-day usage should be. If we're going to be
  * updating the mocked data; we'll need to use a real API key (see [README#Regenerating Mocked Network
@@ -35,7 +35,7 @@ const fakeApiKey = "service:engine:9YC5AooMa2yO11eFlZat11";
 const apiKey = fakeApiKey;
 
 /**
- * An array that we'll spread into all CLI commands to pass the engine api key.
+ * An array that we'll spread into all CLI commands to pass the graph manager api key.
  */
 const cliKeyParameter = [`--key=${apiKey}`];
 
diff --git a/packages/apollo/src/commands/service/__tests__/list.test.ts b/packages/apollo/src/commands/service/__tests__/list.test.ts
@@ -8,13 +8,13 @@ const stagingAPI = "https://engine-staging-graphql.apollographql.com:443";
 /**
  * Default API key. This is not an actual API key but a randomly generated string.
  *
- * If you need to use the `nock` recorder, then this will not work because we won't be able to access engine
+ * If you need to use the `nock` recorder, then this will not work because we won't be able to access graph manager
  * with a fake API key.
  */
 const fakeApiKey = "service:engine:9YC5AooMa2yO11eFlZat11";
 
 /**
- * Engine API key we're using.
+ * Graph Manager API key we're using.
  *
  * This is hard-coded to `fakeApiKey` because this is out day-to-day usage should be. If we're going to be
  * updating the mocked data; we'll need to use a real API key (see [README#Regenerating Mocked Network
@@ -24,7 +24,7 @@ const fakeApiKey = "service:engine:9YC5AooMa2yO11eFlZat11";
 const apiKey = fakeApiKey;
 
 /**
- * An array that we'll spread into all CLI commands to pass the engine api key.
+ * An array that we'll spread into all CLI commands to pass the graph manager api key.
  */
 const cliKeyParameter = [`--key=${apiKey}`];
 
diff --git a/packages/apollo/src/commands/service/check.ts b/packages/apollo/src/commands/service/check.ts
@@ -304,7 +304,7 @@ export default class ServiceCheck extends ProjectCommand {
           const serviceName: string | undefined = flags.serviceName;
 
           if (!graphID) {
-            throw new Error("No service found to link to Engine");
+            throw new Error("No service found to link to Apollo Graph Manager");
           }
 
           // Add some fields to output that are required for producing
@@ -455,10 +455,12 @@ export default class ServiceCheck extends ProjectCommand {
                 };
 
                 const { schema: _, ...restVariables } = variables;
-                this.debug("Variables sent to Engine:");
+                this.debug("Variables sent to Apollo Graph Manager:");
                 this.debug(restVariables);
                 if (schema) {
-                  this.debug("SDL of introspection sent to Engine:");
+                  this.debug(
+                    "SDL of introspection sent to Apollo Graph Manager:"
+                  );
                   this.debug(printSchema(schema));
                 } else {
                   this.debug("Schema hash generated:");
diff --git a/packages/apollo/src/commands/service/delete.ts b/packages/apollo/src/commands/service/delete.ts
@@ -4,7 +4,7 @@ import { ProjectCommand } from "../../Command";
 
 export default class ServiceDelete extends ProjectCommand {
   static description =
-    "Delete a federated service from Engine and recompose remaining services";
+    "Delete a federated service from Apollo Graph Manager and recompose remaining services";
   static flags = {
     ...ProjectCommand.flags,
     tag: flags.string({
@@ -29,10 +29,10 @@ export default class ServiceDelete extends ProjectCommand {
     let result;
     await this.runTasks(({ flags, project, config }) => [
       {
-        title: "Removing service from Engine",
+        title: "Removing service from Apollo Graph Manager",
         task: async () => {
           if (!config.name) {
-            throw new Error("No service found to link to Engine");
+            throw new Error("No service found to link to Apollo Graph Manager");
           }
 
           if (flags.federated) {
diff --git a/packages/apollo/src/commands/service/download.ts b/packages/apollo/src/commands/service/download.ts
@@ -53,7 +53,7 @@ export default class ServiceDownload extends ProjectCommand {
               );
               this.log(
                 chalk.red(
-                  "If you're trying to download a schema from Apollo Engine, use the `client:download-schema` command instead."
+                  "If you're trying to download a schema from Apollo Graph Manager, use the `client:download-schema` command instead."
                 )
               );
             }
diff --git a/packages/apollo/src/commands/service/list.ts b/packages/apollo/src/commands/service/list.ts
@@ -114,7 +114,7 @@ export default class ServiceList extends ProjectCommand {
         graphVariant = flags.tag || config.tag || "current";
 
         if (!graphID) {
-          throw new Error("No service found to link to Engine");
+          throw new Error("No service found to link to Apollo Graph Manager");
         }
 
         return [
diff --git a/packages/apollo/src/commands/service/push.ts b/packages/apollo/src/commands/service/push.ts
@@ -9,7 +9,7 @@ import chalk from "chalk";
 
 export default class ServicePush extends ProjectCommand {
   static aliases = ["schema:publish"];
-  static description = "Push a service to Engine";
+  static description = "Push a service to Apollo Graph Manager";
   static flags = {
     ...ProjectCommand.flags,
     tag: flags.string({
@@ -48,10 +48,10 @@ export default class ServicePush extends ProjectCommand {
     let gitContext;
     await this.runTasks(({ flags, project, config }) => [
       {
-        title: "Uploading service to Engine",
+        title: "Uploading service to Apollo Graph Manager",
         task: async () => {
           if (!config.name) {
-            throw new Error("No service found to link to Engine");
+            throw new Error("No service found to link to Apollo Graph Manager");
           }
 
           if (flags.federated) {
@@ -130,9 +130,9 @@ export default class ServicePush extends ProjectCommand {
           };
 
           const { schema: _, ...restVariables } = variables;
-          this.debug("Variables sent to Engine:");
+          this.debug("Variables sent to Apollo Graph Manager:");
           this.debug(restVariables);
-          this.debug("SDL of introspection sent to Engine:");
+          this.debug("SDL of introspection sent to Apollo Graph Manager:");
           this.debug(printSchema(schema));
 
           const response = await project.engine.uploadSchema(variables);
@@ -143,7 +143,7 @@ export default class ServicePush extends ProjectCommand {
               hash: response.tag ? response.tag.schema.hash : null,
               code: response.code
             };
-            this.debug("Result received from Engine:");
+            this.debug("Result received from Apollo Graph Manager:");
             this.debug(result);
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export type FieldStats = Map<string, Map<string, number \| null>>;`
`46`	`46`	`export function noServiceError(service: string \| undefined, endpoint?: string) {`
`47`	`47`	return `Could not find service ${
`48`	`48`	`service ? service : ""`
`49`		- } from Engine at ${endpoint}. Please check your API key and service name`;
	`49`	+ } from Apollo Graph Manager at ${endpoint}. Please check your API key and service name`;
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`export class ApolloEngineClient extends GraphQLDataSource {`
`@@ -98,7 +98,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (!(data && data.service)) {`
`101`		`- throw new Error("Error in request from Engine");`
	`101`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`102`	`102`	`}`
`103`	`103`	`return data.service;`
`104`	`104`	`});`
`@@ -121,7 +121,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`if (!(data && data.service)) {`
`124`		`- throw new Error("Error in request from Engine");`
	`124`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`125`	`125`	`}`
`126`	`126`	`return data.service.checkSchema;`
`127`	`127`	`});`
`@@ -144,7 +144,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if (!(data && data.service)) {`
`147`		`- throw new Error("Error in request from Engine");`
	`147`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`148`	`148`	`}`
`149`	`149`	`return data.service.uploadSchema;`
`150`	`150`	`});`
`@@ -169,7 +169,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if (!(data && data.service)) {`
`172`		`- throw new Error("Error in request from Engine");`
	`172`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`173`	`173`	`}`
`174`	`174`	`return data.service.upsertImplementingServiceAndTriggerComposition;`
`175`	`175`	`});`
`@@ -194,7 +194,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`if (!(data && data.service)) {`
`197`		`- throw new Error("Error in request from Engine");`
	`197`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`198`	`198`	`}`
`199`	`199`	`return data.service.checkPartialSchema;`
`200`	`200`	`});`
`@@ -212,7 +212,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`if (!data \|\| !data.service) {`
`215`		`- throw new Error("Error in request from Engine");`
	`215`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`return data.service.removeImplementingServiceAndTriggerComposition;`
`@@ -236,7 +236,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`if (!(data && data.service)) {`
`239`		`- throw new Error("Error in request from Engine");`
	`239`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`return data.service.validateOperations.validationResults;`
`@@ -262,7 +262,7 @@ export class ApolloEngineClient extends GraphQLDataSource {`
`262`	`262`	`if (`
`263`	`263`	`!(data && data.service && data.service.registerOperationsWithResponse)`
`264`	`264`	`) {`
`265`		`- throw new Error("Error in request from Engine");`
	`265`	`+ throw new Error("Error in request from Apollo Graph Manager");`
`266`	`266`	`}`
`267`	`267`	`return data.service.registerOperationsWithResponse;`
`268`	`268`	`});`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export default class ClientCheck extends ClientCommand {`
`42`	`42`	`task: async ctx => {`
`43`	`43`	`if (!config.name) {`
`44`	`44`	`throw new Error(`
`45`		`- "No service found to link to Engine. Engine is required for this command."`
	`45`	`+ "No service found to link to Apollo Graph Manager. Graph Manager is required for this command."`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`	`ctx.gitContext = await gitInfo(this.log);`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export default class ClientPush extends ClientCommand {`
`61`	`61`	`task: async (_, task) => {`
`62`	`62`	`if (!config.name) {`
`63`	`63`	`throw new Error(`
`64`		`- "No service found to link to Engine. Engine is required for this command."`
	`64`	`+ "No service found to link to Apollo Graph Manager. Graph Manager is required for this command."`
`65`	`65`	`);`
`66`	`66`	`}`
`67`	`67`