Merge branch 'master' into run-command-errors-display

.golangci.yml

@@ -22,7 +22,7 @@ linters-settings:
       - wrapperFunc
   gocyclo:
     min-complexity: 20
-  golint:
+  revive:
     min-confidence: 0
   gomnd:
     settings:
@@ -62,7 +62,7 @@ linters:
     - gocyclo
     - gofmt
     - goimports
-    - golint
+    - revive
     - gomnd
     - goprintffuncname
     - gosec

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	"github.com/alecthomas/kong"
@@ -60,7 +59,7 @@ func main() {
 	case "run <hash|url>":
 		// piping
 		var fin io.Reader = os.Stdin
-		s, err := ioutil.ReadAll(fin)
+		s, err := io.ReadAll(fin)
 		if err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
@@ -82,7 +81,7 @@ func main() {
 	case "check <hash|url>":
 		// piping
 		var fin io.Reader = os.Stdin
-		s, err := ioutil.ReadAll(fin)
+		s, err := io.ReadAll(fin)
 		if err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
@@ -101,7 +100,7 @@ func main() {
 		fmt.Print(content) // give back so piping can continue
 
 	case "check <hash|url> <cmd>":
-		s, err := ioutil.ReadFile(CLI.Check.Cmd[0])
+		s, err := os.ReadFile(CLI.Check.Cmd[0])
 		if err != nil {
 			fmt.Printf("cannot open %v: %v", CLI.Check.Cmd[0], err)
 			os.Exit(1)
@@ -120,7 +119,7 @@ func main() {
 
 	// XXX need some DRY
 	case "create":
-		s, err := ioutil.ReadAll(os.Stdin)
+		s, err := io.ReadAll(os.Stdin)
 		if err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)
@@ -143,7 +142,7 @@ func main() {
 		fmt.Printf("%v=%v\n", CLI.Create.Digest, res.ActualDigest.For(CLI.Create.Digest))
 
 	case "create <file>":
-		s, err := ioutil.ReadFile(CLI.Create.File)
+		s, err := os.ReadFile(CLI.Create.File)
 		if err != nil {
 			fmt.Printf("Error: %v\n", err)
 			os.Exit(1)

pkg/core.go

@@ -4,13 +4,13 @@ package pkg
 import (
 	//nolint
 	"crypto/md5"
+	"io"
 	"net/http"
 
 	//nolint
 	"crypto/sha1"
 	"crypto/sha256"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
@@ -215,7 +215,7 @@ func (a *Preflight) ExecPiped(script, sig string) error {
 
 func (a *Preflight) Exec(args []string, sig string) error {
 	a.Porcelain.Start(a)
-	s, err := ioutil.ReadFile(args[0])
+	s, err := os.ReadFile(args[0])
 	if err != nil {
 		return fmt.Errorf("cannot open %v: %v", args[0], err)
 	}
@@ -249,7 +249,7 @@ func parsehashList(hashArg string) ([]Signature, error) {
 			return nil, fmt.Errorf("cannot parse hash URL: %v", err)
 		}
 		defer resp.Body.Close()
-		res, err := ioutil.ReadAll(resp.Body)
+		res, err := io.ReadAll(resp.Body)
 		if err != nil {
 			return nil, fmt.Errorf("cannot read hash URL content: %v", err)
 		}

pkg/file_lookup.go

@@ -2,7 +2,7 @@ package pkg
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 )
 
@@ -15,7 +15,7 @@ type FileLookup struct {
 }
 
 func NewFileLookup(f string) (Lookup, error) {
-	content, err := ioutil.ReadFile(f)
+	content, err := os.ReadFile(f)
 	if err != nil {
 		return nil, fmt.Errorf("file lookup: cannot read file: %v", err)
 	}