Merge remote-tracking branch 'origin/main' into helm/replace-cluster-role

Author: nicktrn

apps/webapp/app/env.server.ts

@@ -229,15 +229,21 @@ const EnvironmentSchema = z.object({
   DEPOT_TOKEN: z.string().optional(),
   DEPOT_ORG_ID: z.string().optional(),
   DEPOT_REGION: z.string().default("us-east-1"),
+
+  // Deployment registry
   DEPLOY_REGISTRY_HOST: z.string().min(1),
   DEPLOY_REGISTRY_USERNAME: z.string().optional(),
   DEPLOY_REGISTRY_PASSWORD: z.string().optional(),
   DEPLOY_REGISTRY_NAMESPACE: z.string().min(1).default("trigger"),
+  DEPLOY_REGISTRY_ECR_TAGS: z.string().optional(), // csv, for example: "key1=value1,key2=value2"
+  DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: z.string().optional(),
+  DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: z.string().optional(),
   DEPLOY_IMAGE_PLATFORM: z.string().default("linux/amd64"),
   DEPLOY_TIMEOUT_MS: z.coerce
     .number()
     .int()
     .default(60 * 1000 * 8), // 8 minutes
+
   OBJECT_STORE_BASE_URL: z.string().optional(),
   OBJECT_STORE_ACCESS_KEY_ID: z.string().optional(),
   OBJECT_STORE_SECRET_ACCESS_KEY: z.string().optional(),

apps/webapp/app/services/platform.v3.server.ts

@@ -102,6 +102,8 @@ function initializeMachinePresets(): {
     };
   }
 
+  logger.info("🎛️ Overriding machine presets", { overrides });
+
   return {
     defaultMachine: overrideDefaultMachine(defaultMachineFromPlatform, overrides.defaultMachine),
     machines: overrideMachines(machinesFromPlatform, overrides.machines),

apps/webapp/app/services/realtimeClient.server.ts

@@ -292,7 +292,7 @@ export class RealtimeClient {
   ): URL {
     const $url = new URL(url.toString());
 
-    const electricOrigin = this.#resolveElectricOrigin(environment.id);
+    const electricOrigin = this.#resolveElectricOrigin($url, whereClause, environment.id);
     const electricUrl = new URL(`${electricOrigin}/v1/shape`);
 
     // Copy over all the url search params to the electric url
@@ -483,14 +483,30 @@ export class RealtimeClient {
     return `${this.options.keyPrefix}:${environmentId}`;
   }
 
-  #resolveElectricOrigin(environmentId: string) {
+  #resolveElectricOrigin(url: URL, whereClause: string, environmentId: string) {
     if (typeof this.options.electricOrigin === "string") {
       return this.options.electricOrigin;
     }
 
-    const index = jumpHash(environmentId, this.options.electricOrigin.length);
+    const shardKey = this.#getShardKey(whereClause, environmentId);
 
-    return this.options.electricOrigin[index] ?? this.options.electricOrigin[0];
+    const index = jumpHash(shardKey, this.options.electricOrigin.length);
+
+    const origin = this.options.electricOrigin[index] ?? this.options.electricOrigin[0];
+
+    logger.debug("[realtimeClient] resolveElectricOrigin", {
+      whereClause,
+      environmentId,
+      shardKey,
+      index,
+      electricOrigin: origin,
+    });
+
+    return origin;
+  }
+
+  #getShardKey(whereClause: string, environmentId: string) {
+    return [environmentId, whereClause].join(":");
   }
 
   #registerCommands() {