update cli

Emyrk · Emyrk · commit ecb59d659313 · 2024-07-03T08:58:26.000-05:00
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -420,7 +420,9 @@ func TestTemplatesByOrganization(t *testing.T) {
 
 		ctx := testutil.Context(t, testutil.WaitLong)
 
-		templates, err := client.TemplatesByOrganization(ctx, user.OrganizationID)
+		templates, err := client.Templates(ctx, codersdk.TemplateFilter{
+			OrganizationID: user.OrganizationID,
+		})
 		require.NoError(t, err)
 		require.Len(t, templates, 1)
 	})
@@ -440,7 +442,7 @@ func TestTemplatesByOrganization(t *testing.T) {
 		require.Len(t, templates, 2)
 
 		// Listing all should match
-		templates, err = client.Templates(ctx)
+		templates, err = client.Templates(ctx, codersdk.TemplateFilter{})
 		require.NoError(t, err)
 		require.Len(t, templates, 2)
 
@@ -473,12 +475,19 @@ func TestTemplatesByOrganization(t *testing.T) {
 		ctx := testutil.Context(t, testutil.WaitLong)
 
 		// All 4 are viewable by the owner
-		templates, err := client.Templates(ctx)
+		templates, err := client.Templates(ctx, codersdk.TemplateFilter{})
 		require.NoError(t, err)
 		require.Len(t, templates, 4)
 
+		// View a single organization from the owner
+		templates, err = client.Templates(ctx, codersdk.TemplateFilter{
+			OrganizationID: owner.OrganizationID,
+		})
+		require.NoError(t, err)
+		require.Len(t, templates, 2)
+
 		// Only 2 are viewable by the org user
-		templates, err = user.Templates(ctx)
+		templates, err = user.Templates(ctx, codersdk.TemplateFilter{})
 		require.NoError(t, err)
 		require.Len(t, templates, 2)
 		for _, tmpl := range templates {
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -362,11 +363,33 @@ func (c *Client) TemplatesByOrganization(ctx context.Context, organizationID uui
 	return templates, json.NewDecoder(res.Body).Decode(&templates)
 }
 
+type TemplateFilter struct {
+	OrganizationID uuid.UUID
+}
+
+// asRequestOption returns a function that can be used in (*Client).Request.
+// It modifies the request query parameters.
+func (f TemplateFilter) asRequestOption() RequestOption {
+	return func(r *http.Request) {
+		var params []string
+		// Make sure all user input is quoted to ensure it's parsed as a single
+		// string.
+		if f.OrganizationID != uuid.Nil {
+			params = append(params, fmt.Sprintf("organization:%q", f.OrganizationID.String()))
+		}
+
+		q := r.URL.Query()
+		q.Set("q", strings.Join(params, " "))
+		r.URL.RawQuery = q.Encode()
+	}
+}
+
 // Templates lists all viewable templates
-func (c *Client) Templates(ctx context.Context) ([]Template, error) {
+func (c *Client) Templates(ctx context.Context, filter TemplateFilter) ([]Template, error) {
 	res, err := c.Request(ctx, http.MethodGet,
 		"/api/v2/templates",
 		nil,
+		filter.asRequestOption(),
 	)
 	if err != nil {
 		return nil, xerrors.Errorf("execute request: %w", err)
