Apr 20, 2023 · Apr 13, 2023 · Apr 13, 2023 · Apr 17, 2023 · Apr 17, 2023 · Apr 17, 2023
diff --git a/cli/clibase/option.go b/cli/clibase/option.go
 *s = append(*s, opts...)
 }

 // Filter will only return options that match the given filter. (return true)
 func (s OptionSet) Filter(filter func(opt Option) bool) OptionSet {
 cpy := make(OptionSet, 0)
 for _, opt := range s {
 if filter(opt) {
 cpy = append(cpy, opt)
 }
 }
 return cpy
 }

 // FlagSet returns a pflag.FlagSet for the OptionSet.
 func (s *OptionSet) FlagSet() *pflag.FlagSet {
 if s == nil {
diff --git a/cli/cliui/output.go b/cli/cliui/output.go
 func (textFormat) Format(_ context.Context, data any) (string, error) {
 return fmt.Sprintf("%s", data), nil
 }

 // DataChangeFormat allows manipulating the data passed to an output format.
 // This is because sometimes the data needs to be manipulated before it can be
 // passed to the output format.
 // For example, you may want to pass something different to the text formatter
 // than what you pass to the json formatter.
 type DataChangeFormat struct {
 format OutputFormat
 change func(data any) (any, error)
 }

 // ChangeFormatterData allows manipulating the data passed to an output
 // format.
 func ChangeFormatterData(format OutputFormat, change func(data any) (any, error)) *DataChangeFormat {
 return &DataChangeFormat{format: format, change: change}
 }

 func (d *DataChangeFormat) ID() string {
 return d.format.ID()
 }

 func (d *DataChangeFormat) AttachOptions(opts *clibase.OptionSet) {
 d.format.AttachOptions(opts)
 }

 func (d *DataChangeFormat) Format(ctx context.Context, data any) (string, error) {
 newData, err := d.change(data)
 if err != nil {
 return "", err
 }
 return d.format.Format(ctx, newData)
 }
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 rbac.ResourceUserData.Type:           {rbac.ActionCreate, rbac.ActionUpdate},
 rbac.ResourceWorkspace.Type:          {rbac.ActionUpdate},
 rbac.ResourceWorkspaceExecution.Type: {rbac.ActionCreate},
 rbac.ResourceWorkspaceProxy.Type:     {rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete},
 }),
 Org:  map[string][]rbac.Permission{},
 User: []rbac.Permission{},
