From 0ba05e160a9b568b5f06eecb29722721a5800427 Mon Sep 17 00:00:00 2001
From: Cosmin Cojocar <gcojocar@adobe.com>
Date: Mon, 8 Aug 2022 10:37:43 +0200
Subject: [PATCH] chore: fix lint warnings

Signed-off-by: Cosmin Cojocar <gcojocar@adobe.com>
---
 analyzer_test.go           | 3 +--
 cmd/gosec/main.go          | 4 ++--
 cmd/tlsconfig/tlsconfig.go | 4 ++--
 config.go                  | 3 +--
 helpers_test.go            | 5 ++---
 testutils/pkg.go           | 5 ++---
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/analyzer_test.go b/analyzer_test.go
index 8ffcc13..e84cae1 100644
--- a/analyzer_test.go
+++ b/analyzer_test.go
@@ -2,7 +2,6 @@ package gosec_test
 
 import (
 	"errors"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -30,7 +29,7 @@ var _ = Describe("Analyzer", func() {
 	Context("when processing a package", func() {
 		It("should not report an error if the package contains no Go files", func() {
 			analyzer.LoadRules(rules.Generate(false).RulesInfo())
-			dir, err := ioutil.TempDir("", "empty")
+			dir, err := os.MkdirTemp("", "empty")
 			defer os.RemoveAll(dir)
 			Expect(err).ShouldNot(HaveOccurred())
 			err = analyzer.Process(buildTags, dir)
diff --git a/cmd/gosec/main.go b/cmd/gosec/main.go
index 2ea160d..1a3864b 100644
--- a/cmd/gosec/main.go
+++ b/cmd/gosec/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"runtime"
@@ -354,7 +354,7 @@ func main() {
 	}
 
 	if *flagQuiet {
-		logger = log.New(ioutil.Discard, "", 0)
+		logger = log.New(io.Discard, "", 0)
 	} else {
 		logger = log.New(logWriter, "[gosec] ", log.LstdFlags)
 	}
diff --git a/cmd/tlsconfig/tlsconfig.go b/cmd/tlsconfig/tlsconfig.go
index 5d1b9aa..50ea2f1 100644
--- a/cmd/tlsconfig/tlsconfig.go
+++ b/cmd/tlsconfig/tlsconfig.go
@@ -7,9 +7,9 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"path/filepath"
 
 	"github.com/mozilla/tls-observatory/constants"
@@ -187,7 +187,7 @@ func main() {
 	}
 
 	outputPath := filepath.Join(dir, *outputFile)
-	if err := ioutil.WriteFile(outputPath, src, 0o644); err != nil {
+	if err := os.WriteFile(outputPath, src, 0o644); err != nil {
 		log.Fatalf("Writing output: %s", err)
 	} //#nosec G306
 }
diff --git a/config.go b/config.go
index 59f48bc..443d45f 100644
--- a/config.go
+++ b/config.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 )
 
 const (
@@ -64,7 +63,7 @@ func (c Config) convertGlobals() {
 // should be used with io.Reader to load configuration from
 // file or from string etc.
 func (c Config) ReadFrom(r io.Reader) (int64, error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return int64(len(data)), err
 	}
diff --git a/helpers_test.go b/helpers_test.go
index bdf07b5..094ae24 100644
--- a/helpers_test.go
+++ b/helpers_test.go
@@ -2,7 +2,6 @@ package gosec_test
 
 import (
 	"go/ast"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -18,9 +17,9 @@ var _ = Describe("Helpers", func() {
 		var dir string
 		JustBeforeEach(func() {
 			var err error
-			dir, err = ioutil.TempDir("", "gosec")
+			dir, err = os.MkdirTemp("", "gosec")
 			Expect(err).ShouldNot(HaveOccurred())
-			_, err = ioutil.TempFile(dir, "test*.go")
+			_, err = os.MkdirTemp(dir, "test*.go")
 			Expect(err).ShouldNot(HaveOccurred())
 		})
 		AfterEach(func() {
diff --git a/testutils/pkg.go b/testutils/pkg.go
index 237fdb8..2fa4721 100644
--- a/testutils/pkg.go
+++ b/testutils/pkg.go
@@ -3,7 +3,6 @@ package testutils
 import (
 	"fmt"
 	"go/build"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -30,7 +29,7 @@ type TestPackage struct {
 // NewTestPackage will create a new and empty package. Must call Close() to cleanup
 // auxiliary files
 func NewTestPackage() *TestPackage {
-	workingDir, err := ioutil.TempDir("", "gosecs_test")
+	workingDir, err := os.MkdirTemp("", "gosecs_test")
 	if err != nil {
 		return nil
 	}
@@ -53,7 +52,7 @@ func (p *TestPackage) write() error {
 		return nil
 	}
 	for filename, content := range p.Files {
-		if e := ioutil.WriteFile(filename, []byte(content), 0o644); e != nil {
+		if e := os.WriteFile(filename, []byte(content), 0o644); e != nil {
 			return e
 		} //#nosec G306
 	}