unshadow, unused-reciever

johnstcn · johnstcn · commit cb4d92f94e0e · 2023-02-03T10:56:23.000Z
diff --git a/coderd/authzquery/authz.go b/coderd/authzquery/authz.go
@@ -35,7 +35,7 @@ func (e NotAuthorizedError) Error() string {
 
 // Unwrap will always unwrap to a sql.ErrNoRows so the API returns a 404.
 // So 'errors.Is(err, sql.ErrNoRows)' will always be true.
-func (e NotAuthorizedError) Unwrap() error {
+func (NotAuthorizedError) Unwrap() error {
 	return sql.ErrNoRows
 }
 
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -258,18 +258,18 @@ func asserts(inputs ...any) []AssertRBAC {
 	return out
 }
 
-func (suite *MethodTestSuite) TestExtraMethods() {
-	suite.Run("GetProvisionerDaemons", func() {
-		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+func (s *MethodTestSuite) TestExtraMethods() {
+	s.Run("GetProvisionerDaemons", func() {
+		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
 			d, err := db.InsertProvisionerDaemon(context.Background(), database.InsertProvisionerDaemonParams{
 				ID: uuid.New(),
 			})
 			require.NoError(t, err, "insert provisioner daemon")
 			return methodCase(inputs(), asserts(d, rbac.ActionRead))
 		})
 	})
-	suite.Run("GetDeploymentDAUs", func() {
-		suite.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
+	s.Run("GetDeploymentDAUs", func() {
+		s.RunMethodTest(func(t *testing.T, db database.Store) MethodCase {
 			return methodCase(inputs(), asserts(rbac.ResourceUser.All(), rbac.ActionRead))
 		})
 	})

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (e NotAuthorizedError) Error() string {`
`35`	`35`
`36`	`36`	`// Unwrap will always unwrap to a sql.ErrNoRows so the API returns a 404.`
`37`	`37`	`// So 'errors.Is(err, sql.ErrNoRows)' will always be true.`
`38`		`-func (e NotAuthorizedError) Unwrap() error {`
	`38`	`+func (NotAuthorizedError) Unwrap() error {`
`39`	`39`	`return sql.ErrNoRows`
`40`	`40`	`}`
`41`	`41`