diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ce0dc7..3586471 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: unit-tests: strategy: matrix: - go-version: [ 1.18 ] + go-version: [ 1.19 ] os: [ ubuntu-latest, macos-latest, windows-latest ] runs-on: ${{ matrix.os }} steps: @@ -46,7 +46,7 @@ jobs: Acceptance-Tests: strategy: matrix: - go-version: [ 1.18 ] + go-version: [ 1.19 ] pkgFormat: [ deb, rpm, apk ] pkgPlatform: [ amd64, arm64, 386, ppc64le, armv6, armv7, s390x ] runs-on: ubuntu-latest @@ -81,7 +81,7 @@ jobs: goreleaser: strategy: matrix: - go-version: [ 1.18 ] + go-version: [ 1.19 ] runs-on: ubuntu-latest if: startsWith(github.ref, 'refs/tags/') needs: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ebdf272..9e254ab 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,7 +21,7 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - run: task docs:build - uses: wjdp/htmltest-action@master with: diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index ed64edd..9496485 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -21,7 +21,7 @@ jobs: name: setup go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Set up Task uses: arduino/setup-task@v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d608127..20230a8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: ~1.18 + go-version: ~1.19 - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3a6375f..7a5e912 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ By participating to this project, you agree to abide our [code of conduct](https Prerequisites: - [Task](https://taskfile.dev/#/installation) -- [Go 1.18+](https://golang.org/doc/install) +- [Go 1.19+](https://golang.org/doc/install) - [Docker](https://www.docker.com/) - `gpg` (probably already installed on your system) diff --git a/apk/apk.go b/apk/apk.go index dd2b504..b3c5aed 100644 --- a/apk/apk.go +++ b/apk/apk.go @@ -36,7 +36,6 @@ import ( "fmt" "hash" "io" - "io/ioutil" "net/mail" "os" "path/filepath" @@ -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 } @@ -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 } diff --git a/apk/apk_test.go b/apk/apk_test.go index ebb0333..0b4cd32 100644 --- a/apk/apk_test.go +++ b/apk/apk_test.go @@ -10,7 +10,7 @@ import ( "flag" "fmt" "io" - "io/ioutil" + "os" "path" "path/filepath" "testing" @@ -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) } @@ -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))) } @@ -223,7 +223,7 @@ func TestNoFiles(t *testing.T) { }, }, }), - ioutil.Discard, + io.Discard, ) require.NoError(t, err) } @@ -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) } @@ -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) @@ -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()) } @@ -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) } @@ -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) } @@ -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 } @@ -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) { diff --git a/deb/deb.go b/deb/deb.go index 7b6bb84..ea75588 100644 --- a/deb/deb.go +++ b/deb/deb.go @@ -9,7 +9,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -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 } diff --git a/deb/deb_test.go b/deb/deb_test.go index 4f2600c..9a956c2 100644 --- a/deb/deb_test.go +++ b/deb/deb_test.go @@ -10,7 +10,7 @@ import ( "flag" "fmt" "io" - "io/ioutil" + "os" "path" "path/filepath" "strconv" @@ -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) }) } @@ -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) } @@ -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()) } @@ -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) } @@ -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()) } @@ -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()) } @@ -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))) } @@ -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) } @@ -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()) } @@ -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()) } @@ -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()) } @@ -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()) } @@ -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}[") @@ -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 @@ -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() @@ -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 @@ -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()) } diff --git a/go.mod b/go.mod index 642ae53..3184531 100644 --- a/go.mod +++ b/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 diff --git a/internal/sign/pgp.go b/internal/sign/pgp.go index f8ad0cc..0f6d7ea 100644 --- a/internal/sign/pgp.go +++ b/internal/sign/pgp.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" "io" - "io/ioutil" + "os" "strconv" "unicode" @@ -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) } @@ -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) } @@ -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) } diff --git a/internal/sign/pgp_test.go b/internal/sign/pgp_test.go index a9e1a96..a8954c9 100644 --- a/internal/sign/pgp_test.go +++ b/internal/sign/pgp_test.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" + "os" "testing" "github.com/AlekSi/pointer" @@ -140,11 +140,11 @@ func TestReadKey(t *testing.T) { } func TestIsASCII(t *testing.T) { - data, err := ioutil.ReadFile("testdata/privkey.asc") + data, err := os.ReadFile("testdata/privkey.asc") require.NoError(t, err) require.True(t, isASCII(data)) - data, err = ioutil.ReadFile("testdata/privkey.gpg") + data, err = os.ReadFile("testdata/privkey.gpg") require.NoError(t, err) require.False(t, isASCII(data)) } diff --git a/internal/sign/rsa.go b/internal/sign/rsa.go index c92d2c8..6dd60e8 100644 --- a/internal/sign/rsa.go +++ b/internal/sign/rsa.go @@ -10,7 +10,7 @@ import ( "errors" "fmt" "io" - "io/ioutil" + "os" ) var ( @@ -27,7 +27,7 @@ func RSASignSHA1Digest(sha1Digest []byte, keyFile, passphrase string) ([]byte, e return nil, errDigestNotSH1 } - keyFileContent, err := ioutil.ReadFile(keyFile) + keyFileContent, err := os.ReadFile(keyFile) if err != nil { return nil, fmt.Errorf("reading key file: %w", err) } @@ -83,7 +83,7 @@ func RSAVerifySHA1Digest(sha1Digest, signature []byte, publicKeyFile string) err return errDigestNotSH1 } - keyFileContent, err := ioutil.ReadFile(publicKeyFile) + keyFileContent, err := os.ReadFile(publicKeyFile) if err != nil { return fmt.Errorf("reading key file: %w", err) } diff --git a/rpm/rpm.go b/rpm/rpm.go index 72c9ec5..bf33e99 100644 --- a/rpm/rpm.go +++ b/rpm/rpm.go @@ -6,7 +6,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "strconv" "strings" @@ -279,14 +278,14 @@ func toRelation(items []string) (rpmpack.Relations, error) { func addScriptFiles(info *nfpm.Info, rpm *rpmpack.RPM) error { if info.RPM.Scripts.PreTrans != "" { - data, err := ioutil.ReadFile(info.RPM.Scripts.PreTrans) + data, err := os.ReadFile(info.RPM.Scripts.PreTrans) if err != nil { return err } rpm.AddPretrans(string(data)) } if info.Scripts.PreInstall != "" { - data, err := ioutil.ReadFile(info.Scripts.PreInstall) + data, err := os.ReadFile(info.Scripts.PreInstall) if err != nil { return err } @@ -294,7 +293,7 @@ func addScriptFiles(info *nfpm.Info, rpm *rpmpack.RPM) error { } if info.Scripts.PreRemove != "" { - data, err := ioutil.ReadFile(info.Scripts.PreRemove) + data, err := os.ReadFile(info.Scripts.PreRemove) if err != nil { return err } @@ -302,7 +301,7 @@ func addScriptFiles(info *nfpm.Info, rpm *rpmpack.RPM) error { } if info.Scripts.PostInstall != "" { - data, err := ioutil.ReadFile(info.Scripts.PostInstall) + data, err := os.ReadFile(info.Scripts.PostInstall) if err != nil { return err } @@ -310,7 +309,7 @@ func addScriptFiles(info *nfpm.Info, rpm *rpmpack.RPM) error { } if info.Scripts.PostRemove != "" { - data, err := ioutil.ReadFile(info.Scripts.PostRemove) + data, err := os.ReadFile(info.Scripts.PostRemove) if err != nil { return err } @@ -318,7 +317,7 @@ func addScriptFiles(info *nfpm.Info, rpm *rpmpack.RPM) error { } if info.RPM.Scripts.PostTrans != "" { - data, err := ioutil.ReadFile(info.RPM.Scripts.PostTrans) + data, err := os.ReadFile(info.RPM.Scripts.PostTrans) if err != nil { return err } @@ -393,7 +392,7 @@ func asRPMSymlink(content *files.Content) *rpmpack.RPMFile { } func asRPMFile(content *files.Content, fileType rpmpack.FileType) (*rpmpack.RPMFile, error) { - data, err := ioutil.ReadFile(content.Source) + data, err := os.ReadFile(content.Source) if err != nil && content.Type != "ghost" { return nil, err } diff --git a/rpm/rpm_test.go b/rpm/rpm_test.go index 2baa938..de602fb 100644 --- a/rpm/rpm_test.go +++ b/rpm/rpm_test.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -88,7 +87,7 @@ func exampleInfo() *nfpm.Info { } func TestRPM(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) require.NoError(t, Default.Package(exampleInfo(), f)) @@ -132,7 +131,7 @@ func TestRPM(t *testing.T) { } func TestRPMGroup(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) info := exampleInfo() info.RPM.Group = "Unspecified" @@ -166,7 +165,7 @@ func TestRPMCompression(t *testing.T) { compLevel = "lzma" } t.Run(compLevel, func(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) info := exampleInfo() @@ -196,7 +195,7 @@ func TestRPMCompression(t *testing.T) { } func TestRPMSummary(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) customSummary := "This is my custom summary" @@ -223,7 +222,7 @@ func TestRPMSummary(t *testing.T) { } func TestRPMPackager(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) customPackager := "GoReleaser " @@ -250,7 +249,7 @@ func TestRPMPackager(t *testing.T) { } func TestWithRPMTags(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") require.NoError(t, err) info := exampleInfo() @@ -379,7 +378,7 @@ func TestRPMVersionWithVersionMetadata(t *testing.T) { } func TestWithInvalidEpoch(t *testing.T) { - f, err := ioutil.TempFile("", "test.rpm") + f, err := os.CreateTemp("", "test.rpm") defer func() { _ = f.Close() err = os.Remove(f.Name()) @@ -398,7 +397,7 @@ func TestWithInvalidEpoch(t *testing.T) { func TestRPMScripts(t *testing.T) { info := exampleInfo() - f, err := ioutil.TempFile(".", fmt.Sprintf("%s-%s-*.rpm", info.Name, info.Version)) + f, err := os.CreateTemp(".", fmt.Sprintf("%s-%s-*.rpm", info.Name, info.Version)) require.NoError(t, err) err = Default.Package(info, f) require.NoError(t, err) @@ -473,7 +472,7 @@ func TestRPMFileDoesNotExist(t *testing.T) { } abs, err := filepath.Abs("../testdata/whatever.confzzz") require.NoError(t, err) - err = Default.Package(info, ioutil.Discard) + err = Default.Package(info, io.Discard) require.EqualError(t, err, fmt.Sprintf("matching \"%s\": file does not exist", filepath.ToSlash(abs))) } @@ -521,7 +520,7 @@ func TestConfigNoReplace(t *testing.T) { err := Default.Package(info, &rpmFileBuffer) require.NoError(t, err) - expectedConfigContent, err := ioutil.ReadFile(buildConfigFile) + expectedConfigContent, err := os.ReadFile(buildConfigFile) require.NoError(t, err) packageConfigContent, err := extractFileFromRpm(rpmFileBuffer.Bytes(), packageConfigFile) @@ -690,7 +689,7 @@ func TestRPMSignature(t *testing.T) { info.RPM.Signature.KeyFile = "../internal/sign/testdata/privkey.asc" info.RPM.Signature.KeyPassphrase = "hunter2" - pubkeyFileContent, err := ioutil.ReadFile("../internal/sign/testdata/pubkey.gpg") + pubkeyFileContent, err := os.ReadFile("../internal/sign/testdata/pubkey.gpg") require.NoError(t, err) keyring, err := openpgp.ReadKeyRing(bytes.NewReader(pubkeyFileContent)) @@ -779,7 +778,7 @@ func TestDisableGlobbing(t *testing.T) { err := Default.Package(info, &rpmFileBuffer) require.NoError(t, err) - expectedContent, err := ioutil.ReadFile("../testdata/{file}[") + expectedContent, err := os.ReadFile("../testdata/{file}[") require.NoError(t, err) actualContent, err := extractFileFromRpm(rpmFileBuffer.Bytes(), "/test/{file}[") @@ -869,7 +868,7 @@ func extractFileFromRpm(rpm []byte, filename string) ([]byte, error) { continue } - fileContents, err := ioutil.ReadAll(pr) + fileContents, err := io.ReadAll(pr) if err != nil { return nil, err }