use a sql domain as a type alias so that we can override it as a StringMap in sqlc

SasSwart · SasSwart · commit 70c7ea90d837 · 2024-11-12T09:03:21.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3635,12 +3635,7 @@ func (q *FakeQuerier) GetProvisionerDaemonsByOrganization(_ context.Context, arg
 			continue
 		}
 		if arg.Tags != nil {
-			var argTags map[string]string
-			err := json.Unmarshal(arg.Tags, &argTags)
-			if err != nil {
-				continue
-			}
-			for k, v := range argTags {
+			for k, v := range arg.Tags {
 				if t, found := daemon.Tags[k]; !found || t != v {
 					continue
 				}
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000274_check_tags.up.sql b/coderd/database/migrations/000274_check_tags.up.sql
@@ -1,10 +1,12 @@
-CREATE OR REPLACE FUNCTION tags_compatible(subset_tags jsonb, superset_tags jsonb)
+CREATE DOMAIN tags AS jsonb;
+
+CREATE OR REPLACE FUNCTION tags_compatible(subset_tags tags, superset_tags tags)
 RETURNS boolean as $$
 BEGIN
 	RETURN CASE
-		WHEN superset_tags = '{"scope": "organization", "owner": ""}' :: jsonb
+		WHEN superset_tags :: jsonb = '{"scope": "organization", "owner": ""}' :: jsonb
 		THEN subset_tags = superset_tags
-		ELSE subset_tags <@ superset_tags
+		ELSE subset_tags :: jsonb <@ superset_tags :: jsonb
 	END;
 END;
 $$ LANGUAGE plpgsql;
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql
@@ -14,7 +14,7 @@ WHERE
 	organization_id = @organization_id :: uuid
 	AND
 	-- adding support for searching by tags:
-	(@tags :: jsonb = '' :: jsonb OR tags_compatible(@tags :: jsonb, provisioner_daemons.tags :: jsonb));
+	 (@tags :: tags = '{}' :: tags OR tags_compatible(@tags::tags, provisioner_daemons.tags::tags));
 
 -- name: DeleteOldProvisionerDaemons :exec
 -- Delete provisioner daemons that have been created at least a week ago
diff --git a/coderd/database/queries/provisionerjobs.sql b/coderd/database/queries/provisionerjobs.sql
@@ -22,7 +22,7 @@ WHERE
 			AND nested.organization_id = @organization_id
 			-- Ensure the caller has the correct provisioner.
 			AND nested.provisioner = ANY(@types :: provisioner_type [ ])
-			AND tags_compatible(@tags, nested.tags)
+			AND tags_compatible(@tags :: jsonb, nested.tags)
 		ORDER BY
 			nested.created_at
 		FOR UPDATE
diff --git a/coderd/database/sqlc.yaml b/coderd/database/sqlc.yaml
@@ -35,6 +35,9 @@ sql:
           - db_type: "name_organization_pair"
             go_type:
               type: "NameOrganizationPair"
+          - db_type: "tags"
+            go_type:
+              type: "StringMap"
           - column: "custom_roles.site_permissions"
             go_type:
               type: "CustomRolePermissions"
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -3,7 +3,6 @@ package coderd
 import (
 	"context"
 	"database/sql"
-	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -64,15 +63,7 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	org := httpmw.OrganizationParam(r)
 
-	tags, err := provisionerTags(r)
-	if err != nil {
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error reading tags.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
+	tags := provisionerTags(r)
 	daemons, err := api.Database.GetProvisionerDaemonsByOrganization(
 		ctx,
 		database.GetProvisionerDaemonsByOrganizationParams{
@@ -91,10 +82,10 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(daemons, db2sdk.ProvisionerDaemon))
 }
 
-func provisionerTags(r *http.Request) ([]byte, error) {
+func provisionerTags(r *http.Request) map[string]string {
 	tags := r.URL.Query()["tags"]
 	if len(tags) == 0 {
-		return []byte{}, nil
+		return nil
 	}
 
 	tagMap := map[string]string{}
@@ -106,7 +97,7 @@ func provisionerTags(r *http.Request) ([]byte, error) {
 		}
 	}
 
-	return json.Marshal(tagMap)
+	return tagMap
 }
 
 type provisiionerDaemonAuthResponse struct {

Original file line number	Diff line number	Diff line change
`@@ -3635,12 +3635,7 @@ func (q *FakeQuerier) GetProvisionerDaemonsByOrganization(_ context.Context, arg`
`3635`	`3635`	`continue`
`3636`	`3636`	`}`
`3637`	`3637`	`if arg.Tags != nil {`
`3638`		`- var argTags map[string]string`
`3639`		`- err := json.Unmarshal(arg.Tags, &argTags)`
`3640`		`- if err != nil {`
`3641`		`- continue`
`3642`		`- }`
`3643`		`- for k, v := range argTags {`
	`3638`	`+ for k, v := range arg.Tags {`
`3644`	`3639`	`if t, found := daemon.Tags[k]; !found \|\| t != v {`
`3645`	`3640`	`continue`
`3646`	`3641`	`}`