use correct types when querying db

block · Mar 13, 2024 · 832774d · 832774d
1 parent 11cb32c
commit 832774d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/backend/controller/dal/dal.go b/backend/controller/dal/dal.go
@@ -505,7 +505,7 @@ func (d *DAL) UpsertRunner(ctx context.Context, runner Runner) error {
 		return fmt.Errorf("%s: %w", "failed to JSON encode runner labels", err)
 	}
 	deploymentID, err := d.db.UpsertRunner(ctx, sql.UpsertRunnerParams{
-		Key:            dbKeyFromRunnerKey(runner.Key),
+		Key:            runner.Key,
 		Endpoint:       runner.Endpoint,
 		State:          sql.RunnerState(runner.State),
 		DeploymentName: pgDeploymentName,
@@ -514,9 +514,6 @@ func (d *DAL) UpsertRunner(ctx context.Context, runner Runner) error {
 	if err != nil {
 		return translatePGError(err)
 	}
-	if err != nil {
-		return translatePGError(err)
-	}
 	if runner.Deployment.Ok() && !deploymentID.Ok() {
 		return fmt.Errorf("deployment %s not found", runner.Deployment)
 	}
@@ -537,7 +534,7 @@ func (d *DAL) KillStaleControllers(ctx context.Context, age time.Duration) (int6
 
 // DeregisterRunner deregisters the given runner.
 func (d *DAL) DeregisterRunner(ctx context.Context, key model.RunnerKey) error {
-	count, err := d.db.DeregisterRunner(ctx, dbKeyFromRunnerKey(key))
+	count, err := d.db.DeregisterRunner(ctx, key)
 	if err != nil {
 		return translatePGError(err)
 	}
@@ -854,15 +851,15 @@ func (d *DAL) GetRoutingTable(ctx context.Context, modules []string) (map[string
 }
 
 func (d *DAL) GetRunnerState(ctx context.Context, runnerKey model.RunnerKey) (RunnerState, error) {
-	state, err := d.db.GetRunnerState(ctx, dbKeyFromRunnerKey(runnerKey))
+	state, err := d.db.GetRunnerState(ctx, runnerKey)
 	if err != nil {
 		return "", translatePGError(err)
 	}
 	return RunnerState(state), nil
 }
 
 func (d *DAL) GetRunner(ctx context.Context, runnerKey model.RunnerKey) (Runner, error) {
-	row, err := d.db.GetRunner(ctx, dbKeyFromRunnerKey(runnerKey))
+	row, err := d.db.GetRunner(ctx, runnerKey)
 	if err != nil {
 		return Runner{}, translatePGError(err)
 	}
@@ -1049,8 +1046,3 @@ func translatePGError(err error) error {
 	}
 	return err
 }
-
-func dbKeyFromRunnerKey(key model.RunnerKey) string {
-	value, _ := key.Value()
-	return value.(string)
-}
diff --git a/backend/controller/sql/querier.go b/backend/controller/sql/querier.go
diff --git a/backend/controller/sql/queries.sql b/backend/controller/sql/queries.sql
@@ -122,7 +122,7 @@ WITH matches AS (
     UPDATE runners
         SET state = 'dead',
             deployment_id = NULL
-        WHERE key = $1
+        WHERE key = sqlc.arg('key')::runner_key
         RETURNING 1)
 SELECT COUNT(*)
 FROM matches;
@@ -222,7 +222,7 @@ RETURNING runners.*;
 -- name: GetRunnerState :one
 SELECT state
 FROM runners
-WHERE key = $1;
+WHERE key = sqlc.arg('key')::runner_key;
 
 -- name: GetRunner :one
 SELECT DISTINCT ON (r.key) r.key                                   AS runner_key,
@@ -236,7 +236,7 @@ SELECT DISTINCT ON (r.key) r.key                                   AS runner_key
                                             THEN d.name END, NULL) AS deployment_name
 FROM runners r
          LEFT JOIN deployments d on d.id = r.deployment_id OR r.deployment_id IS NULL
-WHERE r.key = $1;
+WHERE r.key = sqlc.arg('key')::runner_key;
 
 -- name: GetRoutingTable :many
 SELECT endpoint, r.key AS runner_key, r.module_name, d.name deployment_name
@@ -251,7 +251,7 @@ WHERE state = 'assigned'
 SELECT endpoint, r.key AS runner_key, r.module_name, d.name deployment_name, r.state
 FROM runners r
          LEFT JOIN deployments d on r.deployment_id = d.id
-WHERE r.key = $1;
+WHERE r.key = sqlc.arg('key')::runner_key;
 
 -- name: GetRunnersForDeployment :many
 SELECT *

diff --git a/backend/controller/sql/queries.sql.go b/backend/controller/sql/queries.sql.go