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

go1.24: fix lint, unit and system tests

Browse Source 
- development env: base on debian trixie with go1.24
- lint: run with default config
- fix lint errors
- fix unit tests
- fix system test
This commit is contained in:
André Roth
2025-04-12 17:53:48 +02:00
parent ae5379d84a
commit f7057a9517
117 changed files with 803 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgp/gnupg.go
+29 -13
View File
@@ -203,7 +203,9 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
if err != nil {
return nil, err
}
defer tempf.Close()
defer func() {
_ = tempf.Close()
}()
err = os.Remove(tempf.Name())
if err != nil {
@@ -216,7 +218,9 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
if err != nil {
return nil, err
}
defer stderr.Close()
defer func() {
_ = stderr.Close()
}()
err = cmd.Start()
if err != nil {
@@ -232,7 +236,7 @@ func (g *GpgVerifier) runGpgv(args []string, context string, showKeyTip bool) (*
cmderr := cmd.Wait()
tempf.Seek(0, 0)
_, _ = tempf.Seek(0, 0)
statusr := bufio.NewScanner(tempf)
@@ -281,8 +285,10 @@ func (g *GpgVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, sh
if err != nil {
return err
}
defer os.Remove(sigf.Name())
defer sigf.Close()
defer func() {
_ = os.Remove(sigf.Name())
_ = sigf.Close()
}()
_, err = io.Copy(sigf, signature)
if err != nil {
@@ -293,8 +299,10 @@ func (g *GpgVerifier) VerifyDetachedSignature(signature, cleartext io.Reader, sh
if err != nil {
return err
}
defer os.Remove(clearf.Name())
defer clearf.Close()
defer func() {
_ = os.Remove(clearf.Name())
_ = clearf.Close()
}()
_, err = io.Copy(clearf, cleartext)
if err != nil {
@@ -326,8 +334,10 @@ func (g *GpgVerifier) VerifyClearsigned(clearsigned io.Reader, showKeyTip bool)
if err != nil {
return nil, err
}
defer os.Remove(clearf.Name())
defer clearf.Close()
defer func() {
_ = os.Remove(clearf.Name())
_ = clearf.Close()
}()
_, err = io.Copy(clearf, clearsigned)
if err != nil {
@@ -344,8 +354,10 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
if err != nil {
return
}
defer os.Remove(clearf.Name())
defer clearf.Close()
defer func() {
_ = os.Remove(clearf.Name())
_ = clearf.Close()
}()
_, err = io.Copy(clearf, clearsigned)
if err != nil {
@@ -356,7 +368,9 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
if err != nil {
return
}
defer os.Remove(text.Name())
defer func() {
_ = os.Remove(text.Name())
}()
args := []string{"--no-auto-check-trustdb", "--decrypt", "--batch", "--skip-verify", "--output", "-", clearf.Name()}
@@ -365,7 +379,9 @@ func (g *GpgVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File,
if err != nil {
return nil, err
}
defer stdout.Close()
defer func() {
_ = stdout.Close()
}()
err = cmd.Start()
if err != nil {
pgp/gnupg_test.go
+14 -14
View File
@@ -23,8 +23,8 @@ func (s *GnupgSuite) SetUpSuite(c *C) {
// If gpg == gpg1 = pick gpg
func (s *GnupgSuite) TestGPG1(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpg1"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpg1"))
defer func() { _ = os.Setenv("PATH", origPath) }()
signer := NewGpgSigner(GPG1Finder())
c.Assert(signer.gpg, Equals, "gpg")
@@ -33,8 +33,8 @@ func (s *GnupgSuite) TestGPG1(c *C) {
// gpg(2) + gpg1 installed = pick gpg1
func (s *GnupgSuite) TestGPG1Not2(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpg2-and-1"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpg2-and-1"))
defer func() { _ = os.Setenv("PATH", origPath) }()
signer := NewGpgSigner(GPG1Finder())
c.Assert(signer.gpg, Equals, "gpg1")
@@ -43,8 +43,8 @@ func (s *GnupgSuite) TestGPG1Not2(c *C) {
// If gpg == gpg2 and no gpg1 is available = error
func (s *GnupgSuite) TestGPGNothing(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpg2-only"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpg2-only"))
defer func() { _ = os.Setenv("PATH", origPath) }()
c.Assert(func() { NewGpgSigner(GPG1Finder()) }, PanicMatches, `Couldn't find a suitable gpg executable.+`)
}
@@ -52,8 +52,8 @@ func (s *GnupgSuite) TestGPGNothing(c *C) {
// If gpgv == gpgv1 = pick gpgv
func (s *GnupgSuite) TestGPGV1(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpgv1")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpgv1")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { _ = os.Setenv("PATH", origPath) }()
verifier := NewGpgVerifier(GPG1Finder())
c.Assert(verifier.gpgv, Equals, "gpgv")
@@ -62,8 +62,8 @@ func (s *GnupgSuite) TestGPGV1(c *C) {
// gpgv(2) + gpgv1 installed = pick gpgv1
func (s *GnupgSuite) TestGPGV1Not2(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-and-1")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-and-1")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { _ = os.Setenv("PATH", origPath) }()
verifier := NewGpgVerifier(GPG1Finder())
c.Assert(verifier.gpgv, Equals, "gpgv1")
@@ -72,8 +72,8 @@ func (s *GnupgSuite) TestGPGV1Not2(c *C) {
// If gpgv == gpgv2 and no gpgv1 is available = error
func (s *GnupgSuite) TestGPGVNothing(c *C) {
origPath := os.Getenv("PATH")
os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-only")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { os.Setenv("PATH", origPath) }()
_ = os.Setenv("PATH", filepath.Join(s.bins, "gpgv2-only")+":"+filepath.Join(s.bins, "gpg1"))
defer func() { _ = os.Setenv("PATH", origPath) }()
c.Assert(func() { NewGpgVerifier(GPG1Finder()) }, PanicMatches, `Couldn't find a suitable gpg executable.+`)
}
@@ -220,6 +220,6 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) {
func (s *Gnupg2SignerSuite) TearDownTest(c *C) {
s.SignerSuite.TearDownTest(c)
os.Remove("../system/files/aptly2.gpg")
os.Remove("../system/files/aptly2_passphrase.gpg")
_ = os.Remove("../system/files/aptly2.gpg")
_ = os.Remove("../system/files/aptly2_passphrase.gpg")
}
pgp/internal.go
+22 -8
View File
@@ -79,7 +79,9 @@ func (g *GoSigner) Init() error {
if err != nil {
return errors.Wrap(err, "error opening passphrase file")
}
defer passF.Close()
defer func() {
_ = passF.Close()
}()
contents, err := io.ReadAll(passF)
if err != nil {
@@ -224,13 +226,17 @@ func (g *GoSigner) DetachedSign(source string, destination string) error {
if err != nil {
return errors.Wrap(err, "error opening source file")
}
defer message.Close()
defer func() {
_ = message.Close()
}()
signature, err := os.Create(destination)
if err != nil {
return errors.Wrap(err, "error creating signature file")
}
defer signature.Close()
defer func() {
_ = signature.Close()
}()
err = openpgp.ArmoredDetachSign(signature, g.signer, message, g.signerConfig)
if err != nil {
@@ -248,13 +254,17 @@ func (g *GoSigner) ClearSign(source string, destination string) error {
if err != nil {
return errors.Wrap(err, "error opening source file")
}
defer message.Close()
defer func() {
_ = message.Close()
}()
clearsigned, err := os.Create(destination)
if err != nil {
return errors.Wrap(err, "error creating clearsigned file")
}
defer clearsigned.Close()
defer func() {
_ = clearsigned.Close()
}()
stream, err := clearsign.Encode(clearsigned, g.signer.PrivateKey, g.signerConfig)
if err != nil {
@@ -263,7 +273,7 @@ func (g *GoSigner) ClearSign(source string, destination string) error {
_, err = io.Copy(stream, message)
if err != nil {
stream.Close()
_ = stream.Close()
return errors.Wrap(err, "error generating clearsigned signature")
}
@@ -463,7 +473,9 @@ func (g *GoVerifier) ExtractClearsigned(clearsigned io.Reader) (text *os.File, e
if err != nil {
return
}
defer os.Remove(text.Name())
defer func() {
_ = os.Remove(text.Name())
}()
_, err = text.Write(block.Bytes)
if err != nil {
@@ -494,7 +506,9 @@ func loadKeyRing(name string, ignoreMissing bool) (openpgp.EntityList, error) {
return nil, err
}
defer f.Close()
defer func() {
_ = f.Close()
}()
return openpgp.ReadKeyRing(f)
}
pgp/sign_test.go
+7 -6
View File
@@ -3,7 +3,6 @@ package pgp
import (
"crypto/rand"
"io"
"io/ioutil"
"os"
"path"
@@ -57,14 +56,14 @@ func (s *SignerSuite) SetUpTest(c *C) {
_, err = f.Write([]byte("verysecret"))
c.Assert(err, IsNil)
f.Close()
_ = f.Close()
s.signer.SetBatch(true)
}
func (s *SignerSuite) TearDownTest(c *C) {
s.clearF.Close()
s.signedF.Close()
_ = s.clearF.Close()
_ = s.signedF.Close()
}
func (s *SignerSuite) testSignDetached(c *C) {
@@ -137,9 +136,11 @@ func (s *SignerSuite) testClearSign(c *C, expectedKey Key) {
c.Assert(err, IsNil)
extractedF, err := s.verifier.ExtractClearsigned(s.signedF)
c.Assert(err, IsNil)
defer extractedF.Close()
defer func() {
_ = extractedF.Close()
}()
extracted, err := ioutil.ReadAll(extractedF)
extracted, err := io.ReadAll(extractedF)
c.Assert(err, IsNil)
c.Assert(extracted, DeepEquals, s.cleartext)
pgp/verify_test.go
+10 -10
View File
@@ -2,7 +2,7 @@ package pgp
import (
"bytes"
"io/ioutil"
"io"
"os"
. "gopkg.in/check.v1"
@@ -31,8 +31,8 @@ func (s *VerifierSuite) TestVerifyDetached(c *C) {
err = s.verifier.VerifyDetachedSignature(signature, cleartext, false)
c.Assert(err, IsNil)
signature.Close()
cleartext.Close()
_ = signature.Close()
_ = cleartext.Close()
}
}
@@ -50,7 +50,7 @@ func (s *VerifierSuite) TestVerifyClearsigned(c *C) {
c.Check(keyInfo.GoodKeys, DeepEquals, []Key{"04EE7237B7D453EC", "648ACFD622F3D138", "DCC9EFBF77E11517"})
c.Check(keyInfo.MissingKeys, DeepEquals, []Key(nil))
clearsigned.Close()
_ = clearsigned.Close()
}
}
@@ -70,15 +70,15 @@ func (s *VerifierSuite) TestExtractClearsigned(c *C) {
c.Assert(err, IsNil)
c.Check(is, Equals, true)
clearsigned.Seek(0, 0)
_, _ = clearsigned.Seek(0, 0)
extractedF, err := s.verifier.ExtractClearsigned(clearsigned)
c.Assert(err, IsNil)
expected, err := ioutil.ReadAll(cleartext)
expected, err := io.ReadAll(cleartext)
c.Assert(err, IsNil)
extracted, err := ioutil.ReadAll(extractedF)
extracted, err := io.ReadAll(extractedF)
c.Assert(err, IsNil)
// normalize newlines
@@ -87,8 +87,8 @@ func (s *VerifierSuite) TestExtractClearsigned(c *C) {
c.Check(extracted, DeepEquals, expected)
extractedF.Close()
clearsigned.Close()
cleartext.Close()
_ = extractedF.Close()
_ = clearsigned.Close()
_ = cleartext.Close()
}
}