vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-06 05:30:57 +00:00
Code Issues Projects Releases Wiki Activity

update golangci-lint and replace deprecated calls to io/ioutil

Browse Source
This commit is contained in:
Markus Muellner
2022-09-22 17:18:14 +02:00
committed by Benj Fassbind
parent 71fd730598
commit 352f4e8772
23 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgp/gnupg.go
+6 -7
View File
@@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -200,7 +199,7 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
args = append([]string{"--status-fd", "3"}, args...)
cmd := exec.Command(g.gpgv, args...)
tempf, err := ioutil.TempFile("", "aptly-gpg-status")
tempf, err := os.CreateTemp("", "aptly-gpg-status")
if err != nil {
return nil, err
}
@@ -278,7 +277,7 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
func (g *GpgVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, showKeyTip bool) error {
args := g.argsKeyrings()
sigf, err := ioutil.TempFile("", "aptly-gpg")
sigf, err := os.CreateTemp("", "aptly-gpg")
if err != nil {
return err
}
@@ -290,7 +289,7 @@ func (g *GpgVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, sh
return err
}
clearf, err := ioutil.TempFile("", "aptly-gpg")
clearf, err := os.CreateTemp("", "aptly-gpg")
if err != nil {
return err
}
@@ -323,7 +322,7 @@ func (g *GpgVerifier) IsClearSigned(clearsigned io.Reader) (bool, error) {
func (g *GpgVerifier) VerifyClearsigned(clearsigned io.Reader, showKeyTip bool) (*KeyInfo, error) {
args := g.argsKeyrings()
clearf, err := ioutil.TempFile("", "aptly-gpg")
clearf, err := os.CreateTemp("", "aptly-gpg")
if err != nil {
return nil, err
}
@@ -341,7 +340,7 @@ func (g *GpgVerifier) VerifyClearsigned(clearsigned io.Reader, showKeyTip bool)
// ExtractClearsigned extracts cleartext from clearsigned file WITHOUT signature verification
func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, err error) {
clearf, err := ioutil.TempFile("", "aptly-gpg")
clearf, err := os.CreateTemp("", "aptly-gpg")
if err != nil {
return
}
@@ -353,7 +352,7 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
return
}
text, err = ioutil.TempFile("", "aptly-gpg")
text, err = os.CreateTemp("", "aptly-gpg")
if err != nil {
return
}
pgp/internal.go
+5 -6
View File
@@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"sort"
@@ -83,7 +82,7 @@ func (g *GoSigner) Init() error {
}
defer passF.Close()
contents, err := ioutil.ReadAll(passF)
contents, err := io.ReadAll(passF)
if err != nil {
return errors.Wrap(err, "error reading passphrase file")
}
@@ -400,7 +399,7 @@ func (g *GoVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, sho
// IsClearSigned returns true if file contains signature
func (g *GoVerifier) IsClearSigned(clearsigned io.Reader) (bool, error) {
signedBuffer, err := ioutil.ReadAll(clearsigned)
signedBuffer, err := io.ReadAll(clearsigned)
if err != nil {
return false, errors.Wrap(err, "failed to read clearsigned data")
}
@@ -412,7 +411,7 @@ func (g *GoVerifier) IsClearSigned(clearsigned io.Reader) (bool, error) {
// VerifyClearsigned verifies clearsigned file using gpgv
func (g *GoVerifier) VerifyClearsigned(clearsigned io.Reader, showKeyTip bool) (*KeyInfo, error) {
signedBuffer, err := ioutil.ReadAll(clearsigned)
signedBuffer, err := io.ReadAll(clearsigned)
if err != nil {
return nil, errors.Wrap(err, "failed to read clearsigned data")
}
@@ -451,7 +450,7 @@ func (g *GoVerifier) VerifyClearsigned(clearsigned io.Reader, showKeyTip bool) (
// ExtractClearsigned extracts cleartext from clearsigned file WITHOUT signature verification
func (g *GoVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, err error) {
var signedBuffer []byte
signedBuffer, err = ioutil.ReadAll(clearsigned)
signedBuffer, err = io.ReadAll(clearsigned)
if err != nil {
return nil, errors.Wrap(err, "failed to read clearsigned data")
}
@@ -461,7 +460,7 @@ func (g *GoVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, e
return nil, errors.New("no clearsigned data found")
}
text, err = ioutil.TempFile("", "aptly-gpg")
text, err = os.CreateTemp("", "aptly-gpg")
if err != nil {
return
}