Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade to go 1.19 #542

Merged
merged 2 commits into from Aug 22, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions apk/apk.go
Expand Up @@ -36,7 +36,6 @@ import (
"fmt"
"hash"
"io"
"io/ioutil"
"net/mail"
"os"
"path/filepath"
Expand Down Expand Up @@ -358,7 +357,7 @@ func newScriptInsideTarGz(out *tar.Writer, path, dest string) error {
if err != nil {
return err
}
content, err := ioutil.ReadFile(path)
content, err := os.ReadFile(path)
if err != nil {
return err
}
Expand Down Expand Up @@ -478,7 +477,7 @@ func createSymlinkInsideTarGz(file *files.Content, out *tar.Writer) error {
}

func copyToTarAndDigest(file *files.Content, tw *tar.Writer, sizep *int64) error {
contents, err := ioutil.ReadFile(file.Source)
contents, err := os.ReadFile(file.Source)
if err != nil {
return err
}
Expand Down
30 changes: 15 additions & 15 deletions apk/apk_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"path"
"path/filepath"
"testing"
Expand Down Expand Up @@ -165,7 +165,7 @@ func TestDefaultWithArch(t *testing.T) {
}

func TestNoInfo(t *testing.T) {
err := Default.Package(nfpm.WithDefaults(&nfpm.Info{}), ioutil.Discard)
err := Default.Package(nfpm.WithDefaults(&nfpm.Info{}), io.Discard)
require.Error(t, err)
}

Expand Down Expand Up @@ -200,7 +200,7 @@ func TestFileDoesNotExist(t *testing.T) {
},
},
}),
ioutil.Discard,
io.Discard,
)
require.EqualError(t, err, fmt.Sprintf("matching \"%s\": file does not exist", filepath.ToSlash(abs)))
}
Expand All @@ -223,7 +223,7 @@ func TestNoFiles(t *testing.T) {
},
},
}),
ioutil.Discard,
io.Discard,
)
require.NoError(t, err)
}
Expand All @@ -242,9 +242,9 @@ func TestCreateBuilderControl(t *testing.T) {
control := string(extractFromTar(t, w.Bytes(), ".PKGINFO"))
golden := "testdata/TestCreateBuilderControl.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, []byte(control), 0o655)) // nolint: gosec
require.NoError(t, os.WriteFile(golden, []byte(control), 0o655)) // nolint: gosec
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), control)
}
Expand Down Expand Up @@ -274,9 +274,9 @@ func TestCreateBuilderControlScripts(t *testing.T) {
control := string(extractFromTar(t, w.Bytes(), ".PKGINFO"))
golden := "testdata/TestCreateBuilderControlScripts.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, []byte(control), 0o655)) // nolint: gosec
require.NoError(t, os.WriteFile(golden, []byte(control), 0o655)) // nolint: gosec
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), control)

Expand All @@ -303,9 +303,9 @@ func TestControl(t *testing.T) {
}))
golden := "testdata/TestControl.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o655)) // nolint: gosec
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o655)) // nolint: gosec
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand All @@ -328,7 +328,7 @@ func TestSignature(t *testing.T) {
err = sign.RSAVerifySHA1Digest(digest, signature, "../internal/sign/testdata/rsa.pub")
require.NoError(t, err)

err = Default.Package(info, ioutil.Discard)
err = Default.Package(info, io.Discard)
require.NoError(t, err)
}

Expand Down Expand Up @@ -377,11 +377,11 @@ func TestDisableGlobbing(t *testing.T) {

gzr, err := gzip.NewReader(&dataTarGz)
require.NoError(t, err)
dataTar, err := ioutil.ReadAll(gzr)
dataTar, err := io.ReadAll(gzr)
require.NoError(t, err)

extractedContent := extractFromTar(t, dataTar, "test/{file}[")
actualContent, err := ioutil.ReadFile("../testdata/{file}[")
actualContent, err := os.ReadFile("../testdata/{file}[")
require.NoError(t, err)
require.Equal(t, actualContent, extractedContent)
}
Expand All @@ -402,7 +402,7 @@ func extractFromTar(t *testing.T, tarFile []byte, fileName string) []byte {
continue
}

