go/goreleaser
1
0
Fork 0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-06-23 00:40:06 +02:00
Code Issues Releases Activity

refactor: use os and io packages intead of ioutil when possible (#2189)

Browse Source
This commit is contained in:
Carlos Alexandro Becker
2021-04-25 13:00:51 -03:00
committed by GitHub
parent 95bef19280
commit 5866b9cb63
31 changed files with 112 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/util_test.go
View File

@ -1,7 +1,6 @@
package cmd package cmd
import ( import (
"io/ioutil"
"os" "os"
"testing" "testing"
@ -51,7 +50,7 @@ func setup(tb testing.TB) string {
func createFile(tb testing.TB, filename, contents string) { func createFile(tb testing.TB, filename, contents string) {
tb.Helper() tb.Helper()
require.NoError(tb, ioutil.WriteFile(filename, []byte(contents), 0o644)) require.NoError(tb, os.WriteFile(filename, []byte(contents), 0o644))
} }
func createMainGo(tb testing.TB) { func createMainGo(tb testing.TB) {

3
internal/artifact/artifact_test.go
View File

@ -3,6 +3,7 @@ package artifact
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -157,7 +158,7 @@ func TestGroupByPlatform(t *testing.T) {
func TestChecksum(t *testing.T) { func TestChecksum(t *testing.T) {
folder := t.TempDir() folder := t.TempDir()
file := filepath.Join(folder, "subject") file := filepath.Join(folder, "subject")
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0o644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0o644))
artifact := Artifact{ artifact := Artifact{
Path: file, Path: file,

11
internal/builders/golang/build_test.go
View File

@ -2,7 +2,6 @@ package golang
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -553,12 +552,12 @@ func TestRunPipeWithProxiedRepo(t *testing.T) {
folder := testlib.Mktmp(t) folder := testlib.Mktmp(t)
proxied := filepath.Join(folder, "dist/proxy/default") proxied := filepath.Join(folder, "dist/proxy/default")
require.NoError(t, os.MkdirAll(proxied, 0o750)) require.NoError(t, os.MkdirAll(proxied, 0o750))
require.NoError(t, ioutil.WriteFile( require.NoError(t, os.WriteFile(
filepath.Join(proxied, "main.go"), filepath.Join(proxied, "main.go"),
[]byte("// +build: main\npackage main\nimport github.com/goreleaser/goreleaser"), []byte("// +build: main\npackage main\nimport github.com/goreleaser/goreleaser"),
0o666, 0o666,
)) ))
require.NoError(t, ioutil.WriteFile( require.NoError(t, os.WriteFile(
filepath.Join(proxied, "go.mod"), filepath.Join(proxied, "go.mod"),
[]byte("module foo\nrequire github.com/goreleaser/goreleaser v0.161.1"), []byte("module foo\nrequire github.com/goreleaser/goreleaser v0.161.1"),
0o666, 0o666,
@ -592,7 +591,7 @@ func TestRunPipeWithProxiedRepo(t *testing.T) {
func TestRunPipeWithMainFuncNotInMainGoFile(t *testing.T) { func TestRunPipeWithMainFuncNotInMainGoFile(t *testing.T) {
folder := testlib.Mktmp(t) folder := testlib.Mktmp(t)
require.NoError(t, ioutil.WriteFile( require.NoError(t, os.WriteFile(
filepath.Join(folder, "foo.go"), filepath.Join(folder, "foo.go"),
[]byte("package main\nfunc main() {println(0)}"), []byte("package main\nfunc main() {println(0)}"),
0o644, 0o644,
@ -821,7 +820,7 @@ func TestBuildModTimestamp(t *testing.T) {
func writeMainWithoutMainFunc(t *testing.T, folder string) { func writeMainWithoutMainFunc(t *testing.T, folder string) {
t.Helper() t.Helper()
require.NoError(t, ioutil.WriteFile( require.NoError(t, os.WriteFile(
filepath.Join(folder, "main.go"), filepath.Join(folder, "main.go"),
[]byte("package main\nconst a = 2\nfunc notMain() {println(0)}"), []byte("package main\nconst a = 2\nfunc notMain() {println(0)}"),
0o644, 0o644,
@ -830,7 +829,7 @@ func writeMainWithoutMainFunc(t *testing.T, folder string) {
func writeGoodMain(t *testing.T, folder string) { func writeGoodMain(t *testing.T, folder string) {
t.Helper() t.Helper()
require.NoError(t, ioutil.WriteFile( require.NoError(t, os.WriteFile(
filepath.Join(folder, "main.go"), filepath.Join(folder, "main.go"),
[]byte("package main\nvar a = 1\nfunc main() {println(0)}"), []byte("package main\nvar a = 1\nfunc main() {println(0)}"),
0o644, 0o644,

4
internal/exec/exec_test.go
View File

@ -2,7 +2,7 @@ package exec
import ( import (
"fmt" "fmt"
"io/ioutil" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -44,7 +44,7 @@ func TestExecute(t *testing.T) {
{"signature", "sig", artifact.Signature}, {"signature", "sig", artifact.Signature},
} { } {
var file = filepath.Join(folder, "a."+a.ext) var file = filepath.Join(folder, "a."+a.ext)
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0644))
ctx.Artifacts.Add(&artifact.Artifact{ ctx.Artifacts.Add(&artifact.Artifact{
Name: "a." + a.ext, Name: "a." + a.ext,
Goos: "linux", Goos: "linux",

16
internal/http/http_test.go
View File

@ -5,7 +5,7 @@ import (
"encoding/pem" "encoding/pem"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
h "net/http" h "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
@ -22,7 +22,7 @@ import (
func TestAssetOpenDefault(t *testing.T) { func TestAssetOpenDefault(t *testing.T) {
var tf = filepath.Join(t.TempDir(), "asset") var tf = filepath.Join(t.TempDir(), "asset")
require.NoError(t, ioutil.WriteFile(tf, []byte("a"), 0765)) require.NoError(t, os.WriteFile(tf, []byte("a"), 0765))
a, err := assetOpenDefault("blah", &artifact.Artifact{ a, err := assetOpenDefault("blah", &artifact.Artifact{
Path: tf, Path: tf,
@ -33,7 +33,7 @@ func TestAssetOpenDefault(t *testing.T) {
t.Cleanup(func() { t.Cleanup(func() {
require.NoError(t, a.ReadCloser.Close()) require.NoError(t, a.ReadCloser.Close())
}) })
bs, err := ioutil.ReadAll(a.ReadCloser) bs, err := io.ReadAll(a.ReadCloser)
if err != nil { if err != nil {
t.Fatalf("can not read asset: %v", err) t.Fatalf("can not read asset: %v", err)
} }
@ -167,7 +167,7 @@ func doCheck(c check, r *h.Request) error {
if r.ContentLength != contentLength { if r.ContentLength != contentLength {
return fmt.Errorf("request content-length header value %v unexpected, wanted %v", r.ContentLength, contentLength) return fmt.Errorf("request content-length header value %v unexpected, wanted %v", r.ContentLength, contentLength)
} }
bs, err := ioutil.ReadAll(r.Body) bs, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
return fmt.Errorf("reading request body: %v", err) return fmt.Errorf("reading request body: %v", err)
} }
@ -197,13 +197,13 @@ func TestUpload(t *testing.T) {
var m sync.Mutex var m sync.Mutex
mux := h.NewServeMux() mux := h.NewServeMux()
mux.Handle("/", h.HandlerFunc(func(w h.ResponseWriter, r *h.Request) { mux.Handle("/", h.HandlerFunc(func(w h.ResponseWriter, r *h.Request) {
bs, err := ioutil.ReadAll(r.Body) bs, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
w.WriteHeader(h.StatusInternalServerError) w.WriteHeader(h.StatusInternalServerError)
fmt.Fprintf(w, "reading request body: %v", err) fmt.Fprintf(w, "reading request body: %v", err)
return return
} }
r.Body = ioutil.NopCloser(bytes.NewReader(bs)) r.Body = io.NopCloser(bytes.NewReader(bs))
m.Lock() m.Lock()
requests = append(requests, r) requests = append(requests, r)
m.Unlock() m.Unlock()
@ -212,7 +212,7 @@ func TestUpload(t *testing.T) {
})) }))
assetOpen = func(k string, a *artifact.Artifact) (*asset, error) { assetOpen = func(k string, a *artifact.Artifact) (*asset, error) {
return &asset{ return &asset{
ReadCloser: ioutil.NopCloser(bytes.NewReader(content)), ReadCloser: io.NopCloser(bytes.NewReader(content)),
Size: int64(len(content)), Size: int64(len(content)),
}, nil }, nil
} }
@ -251,7 +251,7 @@ func TestUpload(t *testing.T) {
{"sig", artifact.Signature}, {"sig", artifact.Signature},
} { } {
var file = filepath.Join(folder, "a."+a.ext) var file = filepath.Join(folder, "a."+a.ext)
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0644))
ctx.Artifacts.Add(&artifact.Artifact{ ctx.Artifacts.Add(&artifact.Artifact{
Name: "a." + a.ext, Name: "a." + a.ext,
Goos: "linux", Goos: "linux",

4
internal/pipe/artifactory/artifactory.go
View File

@ -4,7 +4,7 @@ package artifactory
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
h "net/http" h "net/http"
"github.com/goreleaser/goreleaser/internal/http" "github.com/goreleaser/goreleaser/internal/http"
@ -81,7 +81,7 @@ func checkResponse(r *h.Response) error {
return nil return nil
} }
errorResponse := &errorResponse{Response: r} errorResponse := &errorResponse{Response: r}
data, err := ioutil.ReadAll(r.Body) data, err := io.ReadAll(r.Body)
if err == nil && data != nil { if err == nil && data != nil {
err := json.Unmarshal(data, errorResponse) err := json.Unmarshal(data, errorResponse)
if err != nil { if err != nil {

9
internal/pipe/artifactory/artifactory_test.go
View File

@ -2,7 +2,6 @@ package artifactory
import ( import (
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os" "os"
@ -63,7 +62,7 @@ func TestRunPipe_ModeBinary(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin") binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666)) require.NoError(t, os.WriteFile(binPath, d1, 0o666))
// Dummy artifactories // Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
@ -396,7 +395,7 @@ func TestRunPipe_BadCredentials(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin") binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666)) require.NoError(t, os.WriteFile(binPath, d1, 0o666))
// Dummy artifactories // Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
@ -456,7 +455,7 @@ func TestRunPipe_UnparsableErrorResponse(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin") binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666)) require.NoError(t, os.WriteFile(binPath, d1, 0o666))
// Dummy artifactories // Dummy artifactories
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
@ -541,7 +540,7 @@ func TestRunPipe_UnparsableTarget(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0o755))
binPath := filepath.Join(dist, "mybin", "mybin") binPath := filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0o666)) require.NoError(t, os.WriteFile(binPath, d1, 0o666))
ctx := context.New(config.Project{ ctx := context.New(config.Project{
ProjectName: "mybin", ProjectName: "mybin",

25
internal/pipe/blob/blob_minio_test.go
View File

@ -6,7 +6,6 @@ package blob
import ( import (
"io" "io"
"io/ioutil"
"net" "net"
"os" "os"
"os/exec" "os/exec"
@ -29,10 +28,10 @@ func TestMinioUpload(t *testing.T) {
tgzpath := filepath.Join(folder, "bin.tar.gz") tgzpath := filepath.Join(folder, "bin.tar.gz")
debpath := filepath.Join(folder, "bin.deb") debpath := filepath.Join(folder, "bin.deb")
checkpath := filepath.Join(folder, "check.txt") checkpath := filepath.Join(folder, "check.txt")
require.NoError(t, ioutil.WriteFile(checkpath, []byte("fake checksums"), 0o744)) require.NoError(t, os.WriteFile(checkpath, []byte("fake checksums"), 0o744))
require.NoError(t, ioutil.WriteFile(srcpath, []byte("fake\nsrc"), 0o744)) require.NoError(t, os.WriteFile(srcpath, []byte("fake\nsrc"), 0o744))
require.NoError(t, ioutil.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744)) require.NoError(t, os.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744))
require.NoError(t, ioutil.WriteFile(debpath, []byte("fake\ndeb"), 0o744)) require.NoError(t, os.WriteFile(debpath, []byte("fake\ndeb"), 0o744))
ctx := context.New(config.Project{ ctx := context.New(config.Project{
Dist: folder, Dist: folder,
ProjectName: "testupload", ProjectName: "testupload",
@ -95,8 +94,8 @@ func TestMinioUploadCustomBucketID(t *testing.T) {
folder := t.TempDir() folder := t.TempDir()
tgzpath := filepath.Join(folder, "bin.tar.gz") tgzpath := filepath.Join(folder, "bin.tar.gz")
debpath := filepath.Join(folder, "bin.deb") debpath := filepath.Join(folder, "bin.deb")
require.NoError(t, ioutil.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744)) require.NoError(t, os.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744))
require.NoError(t, ioutil.WriteFile(debpath, []byte("fake\ndeb"), 0o744)) require.NoError(t, os.WriteFile(debpath, []byte("fake\ndeb"), 0o744))
// Set custom BUCKET_ID env variable. // Set custom BUCKET_ID env variable.
require.NoError(t, os.Setenv("BUCKET_ID", "test")) require.NoError(t, os.Setenv("BUCKET_ID", "test"))
ctx := context.New(config.Project{ ctx := context.New(config.Project{
@ -133,8 +132,8 @@ func TestMinioUploadInvalidCustomBucketID(t *testing.T) {
folder := t.TempDir() folder := t.TempDir()
tgzpath := filepath.Join(folder, "bin.tar.gz") tgzpath := filepath.Join(folder, "bin.tar.gz")
debpath := filepath.Join(folder, "bin.deb") debpath := filepath.Join(folder, "bin.deb")
require.NoError(t, ioutil.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744)) require.NoError(t, os.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744))
require.NoError(t, ioutil.WriteFile(debpath, []byte("fake\ndeb"), 0o744)) require.NoError(t, os.WriteFile(debpath, []byte("fake\ndeb"), 0o744))
ctx := context.New(config.Project{ ctx := context.New(config.Project{
Dist: folder, Dist: folder,
ProjectName: "testupload", ProjectName: "testupload",
@ -171,10 +170,10 @@ func TestMinioUploadSkipPublish(t *testing.T) {
tgzpath := filepath.Join(folder, "bin.tar.gz") tgzpath := filepath.Join(folder, "bin.tar.gz")
debpath := filepath.Join(folder, "bin.deb") debpath := filepath.Join(folder, "bin.deb")
checkpath := filepath.Join(folder, "check.txt") checkpath := filepath.Join(folder, "check.txt")
require.NoError(t, ioutil.WriteFile(checkpath, []byte("fake checksums"), 0o744)) require.NoError(t, os.WriteFile(checkpath, []byte("fake checksums"), 0o744))
require.NoError(t, ioutil.WriteFile(srcpath, []byte("fake\nsrc"), 0o744)) require.NoError(t, os.WriteFile(srcpath, []byte("fake\nsrc"), 0o744))
require.NoError(t, ioutil.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744)) require.NoError(t, os.WriteFile(tgzpath, []byte("fake\ntargz"), 0o744))
require.NoError(t, ioutil.WriteFile(debpath, []byte("fake\ndeb"), 0o744)) require.NoError(t, os.WriteFile(debpath, []byte("fake\ndeb"), 0o744))
ctx := context.New(config.Project{ ctx := context.New(config.Project{
Dist: folder, Dist: folder,
ProjectName: "testupload", ProjectName: "testupload",

5
internal/pipe/blob/blob_test.go
View File

@ -1,7 +1,6 @@
package blob package blob
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -126,8 +125,8 @@ func pipePublish(t *testing.T, extra []config.ExtraFile) {
var folder = t.TempDir() var folder = t.TempDir()
tgzpath := filepath.Join(folder, "bin.tar.gz") tgzpath := filepath.Join(folder, "bin.tar.gz")
debpath := filepath.Join(folder, "bin.deb") debpath := filepath.Join(folder, "bin.deb")
require.NoError(t, ioutil.WriteFile(tgzpath, []byte("fake\ntargz"), 0744)) require.NoError(t, os.WriteFile(tgzpath, []byte("fake\ntargz"), 0744))
require.NoError(t, ioutil.WriteFile(debpath, []byte("fake\ndeb"), 0744)) require.NoError(t, os.WriteFile(debpath, []byte("fake\ndeb"), 0744))
// Azure Blob Context // Azure Blob Context
var azblobctx = context.New(config.Project{ var azblobctx = context.New(config.Project{

4
internal/pipe/blob/upload.go
View File

@ -3,8 +3,8 @@ package blob
import ( import (
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/url" "net/url"
"os"
"path" "path"
"github.com/apex/log" "github.com/apex/log"
@ -166,7 +166,7 @@ func newUploader(ctx *context.Context) uploader {
} }
func getData(ctx *context.Context, conf config.Blob, path string) ([]byte, error) { func getData(ctx *context.Context, conf config.Blob, path string) ([]byte, error) {
data, err := ioutil.ReadFile(path) data, err := os.ReadFile(path)
if err != nil { if err != nil {
return data, fmt.Errorf("failed to open file %s: %w", path, err) return data, fmt.Errorf("failed to open file %s: %w", path, err)
} }

4
internal/pipe/brew/brew.go
View File

@ -5,7 +5,7 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "os"
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
@ -161,7 +161,7 @@ func doRun(ctx *context.Context, brew config.Homebrew, cl client.Client) error {
filename := brew.Name + ".rb" filename := brew.Name + ".rb"
path := filepath.Join(ctx.Config.Dist, filename) path := filepath.Join(ctx.Config.Dist, filename)
log.WithField("formula", path).Info("writing") log.WithField("formula", path).Info("writing")
if err := ioutil.WriteFile(path, []byte(content), 0o644); err != nil { //nolint: gosec if err := os.WriteFile(path, []byte(content), 0o644); err != nil { //nolint: gosec
return fmt.Errorf("failed to write brew formula: %w", err) return fmt.Errorf("failed to write brew formula: %w", err)
} }

26
internal/pipe/brew/brew_test.go
View File

@ -93,10 +93,10 @@ func TestFullFormulae(t *testing.T) {
var golden = "testdata/test.rb.golden" var golden = "testdata/test.rb.golden"
if *update { if *update {
err := ioutil.WriteFile(golden, []byte(formulae), 0655) err := os.WriteFile(golden, []byte(formulae), 0655)
require.NoError(t, err) require.NoError(t, err)
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), formulae) require.Equal(t, string(bts), formulae)
} }
@ -113,10 +113,10 @@ func TestFullFormulaeLinuxOnly(t *testing.T) {
var golden = "testdata/test_linux_only.rb.golden" var golden = "testdata/test_linux_only.rb.golden"
if *update { if *update {
err := ioutil.WriteFile(golden, []byte(formulae), 0655) err := os.WriteFile(golden, []byte(formulae), 0655)
require.NoError(t, err) require.NoError(t, err)
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), formulae) require.Equal(t, string(bts), formulae)
} }
@ -247,13 +247,13 @@ func TestRunPipe(t *testing.T) {
require.True(t, client.CreatedFile) require.True(t, client.CreatedFile)
var golden = fmt.Sprintf("testdata/%s.rb.golden", name) var golden = fmt.Sprintf("testdata/%s.rb.golden", name)
if *update { if *update {
require.NoError(t, ioutil.WriteFile(golden, []byte(client.Content), 0655)) require.NoError(t, os.WriteFile(golden, []byte(client.Content), 0655))
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), client.Content) require.Equal(t, string(bts), client.Content)
distBts, err := ioutil.ReadFile(distFile) distBts, err := os.ReadFile(distFile)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), string(distBts)) require.Equal(t, string(bts), string(distBts))
}) })
@ -312,13 +312,13 @@ func TestRunPipeNameTemplate(t *testing.T) {
require.True(t, client.CreatedFile) require.True(t, client.CreatedFile)
var golden = "testdata/foo_is_bar.rb.golden" var golden = "testdata/foo_is_bar.rb.golden"
if *update { if *update {
require.NoError(t, ioutil.WriteFile(golden, []byte(client.Content), 0655)) require.NoError(t, os.WriteFile(golden, []byte(client.Content), 0655))
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), client.Content) require.Equal(t, string(bts), client.Content)
distBts, err := ioutil.ReadFile(distFile) distBts, err := os.ReadFile(distFile)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), string(distBts)) require.Equal(t, string(bts), string(distBts))
} }
@ -518,13 +518,13 @@ func TestRunPipeForMultipleArmVersions(t *testing.T) {
require.True(t, client.CreatedFile) require.True(t, client.CreatedFile)
var golden = fmt.Sprintf("testdata/%s.rb.golden", name) var golden = fmt.Sprintf("testdata/%s.rb.golden", name)
if *update { if *update {
require.NoError(t, ioutil.WriteFile(golden, []byte(client.Content), 0655)) require.NoError(t, os.WriteFile(golden, []byte(client.Content), 0655))
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), client.Content) require.Equal(t, string(bts), client.Content)
distBts, err := ioutil.ReadFile(distFile) distBts, err := os.ReadFile(distFile)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), string(distBts)) require.Equal(t, string(bts), string(distBts))
} }

5
internal/pipe/build/build_test.go
View File

@ -3,7 +3,6 @@ package build
import ( import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -39,7 +38,7 @@ func (f *fakeBuilder) Build(ctx *context.Context, build config.Build, options ap
if err := os.MkdirAll(filepath.Dir(options.Path), 0755); err != nil { if err := os.MkdirAll(filepath.Dir(options.Path), 0755); err != nil {
return err return err
} }
if err := ioutil.WriteFile(options.Path, []byte("foo"), 0755); err != nil { if err := os.WriteFile(options.Path, []byte("foo"), 0755); err != nil {
return err return err
} }
ctx.Artifacts.Add(&artifact.Artifact{ ctx.Artifacts.Add(&artifact.Artifact{
@ -609,7 +608,7 @@ func TestRunHookEnvs(t *testing.T) {
t.Run("build env inside shell", func(t *testing.T) { t.Run("build env inside shell", func(t *testing.T) {
var shell = `#!/bin/sh -e var shell = `#!/bin/sh -e
touch "$BAR"` touch "$BAR"`
err := ioutil.WriteFile(filepath.Join(tmp, "test.sh"), []byte(shell), 0750) err := os.WriteFile(filepath.Join(tmp, "test.sh"), []byte(shell), 0750)
require.NoError(t, err) require.NoError(t, err)
err = runHook(context.New(config.Project{ err = runHook(context.New(config.Project{
Builds: []config.Build{ Builds: []config.Build{

5
internal/pipe/changelog/changelog.go
View File

@ -4,7 +4,6 @@ package changelog
import ( import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
@ -112,11 +111,11 @@ func (Pipe) Run(ctx *context.Context) error {
path := filepath.Join(ctx.Config.Dist, "CHANGELOG.md") path := filepath.Join(ctx.Config.Dist, "CHANGELOG.md")
log.WithField("changelog", path).Info("writing") log.WithField("changelog", path).Info("writing")
return ioutil.WriteFile(path, []byte(ctx.ReleaseNotes), 0o644) //nolint: gosec return os.WriteFile(path, []byte(ctx.ReleaseNotes), 0o644) //nolint: gosec
} }
func loadFromFile(file string) (string, error) { func loadFromFile(file string) (string, error) {
bts, err := ioutil.ReadFile(file) bts, err := os.ReadFile(file)
if err != nil { if err != nil {
return "", err return "", err
} }

5
internal/pipe/changelog/changelog_test.go
View File

@ -1,7 +1,6 @@
package changelog package changelog
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -111,7 +110,7 @@ func TestChangelog(t *testing.T) {
require.NotContains(t, ctx.ReleaseNotes, "cArs") require.NotContains(t, ctx.ReleaseNotes, "cArs")
require.NotContains(t, ctx.ReleaseNotes, "from goreleaser/some-branch") require.NotContains(t, ctx.ReleaseNotes, "from goreleaser/some-branch")
bts, err := ioutil.ReadFile(filepath.Join(folder, "CHANGELOG.md")) bts, err := os.ReadFile(filepath.Join(folder, "CHANGELOG.md"))
require.NoError(t, err) require.NoError(t, err)
require.NotEmpty(t, string(bts)) require.NotEmpty(t, string(bts))
} }
@ -178,7 +177,7 @@ func TestChangelogForGitlab(t *testing.T) {
require.NotContains(t, ctx.ReleaseNotes, "cArs") require.NotContains(t, ctx.ReleaseNotes, "cArs")
require.NotContains(t, ctx.ReleaseNotes, "from goreleaser/some-branch") require.NotContains(t, ctx.ReleaseNotes, "from goreleaser/some-branch")
bts, err := ioutil.ReadFile(filepath.Join(folder, "CHANGELOG.md")) bts, err := os.ReadFile(filepath.Join(folder, "CHANGELOG.md"))
require.NoError(t, err) require.NoError(t, err)
require.NotEmpty(t, string(bts)) require.NotEmpty(t, string(bts))
} }

7
internal/pipe/checksums/checksums_test.go
View File

@ -2,6 +2,7 @@ package checksums
import ( import (
"io/ioutil" "io/ioutil"
"os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -49,7 +50,7 @@ func TestPipe(t *testing.T) {
t.Run(name, func(t *testing.T) { t.Run(name, func(t *testing.T) {
var folder = t.TempDir() var folder = t.TempDir()
var file = filepath.Join(folder, binary) var file = filepath.Join(folder, binary)
require.NoError(t, ioutil.WriteFile(file, []byte("some string"), 0644)) require.NoError(t, os.WriteFile(file, []byte("some string"), 0644))
var ctx = context.New( var ctx = context.New(
config.Project{ config.Project{
Dist: folder, Dist: folder,
@ -93,7 +94,7 @@ func TestPipe(t *testing.T) {
artifacts = append(artifacts, a.Name) artifacts = append(artifacts, a.Name)
} }
require.Contains(t, artifacts, checksums, binary) require.Contains(t, artifacts, checksums, binary)
bts, err := ioutil.ReadFile(filepath.Join(folder, checksums)) bts, err := os.ReadFile(filepath.Join(folder, checksums))
require.NoError(t, err) require.NoError(t, err)
for _, want := range tt.want { for _, want := range tt.want {
require.Contains(t, string(bts), "61d034473102d7dac305902770471fd50f4c5b26f6831a56dd90b5184b3c30fc "+want) require.Contains(t, string(bts), "61d034473102d7dac305902770471fd50f4c5b26f6831a56dd90b5184b3c30fc "+want)
@ -184,7 +185,7 @@ func TestPipeCouldNotOpenChecksumsTxt(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
var file = filepath.Join(folder, "checksums.txt") var file = filepath.Join(folder, "checksums.txt")
require.NoError(t, ioutil.WriteFile(file, []byte("some string"), 0000)) require.NoError(t, os.WriteFile(file, []byte("some string"), 0000))
var ctx = context.New( var ctx = context.New(
config.Project{ config.Project{
Dist: folder, Dist: folder,

3
internal/pipe/dist/dist.go vendored
View File

@ -4,7 +4,6 @@ package dist
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"github.com/apex/log" "github.com/apex/log"
@ -33,7 +32,7 @@ func (Pipe) Run(ctx *context.Context) (err error) {
} }
return err return err
} }
files, err := ioutil.ReadDir(ctx.Config.Dist) files, err := os.ReadDir(ctx.Config.Dist)
if err != nil { if err != nil {
return return
} }

8
internal/pipe/docker/docker_test.go
View File

@ -1188,7 +1188,7 @@ func TestLinkFile(t *testing.T) {
dst := filepath.Join(dir, "dst") dst := filepath.Join(dir, "dst")
fmt.Println("src:", src.Name()) fmt.Println("src:", src.Name())
fmt.Println("dst:", dst) fmt.Println("dst:", dst)
require.NoError(t, ioutil.WriteFile(src.Name(), []byte("foo"), 0o644)) require.NoError(t, os.WriteFile(src.Name(), []byte("foo"), 0o644))
require.NoError(t, link(src.Name(), dst)) require.NoError(t, link(src.Name(), dst))
require.Equal(t, inode(src.Name()), inode(dst)) require.Equal(t, inode(src.Name()), inode(dst))
} }
@ -1197,7 +1197,7 @@ func TestLinkDirectory(t *testing.T) {
srcDir := t.TempDir() srcDir := t.TempDir()
dstDir := t.TempDir() dstDir := t.TempDir()
const testFile = "test" const testFile = "test"
require.NoError(t, ioutil.WriteFile(filepath.Join(srcDir, testFile), []byte("foo"), 0o644)) require.NoError(t, os.WriteFile(filepath.Join(srcDir, testFile), []byte("foo"), 0o644))
require.NoError(t, link(srcDir, dstDir)) require.NoError(t, link(srcDir, dstDir))
require.Equal(t, inode(filepath.Join(srcDir, testFile)), inode(filepath.Join(dstDir, testFile))) require.Equal(t, inode(filepath.Join(srcDir, testFile)), inode(filepath.Join(dstDir, testFile)))
} }
@ -1209,8 +1209,8 @@ func TestLinkTwoLevelDirectory(t *testing.T) {
const testFile = "test" const testFile = "test"
require.NoError(t, os.Mkdir(srcLevel2, 0o755)) require.NoError(t, os.Mkdir(srcLevel2, 0o755))
require.NoError(t, ioutil.WriteFile(filepath.Join(srcDir, testFile), []byte("foo"), 0o644)) require.NoError(t, os.WriteFile(filepath.Join(srcDir, testFile), []byte("foo"), 0o644))
require.NoError(t, ioutil.WriteFile(filepath.Join(srcLevel2, testFile), []byte("foo"), 0o644)) require.NoError(t, os.WriteFile(filepath.Join(srcLevel2, testFile), []byte("foo"), 0o644))
require.NoError(t, link(srcDir, dstDir)) require.NoError(t, link(srcDir, dstDir))

4
internal/pipe/effectiveconfig/config.go
View File

@ -1,7 +1,7 @@
package effectiveconfig package effectiveconfig
import ( import (
"io/ioutil" "os"
"path/filepath" "path/filepath"
"github.com/apex/log" "github.com/apex/log"
@ -25,5 +25,5 @@ func (Pipe) Run(ctx *context.Context) (err error) {
return err return err
} }
log.WithField("config", path).Info("writing") log.WithField("config", path).Info("writing")
return ioutil.WriteFile(path, bts, 0644) //nolint: gosec return os.WriteFile(path, bts, 0644) //nolint: gosec
} }

5
internal/pipe/effectiveconfig/config_test.go
View File

@ -1,7 +1,6 @@
package effectiveconfig package effectiveconfig
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -16,7 +15,7 @@ func TestPipeDescription(t *testing.T) {
require.NotEmpty(t, Pipe{}.String()) require.NotEmpty(t, Pipe{}.String())
} }
func Test(t *testing.T) { func TestRun(t *testing.T) {
var folder = testlib.Mktmp(t) var folder = testlib.Mktmp(t)
dist := filepath.Join(folder, "dist") dist := filepath.Join(folder, "dist")
require.NoError(t, os.Mkdir(dist, 0755)) require.NoError(t, os.Mkdir(dist, 0755))
@ -26,7 +25,7 @@ func Test(t *testing.T) {
}, },
) )
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
bts, err := ioutil.ReadFile(filepath.Join(dist, "config.yaml")) bts, err := os.ReadFile(filepath.Join(dist, "config.yaml"))
require.NoError(t, err) require.NoError(t, err)
require.NotEmpty(t, string(bts)) require.NotEmpty(t, string(bts))
} }

5
internal/pipe/git/git_test.go
View File

@ -1,7 +1,6 @@
package git package git
import ( import (
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -98,7 +97,7 @@ func TestDirty(t *testing.T) {
testlib.GitAdd(t) testlib.GitAdd(t)
testlib.GitCommit(t, "commit2") testlib.GitCommit(t, "commit2")
testlib.GitTag(t, "v0.0.1") testlib.GitTag(t, "v0.0.1")
require.NoError(t, ioutil.WriteFile(dummy.Name(), []byte("lorem ipsum"), 0o644)) require.NoError(t, os.WriteFile(dummy.Name(), []byte("lorem ipsum"), 0o644))
t.Run("all checks up", func(t *testing.T) { t.Run("all checks up", func(t *testing.T) {
err := Pipe{}.Run(context.New(config.Project{})) err := Pipe{}.Run(context.New(config.Project{}))
require.Error(t, err) require.Error(t, err)
@ -207,7 +206,7 @@ func TestSnapshotDirty(t *testing.T) {
testlib.GitAdd(t) testlib.GitAdd(t)
testlib.GitCommit(t, "whatever") testlib.GitCommit(t, "whatever")
testlib.GitTag(t, "v0.0.1") testlib.GitTag(t, "v0.0.1")
require.NoError(t, ioutil.WriteFile(filepath.Join(folder, "foo"), []byte("foobar"), 0o644)) require.NoError(t, os.WriteFile(filepath.Join(folder, "foo"), []byte("foobar"), 0o644))
ctx := context.New(config.Project{}) ctx := context.New(config.Project{})
ctx.Snapshot = true ctx.Snapshot = true
testlib.AssertSkipped(t, Pipe{}.Run(ctx)) testlib.AssertSkipped(t, Pipe{}.Run(ctx))

14
internal/pipe/release/body_test.go
View File

@ -2,7 +2,7 @@ package release
import ( import (
"flag" "flag"
"io/ioutil" "os"
"testing" "testing"
"github.com/goreleaser/goreleaser/internal/artifact" "github.com/goreleaser/goreleaser/internal/artifact"
@ -32,9 +32,9 @@ func TestDescribeBody(t *testing.T) {
var golden = "testdata/release1.golden" var golden = "testdata/release1.golden"
if *update { if *update {
_ = ioutil.WriteFile(golden, out.Bytes(), 0755) _ = os.WriteFile(golden, out.Bytes(), 0755)
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), out.String()) require.Equal(t, string(bts), out.String())
} }
@ -71,9 +71,9 @@ func TestDescribeBodyWithDockerManifest(t *testing.T) {
var golden = "testdata/release3.golden" var golden = "testdata/release3.golden"
if *update { if *update {
_ = ioutil.WriteFile(golden, out.Bytes(), 0755) _ = os.WriteFile(golden, out.Bytes(), 0755)
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), out.String()) require.Equal(t, string(bts), out.String())
} }
@ -88,9 +88,9 @@ func TestDescribeBodyNoDockerImagesNoBrews(t *testing.T) {
var golden = "testdata/release2.golden" var golden = "testdata/release2.golden"
if *update { if *update {
_ = ioutil.WriteFile(golden, out.Bytes(), 0655) _ = os.WriteFile(golden, out.Bytes(), 0655)
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), out.String()) require.Equal(t, string(bts), out.String())

4
internal/pipe/release/release_test.go
View File

@ -3,7 +3,7 @@ package release
import ( import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@ -559,7 +559,7 @@ func (c *DummyClient) Upload(ctx *context.Context, releaseID string, artifact *a
c.UploadedFilePaths = map[string]string{} c.UploadedFilePaths = map[string]string{}
} }
// ensure file is read to better mimic real behavior // ensure file is read to better mimic real behavior
_, err := ioutil.ReadAll(file) _, err := io.ReadAll(file)
if err != nil { if err != nil {
return fmt.Errorf("unexpected error: %w", err) return fmt.Errorf("unexpected error: %w", err)
} }

15
internal/pipe/scoop/scoop_test.go
View File

@ -3,7 +3,6 @@ package scoop
import ( import (
ctx "context" ctx "context"
"flag" "flag"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -62,7 +61,7 @@ func TestDefault(t *testing.T) {
func Test_doRun(t *testing.T) { func Test_doRun(t *testing.T) {
var folder = testlib.Mktmp(t) var folder = testlib.Mktmp(t)
var file = filepath.Join(folder, "archive") var file = filepath.Join(folder, "archive")
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0644))
type errChecker func(*testing.T, error) type errChecker func(*testing.T, error)
var shouldErr = func(msg string) errChecker { var shouldErr = func(msg string) errChecker {
@ -746,7 +745,7 @@ func Test_doRun(t *testing.T) {
func Test_buildManifest(t *testing.T) { func Test_buildManifest(t *testing.T) {
var folder = t.TempDir() var folder = t.TempDir()
var file = filepath.Join(folder, "archive") var file = filepath.Join(folder, "archive")
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0644))
tests := []struct { tests := []struct {
filename string filename string
@ -982,9 +981,9 @@ func Test_buildManifest(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
if *update { if *update {
require.NoError(t, ioutil.WriteFile(tt.filename, out.Bytes(), 0655)) require.NoError(t, os.WriteFile(tt.filename, out.Bytes(), 0655))
} }
bts, err := ioutil.ReadFile(tt.filename) bts, err := os.ReadFile(tt.filename)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), out.String()) require.Equal(t, string(bts), out.String())
}) })
@ -994,7 +993,7 @@ func Test_buildManifest(t *testing.T) {
func TestWrapInDirectory(t *testing.T) { func TestWrapInDirectory(t *testing.T) {
var folder = t.TempDir() var folder = t.TempDir()
var file = filepath.Join(folder, "archive") var file = filepath.Join(folder, "archive")
require.NoError(t, ioutil.WriteFile(file, []byte("lorem ipsum"), 0644)) require.NoError(t, os.WriteFile(file, []byte("lorem ipsum"), 0644))
var ctx = &context.Context{ var ctx = &context.Context{
TokenType: context.TokenTypeGitLab, TokenType: context.TokenTypeGitLab,
Git: context.GitInfo{ Git: context.GitInfo{
@ -1063,9 +1062,9 @@ func TestWrapInDirectory(t *testing.T) {
var golden = "testdata/test_buildmanifest_wrap.json.golden" var golden = "testdata/test_buildmanifest_wrap.json.golden"
if *update { if *update {
require.NoError(t, ioutil.WriteFile(golden, out.Bytes(), 0655)) require.NoError(t, os.WriteFile(golden, out.Bytes(), 0655))
} }
bts, err := ioutil.ReadFile(golden) bts, err := os.ReadFile(golden)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, string(bts), out.String()) require.Equal(t, string(bts), out.String())
} }

7
internal/pipe/sign/sign_test.go
View File

@ -3,7 +3,6 @@ package sign
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil"
"math/rand" "math/rand"
"os" "os"
"os/exec" "os/exec"
@ -395,11 +394,11 @@ func testSign(tb testing.TB, ctx *context.Context, signaturePaths []string, sign
require.NoError(tb, os.Mkdir(filepath.Join(tmpdir, "linux_amd64"), os.ModePerm)) require.NoError(tb, os.Mkdir(filepath.Join(tmpdir, "linux_amd64"), os.ModePerm))
for _, f := range artifacts { for _, f := range artifacts {
file := filepath.Join(tmpdir, f) file := filepath.Join(tmpdir, f)
require.NoError(tb, ioutil.WriteFile(file, []byte("foo"), 0o644)) require.NoError(tb, os.WriteFile(file, []byte("foo"), 0o644))
} }
require.NoError(tb, ioutil.WriteFile(filepath.Join(tmpdir, "linux_amd64", "artifact4"), []byte("foo"), 0o644)) require.NoError(tb, os.WriteFile(filepath.Join(tmpdir, "linux_amd64", "artifact4"), []byte("foo"), 0o644))
artifacts = append(artifacts, "linux_amd64/artifact4") artifacts = append(artifacts, "linux_amd64/artifact4")
require.NoError(tb, ioutil.WriteFile(filepath.Join(tmpdir, "artifact5.tar.gz"), []byte("foo"), 0o644)) require.NoError(tb, os.WriteFile(filepath.Join(tmpdir, "artifact5.tar.gz"), []byte("foo"), 0o644))
artifacts = append(artifacts, "artifact5.tar.gz") artifacts = append(artifacts, "artifact5.tar.gz")
ctx.Artifacts.Add(&artifact.Artifact{ ctx.Artifacts.Add(&artifact.Artifact{
Name: "artifact1", Name: "artifact1",

3
internal/pipe/snapcraft/snapcraft.go
View File

@ -4,7 +4,6 @@ package snapcraft
import ( import (
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
@ -306,7 +305,7 @@ func create(ctx *context.Context, snap config.Snapcraft, arch string, binaries [
} }
log.WithField("file", file).Debugf("writing metadata file") log.WithField("file", file).Debugf("writing metadata file")
if err = ioutil.WriteFile(file, out, 0644); err != nil { //nolint: gosec if err = os.WriteFile(file, out, 0644); err != nil { //nolint: gosec
return err return err
} }

11
internal/pipe/snapcraft/snapcraft_test.go
View File

@ -2,7 +2,6 @@ package snapcraft
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"syscall" "syscall"
@ -129,7 +128,7 @@ func TestRunPipeWithName(t *testing.T) {
ctx.Version = "v1.2.3" ctx.Version = "v1.2.3"
addBinaries(t, ctx, "foo", dist) addBinaries(t, ctx, "foo", dist)
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
yamlFile, err := ioutil.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml")) yamlFile, err := os.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml"))
require.NoError(t, err) require.NoError(t, err)
var metadata Metadata var metadata Metadata
err = yaml.Unmarshal(yamlFile, &metadata) err = yaml.Unmarshal(yamlFile, &metadata)
@ -177,7 +176,7 @@ func TestRunPipeMetadata(t *testing.T) {
ctx.Version = "v1.2.3" ctx.Version = "v1.2.3"
addBinaries(t, ctx, "foo", dist) addBinaries(t, ctx, "foo", dist)
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
yamlFile, err := ioutil.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml")) yamlFile, err := os.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml"))
require.NoError(t, err) require.NoError(t, err)
var metadata Metadata var metadata Metadata
err = yaml.Unmarshal(yamlFile, &metadata) err = yaml.Unmarshal(yamlFile, &metadata)
@ -236,7 +235,7 @@ func TestRunNoArguments(t *testing.T) {
ctx.Version = "v1.2.3" ctx.Version = "v1.2.3"
addBinaries(t, ctx, "foo", dist) addBinaries(t, ctx, "foo", dist)
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
yamlFile, err := ioutil.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml")) yamlFile, err := os.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml"))
require.NoError(t, err) require.NoError(t, err)
var metadata Metadata var metadata Metadata
err = yaml.Unmarshal(yamlFile, &metadata) err = yaml.Unmarshal(yamlFile, &metadata)
@ -272,7 +271,7 @@ func TestCompleter(t *testing.T) {
addBinaries(t, ctx, "foo", dist) addBinaries(t, ctx, "foo", dist)
addBinaries(t, ctx, "bar", dist) addBinaries(t, ctx, "bar", dist)
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
yamlFile, err := ioutil.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml")) yamlFile, err := os.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml"))
require.NoError(t, err) require.NoError(t, err)
var metadata Metadata var metadata Metadata
err = yaml.Unmarshal(yamlFile, &metadata) err = yaml.Unmarshal(yamlFile, &metadata)
@ -308,7 +307,7 @@ func TestCommand(t *testing.T) {
ctx.Version = "v1.2.3" ctx.Version = "v1.2.3"
addBinaries(t, ctx, "foo", dist) addBinaries(t, ctx, "foo", dist)
require.NoError(t, Pipe{}.Run(ctx)) require.NoError(t, Pipe{}.Run(ctx))
yamlFile, err := ioutil.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml")) yamlFile, err := os.ReadFile(filepath.Join(dist, "foo_amd64", "prime", "meta", "snap.yaml"))
require.NoError(t, err) require.NoError(t, err)
var metadata Metadata var metadata Metadata
err = yaml.Unmarshal(yamlFile, &metadata) err = yaml.Unmarshal(yamlFile, &metadata)

5
internal/pipe/sourcearchive/source_test.go
View File

@ -1,7 +1,6 @@
package sourcearchive package sourcearchive
import ( import (
"io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -20,8 +19,8 @@ func TestArchive(t *testing.T) {
require.NoError(t, os.Mkdir("dist", 0744)) require.NoError(t, os.Mkdir("dist", 0744))
testlib.GitInit(t) testlib.GitInit(t)
require.NoError(t, ioutil.WriteFile("code.txt", []byte("not really code"), 0655)) require.NoError(t, os.WriteFile("code.txt", []byte("not really code"), 0655))
require.NoError(t, ioutil.WriteFile("README.md", []byte("# my dope fake project"), 0655)) require.NoError(t, os.WriteFile("README.md", []byte("# my dope fake project"), 0655))
testlib.GitAdd(t) testlib.GitAdd(t)
testlib.GitCommit(t, "feat: first") testlib.GitCommit(t, "feat: first")

9
internal/pipe/upload/upload_test.go
View File

@ -2,7 +2,6 @@ package upload
import ( import (
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
h "net/http" h "net/http"
"net/http/httptest" "net/http/httptest"
@ -64,7 +63,7 @@ func TestRunPipe_ModeBinary(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin") var binPath = filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666)) require.NoError(t, os.WriteFile(binPath, d1, 0666))
// Dummy http server // Dummy http server
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
@ -226,7 +225,7 @@ func TestRunPipe_ModeBinary_CustomArtifactName(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin") var binPath = filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666)) require.NoError(t, os.WriteFile(binPath, d1, 0666))
// Dummy http server // Dummy http server
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin;deb.distribution=xenial", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin;deb.distribution=xenial", func(w http.ResponseWriter, r *http.Request) {
@ -434,7 +433,7 @@ func TestRunPipe_BadCredentials(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin") var binPath = filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666)) require.NoError(t, os.WriteFile(binPath, d1, 0666))
// Dummy http server // Dummy http server
mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/example-repo-local/mybin/darwin/amd64/mybin", func(w http.ResponseWriter, r *http.Request) {
@ -516,7 +515,7 @@ func TestRunPipe_UnparsableTarget(t *testing.T) {
require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755)) require.NoError(t, os.Mkdir(filepath.Join(dist, "mybin"), 0755))
var binPath = filepath.Join(dist, "mybin", "mybin") var binPath = filepath.Join(dist, "mybin", "mybin")
d1 := []byte("hello\ngo\n") d1 := []byte("hello\ngo\n")
require.NoError(t, ioutil.WriteFile(binPath, d1, 0666)) require.NoError(t, os.WriteFile(binPath, d1, 0666))
var ctx = context.New(config.Project{ var ctx = context.New(config.Project{
ProjectName: "mybin", ProjectName: "mybin",

4
pkg/archive/gzip/gzip_test.go
View File

@ -2,7 +2,7 @@ package gzip
import ( import (
"compress/gzip" "compress/gzip"
"io/ioutil" "io"
"os" "os"
"path/filepath" "path/filepath"
"testing" "testing"
@ -37,7 +37,7 @@ func TestGzFile(t *testing.T) {
require.Equal(t, "sub1/sub2/subfoo.txt", gzf.Name) require.Equal(t, "sub1/sub2/subfoo.txt", gzf.Name)
bts, err := ioutil.ReadAll(gzf) bts, err := io.ReadAll(gzf)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, "sub\n", string(bts)) require.Equal(t, "sub\n", string(bts))
} }

3
pkg/config/config.go
View File

@ -4,7 +4,6 @@ package config
import ( import (
"io" "io"
"io/ioutil"
"os" "os"
"strings" "strings"
@ -645,7 +644,7 @@ func Load(file string) (config Project, err error) {
// LoadReader config via io.Reader. // LoadReader config via io.Reader.
func LoadReader(fd io.Reader) (config Project, err error) { func LoadReader(fd io.Reader) (config Project, err error) {
data, err := ioutil.ReadAll(fd) data, err := io.ReadAll(fd)
if err != nil { if err != nil {
return config, err return config, err
} }