diff --git a/coderd/database/dbauthz/querier.go b/coderd/database/dbauthz/querier.go
 return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByID)(ctx, id)
 }

 func (q *querier) GetWorkspaceProxyByName(ctx context.Context, name string) (database.WorkspaceProxy, error) {
 return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByName)(ctx, name)
 }

 func (q *querier) GetWorkspaceProxyByHostname(ctx context.Context, hostname string) (database.WorkspaceProxy, error) {
 return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByHostname)(ctx, hostname)
 }
 return insert(q.log, q.auth, rbac.ResourceWorkspaceProxy, q.db.InsertWorkspaceProxy)(ctx, arg)
 }

 func (q *querier)UpdateWorkspaceProxy(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 fetch := func(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 func (q *querier)RegisterWorkspaceProxy(ctx context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 fetch := func(ctx context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 return q.db.GetWorkspaceProxyByID(ctx, arg.ID)
 }
 return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateWorkspaceProxy)(ctx, arg)
 return updateWithReturn(q.log, q.auth, fetch, q.db.RegisterWorkspaceProxy)(ctx, arg)
 }

 func (q *querier) UpdateWorkspaceProxyDeleted(ctx context.Context, arg database.UpdateWorkspaceProxyDeletedParams) error {
diff --git a/coderd/database/dbauthz/querier_test.go b/coderd/database/dbauthz/querier_test.go
 ID: uuid.New(),
 }).Asserts(rbac.ResourceWorkspaceProxy, rbac.ActionCreate)
 }))
 s.Run("UpdateWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
 s.Run("RegisterWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
 p, _ := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
 check.Args(database.UpdateWorkspaceProxyParams{
 check.Args(database.RegisterWorkspaceProxyParams{
 ID: p.ID,
 }).Asserts(p, rbac.ActionUpdate)
 }))
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
 return database.WorkspaceProxy{}, sql.ErrNoRows
 }

 func (q *fakeQuerier) GetWorkspaceProxyByName(_ context.Context, name string) (database.WorkspaceProxy, error) {
 q.mutex.Lock()
 defer q.mutex.Unlock()

 for _, proxy := range q.workspaceProxies {
 if proxy.Deleted {
 continue
 }
 if proxy.Name == name {
 return proxy, nil
 }
 }
 return database.WorkspaceProxy{}, sql.ErrNoRows
 }

 func (q *fakeQuerier) GetWorkspaceProxyByHostname(_ context.Context, hostname string) (database.WorkspaceProxy, error) {
 q.mutex.Lock()
 defer q.mutex.Unlock()
 return p, nil
 }

 func (q *fakeQuerier)UpdateWorkspaceProxy(_ context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 func (q *fakeQuerier)RegisterWorkspaceProxy(_ context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
 q.mutex.Lock()
 defer q.mutex.Unlock()

 for i, p := range q.workspaceProxies {
 if p.ID == arg.ID {
 p.Name = arg.Name
 p.Icon = arg.Icon
 p.Url = arg.Url
 p.WildcardHostname = arg.WildcardHostname
 p.UpdatedAt = database.Now()
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -80,6 +80,17 @@ func (s *OptionSet) Add(opts ...Option) {
		s = append(s, opts...)
		}

		// Filter will only return options that match the given filter. (return true)
		func (s OptionSet) Filter(filter func(opt Option) bool) OptionSet {
		cpy := make(OptionSet, 0)
		for _, opt := range s {
		if filter(opt) {
		cpy = append(cpy, opt)
		}
		}
		return cpy
		}

		// FlagSet returns a pflag.FlagSet for the OptionSet.
		func (s OptionSet) FlagSet() pflag.FlagSet {
		if s == nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -192,3 +192,35 @@ func (textFormat) AttachOptions(_ *clibase.OptionSet) {}
		func (textFormat) Format(_ context.Context, data any) (string, error) {
		return fmt.Sprintf("%s", data), nil
		}

		// DataChangeFormat allows manipulating the data passed to an output format.
		// This is because sometimes the data needs to be manipulated before it can be
		// passed to the output format.
		// For example, you may want to pass something different to the text formatter
		// than what you pass to the json formatter.
		type DataChangeFormat struct {
Emyrk marked this conversation as resolved. Show resolvedHide resolved
		format OutputFormat
		change func(data any) (any, error)
		}

		// ChangeFormatterData allows manipulating the data passed to an output
		// format.
		func ChangeFormatterData(format OutputFormat, change func(data any) (any, error)) *DataChangeFormat {
		return &DataChangeFormat{format: format, change: change}
		}

		func (d *DataChangeFormat) ID() string {
		return d.format.ID()
		}

		func (d DataChangeFormat) AttachOptions(opts clibase.OptionSet) {
		d.format.AttachOptions(opts)
		}

		func (d *DataChangeFormat) Format(ctx context.Context, data any) (string, error) {
		newData, err := d.change(data)
		if err != nil {
		return "", err
		}
		return d.format.Format(ctx, newData)
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -181,6 +181,7 @@ var (
		rbac.ResourceUserData.Type: {rbac.ActionCreate, rbac.ActionUpdate},
		rbac.ResourceWorkspace.Type: {rbac.ActionUpdate},
		rbac.ResourceWorkspaceExecution.Type: {rbac.ActionCreate},
		rbac.ResourceWorkspaceProxy.Type: {rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete},
		}),
		Org: map[string][]rbac.Permission{},
		User: []rbac.Permission{},
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1697,6 +1697,10 @@ func (q *querier) GetWorkspaceProxyByID(ctx context.Context, id uuid.UUID) (data
		return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByID)(ctx, id)
		}

		func (q *querier) GetWorkspaceProxyByName(ctx context.Context, name string) (database.WorkspaceProxy, error) {
Emyrk marked this conversation as resolved. Show resolvedHide resolved
		return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByName)(ctx, name)
		}

		func (q *querier) GetWorkspaceProxyByHostname(ctx context.Context, hostname string) (database.WorkspaceProxy, error) {
		return fetch(q.log, q.auth, q.db.GetWorkspaceProxyByHostname)(ctx, hostname)
		}
Expand All		@@ -1705,11 +1709,11 @@ func (q *querier) InsertWorkspaceProxy(ctx context.Context, arg database.InsertW
		return insert(q.log, q.auth, rbac.ResourceWorkspaceProxy, q.db.InsertWorkspaceProxy)(ctx, arg)
		}

		func (q *querier)UpdateWorkspaceProxy(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		fetch := func(ctx context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		func (q *querier)RegisterWorkspaceProxy(ctx context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		fetch := func(ctx context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		return q.db.GetWorkspaceProxyByID(ctx, arg.ID)
		}
		return updateWithReturn(q.log, q.auth, fetch, q.db.UpdateWorkspaceProxy)(ctx, arg)
		return updateWithReturn(q.log, q.auth, fetch, q.db.RegisterWorkspaceProxy)(ctx, arg)
		}

		func (q *querier) UpdateWorkspaceProxyDeleted(ctx context.Context, arg database.UpdateWorkspaceProxyDeletedParams) error {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -444,9 +444,9 @@ func (s *MethodTestSuite) TestWorkspaceProxy() {
		ID: uuid.New(),
		}).Asserts(rbac.ResourceWorkspaceProxy, rbac.ActionCreate)
		}))
		s.Run("UpdateWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
		s.Run("RegisterWorkspaceProxy", s.Subtest(func(db database.Store, check *expects) {
		p, _ := dbgen.WorkspaceProxy(s.T(), db, database.WorkspaceProxy{})
		check.Args(database.UpdateWorkspaceProxyParams{
		check.Args(database.RegisterWorkspaceProxyParams{
		ID: p.ID,
		}).Asserts(p, rbac.ActionUpdate)
		}))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5097,6 +5097,21 @@ func (q *fakeQuerier) GetWorkspaceProxyByID(_ context.Context, id uuid.UUID) (da
		return database.WorkspaceProxy{}, sql.ErrNoRows
		}

		func (q *fakeQuerier) GetWorkspaceProxyByName(_ context.Context, name string) (database.WorkspaceProxy, error) {
		q.mutex.Lock()
		defer q.mutex.Unlock()

		for _, proxy := range q.workspaceProxies {
		if proxy.Deleted {
		continue
		}
		if proxy.Name == name {
		return proxy, nil
		}
		}
		return database.WorkspaceProxy{}, sql.ErrNoRows
		}

		func (q *fakeQuerier) GetWorkspaceProxyByHostname(_ context.Context, hostname string) (database.WorkspaceProxy, error) {
		q.mutex.Lock()
		defer q.mutex.Unlock()
Expand DownExpand Up		@@ -5157,14 +5172,12 @@ func (q *fakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.Inser
		return p, nil
		}

		func (q *fakeQuerier)UpdateWorkspaceProxy(_ context.Context, arg database.UpdateWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		func (q *fakeQuerier)RegisterWorkspaceProxy(_ context.Context, arg database.RegisterWorkspaceProxyParams) (database.WorkspaceProxy, error) {
		q.mutex.Lock()
		defer q.mutex.Unlock()

		for i, p := range q.workspaceProxies {
		if p.ID == arg.ID {
		p.Name = arg.Name
		p.Icon = arg.Icon
		p.Url = arg.Url
		p.WildcardHostname = arg.WildcardHostname
		p.UpdatedAt = database.Now()
Expand Down