Add tags to provisioner daemons

coder · kylecarbs · Nov 16, 2022 · Oct 25, 2022 · Nov 7, 2022 · Nov 7, 2022
commit 43268162c12ebeb3df17169ec4ce56e6ec76e8eb
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,6 +17,7 @@
     "codersdk",
     "cronstrue",
     "databasefake",
+    "dbtype",
     "DERP",
     "derphttp",
     "derpmap",

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -3,6 +3,7 @@ package databasefake
 import (
 	"context"
 	"database/sql"
+	"reflect"
 	"sort"
 	"strings"
 	"sync"
@@ -146,6 +147,9 @@ func (q *fakeQuerier) AcquireProvisionerJob(_ context.Context, arg database.Acqu
 		if !found {
 			continue
 		}
+		if !reflect.DeepEqual(arg.Tags, provisionerJob.Tags) {
+			continue
+		}
 		provisionerJob.StartedAt = arg.StartedAt
 		provisionerJob.UpdatedAt = arg.StartedAt.Time
 		provisionerJob.WorkerID = arg.WorkerID
@@ -1890,26 +1894,6 @@ func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID)
 	return database.ProvisionerDaemon{}, sql.ErrNoRows
 }
 
-func (q *fakeQuerier) GetProvisionerDaemonByAuthToken(_ context.Context, token uuid.NullUUID) (database.ProvisionerDaemon, error) {
-	if !token.Valid {
-		return database.ProvisionerDaemon{}, sql.ErrNoRows
-	}
-
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	for _, provisionerDaemon := range q.provisionerDaemons {
-		if !provisionerDaemon.AuthToken.Valid {
-			continue
-		}
-		if provisionerDaemon.AuthToken.UUID.String() != token.UUID.String() {
-			continue
-		}
-		return provisionerDaemon, nil
-	}
-	return database.ProvisionerDaemon{}, sql.ErrNoRows
-}
-
 func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (database.ProvisionerJob, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -2286,7 +2270,7 @@ func (q *fakeQuerier) InsertProvisionerDaemon(_ context.Context, arg database.In
 		CreatedAt:    arg.CreatedAt,
 		Name:         arg.Name,
 		Provisioners: arg.Provisioners,
-		AuthToken:    arg.AuthToken,
+		Tags:         arg.Tags,
 	}
 	q.provisionerDaemons = append(q.provisionerDaemons, daemon)
 	return daemon, nil

diff --git a/coderd/database/dbtype/dbtype.go b/coderd/database/dbtype/dbtype.go
@@ -0,0 +1,30 @@
+package dbtype
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+
+	"golang.org/x/xerrors"
+)
+
+type Map map[string]string
+
+func (m Map) Scan(src interface{}) error {
+	if src == nil {
+		return nil
+	}
+	switch src := src.(type) {
+	case []byte:
+		err := json.Unmarshal(src, &m)
+		if err != nil {
+			return err
+		}
+	default:
+		return xerrors.Errorf("unsupported Scan, storing driver.Value type %T into type %T", src, m)
+	}
+	return nil
+}
+
+func (m Map) Value() (driver.Value, error) {
+	return json.Marshal(m)
+}
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000072_provisioner_daemon_auth.up.sql b/coderd/database/migrations/000072_provisioner_daemon_auth.up.sql
@@ -1,3 +1,2 @@
-ALTER TABLE provisioner_daemons ADD COLUMN tags jsonb;
-
-ALTER TABLE template_versions ADD COLUMN provisioner_tags jsonb;
+ALTER TABLE provisioner_daemons ADD COLUMN tags jsonb NOT NULL DEFAULT '{}';
+ALTER TABLE provisioner_jobs ADD COLUMN tags jsonb NOT NULL DEFAULT '{}';
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