refactoring

Author: mats16

src/ecs-patterns.ts

@@ -29,8 +29,12 @@ export interface AutoScalingFargateServiceProps extends BaseFargateServiceProps
 }
 
 export class BaseFargateService extends Construct {
+  /**
+   * The URL to connect to an API. The URL contains the protocol, a DNS name, and the port.
+   * (e.g. `http://rest.supabase.internal:8000`)
+   */
+  readonly endpoint: string;
   readonly listenerPort: number;
-  readonly dnsName: string;
   readonly service: ecs.FargateService;
 
   constructor(scope: Construct, id: string, props: BaseFargateServiceProps) {
@@ -84,7 +88,7 @@ export class BaseFargateService extends Construct {
       logDriver,
     });
 
-    this.dnsName = `${serviceName}.${cluster.defaultCloudMapNamespace?.namespaceName}`;
+    this.endpoint = `http://${serviceName}.${cluster.defaultCloudMapNamespace?.namespaceName}:${this.listenerPort}`;
 
     //const cloudMapService = this.service.enableCloudMap({
     //  name: this.serviceName,

src/supabase-stack.ts

@@ -312,7 +312,7 @@ export class SupabaseStack extends FargateStack {
         image: ecs.ContainerImage.fromRegistry(storageImageUri.valueAsString),
         containerPort: 5000,
         environment: {
-          POSTGREST_URL: `http://${rest.dnsName}:${rest.listenerPort}`,
+          POSTGREST_URL: `${rest.endpoint}`,
           PGOPTIONS: '-c search_path=storage,public',
           FILE_SIZE_LIMIT: '52428800',
           TENANT_ID: 'stub',
@@ -356,12 +356,12 @@ 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.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_AUTH_URL', `${auth.endpoint}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_REST_URL', `${rest.endpoint}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_GRAPHQL_URL', `${gql.endpoint}/graphql`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_REALTIME_URL', `${realtime.endpoint}/socket/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_STORAGE_URL', `${storage.endpoint}/`);
+    kong.service.taskDefinition.defaultContainer!.addEnvironment('SUPABASE_META_HOST', `${meta.endpoint}/`);
 
     kong.addBackend(auth);
     kong.addBackend(rest);