Merge branch 'main' into feat/arm64-runtime-guards

Author: tomassrnka

iac/provider-gcp/Makefile

@@ -111,10 +111,6 @@ init:
 .PHONY: state-migrate
 state-migrate:
 	@ printf "Running Terraform state migrations for env: `tput setaf 2``tput bold`$(ENV)`tput sgr0`\n\n"
-	@ $(tf_vars) $(TF) state mv 'module.nomad.nomad_job.api' 'module.nomad.module.api.nomad_job.api' || true
-	@ $(tf_vars) $(TF) state mv 'module.nomad.nomad_job.template_manager' 'module.nomad.module.template_manager.nomad_job.template_manager' || true
-	@ $(tf_vars) $(TF) state mv 'module.nomad.nomad_job.nomad_nodepool_apm[0]' 'module.nomad.module.template_manager_autoscaler[0].nomad_job.nomad_nodepool_apm' || true
-	@ $(tf_vars) $(TF) state mv 'module.nomad.nomad_job.redis[0]' 'module.nomad.module.redis[0].nomad_job.redis' || true
 
 .PHONY: apply-init
 apply-init:

packages/db/queries/get_last_snapshot.sql.go

@@ -1,15 +1,20 @@
 -- name: GetLastSnapshot :one
 SELECT COALESCE(ea.aliases, ARRAY[]::text[])::text[] AS aliases, COALESCE(ea.names, ARRAY[]::text[])::text[] AS names, sqlc.embed(s), sqlc.embed(eb)
 FROM "public"."snapshots" s
-JOIN "public"."env_build_assignments" eba ON eba.env_id = s.env_id AND eba.tag = 'default'
-JOIN "public"."env_builds" eb ON eb.id = eba.build_id
+JOIN LATERAL (
+    SELECT eba.build_id
+    FROM "public"."env_build_assignments" eba
+    JOIN "public"."env_builds" eb_inner ON eb_inner.id = eba.build_id AND eb_inner.status_group = 'ready'
+    WHERE eba.env_id = s.env_id AND eba.tag = 'default'
+    ORDER BY eba.created_at DESC
+    LIMIT 1
+) latest_eba ON TRUE
+JOIN "public"."env_builds" eb ON eb.id = latest_eba.build_id
 LEFT JOIN LATERAL (
     SELECT
         ARRAY_AGG(alias ORDER BY alias) AS aliases,
         ARRAY_AGG(CASE WHEN namespace IS NOT NULL THEN namespace || '/' || alias ELSE alias END ORDER BY alias) AS names
     FROM "public"."env_aliases"
     WHERE env_id = s.base_env_id
 ) ea ON TRUE
-WHERE s.sandbox_id = $1 AND eb.status_group = 'ready'
-ORDER BY eba.created_at DESC
-LIMIT 1;
+WHERE s.sandbox_id = $1;