Merge pull request #1358 from apollographql/mkoneval/AP-512/service-list-cli

service:list in CLI

Author: mayakoneval

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - `apollo`
   - Relax graphql version, resolve missing types "Boolean", "String" [#1355](https://github.com/apollographql/apollo-tooling/pull/1355)
+  - Add `service:list` and tests [#1358](https://github.com/apollographql/apollo-tooling/pull/1358)
 - `apollo-codegen-core`
   - <First `apollo-codegen-core` related entry goes here>
 - `apollo-codegen-flow`

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

@@ -8,7 +8,10 @@ import { SCHEMA_TAGS_AND_FIELD_STATS } from "./operations/schemaTagsAndFieldStat
 import { UPLOAD_AND_COMPOSE_PARTIAL_SCHEMA } from "./operations/uploadAndComposePartialSchema";
 import { CHECK_PARTIAL_SCHEMA } from "./operations/checkPartialSchema";
 import { REMOVE_SERVICE_AND_COMPOSE } from "./operations/removeServiceAndCompose";
+import { LIST_SERVICES } from "./operations/listServices";
 import {
+  ListServices,
+  ListServicesVariables,
   CheckSchema,
   CheckSchemaVariables,
   UploadSchema,
@@ -77,6 +80,29 @@ export class ApolloEngineClient extends GraphQLDataSource {
     ] = require("../../package.json").version;
   }
 
+  public async listServices(variables: ListServicesVariables) {
+    return this.execute<ListServices>({
+      query: LIST_SERVICES,
+      variables
+    }).then(({ data, errors }) => {
+      // use error logger
+      if (errors) {
+        throw new Error(errors.map(error => error.message).join("\n"));
+      }
+
+      if (data && !data.service) {
+        throw new Error(
+          noServiceError(getServiceFromKey(this.engineKey), this.baseURL)
+        );
+      }
+
+      if (!(data && data.service)) {
+        throw new Error("Error in request from Engine");
+      }
+      return data.service;
+    });
+  }
+
   public async checkSchema(variables: CheckSchemaVariables) {
     return this.execute<CheckSchema>({
       query: CHECK_SCHEMA,

packages/apollo-language-server/src/engine/operations/listServices.ts

@@ -0,0 +1,20 @@
+import gql from "graphql-tag";
+
+export const LIST_SERVICES = gql`
+  query ListServices($id: ID!, $graphVariant: String!) {
+    service(id: $id) {
+      implementingServices(graphVariant: $graphVariant) {
+        __typename
+        ... on FederatedImplementingServices {
+          services {
+            graphID
+            graphVariant
+            name
+            url
+            updatedAt
+          }
+        }
+      }
+    }
+  }
+`;

packages/apollo-language-server/src/graphqlTypes.ts

@@ -194,6 +194,72 @@ export interface CheckSchemaVariables {
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
+// ====================================================
+// GraphQL query operation: ListServices
+// ====================================================
+
+export interface ListServices_service_implementingServices_NonFederatedImplementingService {
+  __typename: "NonFederatedImplementingService";
+}
+
+export interface ListServices_service_implementingServices_FederatedImplementingServices_services {
+  __typename: "FederatedImplementingService";
+  /**
+   * Identifies which graph this implementing service belongs to.
+   * Formerly known as "service_id"
+   */
+  graphID: string;
+  /**
+   * Specifies which variant of a graph this implementing service belongs to".
+   * Formerly known as "tag"
+   */
+  graphVariant: string;
+  /**
+   * Name of the implementing service
+   */
+  name: string;
+  /**
+   * URL of the graphql endpoint of the implementing service
+   */
+  url: string | null;
+  /**
+   * Timestamp for when this implementing service was updated
+   */
+  updatedAt: any;
+}
+
+export interface ListServices_service_implementingServices_FederatedImplementingServices {
+  __typename: "FederatedImplementingServices";
+  services: ListServices_service_implementingServices_FederatedImplementingServices_services[];
+}
+
+export type ListServices_service_implementingServices = ListServices_service_implementingServices_NonFederatedImplementingService | ListServices_service_implementingServices_FederatedImplementingServices;
+
+export interface ListServices_service {
+  __typename: "Service";
+  /**
+   * Implementing services that comprise a graph.
+   * Set includeDeleted to see deleted implementing services
+   */
+  implementingServices: ListServices_service_implementingServices | null;
+}
+
+export interface ListServices {
+  /**
+   * Service by ID
+   */
+  service: ListServices_service | null;
+}
+
+export interface ListServicesVariables {
+  id: string;
+  graphVariant: string;
+}
+
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
 // ====================================================
 // GraphQL mutation operation: RegisterOperations
 // ====================================================

packages/apollo/src/commands/service/__tests__/__snapshots__/list.test.ts.snap

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`service:list integration should display non federated message for a non federated service vanilla 1`] = `
+"Loading Apollo Project [started]
+Loading Apollo Project [completed]
+Fetching list of services for graph engine [started]
+Fetching list of services for graph engine [completed]
+
+There are no services on this federated graph
+"
+`;
+
+exports[`service:list integration should list services correctly for a federated service vanilla 1`] = `
+"Loading Apollo Project [started]
+Loading Apollo Project [completed]
+Fetching list of services for graph engine [started]
+Fetching list of services for graph engine [completed]
+
+accounts   http://localhost:4001/graphql  13 May 2019 (a month ago)
+inventory  http://localhost:4002/graphql  16 May 2019 (a month ago)
+products   http://localhost:4003/graphql  16 May 2019 (a month ago)
+reviews    http://localhost:4004/graphql  16 May 2019 (a month ago)
+
+View full details at: https://engine-staging.apollographql.com/graph/engine/service-list
+"
+`;

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

@@ -50,6 +50,10 @@ let mockedConsoleLogOriginal: Console["log"] | null = null;
  */
 let mockedConsoleLogValues: string[] | null = null;
 
+// TODO: the following two functions are identical to the ones found in list.test.ts
+// we are choosing to duplicate them for now, because with a shared helper function,
+// jest overwrites console log output as the tests are run in parallel
+
 /**
  * Mock and capture `console.log` and `stdout.write`s. Return them in that order as a single string.
  *