Skip to content

Commit ec3af79

Browse files
Merge pull request #302 from mergestat/lint-fixes
chore: update some lint issues (deprecated std lib packages)
2 parents 45beb1a + 61c64e0 commit ec3af79

File tree

8 files changed

+17
-18
lines changed

8 files changed

+17
-18
lines changed

cmd/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"database/sql"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"os"
88
"path/filepath"
99
"time"
@@ -97,7 +97,7 @@ Example queries can be found in the GitHub repo: https://github.com/mergestat/me
9797
query = args[0]
9898
} else if isPiped(info) {
9999
var stdin []byte
100-
if stdin, err = ioutil.ReadAll(os.Stdin); err != nil {
100+
if stdin, err = io.ReadAll(os.Stdin); err != nil {
101101
handleExitError(fmt.Errorf("failed to read from stdin: %v", err))
102102
}
103103
query = string(stdin)

cmd/serve.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"database/sql"
55
"encoding/json"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"net/http"
99

1010
"github.com/mergestat/mergestat-lite/pkg/display"
@@ -71,7 +71,7 @@ func (h *queryServiceHandler) httpHandler(w http.ResponseWriter, req *http.Reque
7171

7272
var body []byte
7373
var err error
74-
if body, err = ioutil.ReadAll(req.Body); err != nil {
74+
if body, err = io.ReadAll(req.Body); err != nil {
7575
h.handleErr(w, http.StatusBadRequest, err)
7676
return
7777
}

extensions/internal/enry/enry_detect_language_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package enry
22

33
import (
4-
"io/ioutil"
4+
"os"
55
"testing"
66

77
"github.com/mergestat/mergestat-lite/extensions/internal/tools"
88
)
99

1010
func TestEnryDetectLanguage(t *testing.T) {
1111
path := "./testdata/main.go"
12-
fileContents, err := ioutil.ReadFile(path)
12+
fileContents, err := os.ReadFile(path)
1313
if err != nil {
1414
t.Fatal(err)
1515
}

extensions/internal/enry/enry_is_binary_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package enry
22

33
import (
4-
"io/ioutil"
4+
"os"
55
"testing"
66

77
"github.com/mergestat/mergestat-lite/extensions/internal/tools"
88
)
99

1010
func TestEnryIsBinary(t *testing.T) {
1111
path := "./testdata/binary"
12-
fileContents, err := ioutil.ReadFile(path)
12+
fileContents, err := os.ReadFile(path)
1313
if err != nil {
1414
t.Fatal(err)
1515
}

extensions/internal/git/native/files_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package native_test
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"os"
66
"testing"
77
)
88

@@ -49,7 +49,7 @@ func TestSelectKnownContents(t *testing.T) {
4949
}
5050
t.Logf("file: path=%s contents_len=%d", path, len(contents))
5151

52-
expectedFileContents, err := ioutil.ReadFile(fmt.Sprintf("./testdata/%s/%s.testdata", hash, path))
52+
expectedFileContents, err := os.ReadFile(fmt.Sprintf("./testdata/%s/%s.testdata", hash, path))
5353
if err != nil {
5454
t.Fatalf("failed to load fixture file: %v", err)
5555
}

extensions/internal/golang/go_mod_to_json_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package golang
22

33
import (
44
"encoding/json"
5-
"io/ioutil"
5+
"os"
66
"testing"
77

88
"github.com/mergestat/mergestat-lite/extensions/internal/tools"
99
)
1010

1111
func TestGoModToJSONOK(t *testing.T) {
12-
goMod, err := ioutil.ReadFile("testdata/GoModOK")
12+
goMod, err := os.ReadFile("testdata/GoModOK")
1313
if err != nil {
1414
t.Fatal(err)
1515
}
@@ -58,7 +58,7 @@ func TestGoModToJSONEmpty(t *testing.T) {
5858
}
5959

6060
func TestGoModToJSONMissingVals(t *testing.T) {
61-
goMod, err := ioutil.ReadFile("testdata/GoModMissingVals")
61+
goMod, err := os.ReadFile("testdata/GoModMissingVals")
6262
if err != nil {
6363
t.Fatal(err)
6464
}

extensions/internal/npm/npm.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package npm
44
import (
55
"context"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"net/http"
99

1010
"github.com/mergestat/mergestat-lite/extensions/options"
@@ -49,7 +49,7 @@ func (c *Client) GetPackage(ctx context.Context, packageName string) ([]byte, er
4949
return nil, err
5050
}
5151

52-
body, err := ioutil.ReadAll(res.Body)
52+
body, err := io.ReadAll(res.Body)
5353
if err != nil {
5454
return nil, err
5555
}
@@ -72,7 +72,7 @@ func (c *Client) GetPackageVersion(ctx context.Context, packageName, version str
7272
return nil, err
7373
}
7474

75-
body, err := ioutil.ReadAll(res.Body)
75+
body, err := io.ReadAll(res.Body)
7676
if err != nil {
7777
return nil, err
7878
}

pkg/locator/locator.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package locator
99

1010
import (
1111
"context"
12-
"io/ioutil"
1312
"net/url"
1413
"os"
1514
"path/filepath"
@@ -66,7 +65,7 @@ func determineCloneDir(path, baseCloneDir string) (string, bool, error) {
6665

6766
// if no clone directory is specified, use a tmp dir
6867
if baseCloneDir == "" {
69-
if baseCloneDir, err = ioutil.TempDir(os.TempDir(), "mergestat"); err != nil {
68+
if baseCloneDir, err = os.MkdirTemp("", "mergestat"); err != nil {
7069
return "", false, errors.Wrap(err, "failed to create a temporary directory")
7170
}
7271

0 commit comments

Comments
 (0)