mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fix megacheck issue unused code.
I removed some code, and commented out other one. See, $ gometalinter --vendor --disable-all --disable=gotype --enable=megacheck --deadline 6m ./... | grep unused pkg/api/avatar/avatar.go💯26⚠️ func (*CacheServer).mustInt is unused (U1000) (megacheck) pkg/api/folder_test.go:136:6⚠️ func callGetFolderByUID is unused (U1000) (megacheck) pkg/api/folder_test.go:141:6⚠️ func callDeleteFolder is unused (U1000) (megacheck) pkg/api/live/hub.go:40:15⚠️ func (*hub).removeConnection is unused (U1000) (megacheck) pkg/components/imguploader/azureblobuploader.go:130:5⚠️ var client is unused (U1000) (megacheck) pkg/middleware/middleware_test.go:438:28⚠️ func (*scenarioContext).withInvalidApiKey is unused (U1000) (megacheck) pkg/services/alerting/ticker.go:40:18⚠️ func (*Ticker).updateOffset is unused (U1000) (megacheck) pkg/services/notifications/notifications_test.go:12:6⚠️ type testTriggeredAlert is unused (U1000) (megacheck) pkg/services/sqlstore/dashboard_service_integration_test.go:935:6⚠️ type scenarioContext is unused (U1000) (megacheck) pkg/services/sqlstore/dashboard_service_integration_test.go:939:6⚠️ type scenarioFunc is unused (U1000) (megacheck) pkg/services/sqlstore/dashboard_service_integration_test.go:941:6⚠️ func dashboardGuardianScenario is unused (U1000) (megacheck) pkg/services/sqlstore/transactions_test.go:13:6⚠️ type testQuery is unused (U1000) (megacheck)
This commit is contained in:
parent
a4f5aafe22
commit
dde650905d
@ -97,15 +97,6 @@ type CacheServer struct {
|
|||||||
cache *gocache.Cache
|
cache *gocache.Cache
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *CacheServer) mustInt(r *http.Request, defaultValue int, keys ...string) (v int) {
|
|
||||||
for _, k := range keys {
|
|
||||||
if _, err := fmt.Sscanf(r.FormValue(k), "%d", &v); err == nil {
|
|
||||||
defaultValue = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return defaultValue
|
|
||||||
}
|
|
||||||
|
|
||||||
func (this *CacheServer) Handler(ctx *macaron.Context) {
|
func (this *CacheServer) Handler(ctx *macaron.Context) {
|
||||||
urlPath := ctx.Req.URL.Path
|
urlPath := ctx.Req.URL.Path
|
||||||
hash := urlPath[strings.LastIndex(urlPath, "/")+1:]
|
hash := urlPath[strings.LastIndex(urlPath, "/")+1:]
|
||||||
|
@ -133,16 +133,6 @@ func TestFoldersApiEndpoint(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func callGetFolderByUID(sc *scenarioContext) {
|
|
||||||
sc.handlerFunc = GetFolderByUID
|
|
||||||
sc.fakeReqWithParams("GET", sc.url, map[string]string{}).exec()
|
|
||||||
}
|
|
||||||
|
|
||||||
func callDeleteFolder(sc *scenarioContext) {
|
|
||||||
sc.handlerFunc = DeleteFolder
|
|
||||||
sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
|
|
||||||
}
|
|
||||||
|
|
||||||
func callCreateFolder(sc *scenarioContext) {
|
func callCreateFolder(sc *scenarioContext) {
|
||||||
sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
|
sc.fakeReqWithParams("POST", sc.url, map[string]string{}).exec()
|
||||||
}
|
}
|
||||||
|
@ -37,9 +37,6 @@ func newHub() *hub {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *hub) removeConnection() {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *hub) run(ctx context.Context) {
|
func (h *hub) run(ctx context.Context) {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
|
@ -127,8 +127,6 @@ type xmlError struct {
|
|||||||
const ms_date_layout = "Mon, 02 Jan 2006 15:04:05 GMT"
|
const ms_date_layout = "Mon, 02 Jan 2006 15:04:05 GMT"
|
||||||
const version = "2017-04-17"
|
const version = "2017-04-17"
|
||||||
|
|
||||||
var client = &http.Client{}
|
|
||||||
|
|
||||||
type StorageClient struct {
|
type StorageClient struct {
|
||||||
Auth *Auth
|
Auth *Auth
|
||||||
Transport http.RoundTripper
|
Transport http.RoundTripper
|
||||||
|
@ -435,11 +435,6 @@ func (sc *scenarioContext) withValidApiKey() *scenarioContext {
|
|||||||
return sc
|
return sc
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sc *scenarioContext) withInvalidApiKey() *scenarioContext {
|
|
||||||
sc.apiKey = "nvalidhhhhds"
|
|
||||||
return sc
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sc *scenarioContext) withAuthorizationHeader(authHeader string) *scenarioContext {
|
func (sc *scenarioContext) withAuthorizationHeader(authHeader string) *scenarioContext {
|
||||||
sc.authHeader = authHeader
|
sc.authHeader = authHeader
|
||||||
return sc
|
return sc
|
||||||
|
@ -37,10 +37,6 @@ func NewTicker(last time.Time, initialOffset time.Duration, c clock.Clock) *Tick
|
|||||||
return t
|
return t
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *Ticker) updateOffset(offset time.Duration) {
|
|
||||||
t.newOffset <- offset
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *Ticker) run() {
|
func (t *Ticker) run() {
|
||||||
for {
|
for {
|
||||||
next := t.last.Add(time.Duration(1) * time.Second)
|
next := t.last.Add(time.Duration(1) * time.Second)
|
||||||
|
@ -9,12 +9,6 @@ import (
|
|||||||
. "github.com/smartystreets/goconvey/convey"
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
)
|
)
|
||||||
|
|
||||||
type testTriggeredAlert struct {
|
|
||||||
ActualValue float64
|
|
||||||
Name string
|
|
||||||
State string
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestNotifications(t *testing.T) {
|
func TestNotifications(t *testing.T) {
|
||||||
|
|
||||||
Convey("Given the notifications service", t, func() {
|
Convey("Given the notifications service", t, func() {
|
||||||
|
@ -932,29 +932,6 @@ func TestIntegratedDashboardService(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
type scenarioContext struct {
|
|
||||||
dashboardGuardianMock *guardian.FakeDashboardGuardian
|
|
||||||
}
|
|
||||||
|
|
||||||
type scenarioFunc func(c *scenarioContext)
|
|
||||||
|
|
||||||
func dashboardGuardianScenario(desc string, mock *guardian.FakeDashboardGuardian, fn scenarioFunc) {
|
|
||||||
Convey(desc, func() {
|
|
||||||
origNewDashboardGuardian := guardian.New
|
|
||||||
guardian.MockDashboardGuardian(mock)
|
|
||||||
|
|
||||||
sc := &scenarioContext{
|
|
||||||
dashboardGuardianMock: mock,
|
|
||||||
}
|
|
||||||
|
|
||||||
defer func() {
|
|
||||||
guardian.New = origNewDashboardGuardian
|
|
||||||
}()
|
|
||||||
|
|
||||||
fn(sc)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
type dashboardPermissionScenarioContext struct {
|
type dashboardPermissionScenarioContext struct {
|
||||||
dashboardGuardianMock *guardian.FakeDashboardGuardian
|
dashboardGuardianMock *guardian.FakeDashboardGuardian
|
||||||
}
|
}
|
||||||
|
@ -10,10 +10,6 @@ import (
|
|||||||
. "github.com/smartystreets/goconvey/convey"
|
. "github.com/smartystreets/goconvey/convey"
|
||||||
)
|
)
|
||||||
|
|
||||||
type testQuery struct {
|
|
||||||
result bool
|
|
||||||
}
|
|
||||||
|
|
||||||
var ProvokedError = errors.New("testing error.")
|
var ProvokedError = errors.New("testing error.")
|
||||||
|
|
||||||
func TestTransaction(t *testing.T) {
|
func TestTransaction(t *testing.T) {
|
||||||
|
Loading…
Reference in New Issue
Block a user