lint

Kira-Pilot · Kira-Pilot · commit e5dbe177c2ab · 2023-02-01T22:49:22.000Z
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
@@ -31,7 +31,7 @@ type Request[T Auditable] struct {
 
 	Old    T
 	New    T
-	UserId uuid.UUID
+	UserID uuid.UUID
 }
 
 type BuildAuditParams[T Auditable] struct {
@@ -163,7 +163,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p *RequestParams) (*Request
 		if ok {
 			userID = key.UserID
 		} else {
-			userID = req.UserId
+			userID = req.UserID
 		}
 
 		ip := parseIP(p.Request.RemoteAddr)
diff --git a/coderd/users.go b/coderd/users.go
@@ -1030,7 +1030,7 @@ func (api *API) postLogin(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	aReq.UserId = user.ID
+	aReq.UserID = user.ID
 
 	// If the user doesn't exist, it will be a default struct.
 	equal, err := userpassword.Compare(string(user.HashedPassword), loginWithPassword.Password)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ type Request[T Auditable] struct {`
`31`	`31`
`32`	`32`	`Old T`
`33`	`33`	`New T`
`34`		`- UserId uuid.UUID`
	`34`	`+ UserID uuid.UUID`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`type BuildAuditParams[T Auditable] struct {`
`@@ -163,7 +163,7 @@ func InitRequest[T Auditable](w http.ResponseWriter, p RequestParams) (Request`
`163`	`163`	`if ok {`
`164`	`164`	`userID = key.UserID`
`165`	`165`	`} else {`
`166`		`- userID = req.UserId`
	`166`	`+ userID = req.UserID`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`ip := parseIP(p.Request.RemoteAddr)`
Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,7 @@ func (api API) postLogin(rw http.ResponseWriter, r http.Request) {`
`1030`	`1030`	`return`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`		`- aReq.UserId = user.ID`
	`1033`	`+ aReq.UserID = user.ID`
`1034`	`1034`
`1035`	`1035`	`// If the user doesn't exist, it will be a default struct.`
`1036`	`1036`	`equal, err := userpassword.Compare(string(user.HashedPassword), loginWithPassword.Password)`