feat(app): unify schema composition settings mutations

integration-tests/testkit/flow.ts

@@ -12,7 +12,6 @@ import type {
   CreateTokenInput,
   DeleteMemberRoleInput,
   DeleteTokensInput,
-  EnableExternalSchemaCompositionInput,
   Experimental__UpdateTargetSchemaCompositionInput,
   InviteToOrganizationByEmailInput,
   OrganizationSelectorInput,
@@ -27,6 +26,7 @@ import type {
   UpdateMemberRoleInput,
   UpdateOrganizationSlugInput,
   UpdateProjectSlugInput,
+  UpdateSchemaCompositionInput,
   UpdateTargetConditionalBreakingChangeConfigurationInput,
   UpdateTargetSlugInput,
 } from './gql/graphql';
@@ -1508,25 +1508,24 @@ export async function updateOrgRateLimit(
   });
 }
 
-export async function enableExternalSchemaComposition(
-  input: EnableExternalSchemaCompositionInput,
-  token: string,
-) {
+export async function updateSchemaComposition(input: UpdateSchemaCompositionInput, token: string) {
   return execute({
     document: graphql(`
-      mutation enableExternalSchemaComposition($input: EnableExternalSchemaCompositionInput!) {
-        enableExternalSchemaComposition(input: $input) {
+      mutation updateSchemaComposition($input: UpdateSchemaCompositionInput!) {
+        updateSchemaComposition(input: $input) {
           ok {
             id
             externalSchemaComposition {
               endpoint
             }
           }
           error {
-            message
-            inputErrors {
-              endpoint
-              secret
+            ... on UpdateSchemaCompositionExternalError {
+              message
+              inputErrors {
+                endpoint
+                secret
+              }
             }
           }
         }

integration-tests/tests/api/schema/composition-federation-2.spec.ts

@@ -1,5 +1,5 @@
 import { ProjectType } from 'testkit/gql/graphql';
-import { enableExternalSchemaComposition } from '../../../testkit/flow';
+import { updateSchemaComposition } from '../../../testkit/flow';
 import { initSeed } from '../../../testkit/seed';
 import { generateUnique, getServiceHost } from '../../../testkit/utils';
 
@@ -38,19 +38,20 @@ test.concurrent('call an external service to compose and validate services', asy
   expect(publishUsersResult.schemaPublish.__typename).toBe('SchemaPublishSuccess');
 
   // enable external composition
-  const externalCompositionResult = await enableExternalSchemaComposition(
+  const externalCompositionResult = await updateSchemaComposition(
     {
-      endpoint: `http://${dockerAddress}/compose`,
-      // eslint-disable-next-line no-process-env
-      secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-      projectSlug: project.slug,
-      organizationSlug: organization.slug,
+      external: {
+        endpoint: `http://${dockerAddress}/compose`,
+        // eslint-disable-next-line no-process-env
+        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+        projectSlug: project.slug,
+        organizationSlug: organization.slug,
+      },
     },
     ownerToken,
   ).then(r => r.expectNoGraphQLErrors());
   expect(
-    externalCompositionResult.enableExternalSchemaComposition.ok?.externalSchemaComposition
-      ?.endpoint,
+    externalCompositionResult.updateSchemaComposition.ok?.externalSchemaComposition?.endpoint,
   ).toBe(`http://${dockerAddress}/compose`);
   // Disable Native Federation v2 composition to allow the external composition to take place
   await setNativeFederation(false);

integration-tests/tests/api/schema/delete.spec.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { parse, print } from 'graphql';
-import { enableExternalSchemaComposition } from 'testkit/flow';
+import { updateSchemaComposition } from 'testkit/flow';
 import { ProjectType } from 'testkit/gql/graphql';
 import { initSeed } from 'testkit/seed';
 import { getServiceHost } from 'testkit/utils';
@@ -235,13 +235,15 @@ test.concurrent(
 
       const readToken = await createTargetAccessToken({});
 
-      await enableExternalSchemaComposition(
+      await updateSchemaComposition(
         {
-          endpoint: `http://${await getServiceHost('composition_federation_2', 3069, false)}/compose`,
-          // eslint-disable-next-line no-process-env
-          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-          projectSlug: project.slug,
-          organizationSlug: organization.slug,
+          external: {
+            endpoint: `http://${await getServiceHost('composition_federation_2', 3069, false)}/compose`,
+            // eslint-disable-next-line no-process-env
+            secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+            projectSlug: project.slug,
+            organizationSlug: organization.slug,
+          },
         },
         ownerToken,
       ).then(r => r.expectNoGraphQLErrors());

integration-tests/tests/api/schema/external-composition.spec.ts

@@ -1,6 +1,6 @@
 import { ProjectType } from 'testkit/gql/graphql';
 import { history } from '../../../testkit/external-composition';
-import { enableExternalSchemaComposition } from '../../../testkit/flow';
+import { updateSchemaComposition } from '../../../testkit/flow';
 import { initSeed } from '../../../testkit/seed';
 import { generateUnique, getServiceHost } from '../../../testkit/utils';
 
@@ -43,19 +43,20 @@ test.concurrent('call an external service to compose and validate services', asy
   // so we need to use the name and not resolved host
   const dockerAddress = await getServiceHost('external_composition', 3012, false);
   // enable external composition
-  const externalCompositionResult = await enableExternalSchemaComposition(
+  const externalCompositionResult = await updateSchemaComposition(
     {
-      endpoint: `http://${dockerAddress}/compose`,
-      // eslint-disable-next-line no-process-env
-      secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-      projectSlug: project.slug,
-      organizationSlug: organization.slug,
+      external: {
+        endpoint: `http://${dockerAddress}/compose`,
+        // eslint-disable-next-line no-process-env
+        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+        projectSlug: project.slug,
+        organizationSlug: organization.slug,
+      },
     },
     ownerToken,
   ).then(r => r.expectNoGraphQLErrors());
   expect(
-    externalCompositionResult.enableExternalSchemaComposition.ok?.externalSchemaComposition
-      ?.endpoint,
+    externalCompositionResult.updateSchemaComposition.ok?.externalSchemaComposition?.endpoint,
   ).toBe(`http://${dockerAddress}/compose`);
 
   // set native federation to false to force external composition
@@ -126,19 +127,20 @@ test.concurrent(
     // so we need to use the name and not resolved host
     const dockerAddress = await getServiceHost('external_composition', 3012, false);
     // enable external composition
-    const externalCompositionResult = await enableExternalSchemaComposition(
+    const externalCompositionResult = await updateSchemaComposition(
       {
-        endpoint: `http://${dockerAddress}/fail_on_signature`,
-        // eslint-disable-next-line no-process-env
-        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-        projectSlug: project.slug,
-        organizationSlug: organization.slug,
+        external: {
+          endpoint: `http://${dockerAddress}/fail_on_signature`,
+          // eslint-disable-next-line no-process-env
+          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+          projectSlug: project.slug,
+          organizationSlug: organization.slug,
+        },
       },
       ownerToken,
     ).then(r => r.expectNoGraphQLErrors());
     expect(
-      externalCompositionResult.enableExternalSchemaComposition.ok?.externalSchemaComposition
-        ?.endpoint,
+      externalCompositionResult.updateSchemaComposition.ok?.externalSchemaComposition?.endpoint,
     ).toBe(`http://${dockerAddress}/fail_on_signature`);
 
     // set native federation to false to force external composition
@@ -225,19 +227,20 @@ test.concurrent(
     // so we need to use the name and not resolved host
     const dockerAddress = await getServiceHost('external_composition', 3012, false);
     // enable external composition
-    const externalCompositionResult = await enableExternalSchemaComposition(
+    const externalCompositionResult = await updateSchemaComposition(
       {
-        endpoint: `http://${dockerAddress}/non-existing-endpoint`,
-        // eslint-disable-next-line no-process-env
-        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-        projectSlug: project.slug,
-        organizationSlug: organization.slug,
+        external: {
+          endpoint: `http://${dockerAddress}/non-existing-endpoint`,
+          // eslint-disable-next-line no-process-env
+          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+          projectSlug: project.slug,
+          organizationSlug: organization.slug,
+        },
       },
       ownerToken,
     ).then(r => r.expectNoGraphQLErrors());
     expect(
-      externalCompositionResult.enableExternalSchemaComposition.ok?.externalSchemaComposition
-        ?.endpoint,
+      externalCompositionResult.updateSchemaComposition.ok?.externalSchemaComposition?.endpoint,
     ).toBe(`http://${dockerAddress}/non-existing-endpoint`);
     // set native federation to false to force external composition
     await setNativeFederation(false);
@@ -321,19 +324,20 @@ test.concurrent('a timeout error should be visible to the user', async ({ expect
   // so we need to use the name and not resolved host
   const dockerAddress = await getServiceHost('external_composition', 3012, false);
   // enable external composition
-  const externalCompositionResult = await enableExternalSchemaComposition(
+  const externalCompositionResult = await updateSchemaComposition(
     {
-      endpoint: `http://${dockerAddress}/timeout`,
-      // eslint-disable-next-line no-process-env
-      secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-      projectSlug: project.slug,
-      organizationSlug: organization.slug,
+      external: {
+        endpoint: `http://${dockerAddress}/timeout`,
+        // eslint-disable-next-line no-process-env
+        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+        projectSlug: project.slug,
+        organizationSlug: organization.slug,
+      },
     },
     ownerToken,
   ).then(r => r.expectNoGraphQLErrors());
   expect(
-    externalCompositionResult.enableExternalSchemaComposition.ok?.externalSchemaComposition
-      ?.endpoint,
+    externalCompositionResult.updateSchemaComposition.ok?.externalSchemaComposition?.endpoint,
   ).toBe(`http://${dockerAddress}/timeout`);
   // set native federation to false to force external composition
   await setNativeFederation(false);

integration-tests/tests/api/schema/publish.spec.ts

@@ -7,11 +7,7 @@ import { execute } from 'testkit/graphql';
 import { getServiceHost } from 'testkit/utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { createStorage } from '@hive/storage';
-import {
-  createTarget,
-  enableExternalSchemaComposition,
-  publishSchema,
-} from '../../../testkit/flow';
+import { createTarget, publishSchema, updateSchemaComposition } from '../../../testkit/flow';
 import { initSeed } from '../../../testkit/seed';
 
 test.concurrent(
@@ -2804,13 +2800,15 @@ test('Composition Error (Federation 2) can be served from the database', async (
     );
     const readWriteToken = await createTargetAccessToken({});
 
-    await enableExternalSchemaComposition(
+    await updateSchemaComposition(
       {
-        endpoint: `http://${serviceAddress}/compose`,
-        // eslint-disable-next-line no-process-env
-        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-        projectSlug: project.slug,
-        organizationSlug: organization.slug,
+        external: {
+          endpoint: `http://${serviceAddress}/compose`,
+          // eslint-disable-next-line no-process-env
+          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+          projectSlug: project.slug,
+          organizationSlug: organization.slug,
+        },
       },
       ownerToken,
     ).then(r => r.expectNoGraphQLErrors());
@@ -2924,13 +2922,15 @@ test('Composition Network Failure (Federation 2)', async () => {
     );
     const readWriteToken = await createTargetAccessToken({});
 
-    await enableExternalSchemaComposition(
+    await updateSchemaComposition(
       {
-        endpoint: `http://${serviceAddress}/compose`,
-        // eslint-disable-next-line no-process-env
-        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-        projectSlug: project.slug,
-        organizationSlug: organization.slug,
+        external: {
+          endpoint: `http://${serviceAddress}/compose`,
+          // eslint-disable-next-line no-process-env
+          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+          projectSlug: project.slug,
+          organizationSlug: organization.slug,
+        },
       },
       ownerToken,
     ).then(r => r.expectNoGraphQLErrors());
@@ -2965,12 +2965,14 @@ test('Composition Network Failure (Federation 2)', async () => {
       return;
     }
 
-    await enableExternalSchemaComposition(
+    await updateSchemaComposition(
       {
-        endpoint: `http://${serviceAddress}/no_compose`,
-        secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
-        projectSlug: project.slug,
-        organizationSlug: organization.slug,
+        external: {
+          endpoint: `http://${serviceAddress}/no_compose`,
+          secret: process.env.EXTERNAL_COMPOSITION_SECRET!,
+          projectSlug: project.slug,
+          organizationSlug: organization.slug,
+        },
       },
       ownerToken,
     ).then(r => r.expectNoGraphQLErrors());