fix provisioner tag filtering

coder · SasSwart · Nov 15, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024
commit 86f7dab01b079bc70d305da9d4f85860d259ca83
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,10 @@
-CREATE OR REPLACE FUNCTION tags_compatible(provisioner_tags jsonb, required_tags jsonb)
+CREATE OR REPLACE FUNCTION tags_compatible(subset_tags jsonb, superset_tags jsonb)
 RETURNS boolean as $$
 BEGIN
 	RETURN CASE
-		WHEN provisioner_tags = '{"scope": "organization", "owner": ""}' :: jsonb
-		THEN provisioner_tags = required_tags
-		ELSE required_tags <@ provisioner_tags
+		WHEN superset_tags = '{"scope": "organization", "owner": ""}' :: jsonb
+		THEN subset_tags = superset_tags
+		ELSE subset_tags <@ superset_tags
 	END;
 END;
 $$ LANGUAGE plpgsql;
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
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(nested.tags, @tags)
+			AND tags_compatible(@tags, nested.tags)
 		ORDER BY
 			nested.created_at
 		FOR UPDATE

diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -65,12 +65,12 @@
 	org := httpmw.OrganizationParam(r)
 
 	tags := provisionerTags(r)
-
+	tagsJSON, err := json.Marshal(tags)
 	daemons, err := api.Database.GetProvisionerDaemonsByOrganization(
 		ctx,
 		database.GetProvisionerDaemonsByOrganizationParams{
 			OrganizationID: org.ID,
-			Tags:           tags,
+			Tags:           tagsJSON,
 		},
 	)
 	if err != nil {
@@ -84,22 +84,21 @@
 	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(daemons, db2sdk.ProvisionerDaemon))
 }
 
-func provisionerTags(r *http.Request) json.RawMessage {
+func provisionerTags(r *http.Request) map[string]string {
 	tags := r.URL.Query()["tags"]
 	if len(tags) == 0 {
-		return json.RawMessage("{}")
+		return nil
 	}
 
-	var pairs []string
+	var tagMap map[string]string
 	for _, tag := range tags {
 		parts := strings.SplitN(tag, "=", 2)
 		if len(parts) == 2 {
-			pairs = append(pairs, fmt.Sprintf(`%q:%q`, parts[0], parts[1]))
+			tagMap[parts[0]] = parts[1]
 		}
 	}
 
-	jsonString := fmt.Sprintf("{%s}", strings.Join(pairs, ","))
-	return json.RawMessage(jsonString)
+	return tagMap
 }
 
 type provisiionerDaemonAuthResponse struct {