data, err := ioutil.ReadAll(tr)
data, err := io.ReadAll(tr)
require.NoError(t, err)
return data
}
Expand Down Expand Up @@ -484,7 +484,7 @@ func TestPackageSymlinks(t *testing.T) {
Type: "symlink",
},
}
require.NoError(t, Default.Package(info, ioutil.Discard))
require.NoError(t, Default.Package(info, io.Discard))
}

func TestDirectories(t *testing.T) {
Expand Down
3 changes: 1 addition & 2 deletions deb/deb.go
Expand Up @@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -664,7 +663,7 @@ func newFilePathInsideTar(out *tar.Writer, path, dest string, mode int64) error
if err != nil {
return err
}
content, err := ioutil.ReadAll(file)
content, err := io.ReadAll(file)
if err != nil {
return err
}
Expand Down
56 changes: 28 additions & 28 deletions deb/deb_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"os"
"path"
"path/filepath"
"strconv"
Expand Down Expand Up @@ -92,7 +92,7 @@ func TestDeb(t *testing.T) {
t.Run(arch, func(t *testing.T) {
info := exampleInfo()
info.Arch = arch
err := Default.Package(info, ioutil.Discard)
err := Default.Package(info, io.Discard)
require.NoError(t, err)
})
}
Expand All @@ -110,7 +110,7 @@ func extractDebVersion(deb *bytes.Buffer) string {
func TestDebVersionWithDash(t *testing.T) {
info := exampleInfo()
info.Version = "1.0.0-beta"
err := Default.Package(info, ioutil.Discard)
err := Default.Package(info, io.Discard)
require.NoError(t, err)
}

Expand Down Expand Up @@ -199,9 +199,9 @@ func TestControl(t *testing.T) {
}))
golden := "testdata/control.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand All @@ -219,9 +219,9 @@ func TestSpecialFiles(t *testing.T) {
mode, err := strconv.ParseInt("0644", 8, 64)
require.NoError(t, err)
require.Equal(t, int64(header.FileInfo().Mode()), mode)
data, err := ioutil.ReadAll(in)
data, err := io.ReadAll(in)
require.NoError(t, err)
org, err := ioutil.ReadFile(filePath)
org, err := os.ReadFile(filePath)
require.NoError(t, err)
require.Equal(t, data, org)
}
Expand Down Expand Up @@ -253,9 +253,9 @@ func TestNoJoinsControl(t *testing.T) {
}))
golden := "testdata/control2.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand Down Expand Up @@ -288,9 +288,9 @@ func TestVersionControl(t *testing.T) {
}))
golden := "testdata/control4.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand Down Expand Up @@ -326,7 +326,7 @@ func TestDebFileDoesNotExist(t *testing.T) {
},
},
}),
ioutil.Discard,
io.Discard,
)
require.EqualError(t, err, fmt.Sprintf("matching \"%s\": file does not exist", filepath.ToSlash(abs)))
}
Expand All @@ -349,13 +349,13 @@ func TestDebNoFiles(t *testing.T) {
},
},
}),
ioutil.Discard,
io.Discard,
)
require.NoError(t, err)
}

func TestDebNoInfo(t *testing.T) {
err := Default.Package(nfpm.WithDefaults(&nfpm.Info{}), ioutil.Discard)
err := Default.Package(nfpm.WithDefaults(&nfpm.Info{}), io.Discard)
require.Error(t, err)
}

