IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14750 from grafana/gometalinter-fixes

Browse Source 
Fixed new gometalinter issues
This commit is contained in:
Torkel Ödegaard 2019-01-07 11:20:08 +01:00 committed by GitHub
commit cfd1467a76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/components/dashdiffs/formatter_json.go
View File

@ -206,10 +206,9 @@ func (f *JSONFormatter) processObject(object map[string]interface{}, deltas []di
// Added // Added
for _, delta := range deltas { for _, delta := range deltas {
switch delta.(type) { switch delta := delta.(type) {
case *diff.Added: case *diff.Added:
d := delta.(*diff.Added) f.printRecursive(delta.Position.String(), delta.Value, ChangeAdded)
f.printRecursive(d.Position.String(), d.Value, ChangeAdded)
} }
} }
@ -222,9 +221,8 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
if len(matchedDeltas) > 0 { if len(matchedDeltas) > 0 {
for _, matchedDelta := range matchedDeltas { for _, matchedDelta := range matchedDeltas {
switch matchedDelta.(type) { switch matchedDelta := matchedDelta.(type) {
case *diff.Object: case *diff.Object:
d := matchedDelta.(*diff.Object)
switch value.(type) { switch value.(type) {
case map[string]interface{}: case map[string]interface{}:
//ok //ok
@ -238,7 +236,7 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.print("{") f.print("{")
f.closeLine() f.closeLine()
f.push(positionStr, len(o), false) f.push(positionStr, len(o), false)
f.processObject(o, d.Deltas) f.processObject(o, matchedDelta.Deltas)
f.pop() f.pop()
f.newLine(ChangeNil) f.newLine(ChangeNil)
f.print("}") f.print("}")
@ -246,7 +244,6 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.closeLine() f.closeLine()
case *diff.Array: case *diff.Array:
d := matchedDelta.(*diff.Array)
switch value.(type) { switch value.(type) {
case []interface{}: case []interface{}:
//ok //ok
@ -260,7 +257,7 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.print("[") f.print("[")
f.closeLine() f.closeLine()
f.push(positionStr, len(a), true) f.push(positionStr, len(a), true)
f.processArray(a, d.Deltas) f.processArray(a, matchedDelta.Deltas)
f.pop() f.pop()
f.newLine(ChangeNil) f.newLine(ChangeNil)
f.print("]") f.print("]")
@ -268,27 +265,23 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
f.closeLine() f.closeLine()
case *diff.Added: case *diff.Added:
d := matchedDelta.(*diff.Added) f.printRecursive(positionStr, matchedDelta.Value, ChangeAdded)
f.printRecursive(positionStr, d.Value, ChangeAdded)
f.size[len(f.size)-1]++ f.size[len(f.size)-1]++
case *diff.Modified: case *diff.Modified:
d := matchedDelta.(*diff.Modified)
savedSize := f.size[len(f.size)-1] savedSize := f.size[len(f.size)-1]
f.printRecursive(positionStr, d.OldValue, ChangeOld) f.printRecursive(positionStr, matchedDelta.OldValue, ChangeOld)
f.size[len(f.size)-1] = savedSize f.size[len(f.size)-1] = savedSize
f.printRecursive(positionStr, d.NewValue, ChangeNew) f.printRecursive(positionStr, matchedDelta.NewValue, ChangeNew)
case *diff.TextDiff: case *diff.TextDiff:
savedSize := f.size[len(f.size)-1] savedSize := f.size[len(f.size)-1]
d := matchedDelta.(*diff.TextDiff) f.printRecursive(positionStr, matchedDelta.OldValue, ChangeOld)
f.printRecursive(positionStr, d.OldValue, ChangeOld)
f.size[len(f.size)-1] = savedSize f.size[len(f.size)-1] = savedSize
f.printRecursive(positionStr, d.NewValue, ChangeNew) f.printRecursive(positionStr, matchedDelta.NewValue, ChangeNew)
case *diff.Deleted: case *diff.Deleted:
d := matchedDelta.(*diff.Deleted) f.printRecursive(positionStr, matchedDelta.Value, ChangeDeleted)
f.printRecursive(positionStr, d.Value, ChangeDeleted)
default: default:
return errors.New("Unknown Delta type detected") return errors.New("Unknown Delta type detected")
@ -305,13 +298,13 @@ func (f *JSONFormatter) processItem(value interface{}, deltas []diff.Delta, posi
func (f *JSONFormatter) searchDeltas(deltas []diff.Delta, position diff.Position) (results []diff.Delta) { func (f *JSONFormatter) searchDeltas(deltas []diff.Delta, position diff.Position) (results []diff.Delta) {
results = make([]diff.Delta, 0) results = make([]diff.Delta, 0)
for _, delta := range deltas { for _, delta := range deltas {
switch delta.(type) { switch typedDelta := delta.(type) {
case diff.PostDelta: case diff.PostDelta:
if delta.(diff.PostDelta).PostPosition() == position { if typedDelta.PostPosition() == position {
results = append(results, delta) results = append(results, delta)
} }
case diff.PreDelta: case diff.PreDelta:
if delta.(diff.PreDelta).PrePosition() == position { if typedDelta.PrePosition() == position {
results = append(results, delta) results = append(results, delta)
} }
default: default:
@ -417,20 +410,19 @@ func (f *JSONFormatter) print(a string) {
} }
func (f *JSONFormatter) printRecursive(name string, value interface{}, change ChangeType) { func (f *JSONFormatter) printRecursive(name string, value interface{}, change ChangeType) {
switch value.(type) { switch value := value.(type) {
case map[string]interface{}: case map[string]interface{}:
f.newLine(change) f.newLine(change)
f.printKey(name) f.printKey(name)
f.print("{") f.print("{")
f.closeLine() f.closeLine()
m := value.(map[string]interface{}) size := len(value)
size := len(m)
f.push(name, size, false) f.push(name, size, false)
keys := sortKeys(m) keys := sortKeys(value)
for _, key := range keys { for _, key := range keys {
f.printRecursive(key, m[key], change) f.printRecursive(key, value[key], change)
} }
f.pop() f.pop()
@ -445,10 +437,9 @@ func (f *JSONFormatter) printRecursive(name string, value interface{}, change Ch
f.print("[") f.print("[")
f.closeLine() f.closeLine()
s := value.([]interface{}) size := len(value)
size := len(s)
f.push("", size, true) f.push("", size, true)
for _, item := range s { for _, item := range value {
f.printRecursive("", item, change) f.printRecursive("", item, change)
} }
f.pop() f.pop()

8
pkg/services/sqlstore/login_attempt.go
View File

@ -78,14 +78,14 @@ func GetUserLoginAttemptCount(query *m.GetUserLoginAttemptCountQuery) error {
} }
func toInt64(i interface{}) int64 { func toInt64(i interface{}) int64 {
switch i.(type) { switch i := i.(type) {
case []byte: case []byte:
n, _ := strconv.ParseInt(string(i.([]byte)), 10, 64) n, _ := strconv.ParseInt(string(i), 10, 64)
return n return n
case int: case int:
return int64(i.(int)) return int64(i)
case int64: case int64:
return i.(int64) return i
} }
return 0 return 0
} }

8
public/app/core/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
View File

@ -6,8 +6,8 @@ exports[`CustomScrollbar renders correctly 1`] = `
style={ style={
Object { Object {
"height": "auto", "height": "auto",
"maxHeight": "inherit", "maxHeight": "100%",
"minHeight": "inherit", "minHeight": "0",
"overflow": "hidden", "overflow": "hidden",
"position": "relative", "position": "relative",
"width": "100%", "width": "100%",
@ -23,8 +23,8 @@ exports[`CustomScrollbar renders correctly 1`] = `
"left": undefined, "left": undefined,
"marginBottom": 0, "marginBottom": 0,
"marginRight": 0, "marginRight": 0,
"maxHeight": "calc(inherit + 0px)", "maxHeight": "calc(100% + 0px)",
"minHeight": "calc(inherit + 0px)", "minHeight": "calc(0 + 0px)",
"overflow": "scroll", "overflow": "scroll",
"position": "relative", "position": "relative",
"right": undefined, "right": undefined,