public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Fix issues reported by staticcheck; enable stylecheck linter (#28866)

Browse Source 
* Chore: Fix issues reported by staticcheck

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
This commit is contained in:
Arve Knudsen
2020-11-05 15:37:11 +01:00
committed by GitHub
co-authored by Emil Tullstedt
parent 135b83e17f
commit 676d393ec9
27 changed files with 193 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/admin_provisioning.go
+8 -8
View File
@@ -6,32 +6,32 @@ import (
"github.com/grafana/grafana/pkg/models"
)
func (server *HTTPServer) AdminProvisioningReloadDashboards(c *models.ReqContext) Response {
err := server.ProvisioningService.ProvisionDashboards()
func (hs *HTTPServer) AdminProvisioningReloadDashboards(c *models.ReqContext) Response {
err := hs.ProvisioningService.ProvisionDashboards()
if err != nil && err != context.Canceled {
return Error(500, "", err)
}
return Success("Dashboards config reloaded")
}
func (server *HTTPServer) AdminProvisioningReloadDatasources(c *models.ReqContext) Response {
err := server.ProvisioningService.ProvisionDatasources()
func (hs *HTTPServer) AdminProvisioningReloadDatasources(c *models.ReqContext) Response {
err := hs.ProvisioningService.ProvisionDatasources()
if err != nil {
return Error(500, "", err)
}
return Success("Datasources config reloaded")
}
func (server *HTTPServer) AdminProvisioningReloadPlugins(c *models.ReqContext) Response {
err := server.ProvisioningService.ProvisionPlugins()
func (hs *HTTPServer) AdminProvisioningReloadPlugins(c *models.ReqContext) Response {
err := hs.ProvisioningService.ProvisionPlugins()
if err != nil {
return Error(500, "Failed to reload plugins config", err)
}
return Success("Plugins config reloaded")
}
func (server *HTTPServer) AdminProvisioningReloadNotifications(c *models.ReqContext) Response {
err := server.ProvisioningService.ProvisionNotifications()
func (hs *HTTPServer) AdminProvisioningReloadNotifications(c *models.ReqContext) Response {
err := hs.ProvisioningService.ProvisionNotifications()
if err != nil {
return Error(500, "", err)
}
pkg/api/admin_users.go
+8 -8
View File
@@ -121,7 +121,7 @@ func AdminDeleteUser(c *models.ReqContext) Response {
}
// POST /api/admin/users/:id/disable
func (server *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
userID := c.ParamsInt64(":id")
// External users shouldn't be disabled from API
@@ -138,7 +138,7 @@ func (server *HTTPServer) AdminDisableUser(c *models.ReqContext) Response {
return Error(500, "Failed to disable user", err)
}
err := server.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userID)
err := hs.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userID)
if err != nil {
return Error(500, "Failed to disable user", err)
}
@@ -168,24 +168,24 @@ func AdminEnableUser(c *models.ReqContext) Response {
}
// POST /api/admin/users/:id/logout
func (server *HTTPServer) AdminLogoutUser(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminLogoutUser(c *models.ReqContext) Response {
userID := c.ParamsInt64(":id")
if c.UserId == userID {
return Error(400, "You cannot logout yourself", nil)
}
return server.logoutUserFromAllDevicesInternal(c.Req.Context(), userID)
return hs.logoutUserFromAllDevicesInternal(c.Req.Context(), userID)
}
// GET /api/admin/users/:id/auth-tokens
func (server *HTTPServer) AdminGetUserAuthTokens(c *models.ReqContext) Response {
func (hs *HTTPServer) AdminGetUserAuthTokens(c *models.ReqContext) Response {
userID := c.ParamsInt64(":id")
return server.getUserAuthTokensInternal(c, userID)
return hs.getUserAuthTokensInternal(c, userID)
}
// POST /api/admin/users/:id/revoke-auth-token
func (server *HTTPServer) AdminRevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
func (hs *HTTPServer) AdminRevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
userID := c.ParamsInt64(":id")
return server.revokeUserAuthTokenInternal(c, userID, cmd)
return hs.revokeUserAuthTokenInternal(c, userID, cmd)
}
pkg/api/dashboard_test.go
+1 -1
View File
@@ -1246,7 +1246,7 @@ func (m mockDashboardProvisioningService) GetProvisionedDashboardData(name strin
panic("implement me")
}
func (mock mockDashboardProvisioningService) GetProvisionedDashboardDataByDashboardID(dashboardId int64) (*models.DashboardProvisioning, error) {
func (m mockDashboardProvisioningService) GetProvisionedDashboardDataByDashboardID(dashboardId int64) (*models.DashboardProvisioning, error) {
return &models.DashboardProvisioning{}, nil
}
pkg/api/ldap_debug.go
+5 -5
View File
@@ -97,7 +97,7 @@ func (user *LDAPUserDTO) FetchOrgs() error {
}
// ReloadLDAPCfg reloads the LDAP configuration
func (server *HTTPServer) ReloadLDAPCfg() Response {
func (hs *HTTPServer) ReloadLDAPCfg() Response {
if !ldap.IsEnabled() {
return Error(http.StatusBadRequest, "LDAP is not enabled", nil)
}
@@ -110,7 +110,7 @@ func (server *HTTPServer) ReloadLDAPCfg() Response {
}
// GetLDAPStatus attempts to connect to all the configured LDAP servers and returns information on whenever they're available or not.
func (server *HTTPServer) GetLDAPStatus(c *models.ReqContext) Response {
func (hs *HTTPServer) GetLDAPStatus(c *models.ReqContext) Response {
if !ldap.IsEnabled() {
return Error(http.StatusBadRequest, "LDAP is not enabled", nil)
}
@@ -152,7 +152,7 @@ func (server *HTTPServer) GetLDAPStatus(c *models.ReqContext) Response {
}
// PostSyncUserWithLDAP enables a single Grafana user to be synchronized against LDAP
func (server *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) Response {
func (hs *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) Response {
if !ldap.IsEnabled() {
return Error(http.StatusBadRequest, "LDAP is not enabled", nil)
}
@@ -203,7 +203,7 @@ func (server *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) Response {
return Error(http.StatusInternalServerError, "Failed to disable the user", err)
}
err = server.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userId)
err = hs.AuthTokenService.RevokeAllUserTokens(c.Req.Context(), userId)
if err != nil {
return Error(http.StatusInternalServerError, "Failed to remove session tokens for the user", err)
}
@@ -231,7 +231,7 @@ func (server *HTTPServer) PostSyncUserWithLDAP(c *models.ReqContext) Response {
}
// GetUserFromLDAP finds an user based on a username in LDAP. This helps illustrate how would the particular user be mapped in Grafana when synced.
func (server *HTTPServer) GetUserFromLDAP(c *models.ReqContext) Response {
func (hs *HTTPServer) GetUserFromLDAP(c *models.ReqContext) Response {
if !ldap.IsEnabled() {
return Error(http.StatusBadRequest, "LDAP is not enabled", nil)
}
pkg/api/plugins.go
+1
View File
@@ -8,6 +8,7 @@ import (
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
pkg/api/user_token.go
+11 -11
View File
@@ -12,16 +12,16 @@ import (
)
// GET /api/user/auth-tokens
func (server *HTTPServer) GetUserAuthTokens(c *models.ReqContext) Response {
return server.getUserAuthTokensInternal(c, c.UserId)
func (hs *HTTPServer) GetUserAuthTokens(c *models.ReqContext) Response {
return hs.getUserAuthTokensInternal(c, c.UserId)
}
// POST /api/user/revoke-auth-token
func (server *HTTPServer) RevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
return server.revokeUserAuthTokenInternal(c, c.UserId, cmd)
func (hs *HTTPServer) RevokeUserAuthToken(c *models.ReqContext, cmd models.RevokeAuthTokenCmd) Response {
return hs.revokeUserAuthTokenInternal(c, c.UserId, cmd)
}
func (server *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, userID int64) Response {
func (hs *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context, userID int64) Response {
userQuery := models.GetUserByIdQuery{Id: userID}
if err := bus.Dispatch(&userQuery); err != nil {
@@ -31,7 +31,7 @@ func (server *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context,
return Error(500, "Could not read user from database", err)
}
err := server.AuthTokenService.RevokeAllUserTokens(ctx, userID)
err := hs.AuthTokenService.RevokeAllUserTokens(ctx, userID)
if err != nil {
return Error(500, "Failed to logout user", err)
}
@@ -41,7 +41,7 @@ func (server *HTTPServer) logoutUserFromAllDevicesInternal(ctx context.Context,
})
}
func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int64) Response {
func (hs *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID int64) Response {
userQuery := models.GetUserByIdQuery{Id: userID}
if err := bus.Dispatch(&userQuery); err != nil {
@@ -51,7 +51,7 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID
return Error(500, "Failed to get user", err)
}
tokens, err := server.AuthTokenService.GetUserTokens(c.Req.Context(), userID)
tokens, err := hs.AuthTokenService.GetUserTokens(c.Req.Context(), userID)
if err != nil {
return Error(500, "Failed to get user auth tokens", err)
}
@@ -108,7 +108,7 @@ func (server *HTTPServer) getUserAuthTokensInternal(c *models.ReqContext, userID
return JSON(200, result)
}
func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd models.RevokeAuthTokenCmd) Response {
func (hs *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, userID int64, cmd models.RevokeAuthTokenCmd) Response {
userQuery := models.GetUserByIdQuery{Id: userID}
if err := bus.Dispatch(&userQuery); err != nil {
@@ -118,7 +118,7 @@ func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, user
return Error(500, "Failed to get user", err)
}
token, err := server.AuthTokenService.GetUserToken(c.Req.Context(), userID, cmd.AuthTokenId)
token, err := hs.AuthTokenService.GetUserToken(c.Req.Context(), userID, cmd.AuthTokenId)
if err != nil {
if err == models.ErrUserTokenNotFound {
return Error(404, "User auth token not found", err)
@@ -130,7 +130,7 @@ func (server *HTTPServer) revokeUserAuthTokenInternal(c *models.ReqContext, user
return Error(400, "Cannot revoke active user auth token", nil)
}
err = server.AuthTokenService.RevokeToken(c.Req.Context(), token)
err = hs.AuthTokenService.RevokeToken(c.Req.Context(), token)
if err != nil {
if err == models.ErrUserTokenNotFound {
return Error(404, "User auth token not found", err)