filter by tags in dbmem

SasSwart · SasSwart · commit e835326a099e · 2024-11-11T16:19:17.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3631,11 +3631,23 @@ func (q *FakeQuerier) GetProvisionerDaemonsByOrganization(_ context.Context, arg
 
 	daemons := make([]database.ProvisionerDaemon, 0)
 	for _, daemon := range q.provisionerDaemons {
-		// TODO (sas): filter by tags here
-		if daemon.OrganizationID == arg.OrganizationID {
-			daemon.Tags = maps.Clone(daemon.Tags)
-			daemons = append(daemons, daemon)
+		if daemon.OrganizationID != arg.OrganizationID {
+			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 {
+				if t, found := daemon.Tags[k]; !found || t != v {
+					continue
+				}
+			}
 		}
+		daemon.Tags = maps.Clone(daemon.Tags)
+		daemons = append(daemons, daemon)
 	}
 
 	return daemons, nil
diff --git a/enterprise/coderd/provisionerdaemons.go b/enterprise/coderd/provisionerdaemons.go
@@ -64,8 +64,7 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	org := httpmw.OrganizationParam(r)
 
-	tags := provisionerTags(r)
-	tagsJSON, err := json.Marshal(tags)
+	tags, err := provisionerTags(r)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error reading tags.",
@@ -78,7 +77,7 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
 		ctx,
 		database.GetProvisionerDaemonsByOrganizationParams{
 			OrganizationID: org.ID,
-			Tags:           tagsJSON,
+			Tags:           tags,
 		},
 	)
 	if err != nil {
@@ -92,10 +91,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) map[string]string {
+func provisionerTags(r *http.Request) ([]byte, error) {
 	tags := r.URL.Query()["tags"]
 	if len(tags) == 0 {
-		return nil
+		return nil, nil
 	}
 
 	tagMap := map[string]string{}
@@ -107,7 +106,7 @@ func provisionerTags(r *http.Request) map[string]string {
 		}
 	}
 
-	return tagMap
+	return json.Marshal(tagMap)
 }
 
 type provisiionerDaemonAuthResponse struct {

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ func (api API) provisionerDaemons(rw http.ResponseWriter, r http.Request) {`
`64`	`64`	`ctx := r.Context()`
`65`	`65`	`org := httpmw.OrganizationParam(r)`
`66`	`66`
`67`		`- tags := provisionerTags(r)`
`68`		`- tagsJSON, err := json.Marshal(tags)`
	`67`	`+ tags, err := provisionerTags(r)`
`69`	`68`	`if err != nil {`
`70`	`69`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`
`71`	`70`	`Message: "Internal error reading tags.",`
`@@ -78,7 +77,7 @@ func (api API) provisionerDaemons(rw http.ResponseWriter, r http.Request) {`
`78`	`77`	`ctx,`
`79`	`78`	`database.GetProvisionerDaemonsByOrganizationParams{`
`80`	`79`	`OrganizationID: org.ID,`
`81`		`- Tags: tagsJSON,`
	`80`	`+ Tags: tags,`
`82`	`81`	`},`
`83`	`82`	`)`
`84`	`83`	`if err != nil {`
`@@ -92,10 +91,10 @@ func (api API) provisionerDaemons(rw http.ResponseWriter, r http.Request) {`
`92`	`91`	`httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(daemons, db2sdk.ProvisionerDaemon))`
`93`	`92`	`}`
`94`	`93`
`95`		`-func provisionerTags(r *http.Request) map[string]string {`
	`94`	`+func provisionerTags(r *http.Request) ([]byte, error) {`
`96`	`95`	`tags := r.URL.Query()["tags"]`
`97`	`96`	`if len(tags) == 0 {`
`98`		`- return nil`
	`97`	`+ return nil, nil`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`tagMap := map[string]string{}`
`@@ -107,7 +106,7 @@ func provisionerTags(r *http.Request) map[string]string {`
`107`	`106`	`}`
`108`	`107`	`}`
`109`	`108`
`110`		`- return tagMap`
	`109`	`+ return json.Marshal(tagMap)`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`type provisiionerDaemonAuthResponse struct {`