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

Chore: Enable Go linter gocritic (#26224)

Browse Source 
* Chore: Enable gocritic linter

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-07-16 14:39:01 +02:00
committed by GitHub
parent 317c7b269c
commit d4e4cb4c71
43 changed files with 184 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/components/dashdiffs/formatter_basic.go
+4 -6
View File
@@ -212,12 +212,10 @@ func (b *BasicDiff) Basic(lines []*JSONLine) []*BasicBlock {
// - if we're not recording a change, then we do nothing,
// since the BasicDiff doesn't report on unchanged JSON
// values.
} else {
if b.writing {
b.writing = false
b.Summary.LineEnd = line.LineNum
b.Block.Summaries = append(b.Block.Summaries, b.Summary)
}
} else if b.writing {
b.writing = false
b.Summary.LineEnd = line.LineNum
b.Block.Summaries = append(b.Block.Summaries, b.Summary)
}
}
}
pkg/components/dashdiffs/formatter_json.go
+5 -6
View File
@@ -201,9 +201,8 @@ func (f *JSONFormatter) processArray(array []interface{}, deltas []diff.Delta) e
// additional Added
for _, delta := range deltas {
switch delta.(type) {
case *diff.Added:
d := delta.(*diff.Added)
d, ok := delta.(*diff.Added)
if ok {
// skip items already processed
if int(d.Position.(diff.Index)) < len(array) {
continue
@@ -226,9 +225,9 @@ func (f *JSONFormatter) processObject(object map[string]interface{}, deltas []di
// Added
for _, delta := range deltas {
switch delta := delta.(type) {
case *diff.Added:
f.printRecursive(delta.Position.String(), delta.Value, ChangeAdded)
d, ok := delta.(*diff.Added)
if ok {
f.printRecursive(d.Position.String(), d.Value, ChangeAdded)
}
}
pkg/components/simplejson/simplejson_go11.go
+12 -9
View File
@@ -29,9 +29,9 @@ func NewFromReader(r io.Reader) (*Json, error) {
// Float64 coerces into a float64
func (j *Json) Float64() (float64, error) {
switch j.data.(type) {
switch n := j.data.(type) {
case json.Number:
return j.data.(json.Number).Float64()
return n.Float64()
case float32, float64:
return reflect.ValueOf(j.data).Float(), nil
case int, int8, int16, int32, int64:
@@ -44,10 +44,13 @@ func (j *Json) Float64() (float64, error) {
// Int coerces into an int
func (j *Json) Int() (int, error) {
switch j.data.(type) {
switch n := j.data.(type) {
case json.Number:
i, err := j.data.(json.Number).Int64()
return int(i), err
i, err := n.Int64()
if err != nil {
return 0, err
}
return int(i), nil
case float32, float64:
return int(reflect.ValueOf(j.data).Float()), nil
case int, int8, int16, int32, int64:
@@ -60,9 +63,9 @@ func (j *Json) Int() (int, error) {
// Int64 coerces into an int64
func (j *Json) Int64() (int64, error) {
switch j.data.(type) {
switch n := j.data.(type) {
case json.Number:
return j.data.(json.Number).Int64()
return n.Int64()
case float32, float64:
return int64(reflect.ValueOf(j.data).Float()), nil
case int, int8, int16, int32, int64:
@@ -75,9 +78,9 @@ func (j *Json) Int64() (int64, error) {
// Uint64 coerces into an uint64
func (j *Json) Uint64() (uint64, error) {
switch j.data.(type) {
switch n := j.data.(type) {
case json.Number:
return strconv.ParseUint(j.data.(json.Number).String(), 10, 64)
return strconv.ParseUint(n.String(), 10, 64)
case float32, float64:
return uint64(reflect.ValueOf(j.data).Float()), nil
case int, int8, int16, int32, int64: