Merge branch 'main' into wilson/eng-6493-add-api-key-in-audit-log

Author: wilsonrivera

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "helm/cosmo": "0.12.3",
-  "helm/cosmo/charts/router": "0.9.0"
+  "helm/cosmo": "0.13.0",
+  "helm/cosmo/charts/router": "0.10.0"
 }

README.md

@@ -21,6 +21,11 @@
 
 WunderGraph Cosmo is a comprehensive Lifecycle API Management platform tailored for Federated GraphQL. It encompasses everything from Schema Registry, composition checks, and analytics, to metrics, tracing, and routing. Whether you’re looking to deploy 100% on-prem or prefer a [Managed Service](https://cosmo.wundergraph.com/login), Cosmo offers flexibility without vendor lock-in, all under the Apache 2.0 license.
 
+## The State of GraphQL Federation 2024
+
+Get insights from industry experts and Federation practicioners across all industries and learn how companies are using GraphQL Federation.
+Head over to the [State of GraphQL Federation 2024](https://wundergraph.com/state-of-graphql-federation/2024) page and download the full **48 page PDF report** for free!
+
 ### Why Federated GraphQL?
 
 GraphQL Federation empowers organizations to break down their GraphQL schema into multiple smaller, manageable schemas, each maintained by different teams or services. These individual schemas are then combined into a single, unified graph, ensuring that all teams have consistent access to the data they need. In today's data-driven world, where information is often referred to as the new oil, building a unified API that can be consumed by both internal and external teams is more crucial than ever.
@@ -74,4 +79,4 @@ We welcome contributions from the community! Whether it's fixing a bug, adding n
 
 ## License
 
-Cosmo is licensed under the [Apache License, Version 2.0](LICENSE).
+Cosmo is licensed under the [Apache License, Version 2.0](LICENSE).

cdn-server/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.14.2](https://github.com/wundergraph/cosmo/compare/[email protected]@0.14.2) (2025-03-11)
+
+**Note:** Version bump only for package cdn
+
 ## [0.14.1](https://github.com/wundergraph/cosmo/compare/[email protected]@0.14.1) (2025-02-21)
 
 **Note:** Version bump only for package cdn

cdn-server/cdn/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.2](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-03-11)
+
+**Note:** Version bump only for package @wundergraph/cosmo-cdn
+
 ## [0.9.1](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-02-21)
 
 **Note:** Version bump only for package @wundergraph/cosmo-cdn

cdn-server/cdn/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wundergraph/cosmo-cdn",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "author": {
     "name": "WunderGraph Maintainers",
     "email": "[email protected]"

cdn-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdn",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "private": true,
   "author": {
     "name": "WunderGraph Maintainers",

cli/CHANGELOG.md

@@ -4,6 +4,12 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.75.6](https://github.com/wundergraph/cosmo/compare/[email protected]@0.75.6) (2025-03-11)
+
+### Bug Fixes
+
+* composition warnings should respect --json flag and output in JSON format ([#1673](https://github.com/wundergraph/cosmo/issues/1673)) ([745140f](https://github.com/wundergraph/cosmo/commit/745140f001230fea2cbd1fd7e6e2b12d47eeb36f)) (@JivusAyrus)
+
 ## [0.75.5](https://github.com/wundergraph/cosmo/compare/[email protected]@0.75.5) (2025-03-06)
 
 ### Bug Fixes

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.75.5",
+  "version": "0.75.6",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/src/index.js",

cli/src/commands/feature-subgraph/commands/publish.ts

@@ -11,6 +11,7 @@ import { BaseCommandOptions, SubgraphCommandJsonOutput } from '../../../core/typ
 import { getBaseHeaders } from '../../../core/config.js';
 import { validateSubscriptionProtocols } from '../../../utils.js';
 import { websocketSubprotocolDescription } from '../../../constants.js';
+import { handleCompositionResult } from '../../../handle-composition-result.js';
 
 export default (opts: BaseCommandOptions) => {
   const command = new Command('publish');
@@ -60,6 +61,7 @@ export default (opts: BaseCommandOptions) => {
   );
   command.option('-r, --raw', 'Prints to the console in json format instead of table');
   command.option('-j, --json', 'Prints to the console in json format instead of table');
+  command.option('--suppress-warnings', 'This flag suppresses any warnings produced by composition.');
 
   command.action(async (name, options) => {
     const schemaFile = resolve(options.schema);
@@ -114,132 +116,33 @@ export default (opts: BaseCommandOptions) => {
       },
     );
 
-    switch (resp.response?.code) {
-      case EnumStatusCode.OK: {
-        if (shouldOutputJson) {
-          const successMessageJson: SubgraphCommandJsonOutput = {
-            status: 'success',
-            message: 'Feature subgraph published successfully.',
-            compositionErrors: resp.compositionErrors,
-            deploymentErrors: resp.deploymentErrors,
-          };
-          console.log(JSON.stringify(successMessageJson));
-        } else {
-          spinner.succeed(
-            resp?.hasChanged === false ? 'No new changes to publish.' : 'Feature subgraph published successfully.',
-          );
-        }
-
-        break;
-      }
-      case EnumStatusCode.ERR_SUBGRAPH_COMPOSITION_FAILED: {
-        if (shouldOutputJson) {
-          const compositionFailedMessageJson: SubgraphCommandJsonOutput = {
-            status: 'error',
-            message: 'Feature subgraph published but with composition errors.',
-            compositionErrors: resp.compositionErrors,
-            deploymentErrors: resp.deploymentErrors,
-          };
-          console.log(JSON.stringify(compositionFailedMessageJson));
-        } else {
-          spinner.warn('Feature subgraph published but with composition errors.');
-
-          const compositionErrorsTable = new Table({
-            head: [
-              pc.bold(pc.white('FEDERATED_GRAPH_NAME')),
-              pc.bold(pc.white('NAMESPACE')),
-              pc.bold(pc.white('FEATURE_FLAG')),
-              pc.bold(pc.white('ERROR_MESSAGE')),
-            ],
-            colWidths: [30, 30, 30, 120],
-            wordWrap: true,
-          });
-
-          console.log(
-            pc.red(
-              `We found composition errors, while composing the federated graph.\nThe router will continue to work with the latest valid schema.\n${pc.bold(
-                'Please check the errors below:',
-              )}`,
-            ),
-          );
-          for (const compositionError of resp.compositionErrors) {
-            compositionErrorsTable.push([
-              compositionError.federatedGraphName,
-              compositionError.namespace,
-              compositionError.featureFlag || '-',
-              compositionError.message,
-            ]);
-          }
-          // Don't exit here with 1 because the change was still applied
-          console.log(compositionErrorsTable.toString());
-
-          if (options.failOnCompositionError) {
-            program.error(pc.red(pc.bold('The command failed due to composition errors.')));
-          }
-        }
-        break;
-      }
-      case EnumStatusCode.ERR_DEPLOYMENT_FAILED: {
-        if (shouldOutputJson) {
-          const deploymentFailedMessageJson: SubgraphCommandJsonOutput = {
-            status: 'error',
-            message: `Feature subgraph was published, but the updated composition hasn't been deployed, so it's not accessible to the router. Check the errors listed below for details.`,
-            compositionErrors: resp.compositionErrors,
-            deploymentErrors: resp.deploymentErrors,
-          };
-          console.log(JSON.stringify(deploymentFailedMessageJson));
-        } else {
-          spinner.warn(
-            "Feature subgraph was published, but the updated composition hasn't been deployed, so it's not accessible to the router. Check the errors listed below for details.",
-          );
-
-          const deploymentErrorsTable = new Table({
-            head: [
-              pc.bold(pc.white('FEDERATED_GRAPH_NAME')),
-              pc.bold(pc.white('NAMESPACE')),
-              pc.bold(pc.white('ERROR_MESSAGE')),
-            ],
-            colWidths: [30, 30, 120],
-            wordWrap: true,
-          });
-
-          for (const deploymentError of resp.deploymentErrors) {
-            deploymentErrorsTable.push([
-              deploymentError.federatedGraphName,
-              deploymentError.namespace,
-              deploymentError.message,
-            ]);
-          }
-          // Don't exit here with 1 because the change was still applied
-          console.log(deploymentErrorsTable.toString());
-
-          if (options.failOnAdmissionWebhookError) {
-            program.error(pc.red(pc.bold('The command failed due to admission webhook errors.')));
-          }
-        }
-
-        break;
-      }
-      default: {
-        if (shouldOutputJson) {
-          const defaultErrorMessageJson: SubgraphCommandJsonOutput = {
-            status: 'error',
-            message: `Failed to publish feature subgraph "${name}".`,
-            compositionErrors: resp.compositionErrors,
-            deploymentErrors: resp.deploymentErrors,
-            details: resp.response?.details,
-          };
-          console.log(JSON.stringify(defaultErrorMessageJson));
-        } else {
-          spinner.fail(`Failed to publish feature subgraph "${name}".`);
-          if (resp.response?.details) {
-            program.error(pc.red(pc.bold(resp.response?.details)));
-          }
-        }
-        process.exitCode = 1;
-        // eslint-disable-next-line no-useless-return
-        return;
-      }
+    try {
+      handleCompositionResult({
+        responseCode: resp.response?.code,
+        responseDetails: resp.response?.details,
+        compositionErrors: resp.compositionErrors,
+        compositionWarnings: resp.compositionWarnings,
+        deploymentErrors: resp.deploymentErrors,
+        spinner,
+        successMessage:
+          resp?.hasChanged === false ? 'No new changes to publish.' : 'Feature subgraph published successfully.',
+        subgraphCompositionBaseErrorMessage: 'Feature subgraph published but with composition errors.',
+        subgraphCompositionDetailedErrorMessage: `We found composition errors, while composing the federated graph.\nThe router will continue to work with the latest valid schema.\n${pc.bold(
+          'Please check the errors below:',
+        )}`,
+        deploymentErrorMessage: `Feature subgraph was published, but the updated composition hasn't been deployed, so it's not accessible to the router. Check the errors listed below for details.`,
+        defaultErrorMessage: `Failed to publish feature subgraph "${name}".`,
+        shouldOutputJson: options.json,
+        suppressWarnings: options.suppressWarnings,
+        failOnCompositionError: options.failOnCompositionError,
+        failOnAdmissionWebhookError: options.failOnAdmissionWebhookError,
+        failOnCompositionErrorMessage: `The command failed due to composition errors.`,
+        failOnAdmissionWebhookErrorMessage: `The command failed due to admission webhook errors.`,
+      });
+    } catch {
+      process.exitCode = 1;
+      // eslint-disable-next-line no-useless-return
+      return;
     }
   });
 

cli/src/core/types/types.ts

@@ -1,4 +1,8 @@
-import { CompositionError, DeploymentError } from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb.js';
+import {
+  CompositionError,
+  CompositionWarning,
+  DeploymentError,
+} from '@wundergraph/cosmo-connect/dist/platform/v1/platform_pb.js';
 import { Client } from '../client/client.js';
 
 export interface BaseCommandOptions {
@@ -13,6 +17,7 @@ export type SubgraphCommandJsonOutput = {
   status: 'success' | 'error';
   compositionErrors: CompositionError[];
   deploymentErrors: DeploymentError[];
+  compositionWarnings?: CompositionWarning[];
   message: string;
   details?: string;
 };

cli/src/handle-composition-result.ts

@@ -24,6 +24,10 @@ export const handleCompositionResult = ({
   defaultErrorMessage,
   shouldOutputJson,
   suppressWarnings,
+  failOnCompositionError,
+  failOnCompositionErrorMessage,
+  failOnAdmissionWebhookError,
+  failOnAdmissionWebhookErrorMessage,
 }: {
   responseCode: EnumStatusCode | undefined;
   responseDetails: string | undefined;
@@ -38,6 +42,10 @@ export const handleCompositionResult = ({
   defaultErrorMessage: string;
   shouldOutputJson?: boolean;
   suppressWarnings?: boolean;
+  failOnCompositionError?: boolean;
+  failOnCompositionErrorMessage?: string;
+  failOnAdmissionWebhookError?: boolean;
+  failOnAdmissionWebhookErrorMessage?: string;
 }) => {
   switch (responseCode) {
     case EnumStatusCode.OK: {
@@ -48,6 +56,9 @@ export const handleCompositionResult = ({
           compositionErrors,
           deploymentErrors,
         };
+        if (!suppressWarnings) {
+          successMessageJson.compositionWarnings = compositionWarnings;
+        }
         console.log(JSON.stringify(successMessageJson));
       } else {
         spinner.succeed(successMessage);
@@ -62,6 +73,9 @@ export const handleCompositionResult = ({
           compositionErrors,
           deploymentErrors,
         };
+        if (!suppressWarnings) {
+          compositionFailedMessageJson.compositionWarnings = compositionWarnings;
+        }
         console.log(JSON.stringify(compositionFailedMessageJson));
       } else {
         spinner.fail(subgraphCompositionBaseErrorMessage);
@@ -89,6 +103,10 @@ export const handleCompositionResult = ({
         // Don't exit here with 1 because the change was still applied
         console.log(compositionErrorsTable.toString());
       }
+      if (failOnCompositionError) {
+        console.log(pc.red(pc.bold(failOnCompositionErrorMessage || 'The command failed due to composition errors.')));
+        throw new Error(failOnCompositionErrorMessage || 'The command failed due to composition errors.');
+      }
       break;
     }
     case EnumStatusCode.ERR_DEPLOYMENT_FAILED: {
@@ -99,6 +117,9 @@ export const handleCompositionResult = ({
           compositionErrors,
           deploymentErrors,
         };
+        if (!suppressWarnings) {
+          deploymentFailedMessageJson.compositionWarnings = compositionWarnings;
+        }
         console.log(JSON.stringify(deploymentFailedMessageJson));
       } else {
         spinner.warn(deploymentErrorMessage);
@@ -123,6 +144,12 @@ export const handleCompositionResult = ({
         // Don't exit here with 1 because the change was still applied
         console.log(deploymentErrorsTable.toString());
       }
+      if (failOnAdmissionWebhookError) {
+        console.log(
+          pc.red(pc.bold(failOnAdmissionWebhookErrorMessage || 'The command failed due to admission webhook errors.')),
+        );
+        throw new Error(failOnAdmissionWebhookErrorMessage || 'The command failed due to admission webhook errors.');
+      }
       break;
     }
     default: {
@@ -134,6 +161,9 @@ export const handleCompositionResult = ({
           deploymentErrors,
           details: responseDetails,
         };
+        if (!suppressWarnings) {
+          defaultErrorMessageJson.compositionWarnings = compositionWarnings;
+        }
         console.log(JSON.stringify(defaultErrorMessageJson));
       } else {
         spinner.fail(defaultErrorMessage);
@@ -145,7 +175,7 @@ export const handleCompositionResult = ({
     }
   }
 
-  if (!suppressWarnings && compositionWarnings.length > 0) {
+  if (!shouldOutputJson && !suppressWarnings && compositionWarnings.length > 0) {
     const compositionWarningsTable = new Table({
       head: [
         pc.bold(pc.white('FEDERATED_GRAPH_NAME')),

composition/CHANGELOG.md

@@ -4,6 +4,10 @@ Binaries are attached to the github release otherwise all images can be found [h
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.37.2](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-03-11)
+
+**Note:** Version bump only for package @wundergraph/composition
+
 ## [0.37.1](https://github.com/wundergraph/cosmo/compare/@wundergraph/[email protected]...@wundergraph/[email protected]) (2025-02-27)
 
 ### Bug Fixes

composition/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wundergraph/composition",
-  "version": "0.37.1",
+  "version": "0.37.2",
   "author": {
     "name": "WunderGraph Maintainers",
     "email": "[email protected]"