Merge branch 'main' into fix-unhandled-is-not-found-error

Makefile

@@ -51,7 +51,8 @@ init:
 plan:
 	@ printf "Planning Terraform for env: `tput setaf 2``tput bold`$(ENV)`tput sgr0`\n\n"
 	terraform fmt -recursive
-	$(tf_vars) terraform plan -out=.tfplan.$(ENV) -compact-warnings -detailed-exitcode $$(echo $(ALL_MODULES) | tr ' ' '\n' | awk '{print "-target=module." $$0 ""}' | xargs)
+	$(eval TARGET := $(shell echo $(ALL_MODULES) | tr ' ' '\n' | awk '{print "-target=module." $$0 ""}' | xargs))
+	$(tf_vars) terraform plan -out=.tfplan.$(ENV) -compact-warnings -detailed-exitcode $(TARGET)
 
 .PHONY: apply
 apply:
@@ -69,13 +70,14 @@ apply:
 .PHONY: plan-without-jobs
 plan-without-jobs:
 	@ printf "Planning Terraform for env: `tput setaf 2``tput bold`$(ENV)`tput sgr0`\n\n"
+	$(eval TARGET := $(shell echo $(ALL_MODULES) | tr ' ' '\n' | grep -v -e "nomad" | awk '{print "-target=module." $$0 ""}' | xargs))
 	$(tf_vars) \
 	terraform plan \
 	-out=.tfplan.$(ENV) \
 	-input=false \
 	-compact-warnings \
 	-parallelism=20 \
-  	$$(echo $(ALL_MODULES) | tr ' ' '\n' | grep -v -e "nomad" | awk '{print "-target=module." $$0 ""}' | xargs)
+  	$(TARGET)
 
 .PHONY: destroy
 destroy:

main.tf

@@ -72,7 +72,7 @@ module "buckets" {
   gcp_project_id            = var.gcp_project_id
   gcp_region                = var.gcp_region
 
-  fc_template_bucket_name     = var.template_bucket_name
+  fc_template_bucket_name     = length(var.template_bucket_name) > 0 ? var.template_bucket_name : "${var.gcp_project_id}-fc-templates"
   fc_template_bucket_location = var.template_bucket_location
 
   labels = var.labels

packages/envd/Makefile

@@ -34,14 +34,7 @@ start-docker:
 
 build-and-upload:
 	make build
-	make upload-local
-	gcloud compute instance-groups list-instances $(PREFIX)orch-client-ig \
-          	  --zone=$(GCP_ZONE) \
-          	  --project=$(GCP_PROJECT_ID) \
-          	  --format="value(instance)" \
-          	  --quiet | xargs -I {} -P 5 sh -c "gcloud compute ssh {} --zone=$(GCP_ZONE) --command='sudo rm -rf /fc-vm/envd && \
-												sudo cp /mnt/disks/envs-pipeline/envd /fc-vm/envd && sudo chmod +x /fc-vm/envd"
-	@echo "Uploaded envd to all clients"
+	make upload
 
 .PHONY: generate
 generate:

packages/envd/upload.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 GCP_PROJECT_ID=$1
 
-chmod +x dist/envd_linux_amd64_v1/envd
+chmod +x bin/envd
 
 gsutil -h "Cache-Control:no-cache, max-age=0" \
-  cp dist/envd_linux_amd64_v1/envd "gs://${GCP_PROJECT_ID}-fc-env-pipeline/envd"
+  cp bin/envd "gs://${GCP_PROJECT_ID}-fc-env-pipeline/envd"

packages/nomad/orchestrator.hcl

@@ -93,8 +93,9 @@ job "orchestrator" {
       driver = "raw_exec"
 
       resources {
-        memory     = var.memory_mb
+        memory_max     = var.memory_mb
         cpu        = var.cpu_mhz
+
       }
 
       env {

packages/nomad/otel-collector.hcl

@@ -192,6 +192,7 @@ processors:
           - "nomad_client_host_memory_available"
           - "nomad_client_host_memory_total"
           - "nomad_client_unallocated_memory"
+          - "nomad_nomad_job_summary_running"
           - "orchestrator.*"
           - "api.*"
   attributes/session-proxy:

packages/shared/Makefile

@@ -10,6 +10,14 @@ generate-models:
 	rm -rf pkg/models/*
 	go generate ./pkg/generate_models.go
 
+.PHONY: prep-dev-cluster
+prep-dev-cluster:
+	@echo "Seeding database..."
+	@POSTGRES_CONNECTION_STRING=$(POSTGRES_CONNECTION_STRING) go run ./scripts/seed-db.go
+	@echo "Building base template..."
+	@E2B_DOMAIN=$(DOMAIN_NAME) e2b tpl build -p scripts
+	@echo "Done"
+
 check-atlas:
 	@if ! command -v atlas >/dev/null 2>&1; then \
 		echo "Atlas is not installed. Do you want to install it?  (Y/n): "; \

packages/shared/migrations/20250601142106.sql

@@ -0,0 +1,27 @@
+-- Alter "teams" table
+ALTER TABLE "public"."teams" DROP COLUMN "is_default";
+
+CREATE OR REPLACE FUNCTION public.post_user_signup()
+    RETURNS TRIGGER
+    LANGUAGE plpgsql
+AS $post_user_signup$
+DECLARE
+    team_id                 uuid;
+BEGIN
+    RAISE NOTICE 'Creating default team for user %', NEW.id;
+    INSERT INTO public.teams(name, tier, email) VALUES (NEW.email, 'base_v1', NEW.email) RETURNING id INTO team_id;
+    INSERT INTO public.users_teams(user_id, team_id, is_default) VALUES (NEW.id, team_id, true);
+    RAISE NOTICE 'Created default team for user % and team %', NEW.id, team_id;
+
+    -- Generate a random 20 byte string and encode it as hex, so it's 40 characters
+    INSERT INTO public.team_api_keys (team_id)
+    VALUES (team_id);
+
+    INSERT INTO public.access_tokens (user_id)
+    VALUES (NEW.id);
+
+    PERFORM public.extra_for_post_user_signup(NEW.id, team_id);
+
+    RETURN NEW;
+END
+$post_user_signup$ SECURITY DEFINER SET search_path = public;

packages/shared/pkg/db/envs.go

@@ -65,6 +65,7 @@ func (db *DB) GetEnvs(ctx context.Context, teamID uuid.UUID) (result []*Template
 		Where(
 			env.TeamID(teamID),
 			env.HasBuildsWith(envbuild.StatusEQ(envbuild.StatusUploaded)),
+			env.Not(env.HasSnapshots()),
 		).
 		Order(models.Asc(env.FieldCreatedAt)).
 		WithEnvAliases().