progress

coder · deansheather · Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023
commit 4ba7af6ad73447b60287367cfd16cff085b6320b
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/system.go b/coderd/database/dbauthz/system.go
@@ -154,6 +154,13 @@ func (q *querier) InsertDeploymentID(ctx context.Context, value string) error {
 	return q.db.InsertDeploymentID(ctx, value)
 }
 
+func (q *querier) GetReplicaByID(ctx context.Context, id uuid.UUID) (database.Replica, error) {
+	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
+		return database.Replica{}, err
+	}
+	return q.db.GetReplicaByID(ctx, id)
+}
+
 func (q *querier) InsertReplica(ctx context.Context, arg database.InsertReplicaParams) (database.Replica, error) {
 	if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceSystem); err != nil {
 		return database.Replica{}, err

diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -4908,6 +4908,19 @@ func (q *fakeQuerier) DeleteReplicasUpdatedBefore(_ context.Context, before time
 	return nil
 }
 
+func (q *fakeQuerier) GetReplicaByID(_ context.Context, id uuid.UUID) (database.Replica, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	for _, replica := range q.replicas {
+		if replica.ID == id {
+			return replica, nil
+		}
+	}
+
+	return database.Replica{}, sql.ErrNoRows
+}
+
 func (q *fakeQuerier) InsertReplica(_ context.Context, arg database.InsertReplicaParams) (database.Replica, error) {
 	if err := validateDatabaseType(arg); err != nil {
 		return database.Replica{}, err
@@ -4926,6 +4939,7 @@ func (q *fakeQuerier) InsertReplica(_ context.Context, arg database.InsertReplic
 		RelayAddress:    arg.RelayAddress,
 		Version:         arg.Version,
 		DatabaseLatency: arg.DatabaseLatency,
+		Primary:         arg.Primary,
 	}
 	q.replicas = append(q.replicas, replica)
 	return replica, nil
@@ -4952,6 +4966,7 @@ func (q *fakeQuerier) UpdateReplica(_ context.Context, arg database.UpdateReplic
 		replica.Version = arg.Version
 		replica.Error = arg.Error
 		replica.DatabaseLatency = arg.DatabaseLatency
+		replica.Primary = arg.Primary
 		q.replicas[index] = replica
 		return replica, nil
 	}

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000121_workspace_proxy_region_id.up.sql b/coderd/database/migrations/000121_workspace_proxy_region_id.up.sql
@@ -1,6 +1,6 @@
 ALTER TABLE workspace_proxies
-	-- adding a serial to a table without a default value will be filled as you
-	-- would expect
+	-- Adding a serial to a table without a default value will be filled as you
+	-- would expect on versions of Postgres >= 9 AFAIK (which we require).
 	ADD COLUMN region_id serial NOT NULL,
 	ADD COLUMN derp_enabled boolean NOT NULL DEFAULT true,
 	ADD CONSTRAINT workspace_proxies_region_id_unique UNIQUE (region_id);
diff --git a/coderd/database/migrations/000122_replica_primary.down.sql b/coderd/database/migrations/000122_replica_primary.down.sql
@@ -0,0 +1,10 @@
+BEGIN;
+
+-- drop any rows that aren't primary replicas
+DELETE FROM replicas
+	WHERE "primary" = false;
+
+ALTER TABLE replicas
+	DROP COLUMN "primary";
+
+COMMIT;
diff --git a/coderd/database/migrations/000122_replica_primary.up.sql b/coderd/database/migrations/000122_replica_primary.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE replicas
+	ADD COLUMN "primary" boolean NOT NULL DEFAULT true;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/replicas.sql b/coderd/database/queries/replicas.sql
@@ -1,6 +1,9 @@
 -- name: GetReplicasUpdatedAfter :many
 SELECT * FROM replicas WHERE updated_at > $1 AND stopped_at IS NULL;
 
+-- name: GetReplicaByID :one
+SELECT * FROM replicas WHERE id = $1;
+
 -- name: InsertReplica :one
 INSERT INTO replicas (
     id,
@@ -11,8 +14,9 @@ INSERT INTO replicas (
     region_id,
     relay_address,
     version,
-    database_latency
-) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
+    database_latency,
+	"primary"
+) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *;
 
 -- name: UpdateReplica :one
 UPDATE replicas SET
@@ -24,7 +28,8 @@ UPDATE replicas SET
     hostname = $7,
     version = $8,
     error = $9,
-    database_latency = $10
+    database_latency = $10,
+	"primary" = $11
 WHERE id = $1 RETURNING *;
 
 -- name: DeleteReplicasUpdatedBefore :exec

diff --git a/docs/api/schemas.md b/docs/api/schemas.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE replicas
		ADD COLUMN "primary" boolean NOT NULL DEFAULT true;