distributed in other envs

Author: enisdenjo

docker-bake.hcl

@@ -42,7 +42,8 @@ group "e2e" {
   targets = [
     "gateway_e2e",
     "gateway_e2e_openapi-javascript-wiki",
-    "gateway_e2e_operation-field-permissions"
+    "gateway_e2e_operation-field-permissions",
+    "gateway_e2e_distributed-subscriptions-webhooks"
   ]
 }
 
@@ -114,3 +115,20 @@ target "gateway_e2e_operation-field-permissions_bun" {
     "gateway_e2e-bun": "target:gateway_e2e-bun"
   }
 }
+
+target "gateway_e2e_distributed-subscriptions-webhooks" {
+  context = "e2e/distributed-subscriptions-webhooks"
+  dockerfile = "gateway.Dockerfile"
+  tags = ["ghcr.io/graphql-hive/gateway:e2e.distributed-subscriptions-webhooks"]
+  contexts = {
+    "gateway_e2e": "target:gateway_e2e"
+  }
+}
+target "gateway_e2e_distributed-subscriptions-webhooks_bun" {
+  context = "e2e/distributed-subscriptions-webhooks"
+  dockerfile = "gateway_bun.Dockerfile"
+  tags = ["ghcr.io/graphql-hive/gateway:e2e.distributed-subscriptions-webhooks-bun"]
+  contexts = {
+    "gateway_e2e-bun": "target:gateway_e2e-bun"
+  }
+}

e2e/distributed-subscriptions-webhooks/distributed-subscriptions-webhooks.e2e.ts

@@ -1,9 +1,17 @@
-import { Container, createTenv, getAvailablePort } from '@internal/e2e';
+import fs from 'fs/promises';
+import {
+  Container,
+  createTenv,
+  dockerHostName,
+  getAvailablePort,
+  handleDockerHostNameInURLOrAtPath,
+} from '@internal/e2e';
 import { fetch } from '@whatwg-node/fetch';
 import { createClient } from 'graphql-sse';
 import { beforeAll, expect, it } from 'vitest';
 
-const { container, gateway, service, composeWithMesh } = createTenv(__dirname);
+const { container, gateway, service, composeWithMesh, gatewayRunner } =
+  createTenv(__dirname);
 
 let redis!: Container;
 beforeAll(async () => {
@@ -33,16 +41,25 @@ it('should receive subscription event on distributed gateway', async () => {
     services: [products],
   });
 
+  if (gatewayRunner.includes('docker')) {
+    await handleDockerHostNameInURLOrAtPath(supergraph, []);
+  }
+
+  const gwEnv = {
+    REDIS_HOST: gatewayRunner.includes('docker') ? dockerHostName : '0.0.0.0',
+    REDIS_PORT: redis.port,
+  };
+
   const mainGw = await gateway({
     port: mainGwPort,
     supergraph,
-    env: { REDIS_PORT: redis.port },
+    env: gwEnv,
   });
 
   const gws = [
     mainGw, // main
-    await gateway({ supergraph, env: { REDIS_PORT: redis.port } }), // replica 1
-    await gateway({ supergraph, env: { REDIS_PORT: redis.port } }), // replica 2
+    await gateway({ supergraph, env: gwEnv }), // replica 1
+    await gateway({ supergraph, env: gwEnv }), // replica 2
   ];
 
   const clients = gws.map((gw) =>

e2e/distributed-subscriptions-webhooks/gateway.Dockerfile

@@ -0,0 +1,3 @@
+FROM gateway_e2e
+
+RUN npm i ioredis

e2e/distributed-subscriptions-webhooks/gateway.config.ts

@@ -7,10 +7,17 @@ import Redis from 'ioredis';
  * subscriber commands (SUBSCRIBE, UNSUBSCRIBE, etc.). Meaning, it cannot execute other commands like PUBLISH.
  * To avoid this, we use two separate Redis clients: one for publishing and one for subscribing.
  */
-const pub = new Redis({ port: parseInt(process.env['REDIS_PORT']!) });
-const sub = new Redis({ port: parseInt(process.env['REDIS_PORT']!) });
+const pub = new Redis({
+  host: process.env['REDIS_HOST'],
+  port: parseInt(process.env['REDIS_PORT']!),
+});
+const sub = new Redis({
+  host: process.env['REDIS_HOST'],
+  port: parseInt(process.env['REDIS_PORT']!),
+});
 
 export const gatewayConfig = defineConfig({
+  maskedErrors: false,
   webhooks: true,
   pubsub: new RedisPubSub({ pub, sub }),
 });

e2e/distributed-subscriptions-webhooks/gateway_bun.Dockerfile

@@ -0,0 +1,3 @@
+FROM gateway_e2e-bun
+
+RUN bun i ioredis