fix(parsers): Linter issues (#11607)

This commit is contained in:
Sven Rebhan 2022-08-05 18:16:10 +02:00 committed by GitHub
parent f4e76893d1
commit 091380f4b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions

View File

@ -3,7 +3,6 @@ package json_v2_test
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"strings" "strings"
"testing" "testing"
@ -20,7 +19,7 @@ import (
func TestMultipleConfigs(t *testing.T) { func TestMultipleConfigs(t *testing.T) {
// Get all directories in testdata // Get all directories in testdata
folders, err := ioutil.ReadDir("testdata") folders, err := os.ReadDir("testdata")
require.NoError(t, err) require.NoError(t, err)
// Make sure testdata contains data // Make sure testdata contains data
require.Greater(t, len(folders), 0) require.Greater(t, len(folders), 0)

View File

@ -52,19 +52,22 @@ func (ep *ValueParser) parse(p *PointParser, pt *Point) error {
p.writeBuf.Reset() p.writeBuf.Reset()
if tok == MinusSign { if tok == MinusSign {
p.writeBuf.WriteString(lit) if _, err := p.writeBuf.WriteString(lit); err != nil {
return fmt.Errorf("unable to write: %w", err)
}
tok, lit = p.scan() tok, lit = p.scan()
} }
for tok != EOF && (tok == Letter || tok == Number || tok == Dot || tok == MinusSign) { for tok != EOF && (tok == Letter || tok == Number || tok == Dot || tok == MinusSign) {
p.writeBuf.WriteString(lit) if _, err := p.writeBuf.WriteString(lit); err != nil {
return fmt.Errorf("unable to write: %w", err)
}
tok, lit = p.scan() tok, lit = p.scan()
} }
p.unscan() p.unscan()
pt.Value = p.writeBuf.String() pt.Value = p.writeBuf.String()
_, err := strconv.ParseFloat(pt.Value, 64) if _, err := strconv.ParseFloat(pt.Value, 64); err != nil {
if err != nil {
return fmt.Errorf("invalid metric value %s", pt.Value) return fmt.Errorf("invalid metric value %s", pt.Value)
} }
return nil return nil
@ -90,7 +93,9 @@ func (ep *TimestampParser) parse(p *PointParser, pt *Point) error {
p.writeBuf.Reset() p.writeBuf.Reset()
for tok != EOF && tok == Number { for tok != EOF && tok == Number {
p.writeBuf.WriteString(lit) if _, err := p.writeBuf.WriteString(lit); err != nil {
return fmt.Errorf("unable to write: %w", err)
}
tok, lit = p.scan() tok, lit = p.scan()
} }
p.unscan() p.unscan()
@ -187,7 +192,9 @@ func parseQuotedLiteral(p *PointParser) (string, error) {
for tok != EOF && (tok != Quotes || (tok == Quotes && escaped)) { for tok != EOF && (tok != Quotes || (tok == Quotes && escaped)) {
// let everything through // let everything through
escaped = tok == Backslash escaped = tok == Backslash
p.writeBuf.WriteString(lit) if _, err := p.writeBuf.WriteString(lit); err != nil {
return "", fmt.Errorf("unable to write: %w", err)
}
tok, lit = p.scan() tok, lit = p.scan()
} }
if tok == EOF { if tok == EOF {
@ -208,7 +215,9 @@ func parseLiteral(p *PointParser) (string, error) {
p.writeBuf.Reset() p.writeBuf.Reset()
for tok != EOF && tok > literalBeg && tok < literalEnd { for tok != EOF && tok > literalBeg && tok < literalEnd {
p.writeBuf.WriteString(lit) if _, err := p.writeBuf.WriteString(lit); err != nil {
return "", fmt.Errorf("unable to write: %w", err)
}
tok, lit = p.scan() tok, lit = p.scan()
if tok == Delta { if tok == Delta {
return "", errors.New("found delta inside metric name") return "", errors.New("found delta inside metric name")