Expand Down Expand Up @@ -411,9 +411,9 @@ func TestMinimalFields(t *testing.T) {
}))
golden := "testdata/minimal.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand All @@ -433,9 +433,9 @@ func TestDebEpoch(t *testing.T) {
}))
golden := "testdata/withepoch.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand All @@ -462,9 +462,9 @@ func TestDebRules(t *testing.T) {
}))
golden := "testdata/rules.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand All @@ -483,9 +483,9 @@ func TestMultilineFields(t *testing.T) {
}))
golden := "testdata/multiline.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
Expand Down Expand Up @@ -990,7 +990,7 @@ func TestDisableGlobbing(t *testing.T) {
dataTarball, _, _, tarballName, err := createDataTarball(info)
require.NoError(t, err)

expectedContent, err := ioutil.ReadFile("../testdata/{file}[")
expectedContent, err := os.ReadFile("../testdata/{file}[")
require.NoError(t, err)

actualContent := extractFileFromTar(t, inflate(t, tarballName, dataTarball), "/test/{file}[")
Expand Down Expand Up @@ -1105,7 +1105,7 @@ func extractFileFromTar(tb testing.TB, tarFile []byte, filename string) []byte {
continue
}

fileContents, err := ioutil.ReadAll(tr)
fileContents, err := io.ReadAll(tr)
require.NoError(tb, err)

return fileContents
Expand Down Expand Up @@ -1226,7 +1226,7 @@ func inflate(tb testing.TB, nameOrType string, data []byte) []byte {
tb.Fatalf("invalid inflation type: %s", ext)
}

inflatedData, err := ioutil.ReadAll(inflateReadCloser)
inflatedData, err := io.ReadAll(inflateReadCloser)
require.NoError(tb, err)

err = inflateReadCloser.Close()
Expand Down Expand Up @@ -1289,7 +1289,7 @@ func extractFileFromAr(tb testing.TB, arFile []byte, filename string) []byte {
continue
}

fileContents, err := ioutil.ReadAll(tr)
fileContents, err := io.ReadAll(tr)
require.NoError(tb, err)

return fileContents
Expand Down Expand Up @@ -1357,9 +1357,9 @@ func TestFields(t *testing.T) {
}))
golden := "testdata/control3.golden"
if *update {
require.NoError(t, ioutil.WriteFile(golden, w.Bytes(), 0o600))
require.NoError(t, os.WriteFile(golden, w.Bytes(), 0o600))
}
bts, err := ioutil.ReadFile(golden) //nolint:gosec
bts, err := os.ReadFile(golden) //nolint:gosec
require.NoError(t, err)
require.Equal(t, string(bts), w.String())
}
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/goreleaser/nfpm/v2

go 1.18
go 1.19

require (
github.com/AlekSi/pointer v1.2.0
Expand Down
8 changes: 4 additions & 4 deletions internal/sign/pgp.go
Expand Up @@ -6,7 +6,7 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"strconv"
"unicode"

Expand Down Expand Up @@ -117,7 +117,7 @@ func PGPClearSignWithKeyID(message io.Reader, keyFile, passphrase string, hexKey
// identity is not explicitly checked, other that the obvious fact that the signer's key must
// be in the armoredPubKeyFile.
func PGPVerify(message io.Reader, signature []byte, armoredPubKeyFile string) error {
keyFileContent, err := ioutil.ReadFile(armoredPubKeyFile)
keyFileContent, err := os.ReadFile(armoredPubKeyFile)
if err != nil {
return fmt.Errorf("reading armored public key file: %w", err)
}
Expand Down Expand Up @@ -146,7 +146,7 @@ func PGPVerify(message io.Reader, signature []byte, armoredPubKeyFile string) er
}

func PGPReadMessage(message []byte, armoredPubKeyFile string) error {
keyFileContent, err := ioutil.ReadFile(armoredPubKeyFile)
keyFileContent, err := os.ReadFile(armoredPubKeyFile)
if err != nil {
return fmt.Errorf("reading armored public key file: %w", err)
}
Expand Down Expand Up @@ -190,7 +190,7 @@ var (
)

func readSigningKey(keyFile, passphrase string) (*openpgp.Entity, error) {
fileContent, err := ioutil.ReadFile(keyFile)
fileContent, err := os.ReadFile(keyFile)
if err != nil {
return nil, fmt.Errorf("reading PGP key file: %w", err)
}
Expand Down