hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: replace uses of ioutil with io and os (#223)

Browse Source
This commit is contained in:
Daniel Moran
2021-08-04 14:45:22 -04:00
committed by GitHub
parent aafdda744d
commit d615694ee9
38 changed files with 227 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/csv2lp/csv2lp_test.go
View File

@ -4,7 +4,6 @@ import (
"bytes"
"errors"
"io"
"io/ioutil"
"log"
"os"
"strconv"
@ -200,7 +199,7 @@ func Test_CsvToLineProtocol_LogTableColumns(t *testing.T) {
require.False(t, reader.skipRowOnError)
require.True(t, reader.logTableDataColumns)
// read all the data
ioutil.ReadAll(reader)
io.ReadAll(reader)
out := buf.String()
// fmt.Println(out)
@ -228,7 +227,7 @@ func Test_CsvToLineProtocol_LogTimeZoneWarning(t *testing.T) {
"_measurement,a,b\ncpu,1,1"
reader := CsvToLineProtocol(strings.NewReader(csv))
bytes, _ := ioutil.ReadAll(reader)
bytes, _ := io.ReadAll(reader)
out := buf.String()
// fmt.Println(out) // "::PREFIX::WARNING: #timezone annotation: unknown time zone 1
@ -258,7 +257,7 @@ func Test_CsvToLineProtocol_SkipRowOnError(t *testing.T) {
require.Equal(t, reader.skipRowOnError, true)
require.Equal(t, reader.logTableDataColumns, false)
// read all the data
ioutil.ReadAll(reader)
io.ReadAll(reader)
out := buf.String()
// fmt.Println(out)
@ -315,7 +314,7 @@ func Test_CsvToLineProtocol_RowSkipped(t *testing.T) {
})
}
// read all the data
ioutil.ReadAll(reader)
io.ReadAll(reader)
out := buf.String()
require.Empty(t, out, "No log messages expected because RowSkipped handler is set")
@ -410,7 +409,7 @@ cpu;3a
})
}
// read all the data
ioutil.ReadAll(reader)
io.ReadAll(reader)
out := buf.String()
require.Empty(t, out, "No log messages expected because RowSkipped handler is set")
@ -445,7 +444,7 @@ func Test_CsvToLineProtocol_LineEndingWarning(t *testing.T) {
"1549240000000000000,xx:xx:xx:xx:xx:xx,2nd Floor Open Plan DS,0,test"
reader := CsvToLineProtocol(strings.NewReader(csv))
bytes, _ := ioutil.ReadAll(reader)
bytes, _ := io.ReadAll(reader)
out := buf.String()
messages := strings.Count(out, prefix)
@ -475,7 +474,7 @@ func Test_CsvToLineProtocol_WindowsLineEndings(t *testing.T) {
"1549240000000000000,a,b,0,test"
reader := CsvToLineProtocol(strings.NewReader(csv))
bytes, _ := ioutil.ReadAll(reader)
bytes, _ := io.ReadAll(reader)
out := buf.String()
messages := strings.Count(out, prefix)

4
pkg/csv2lp/data_conversion_test.go
View File

@ -3,7 +3,7 @@ package csv2lp
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"log"
"math"
"os"
@ -283,7 +283,7 @@ func Test_NormalizeNumberString(t *testing.T) {
func Test_CreateDecoder(t *testing.T) {
decoder, err := CreateDecoder("UTF-8")
toUtf8 := func(in []byte) string {
s, _ := ioutil.ReadAll(decoder(bytes.NewReader(in)))
s, _ := io.ReadAll(decoder(bytes.NewReader(in)))
return string(s)
}
require.NotNil(t, decoder)

4
pkg/csv2lp/examples_test.go
View File

@ -2,7 +2,7 @@ package csv2lp
import (
"fmt"
"io/ioutil"
"io"
"strings"
"testing"
@ -184,7 +184,7 @@ func Test_Examples(t *testing.T) {
comma := example.normalize()
transformer := CsvToLineProtocol(strings.NewReader(example.csv))
transformer.SkipRowOnError(true)
result, err := ioutil.ReadAll(transformer)
result, err := io.ReadAll(transformer)
if err != nil {
require.Nil(t, fmt.Sprintf("%s", err))
}

36
pkg/fluxcsv/query_result_test.go
View File

@ -2,7 +2,7 @@ package fluxcsv_test
import (
"fmt"
"io/ioutil"
"io"
"strings"
"testing"
"time"
@ -67,7 +67,7 @@ func TestQueryCVSResultSingleTable(t *testing.T) {
require.NoError(t, err)
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -296,7 +296,7 @@ func TestQueryCVSResultMultiTables(t *testing.T) {
require.NoError(t, err)
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -411,7 +411,7 @@ func TestQueryCVSResultSingleTableMultiColumnsNoValue(t *testing.T) {
require.NoError(t, err)
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -439,7 +439,7 @@ func TestErrorInRow(t *testing.T) {
`,failed to create physical plan: invalid time bounds from procedure from: bounds contain zero time,897`}
csvTable := makeCSVstring(csvRowsError)
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
@ -453,7 +453,7 @@ func TestErrorInRow(t *testing.T) {
`,failed to create physical plan: invalid time bounds from procedure from: bounds contain zero time,`}
csvTable = makeCSVstring(csvRowsErrorNoReference)
reader = strings.NewReader(csvTable)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
@ -467,7 +467,7 @@ func TestErrorInRow(t *testing.T) {
`,,`}
csvTable = makeCSVstring(csvRowsErrorNoMessage)
reader = strings.NewReader(csvTable)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
@ -484,7 +484,7 @@ func TestInvalidDataType(t *testing.T) {
`
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "unknown data type int", queryResult.Err().Error())
@ -546,7 +546,7 @@ func TestReorderedAnnotations(t *testing.T) {
`
reader := strings.NewReader(csvTable1)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -572,7 +572,7 @@ func TestReorderedAnnotations(t *testing.T) {
`
reader = strings.NewReader(csvTable2)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -644,7 +644,7 @@ func TestDatatypeOnlyAnnotation(t *testing.T) {
`
reader := strings.NewReader(csvTable1)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())
@ -672,7 +672,7 @@ func TestMissingDatatypeAnnotation(t *testing.T) {
`
reader := strings.NewReader(csvTable1)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, datatype annotation not found", queryResult.Err().Error())
@ -686,7 +686,7 @@ func TestMissingDatatypeAnnotation(t *testing.T) {
`
reader = strings.NewReader(csvTable2)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, datatype annotation not found", queryResult.Err().Error())
@ -700,7 +700,7 @@ func TestMissingAnnotations(t *testing.T) {
`
reader := strings.NewReader(csvTable3)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, annotations not found", queryResult.Err().Error())
@ -715,7 +715,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, row has different number of columns than the table: 11 vs 10", queryResult.Err().Error())
@ -728,7 +728,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`
reader = strings.NewReader(csvTable2)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, row has different number of columns than the table: 8 vs 10", queryResult.Err().Error())
@ -741,7 +741,7 @@ func TestDifferentNumberOfColumns(t *testing.T) {
`
reader = strings.NewReader(csvTable3)
queryResult = fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult = fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.False(t, queryResult.Next())
require.NotNil(t, queryResult.Err())
require.Equal(t, "parsing error, row has different number of columns than the table: 10 vs 8", queryResult.Err().Error())
@ -758,7 +758,7 @@ func TestEmptyValue(t *testing.T) {
`
reader := strings.NewReader(csvTable)
queryResult := fluxcsv.NewQueryTableResult(ioutil.NopCloser(reader))
queryResult := fluxcsv.NewQueryTableResult(io.NopCloser(reader))
require.True(t, queryResult.Next(), queryResult.Err())
require.Nil(t, queryResult.Err())

5
pkg/gzip/pipe_test.go
View File

@ -5,7 +5,6 @@ import (
"compress/gzip"
"errors"
"io"
"io/ioutil"
"strings"
"testing"
@ -21,7 +20,7 @@ func TestGzipPipe(t *testing.T) {
data := strings.Repeat("Data data I'm some data\n", 1024)
reader := strings.NewReader(data)
pipe := pgzip.NewGzipPipe(ioutil.NopCloser(reader))
pipe := pgzip.NewGzipPipe(io.NopCloser(reader))
defer pipe.Close()
gunzip, err := gzip.NewReader(pipe)
require.NoError(t, err)
@ -38,7 +37,7 @@ func TestGzipPipe(t *testing.T) {
t.Parallel()
reader := &failingReader{n: 3, err: errors.New("I BROKE")}
pipe := pgzip.NewGzipPipe(ioutil.NopCloser(reader))
pipe := pgzip.NewGzipPipe(io.NopCloser(reader))
defer pipe.Close()
gunzip, err := gzip.NewReader(pipe)
require.NoError(t, err)

3
pkg/jsonnet/decode.go
View File

@ -3,7 +3,6 @@ package jsonnet
import (
"encoding/json"
"io"
"io/ioutil"
"github.com/google/go-jsonnet"
)
@ -20,7 +19,7 @@ func NewDecoder(r io.Reader) *Decoder {
// Decode decodes the stream into the provide value.
func (d *Decoder) Decode(v interface{}) error {
b, err := ioutil.ReadAll(d.r)
b, err := io.ReadAll(d.r)
if err != nil {
return err
}