Add service delete command and mutation

JakeDawkins · JakeDawkins · commit 8db2ff2f3632 · 2019-04-15T10:41:51.000-07:00
diff --git a/packages/apollo-language-server/src/engine/index.ts b/packages/apollo-language-server/src/engine/index.ts
@@ -7,6 +7,7 @@ import { REGISTER_OPERATIONS } from "./operations/registerOperations";
 import { SCHEMA_TAGS_AND_FIELD_STATS } from "./operations/schemaTagsAndFieldStats";
 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 {
   CheckSchema,
   CheckSchemaVariables,
@@ -22,7 +23,9 @@ import {
   SchemaTagInfo,
   SchemaTagInfoVariables,
   CheckPartialSchema,
-  CheckPartialSchemaVariables
+  CheckPartialSchemaVariables,
+  RemoveServiceAndCompose,
+  RemoveServiceAndComposeVariables
 } from "../graphqlTypes";
 import { SCHEMA_TAG_INFO_QUERY } from "./operations/schemaTagInfo";
 
@@ -173,6 +176,25 @@ export class ApolloEngineClient extends GraphQLDataSource {
     });
   }
 
+  public async removeServiceAndCompose(
+    variables: RemoveServiceAndComposeVariables
+  ) {
+    return this.execute<RemoveServiceAndCompose>({
+      query: REMOVE_SERVICE_AND_COMPOSE,
+      variables
+    }).then(({ data, errors }) => {
+      if (errors) {
+        throw new Error(errors.map(error => error.message).join("\n"));
+      }
+
+      if (!data || !data.service) {
+        throw new Error("Error in request from Engine");
+      }
+
+      return data.service.removeImplementingServiceAndTriggerComposition;
+    });
+  }
+
   public async validateOperations(variables: ValidateOperationsVariables) {
     return this.execute<ValidateOperations>({
       query: VALIDATE_OPERATIONS,
diff --git a/packages/apollo-language-server/src/engine/operations/removeServiceAndCompose.ts b/packages/apollo-language-server/src/engine/operations/removeServiceAndCompose.ts
@@ -0,0 +1,38 @@
+import gql from "graphql-tag";
+
+export const REMOVE_SERVICE_AND_COMPOSE = gql`
+  mutation RemoveServiceAndCompose(
+    $id: ID!
+    $graphVariant: String!
+    $name: String!
+  ) {
+    service(id: $id) {
+      removeImplementingServiceAndTriggerComposition(
+        graphVariant: $graphVariant
+        name: $name
+      ) {
+        compositionConfig {
+          implementingServiceLocations {
+            name
+            path
+          }
+        }
+        errors {
+          location {
+            column
+            line
+          }
+          message
+        }
+        warnings {
+          location {
+            column
+            line
+          }
+          message
+        }
+        updatedGateway
+      }
+    }
+  }
+`;
diff --git a/packages/apollo-language-server/src/graphqlTypes.ts b/packages/apollo-language-server/src/graphqlTypes.ts
@@ -54,11 +54,11 @@ export interface CheckPartialSchema_service {
   __typename: "ServiceMutation";
   /**
    * This mutation will not result in any changes to the implementing service
-   * 
+   *
    * Run composition with the Implementing Service's partial schema replaced with the one provided
    * in the mutation's input. Store the composed schema, return the hash of the composed schema,
    * and any warnings and errors pertaining to composition.
-   * 
+   *
    * This mutation will not run validation against operations.
    */
   validatePartialSchemaOfImplementingServiceAgainstGraph: CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph;
@@ -167,11 +167,11 @@ export interface CheckSchema_service {
   /**
    * Validate, diff, and store a schema so the diff can be viewed by users in the UI.
    * This mutation will not mark the schema as "published".
-   * 
+   *
    * One of "proposedSchema" or "proposedSchemaHash" must be provided.
    * If both are provided, the computed schema hash will be compared with the input hash,
    * an error will be returned if the hashes don't match.
-   * 
+   *
    * If the "proposedSchemaHash" is specified, the already stored schema will be loaded.
    */
   checkSchema: CheckSchema_service_checkSchema;
@@ -218,6 +218,106 @@ export interface RegisterOperationsVariables {
 /* eslint-disable */
 // This file was automatically generated and should not be edited.
 
+// ====================================================
+// GraphQL mutation operation: RemoveServiceAndCompose
+// ====================================================
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_compositionConfig_implementingServices {
+  __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: string;
+  path: string;
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_compositionConfig {
+  __typename: "CompositionConfig";
+  /**
+   * List of implementing services that comprise a composed graph
+   */
+  implementingServices: RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_compositionConfig_implementingServices[];
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_errors_location {
+  __typename: "SourceLocation";
+  column: number;
+  line: number;
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_errors {
+  __typename: "SchemaCompositionError";
+  location: RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_errors_location;
+  message: string;
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_warnings_location {
+  __typename: "SourceLocation";
+  column: number;
+  line: number;
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_warnings {
+  __typename: "SchemaCompositionWarning";
+  location: RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_warnings_location;
+  message: string;
+}
+
+export interface RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition {
+  __typename: "CompositionResult";
+  /**
+   * The produced composition config. Will be null if there are any errors
+   */
+  compositionConfig: RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_compositionConfig | null;
+  /**
+   * List of errors during composition. Errors mean that Apollo was unable to compose the
+   * graph's implementing services into a GraphQL schema. This partial schema should not be
+   * published to the implementing service if there were any errors encountered
+   */
+  errors: (RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_errors | null)[];
+  /**
+   * List of warnings encountered during composing implementing services into a complete schema.
+   * Though a schema was composed for the graph with the proposed partial schema,
+   * these warnings may indicate undesired behavior or lost information. We recommend that no service
+   * is pushed with warnings that are not fully understood. Pushing an implementing service with warnings
+   * in its composition result will result in updating the composition config.
+   */
+  warnings: (RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition_warnings | null)[];
+  /**
+   * Whether the gateway link was updated.
+   */
+  updatedGateway: boolean;
+}
+
+export interface RemoveServiceAndCompose_service {
+  __typename: "ServiceMutation";
+  /**
+   * Remove an implementing service from a graph and update its service list manifest
+   */
+  removeImplementingServiceAndTriggerComposition: RemoveServiceAndCompose_service_removeImplementingServiceAndTriggerComposition;
+}
+
+export interface RemoveServiceAndCompose {
+  service: RemoveServiceAndCompose_service | null;
+}
+
+export interface RemoveServiceAndComposeVariables {
+  id: string;
+  graphVariant: string;
+  name: string;
+}
+
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
 // ====================================================
 // GraphQL query operation: SchemaTagInfo
 // ====================================================
@@ -388,10 +488,10 @@ export interface UploadAndComposePartialSchema_service {
   /**
    * Creates or updates an implementing service of a given "name" on the graph variant, then
    * updates the graph variant's composition configs/artifacts to reflect these changes.
-   * 
+   *
    * An enriched SDL of the implementing service can be uploaded
    * via "implementingServiceConfiguration.partialSchema.partialSchemaSDL".
-   * 
+   *
    * Alternatively, previously uploaded partial schema could be re-associated with the
    * implementing service via "implementingServiceConfiguration.partialSchema.partialSchemaHash".
    */
@@ -1595,10 +1695,10 @@ export interface OperationDocumentInput {
 /**
  * Input for registering a partial schema to an implementing service.
  * One of the fields must be specified (validated server-side).
- * 
+ *
  * If a new partialSchemaSDL is passed in, this operation will store it before
  * creating the association.
- * 
+ *
  * If both the sdl and hash are specified, an error will be thrown if the provided
  * hash doesn't match our hash of the sdl contents
  */
diff --git a/packages/apollo/src/commands/service/delete.ts b/packages/apollo/src/commands/service/delete.ts
@@ -0,0 +1,95 @@
+import { flags } from "@oclif/command";
+import { table } from "heroku-cli-util";
+import { introspectionFromSchema } from "graphql";
+
+import { gitInfo } from "../../git";
+import { ProjectCommand } from "../../Command";
+import { GraphQLServiceProject } from "apollo-language-server";
+
+export default class ServiceDelete extends ProjectCommand {
+  static description =
+    "Delete a federated service from Engine and recompose remaining services";
+  static flags = {
+    ...ProjectCommand.flags,
+    tag: flags.string({
+      char: "t",
+      description: "The variant of the service to delete",
+      default: "current"
+    }),
+    federated: flags.boolean({
+      char: "f",
+      default: false,
+      description:
+        "Indicates that the schema is a partial schema from a federated service"
+    }),
+    serviceName: flags.string({
+      required: true,
+      description:
+        "Provides the name of the implementing service for a federated graph"
+    })
+  };
+
+  async run() {
+    let result;
+    await this.runTasks(({ flags, project, config }) => [
+      {
+        title: "Removing service from Engine",
+        task: async () => {
+          if (!config.name) {
+            throw new Error("No service found to link to Engine");
+          }
+
+          if (!flags.federated) {
+            this.error(
+              "Deleting a service is only supported for federated services. Use the --federated flag if this is a federated service."
+            );
+          }
+
+          const {
+            // compositionConfig,
+            errors,
+            warnings,
+            updatedGateway
+          } = await project.engine.removeServiceAndCompose({
+            id: config.name,
+            graphVariant: config.tag,
+            name: flags.serviceName // XXX should this also use queried service info?
+          });
+
+          result = {
+            serviceName: flags.serviceName,
+            graphVariant: config.tag,
+            graphName: config.name,
+            warnings,
+            errors,
+            updatedGateway
+          };
+
+          return;
+        }
+      }
+    ]);
+
+    this.log("\n");
+
+    if (result.errors && result.errors.length) {
+      this.error(result.errors.join("\n"));
+    }
+
+    if (result.warnings && result.warnings.length) {
+      this.warn(result.warnings.join("\n"));
+    }
+
+    if (result.updatedGateway) {
+      this.log(
+        `The ${result.serviceName} service with ${
+          result.graphVariant
+        } tag was removed from ${
+          result.graphName
+        }. Remaining services were composed.`
+      );
+      this.log("\n");
+      this.log("\n");
+    }
+  }
+}
diff --git a/packages/apollo/src/commands/service/push.ts b/packages/apollo/src/commands/service/push.ts
@@ -86,7 +86,10 @@ export default class ServicePush extends ProjectCommand {
               graphVariant: config.tag,
               name: flags.serviceName || info.name,
               url: flags.serviceURL || info.url,
-              revision: flags.serviceRevision || gitContext.commit,
+              revision:
+                flags.serviceRevision ||
+                (gitContext && gitContext.commit) ||
+                "",
               activePartialSchema: {
                 sdl: info.sdl
               }
