Commit117f838

committed

Linting

1 parentb76f373 commit117f838Copy full SHA for 117f838

File tree

-20

lines changed

-20

lines changed

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,8 @@ package coderd_test`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`-"fmt"`
`6`		`-"net/http"`
`7`	`5`	`"testing"`
`8`	`6`
`9`		`-"github.com/coder/coder/coderd"`
`10`		`-"github.com/go-chi/chi/v5"`
`11`		`-`
`12`	`7`	`"go.uber.org/goleak"`
`13`	`8`
`14`	`9`	`"github.com/stretchr/testify/require"`
`@@ -29,12 +24,3 @@ func TestBuildInfo(t *testing.T) {`
`29`	`24`	`require.Equal(t,buildinfo.ExternalURL(),buildInfo.ExternalURL,"external URL")`
`30`	`25`	`require.Equal(t,buildinfo.Version(),buildInfo.Version,"version")`
`31`	`26`	`}`
`32`		`-`
`33`		`-funcTestWalk(t*testing.T) {`
`34`		`-r,_:=coderd.New(&coderd.Options{})`
`35`		`-chiRouter:=r.(chi.Router)`
`36`		`-chi.Walk(chiRouter,func(methodstring,routestring,handler http.Handler,middlewares...func(http.Handler) http.Handler)error {`
`37`		`-fmt.Println(method,route)`
`38`		`-returnnil`
`39`		`-})`
`40`		`-}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -245,14 +245,15 @@ func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams`
`245`	`245`	`returntmp,nil`
`246`	`246`	`}`
`247`	`247`
`248`		`-func (q*fakeQuerier)GetAllUserRoles(ctx context.Context,userID uuid.UUID) (database.GetAllUserRolesRow,error) {`
	`248`	`+func (q*fakeQuerier)GetAllUserRoles(_ context.Context,userID uuid.UUID) (database.GetAllUserRolesRow,error) {`
`249`	`249`	`q.mutex.RLock()`
`250`	`250`	`deferq.mutex.RUnlock()`
`251`	`251`
`252`	`252`	`varuser*database.User`
`253`	`253`	`roles:=make([]string,0)`
`254`	`254`	`for_,u:=rangeq.users {`
`255`	`255`	`ifu.ID==userID {`
	`256`	`+u:=u`
`256`	`257`	`roles=append(roles,u.RBACRoles...)`
`257`	`258`	`user=&u`
`258`	`259`	`break`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package httpmw`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`-"fmt"`
`6`	`5`	`"net/http"`
`7`	`6`
`8`	`7`	`"golang.org/x/xerrors"`
`@@ -111,7 +110,7 @@ func ExtractUserRoles(db database.Store) func(http.Handler) http.Handler {`
`111`	`110`	`role,err:=db.GetAllUserRoles(r.Context(),apiKey.UserID)`
`112`	`111`	`iferr!=nil {`
`113`	`112`	`httpapi.Write(rw,http.StatusUnauthorized, httpapi.Response{`
`114`		`-Message:fmt.Sprintf("roles not found",AuthCookie),`
	`113`	`+Message:"roles not found",`
`115`	`114`	`})`
`116`	`115`	`return`
`117`	`116`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,15 @@ import (`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// assignableSiteRoles returns all site wide roles that can be assigned.`
`13`		`-func (apiapi)assignableSiteRoles(rw http.ResponseWriter,rhttp.Request) {`
	`13`	`+func (api)assignableSiteRoles(rw http.ResponseWriter,_http.Request) {`
`14`	`14`	`// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the`
`15`	`15`	`// role of the user.`
`16`	`16`	`roles:=rbac.SiteRoles()`
`17`	`17`	`httpapi.Write(rw,http.StatusOK,roles)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// assignableSiteRoles returns all site wide roles that can be assigned.`
`21`		`-func (apiapi)assignableOrgRoles(rw http.ResponseWriter,rhttp.Request) {`
	`21`	`+func (api)assignableOrgRoles(rw http.ResponseWriter,rhttp.Request) {`
`22`	`22`	`// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the`
`23`	`23`	`// role of the user.`
`24`	`24`	`organization:=httpmw.OrganizationParam(r)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,11 @@ import (`
`5`	`5`	`"net/http"`
`6`	`6`	`"testing"`
`7`	`7`
	`8`	`+"github.com/stretchr/testify/require"`
	`9`	`+`
`8`	`10`	`"github.com/coder/coder/coderd/coderdtest"`
`9`	`11`	`"github.com/coder/coder/coderd/rbac"`
`10`	`12`	`"github.com/coder/coder/codersdk"`
`11`		`-"github.com/stretchr/testify/require"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`funcTestListRoles(t*testing.T) {`

Comments

(0)