yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Update golangci-lint to v1.50.0

Browse Source
This commit is contained in:
Leander Beernaert
2022-10-17 11:02:56 +02:00
parent e0603f741f
commit 9d800324af
70 changed files with 247 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/versioner/version.go
View File

@ -21,7 +21,6 @@ import (
"bytes"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -65,12 +64,12 @@ func (v *Version) SemVer() *semver.Version {
// VerifyFiles verifies all files in the version directory.
func (v *Version) VerifyFiles(kr *crypto.KeyRing) error {
fileBytes, err := ioutil.ReadFile(filepath.Join(v.path, sumFile)) //nolint:gosec
fileBytes, err := os.ReadFile(filepath.Join(v.path, sumFile)) //nolint:gosec
if err != nil {
return err
}
sigBytes, err := ioutil.ReadFile(filepath.Join(v.path, sumFile+".sig")) //nolint:gosec
sigBytes, err := os.ReadFile(filepath.Join(v.path, sumFile+".sig")) //nolint:gosec
if err != nil {
return err
}

11
internal/versioner/version_test.go
View File

@ -19,7 +19,6 @@ package versioner
import (
"crypto/rand"
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -33,7 +32,7 @@ import (
)
func TestVerifyFiles(t *testing.T) {
tempDir, err := ioutil.TempDir("", "verify-test")
tempDir, err := os.MkdirTemp("", "verify-test")
require.NoError(t, err)
version := &Version{
@ -53,7 +52,7 @@ func TestVerifyFiles(t *testing.T) {
}
func TestVerifyWithBadFile(t *testing.T) {
tempDir, err := ioutil.TempDir("", "verify-test")
tempDir, err := os.MkdirTemp("", "verify-test")
require.NoError(t, err)
version := &Version{
@ -76,7 +75,7 @@ func TestVerifyWithBadFile(t *testing.T) {
}
func TestVerifyWithBadSubFile(t *testing.T) {
tempDir, err := ioutil.TempDir("", "verify-test")
tempDir, err := os.MkdirTemp("", "verify-test")
require.NoError(t, err)
version := &Version{
@ -136,10 +135,10 @@ func makeFile(t *testing.T, path string) {
}
func signFile(t *testing.T, path string, kr *crypto.KeyRing) {
file, err := ioutil.ReadFile(path)
file, err := os.ReadFile(path)
require.NoError(t, err)
sig, err := kr.SignDetached(crypto.NewPlainMessage(file))
require.NoError(t, err)
require.NoError(t, ioutil.WriteFile(path+".sig", sig.GetBinary(), 0o700))
require.NoError(t, os.WriteFile(path+".sig", sig.GetBinary(), 0o700))
}

4
internal/versioner/versioner.go
View File

@ -19,7 +19,7 @@ package versioner
import (
"errors"
"io/ioutil"
"os"
"path/filepath"
"sort"
@ -43,7 +43,7 @@ func New(root string) *Versioner {
// ListVersions returns a collection of all available version numbers, sorted from newest to oldest.
func (v *Versioner) ListVersions() (Versions, error) {
dirs, err := ioutil.ReadDir(v.root)
dirs, err := os.ReadDir(v.root)
if err != nil {
return nil, err
}

4
internal/versioner/versioner_remove_test.go
View File

@ -21,7 +21,7 @@
package versioner
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -33,7 +33,7 @@ import (
// RemoveOldVersions is a noop on darwin; we don't test it there.
func TestRemoveOldVersions(t *testing.T) {
updates, err := ioutil.TempDir(t.TempDir(), "updates")
updates, err := os.MkdirTemp(t.TempDir(), "updates")
require.NoError(t, err)
v := newTestVersioner(t, "myCoolApp", updates, "2.3.4-beta", "2.3.4", "2.3.5", "2.4.0")

3
internal/versioner/versioner_test.go
View File

@ -18,7 +18,6 @@
package versioner
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -29,7 +28,7 @@ import (
)
func TestListVersions(t *testing.T) {
updates, err := ioutil.TempDir("", "updates")
updates, err := os.MkdirTemp("", "updates")
require.NoError(t, err)
v := newTestVersioner(t, "myCoolApp", updates, "2.3.4-beta", "2.3.4", "2.3.5", "2.4.0")