refactor: use regionId in sentinels

Author: chronark

pkg/db/bulk_sentinel_insert.sql_generated.go

@@ -1,2 +1,2 @@
 -- name: FindSentinelsByEnvironmentID :many
-SELECT * FROM sentinels WHERE environment_id = sqlc.arg(environment_id);
+SELECT sqlc.embed(s), sqlc.embed(r) FROM sentinels s LEFT JOIN regions r ON s.region_id = r.id WHERE s.environment_id = sqlc.arg(environment_id);

pkg/db/models_generated.go

@@ -2,6 +2,6 @@
 -- ListSentinelsByRegion returns sentinels for a region with version > after_version.
 -- Used by WatchSentinels to stream sentinel state changes to krane agents.
 SELECT * FROM `sentinels`
-WHERE region = sqlc.arg(region) AND version > sqlc.arg(afterVersion)
+WHERE region_id = sqlc.arg(region_id) AND version > sqlc.arg(afterVersion)
 ORDER BY version ASC
 LIMIT ?;

pkg/db/querier_generated.go

@@ -6,7 +6,7 @@ INSERT INTO sentinels (
     project_id,
     k8s_address,
     k8s_name,
-    region,
+    region_id,
     image,
     health,
     desired_replicas,
@@ -22,7 +22,7 @@ INSERT INTO sentinels (
     sqlc.arg(project_id),
     sqlc.arg(k8s_address),
     sqlc.arg(k8s_name),
-    sqlc.arg(region),
+    sqlc.arg(region_id),
     sqlc.arg(image),
     sqlc.arg(health),
     sqlc.arg(desired_replicas),

pkg/db/queries/sentinel_find_by_environment_id.sql

@@ -3,7 +3,7 @@
 -- Used during bootstrap to stream all running sentinels to krane.
 SELECT *
 FROM `sentinels`
-WHERE (sqlc.arg(region) = '' OR region = sqlc.arg(region))
+WHERE (sqlc.arg(region_id) = '' OR region_id = sqlc.arg(region_id))
     AND desired_state = sqlc.arg(desired_state)
     AND id > sqlc.arg(pagination_cursor)
 ORDER BY id ASC

pkg/db/queries/sentinel_find_by_versions.sql

@@ -606,7 +606,7 @@ CREATE TABLE `sentinels` (
 	`environment_id` varchar(255) NOT NULL,
 	`k8s_name` varchar(64) NOT NULL,
 	`k8s_address` varchar(255) NOT NULL,
-	`region` varchar(255) NOT NULL,
+	`region_id` varchar(255) NOT NULL DEFAULT 'TODO',
 	`image` varchar(255) NOT NULL,
 	`desired_state` enum('running','standby','archived') NOT NULL DEFAULT 'running',
 	`health` enum('unknown','paused','healthy','unhealthy') NOT NULL DEFAULT 'unknown',
@@ -621,8 +621,7 @@ CREATE TABLE `sentinels` (
 	CONSTRAINT `sentinels_id_unique` UNIQUE(`id`),
 	CONSTRAINT `sentinels_k8s_name_unique` UNIQUE(`k8s_name`),
 	CONSTRAINT `sentinels_k8s_address_unique` UNIQUE(`k8s_address`),
-	CONSTRAINT `one_env_per_region` UNIQUE(`environment_id`,`region`),
-	CONSTRAINT `unique_version_per_region` UNIQUE(`region`,`version`)
+	CONSTRAINT `unique_version_per_region` UNIQUE(`region_id`,`version`)
 );
 
 CREATE TABLE `instances` (