Skip to content

Commit 0ba05e1

Browse files
committed
chore: fix lint warnings
Signed-off-by: Cosmin Cojocar <[email protected]>
1 parent d3933f9 commit 0ba05e1

File tree

6 files changed

+10
-14
lines changed

6 files changed

+10
-14
lines changed

analyzer_test.go

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

33
import (
44
"errors"
5-
"io/ioutil"
65
"log"
76
"os"
87
"strings"
@@ -30,7 +29,7 @@ var _ = Describe("Analyzer", func() {
3029
Context("when processing a package", func() {
3130
It("should not report an error if the package contains no Go files", func() {
3231
analyzer.LoadRules(rules.Generate(false).RulesInfo())
33-
dir, err := ioutil.TempDir("", "empty")
32+
dir, err := os.MkdirTemp("", "empty")
3433
defer os.RemoveAll(dir)
3534
Expect(err).ShouldNot(HaveOccurred())
3635
err = analyzer.Process(buildTags, dir)

cmd/gosec/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package main
1717
import (
1818
"flag"
1919
"fmt"
20-
"io/ioutil"
20+
"io"
2121
"log"
2222
"os"
2323
"runtime"
@@ -354,7 +354,7 @@ func main() {
354354
}
355355

356356
if *flagQuiet {
357-
logger = log.New(ioutil.Discard, "", 0)
357+
logger = log.New(io.Discard, "", 0)
358358
} else {
359359
logger = log.New(logWriter, "[gosec] ", log.LstdFlags)
360360
}

cmd/tlsconfig/tlsconfig.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"flag"
88
"fmt"
99
"go/format"
10-
"io/ioutil"
1110
"log"
1211
"net/http"
12+
"os"
1313
"path/filepath"
1414

1515
"github.com/mozilla/tls-observatory/constants"
@@ -187,7 +187,7 @@ func main() {
187187
}
188188

189189
outputPath := filepath.Join(dir, *outputFile)
190-
if err := ioutil.WriteFile(outputPath, src, 0o644); err != nil {
190+
if err := os.WriteFile(outputPath, src, 0o644); err != nil {
191191
log.Fatalf("Writing output: %s", err)
192192
} //#nosec G306
193193
}

config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/json"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
)
109

1110
const (
@@ -64,7 +63,7 @@ func (c Config) convertGlobals() {
6463
// should be used with io.Reader to load configuration from
6564
// file or from string etc.
6665
func (c Config) ReadFrom(r io.Reader) (int64, error) {
67-
data, err := ioutil.ReadAll(r)
66+
data, err := io.ReadAll(r)
6867
if err != nil {
6968
return int64(len(data)), err
7069
}

helpers_test.go

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

33
import (
44
"go/ast"
5-
"io/ioutil"
65
"os"
76
"path/filepath"
87
"regexp"
@@ -18,9 +17,9 @@ var _ = Describe("Helpers", func() {
1817
var dir string
1918
JustBeforeEach(func() {
2019
var err error
21-
dir, err = ioutil.TempDir("", "gosec")
20+
dir, err = os.MkdirTemp("", "gosec")
2221
Expect(err).ShouldNot(HaveOccurred())
23-
_, err = ioutil.TempFile(dir, "test*.go")
22+
_, err = os.MkdirTemp(dir, "test*.go")
2423
Expect(err).ShouldNot(HaveOccurred())
2524
})
2625
AfterEach(func() {

testutils/pkg.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package testutils
33
import (
44
"fmt"
55
"go/build"
6-
"io/ioutil"
76
"log"
87
"os"
98
"path"
@@ -30,7 +29,7 @@ type TestPackage struct {
3029
// NewTestPackage will create a new and empty package. Must call Close() to cleanup
3130
// auxiliary files
3231
func NewTestPackage() *TestPackage {
33-
workingDir, err := ioutil.TempDir("", "gosecs_test")
32+
workingDir, err := os.MkdirTemp("", "gosecs_test")
3433
if err != nil {
3534
return nil
3635
}
@@ -53,7 +52,7 @@ func (p *TestPackage) write() error {
5352
return nil
5453
}
5554
for filename, content := range p.Files {
56-
if e := ioutil.WriteFile(filename, []byte(content), 0o644); e != nil {
55+
if e := os.WriteFile(filename, []byte(content), 0o644); e != nil {
5756
return e
5857
} //#nosec G306
5958
}

0 commit comments

Comments
 (0)