Merge branch 'main' of github.com:wundergraph/cosmo into suvij/eng-6332-store-persisted-operation-content-in-the-database-and-show

Author: JivusAyrus

.github/workflows/router-ci.yaml

@@ -2,12 +2,12 @@ name: Router CI
 on:
   pull_request:
     paths:
-      - "composition-go/**/*"
-      - "demo/**/*"
-      - "router/**/*"
-      - "router-tests/**/*"
-      - "connect/**/*"
-      - ".github/workflows/router-ci.yaml"
+      - 'composition-go/**/*'
+      - 'demo/**/*'
+      - 'router/**/*'
+      - 'router-tests/**/*'
+      - 'connect/**/*'
+      - '.github/workflows/router-ci.yaml'
 
 concurrency:
   group: ${{github.workflow}}-${{github.head_ref}}
@@ -150,6 +150,22 @@ jobs:
           password: ${{secrets.DOCKER_PASSWORD}}
         ports:
           - 6379:6379
+      kafka:
+        image: bitnami/kafka:3.7.0
+        env:
+          KAFKA_ENABLE_KRAFT: yes
+          KAFKA_CFG_PROCESS_ROLES: controller,broker
+          KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+          KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+          KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+          KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
+          KAFKA_CFG_TRANSACTION_PARTITION_VERIFICATION_ENABLE: false
+          KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
+          KAFKA_CFG_NODE_ID: 1
+          ALLOW_PLAINTEXT_LISTENER: yes
+          KAFKA_KRAFT_CLUSTER_ID: XkpGZQ27R3eTl3OdTm2LYA # 16 byte base64-encoded UUID
+        ports:
+          - '9092:9092'
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/go
@@ -205,14 +221,14 @@ jobs:
           dockerfile: router/Dockerfile
           token: ${{secrets.GITHUB_TOKEN}}
           image_name: router
-          image_description: "Cosmo Router"
+          image_description: 'Cosmo Router'
           image_platforms: 'linux/amd64'
           load_Image: 'true'
           push: 'false'
 
       - uses: ./.github/actions/image-scan
         with:
-          name: "Router"
+          name: 'Router'
           github_token: ${{secrets.GITHUB_TOKEN}}
           image_ref: 'ghcr.io/wundergraph/cosmo/router:sha-${{ github.sha }}'
 
@@ -233,4 +249,4 @@ jobs:
           dockerfile: router/Dockerfile
           token: ${{secrets.GITHUB_TOKEN}}
           image_name: router
-          image_description: "Cosmo Router"
+          image_description: 'Cosmo Router'

.github/workflows/studio-ci.yaml

@@ -2,9 +2,11 @@ name: Studio CI
 on:
   pull_request:
     paths:
-      - "studio/**/*"
-      - "connect/**/*"
-      - ".github/workflows/studio-ci.yaml"
+      - 'studio/**/*'
+      - 'connect/**/*'
+      - 'shared/**/*'
+      - 'composition/**/*'
+      - '.github/workflows/studio-ci.yaml'
 
 concurrency:
   group: ${{github.workflow}}-${{github.head_ref}}
@@ -69,4 +71,4 @@ jobs:
           dockerfile: studio/Dockerfile
           token: ${{secrets.GITHUB_TOKEN}}
           image_name: studio
-          image_description: "Cosmo Studio"
+          image_description: 'Cosmo Studio'

