support updated mutation for pushing a partial service

Author: James Baxley

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

@@ -104,7 +104,8 @@ export class GraphQLDataSource<TContext = any> {
   }
 
   private onErrorLink() {
-    return onError(({ graphQLErrors, networkError }) => {
+    return onError(({ graphQLErrors, networkError, operation }) => {
+      const { result, response } = operation.getContext();
       if (graphQLErrors) {
         graphQLErrors.map(graphqlError =>
           console.error(`[GraphQL error]: ${graphqlError.message}`)
@@ -114,6 +115,10 @@ export class GraphQLDataSource<TContext = any> {
       if (networkError) {
         console.log(`[Network Error]: ${networkError}`);
       }
+
+      if (response && response.status >= 400) {
+        console.log(`[Network Error] ${response.bodyText}`);
+      }
     });
   }
 }

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

@@ -13,7 +13,16 @@ export const CHECK_PARTIAL_SCHEMA = gql`
         implementingServiceName: $implementingServiceName
         partialSchema: $partialSchema
       ) {
-        schemaHash
+        compositionConfig {
+          schemaHash
+        }
+        errors {
+          message
+        }
+        warnings {
+          message
+        }
+        didUpdateGateway: updatedGateway
       }
     }
   }

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

@@ -19,7 +19,7 @@ export const CHECK_SCHEMA = gql`
       ) {
         targetUrl
         diffToPrevious {
-          type
+          type: severity
           affectedClients {
             __typename
           }
@@ -28,7 +28,7 @@ export const CHECK_SCHEMA = gql`
           }
           numberOfCheckedOperations
           changes {
-            type
+            type: severity
             code
             description
           }

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

@@ -6,18 +6,28 @@ export const UPLOAD_AND_COMPOSE_PARTIAL_SCHEMA = gql`
     $graphVariant: String!
     $name: String!
     $url: String!
-    $sha: String!
+    $revision: String!
     $activePartialSchema: PartialSchemaInput!
   ) {
     service(id: $id) {
       upsertImplementingServiceAndTriggerComposition(
         name: $name
         url: $url
-        sha: $sha
+        revision: $revision
         activePartialSchema: $activePartialSchema
         graphVariant: $graphVariant
       ) {
-        schemaHash
+        compositionConfig {
+          schemaHash
+        }
+        errors {
+          message
+        }
+        warnings {
+          message
+        }
+        didUpdateGateway: updatedGateway
+        serviceWasCreated: wasCreated
       }
     }
   }

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

@@ -6,14 +6,50 @@
 // GraphQL mutation operation: CheckPartialSchema
 // ====================================================
 
-export interface CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph {
-  __typename: "CompositionResult";
+export interface CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_compositionConfig {
+  __typename: "CompositionConfig";
   /**
    * Hash of the composed schema
    */
   schemaHash: string;
 }
 
+export interface CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_errors {
+  __typename: "SchemaCompositionError";
+  message: string;
+}
+
+export interface CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_warnings {
+  __typename: "SchemaCompositionWarning";
+  message: string;
+}
+
+export interface CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph {
+  __typename: "CompositionResult";
+  /**
+   * The produced composition config. Will be null if there are any errors
+   */
+  compositionConfig: CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_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: (CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_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: (CheckPartialSchema_service_validatePartialSchemaOfImplementingServiceAgainstGraph_warnings | null)[];
+  /**
+   * Whether the gateway link was updated.
+   */
+  didUpdateGateway: boolean;
+}
+
 export interface CheckPartialSchema_service {
   __typename: "ServiceMutation";
   /**
@@ -60,7 +96,7 @@ export interface CheckSchema_service_checkSchema_diffToPrevious_changes {
   /**
    * Indication of the success of the overall change, either failure, warning, or notice.
    */
-  type: ChangeType;
+  type: ChangeSeverity;
   /**
    * Indication of the kind of target and action of the change, e.g. 'TYPE_REMOVED'.
    */
@@ -88,7 +124,10 @@ export interface CheckSchema_service_checkSchema_diffToPrevious_validationConfig
 
 export interface CheckSchema_service_checkSchema_diffToPrevious {
   __typename: "SchemaDiff";
-  type: ChangeType;
+  /**
+   * Indication of the success of the change, either failure, warning, or notice.
+   */
+  type: ChangeSeverity;
   /**
    * Clients affected by all changes in diff
    */
@@ -296,14 +335,54 @@ export interface SchemaTagsAndFieldStatsVariables {
 // GraphQL mutation operation: UploadAndComposePartialSchema
 // ====================================================
 
-export interface UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition {
-  __typename: "CompositionResult";
+export interface UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_compositionConfig {
+  __typename: "CompositionConfig";
   /**
    * Hash of the composed schema
    */
   schemaHash: string;
 }
 
+export interface UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_errors {
+  __typename: "SchemaCompositionError";
+  message: string;
+}
+
+export interface UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_warnings {
+  __typename: "SchemaCompositionWarning";
+  message: string;
+}
+
+export interface UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition {
+  __typename: "CompositionAndUpsertResult";
+  /**
+   * The produced composition config. Will be null if there are any errors
+   */
+  compositionConfig: UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_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: (UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_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: (UploadAndComposePartialSchema_service_upsertImplementingServiceAndTriggerComposition_warnings | null)[];
+  /**
+   * Whether the gateway link was updated.
+   */
+  didUpdateGateway: boolean;
+  /**
+   * Whether an implementingService was created as part of this mutation
+   */
+  serviceWasCreated: boolean;
+}
+
 export interface UploadAndComposePartialSchema_service {
   __typename: "ServiceMutation";
   /**
@@ -328,7 +407,7 @@ export interface UploadAndComposePartialSchemaVariables {
   graphVariant: string;
   name: string;
   url: string;
-  sha: string;
+  revision: string;
   activePartialSchema: PartialSchemaInput;
 }
 
@@ -1364,7 +1443,7 @@ export interface IntrospectionTypeRef {
 // START Enums and Input Objects
 //==============================================================
 
-export enum ChangeType {
+export enum ChangeSeverity {
   FAILURE = "FAILURE",
   NOTICE = "NOTICE",
   WARNING = "WARNING",

packages/apollo-language-server/src/providers/federation-info/endpoint.ts

@@ -24,8 +24,6 @@ export class EndpointFederationInfoProvider
       query getFederationInfo {
         _service {
           sdl
-          name
-          url
         }
       }
     `;

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

@@ -8,7 +8,7 @@ import { validateHistoricParams } from "../../utils";
 import {
   CheckSchema_service_checkSchema,
   CheckSchema_service_checkSchema_diffToPrevious_changes as Change,
-  ChangeType
+  ChangeSeverity as ChangeType
 } from "apollo-language-server/lib/graphqlTypes";
 import { ApolloConfig, GraphQLServiceProject } from "apollo-language-server";
 import moment from "moment";
@@ -263,7 +263,11 @@ export default class ServiceCheck extends ProjectCommand {
                  * name: implementing service name inside of the graph
                  * sha: git commit hash/docker id. placeholder for now
                  */
-                const { schemaHash } = await project.engine.checkPartialSchema({
+                const {
+                  errors,
+                  warnings,
+                  compositionConfig
+                } = await project.engine.checkPartialSchema({
                   id: config.name,
                   graphVariant: config.name,
                   implementingServiceName: info.name,
@@ -272,7 +276,14 @@ export default class ServiceCheck extends ProjectCommand {
                   }
                 });
 
-                console.log({ schemaHash });
+                if (errors.length) {
+                  this.error(errors.join("\n"));
+                  return;
+                }
+                if (warnings.length) {
+                  this.warn(warnings.join("\n"));
+                }
+
                 return;
               }