bug fix

Author: mats16

containers/kong/kong-template.yml

@@ -35,7 +35,7 @@ acls:
 services:
   ## Open Auth routes
   - name: auth-v1-open
-    url: ${SUPABASE_AUTH_URL:=http://auth:9999/}verify
+    url: ${SUPABASE_AUTH_URL:=http://auth.supabase.internal:9999/}verify
     routes:
       - name: auth-v1-open
         strip_path: true
@@ -44,7 +44,7 @@ services:
     plugins:
       - name: cors
   - name: auth-v1-open-callback
-    url: ${SUPABASE_AUTH_URL:=http://auth:9999/}callback
+    url: ${SUPABASE_AUTH_URL:=http://auth.supabase.internal:9999/}callback
     routes:
       - name: auth-v1-open-callback
         strip_path: true
@@ -53,7 +53,7 @@ services:
     plugins:
       - name: cors
   - name: auth-v1-open-authorize
-    url: ${SUPABASE_AUTH_URL:=http://auth:9999/}authorize
+    url: ${SUPABASE_AUTH_URL:=http://auth.supabase.internal:9999/}authorize
     routes:
       - name: auth-v1-open-authorize
         strip_path: true
@@ -65,7 +65,7 @@ services:
   ## Secure Auth routes
   - name: auth-v1
     _comment: "GoTrue: /auth/v1/* -> http://auth:9999/*"
-    url: ${SUPABASE_AUTH_URL:=http://auth:9999/}
+    url: ${SUPABASE_AUTH_URL:=http://auth.supabase.internal:9999/}
     routes:
       - name: auth-v1-all
         strip_path: true
@@ -86,7 +86,7 @@ services:
   ## Secure REST routes
   - name: rest-v1
     _comment: "PostgREST: /rest/v1/* -> http://rest:3000/*"
-    url: ${SUPABASE_REST_URL:=http://rest:3000/}
+    url: ${SUPABASE_REST_URL:=http://rest.supabase.internal:3000/}
     routes:
       - name: rest-v1-all
         strip_path: true
@@ -107,7 +107,7 @@ services:
   ## Secure GraphQL routes
   - name: graphql-v1
     _comment: "PostgREST: /graphql/v1/* -> http://rest:3000/rpc/graphql"
-    url: ${SUPABASE_GRAPHQL_URL:=http://rest:3000/rpc/graphql}
+    url: ${SUPABASE_GRAPHQL_URL:=http://rest.supabase.internal:3000/rpc/graphql}
     routes:
       - name: graphql-v1-all
         strip_path: true
@@ -133,7 +133,7 @@ services:
   ## Secure Realtime routes
   - name: realtime-v1
     _comment: "Realtime: /realtime/v1/* -> ws://realtime:4000/socket/*"
-    url: ${SUPABASE_REALTIME_URL:=http://realtime:4000/socket/}
+    url: ${SUPABASE_REALTIME_URL:=http://realtime.supabase.internal:4000/socket/}
     routes:
       - name: realtime-v1-all
         strip_path: true
@@ -154,7 +154,7 @@ services:
   ## Storage routes: the storage server manages its own auth
   - name: storage-v1
     _comment: "Storage: /storage/v1/* -> http://storage:5000/*"
-    url: ${SUPABASE_STORAGE_URL:=http://storage:5000/}
+    url: ${SUPABASE_STORAGE_URL:=http://storage.supabase.internal:5000/}
     routes:
       - name: storage-v1-all
         strip_path: true
@@ -166,7 +166,7 @@ services:
   ## Secure Database routes
   - name: meta
     _comment: "pg-meta: /pg/* -> http://pg-meta:8080/*"
-    url: ${SUPABASE_META_HOST:=http://meta:8080/}
+    url: ${SUPABASE_META_HOST:=http://meta.supabase.internal:8080/}
     routes:
       - name: meta-all
         strip_path: true

src/ecs-patterns.ts

@@ -30,13 +30,13 @@ export interface AutoScalingFargateServiceProps extends BaseFargateServiceProps
 
 export class BaseFargateService extends Construct {
   readonly listenerPort: number;
-  readonly serviceName: string;
+  readonly dnsName: string;
   readonly service: ecs.FargateService;
 
   constructor(scope: Construct, id: string, props: BaseFargateServiceProps) {
     super(scope, id);
 
-    this.serviceName = props.serviceName || id.toLowerCase();
+    const serviceName = props.serviceName || id.toLowerCase();
     const { cluster, taskImageOptions } = props;
 
     this.listenerPort = taskImageOptions.containerPort;
@@ -79,12 +79,13 @@ export class BaseFargateService extends Construct {
     this.service.enableServiceConnect({
       services: [{
         portMappingName: 'http',
-        discoveryName: this.serviceName,
-        dnsName: this.serviceName,
+        discoveryName: serviceName,
       }],
       logDriver,
     });
 
+    this.dnsName = `${serviceName}.${cluster.defaultCloudMapNamespace?.namespaceName}`;
+
     //const cloudMapService = this.service.enableCloudMap({
     //  name: this.serviceName,
     //  dnsRecordType: servicediscovery.DnsRecordType.SRV,

src/supabase-stack.ts

@@ -269,7 +269,6 @@ export class SupabaseStack extends FargateStack {
       minTaskCount: 0,
       maxTaskCount: 0,
     });
-    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_GRAPHQL_URL', `http://${gql.serviceName}:${gql.listenerPort}/graphql`);
 
     const realtime = new AutoScalingFargateService(this, 'Realtime', {
       cluster,
@@ -313,7 +312,7 @@ export class SupabaseStack extends FargateStack {
         image: ecs.ContainerImage.fromRegistry(storageImageUri.valueAsString),
         containerPort: 5000,
         environment: {
-          POSTGREST_URL: `http://${rest.serviceName}:${rest.listenerPort}`,
+          POSTGREST_URL: `http://${rest.dnsName}:${rest.listenerPort}`,
           PGOPTIONS: '-c search_path=storage,public',
           FILE_SIZE_LIMIT: '52428800',
           TENANT_ID: 'stub',
@@ -357,6 +356,13 @@ export class SupabaseStack extends FargateStack {
       },
     });
 
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_AUTH_URL', `http://${auth.dnsName}:${auth.listenerPort}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_REST_URL', `http://${rest.dnsName}:${rest.listenerPort}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_GRAPHQL_URL', `http://${gql.dnsName}:${gql.listenerPort}/graphql`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_REALTIME_URL', `http://${realtime.dnsName}:${realtime.listenerPort}/socket/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_STORAGE_URL', `http://${storage.dnsName}:${storage.listenerPort}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_META_HOST', `http://${meta.dnsName}:${meta.listenerPort}/`);
+
     kong.addBackend(auth);
     kong.addBackend(rest);
     kong.addBackend(gql);