cli/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.3](https://github.com/wundergraph/cosmo/compare/wgc@0.75.2...wgc@0.75.3) (2025-02-26)
+
+### Bug Fixes
+
+* improve wgc auth login and router compatibility-version ([#1636](https://github.com/wundergraph/cosmo/issues/1636)) ([6946363](https://github.com/wundergraph/cosmo/commit/6946363024e49b6170a9553728ac3ecc973ce394)) (@Aenimus)
+
+## [0.75.2](https://github.com/wundergraph/cosmo/compare/wgc@0.75.1...wgc@0.75.2) (2025-02-26)
+
+### Bug Fixes
+
+* **cli:** resolve broken console outputs ([#1623](https://github.com/wundergraph/cosmo/issues/1623)) ([6aa67af](https://github.com/wundergraph/cosmo/commit/6aa67aff01f83de5f4a195de32e5674f337ec325)) (@SkArchon)
+
 ## [0.75.1](https://github.com/wundergraph/cosmo/compare/wgc@0.75.0...wgc@0.75.1) (2025-02-25)
 
 ### Bug Fixes

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgc",
-  "version": "0.75.1",
+  "version": "0.75.3",
   "description": "The official CLI tool to manage the GraphQL Federation Platform Cosmo",
   "type": "module",
   "main": "dist/src/index.js",
@@ -41,7 +41,6 @@
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-node": "^1.4.0",
     "@graphql-tools/utils": "^10.2.2",
-    "@scarf/scarf": "^1.3.0",
     "@wundergraph/composition": "workspace:*",
     "@wundergraph/cosmo-connect": "workspace:*",
     "@wundergraph/cosmo-shared": "workspace:*",

cli/src/commands/auth/commands/login.ts

@@ -3,9 +3,12 @@ import open from 'open';
 import pc from 'picocolors';
 import jwtDecode from 'jwt-decode';
 import inquirer from 'inquirer';
+import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
+import ora from 'ora';
 import { BaseCommandOptions } from '../../../core/types/types.js';
 import { DecodedAccessToken, performDeviceAuth, startPollingForAccessToken } from '../utils.js';
 import { updateConfigFile } from '../../../utils.js';
+import { getBaseHeaders } from '../../../core/config.js';
 
 export default (opts: BaseCommandOptions) => {
   const loginCommand = new Command('login');
@@ -45,16 +48,51 @@ export default (opts: BaseCommandOptions) => {
       program.error('Could not perform authentication. Please try again');
     }
 
-    const organizations = new Set(decoded.groups.map((group) => group.split('/')[1]));
+    const organizationSlugs = new Set(decoded.groups.map((group) => group.split('/')[1]));
+
+    const organizationSlugByDisplayKey = new Map<string, string>();
+    const organizationKeys: Array<string> = [];
+    const spinner = ora('Fetching organizations...').start();
+    for (const organizationSlug of organizationSlugs) {
+      const headers = getBaseHeaders();
+      const response = await opts.client.platform.getOrganizationBySlug(
+        {
+          slug: organizationSlug,
+        },
+        {
+          headers: {
+            ...headers,
+            authorization: `Bearer ${accessTokenResp.response.accessToken}`,
+            'cosmo-org-slug': organizationSlug,
+          },
+        },
+      );
+      if (!response.response || response.response.code !== EnumStatusCode.OK || !response.organization) {
+        organizationKeys.push(organizationSlug);
+        organizationSlugByDisplayKey.set(organizationSlug, organizationSlug);
+        continue;
+      }
+      const organizationKey = `${response.organization.name} (${organizationSlug})`;
+      organizationKeys.push(organizationKey);
+      organizationSlugByDisplayKey.set(organizationKey, organizationSlug);
+    }
+
+    spinner.stop();
 
     const selectedOrganization = await inquirer.prompt({
-      name: 'organizationSlug',
+      name: 'organizationKey',
       type: 'list',
       message: 'Select Organization:',
-      choices: [...organizations],
+      choices: organizationKeys,
     });
 
-    updateConfigFile({ ...accessTokenResp.response, organizationSlug: selectedOrganization.organizationSlug });
+    const organizationSlug = organizationSlugByDisplayKey.get(selectedOrganization.organizationKey);
+
+    if (!organizationSlug) {
+      program.error('Unable to login.');
+    }
+
+    updateConfigFile({ ...accessTokenResp.response, organizationSlug });
 
     console.log(pc.green('Logged in Successfully!'));
   });

cli/src/commands/router/index.ts

@@ -31,7 +31,7 @@ export default (opts: BaseCommandOptions) => {
   );
 
   cmd.hook('preAction', async (thisCmd) => {
-    if (['compose', 'download-binary'].includes(thisCmd.args[0])) {
+    if (['compose', 'download-binary', 'compatibility-version'].includes(thisCmd.args[0])) {
       return;
     }
     await checkAuth();