Skip to content

Commit 042c224

Browse files
EmyrkEmyrk
committed
fixup trailing slash on router comment
1 parent 290cabc commit 042c224

File tree

7 files changed

+22
-11
lines changed

7 files changed

+22
-11
lines changed

‎coderd/apidoc/docs.go

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderdtest/swaggerparser.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ func VerifySwaggerDefinitions(t *testing.T, router chi.Router, swaggerComments [
167167

168168
c := findSwaggerCommentByMethodAndRoute(swaggerComments, method, route)
169169
assert.NotNil(t, c, "Missing @Router annotation")
170+
170171
if c == nil {
171172
return // do not fail next assertion for this route
172173
}

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,22 @@ func (s *MethodTestSuite) TestOrganization() {
643643
o.ID,
644644
).Asserts(o, policy.ActionDelete)
645645
}))
646+
s.Run("OrganizationMembers", s.Subtest(func(db database.Store, check *expects) {
647+
o := dbgen.Organization(s.T(), db, database.Organization{})
648+
u := dbgen.User(s.T(), db, database.User{})
649+
mem := dbgen.OrganizationMember(s.T(), db, database.OrganizationMember{
650+
OrganizationID: o.ID,
651+
UserID: u.ID,
652+
Roles: []string{rbac.RoleOrgAdmin(o.ID)},
653+
})
654+
655+
check.Args(database.OrganizationMembersParams{
656+
OrganizationID: uuid.UUID{},
657+
UserID: uuid.UUID{},
658+
}).Asserts(
659+
mem, policy.ActionRead,
660+
)
661+
}))
646662
s.Run("UpdateMemberRoles", s.Subtest(func(db database.Store, check *expects) {
647663
o := dbgen.Organization(s.T(), db, database.Organization{})
648664
u := dbgen.User(s.T(), db, database.User{})

‎coderd/database/dbauthz/setup_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
274274
} else {
275275
s.ErrorContains(err, testCase.cancelledCtxExpect)
276276
}
277-
278277
}
279278
})
280279
}

‎coderd/members.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ import (
1717
// @Summary List organization members
1818
// @ID list-organization-members
1919
// @Security CoderSessionToken
20-
// @Accept json
2120
// @Produce json
2221
// @Tags Members
2322
// @Param organization path string true "Organization ID"
2423
// @Success 200 {object} []codersdk.OrganizationMemberWithName
25-
// @Router /organizations/{organization}/members/ [get]
24+
// @Router /organizations/{organization}/members [get]
2625
func (api *API) listMembers(rw http.ResponseWriter, r *http.Request) {
2726
var (
2827
ctx = r.Context()

‎docs/api/members.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)