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

3
internal/logging/clear.go
View File

@ -18,7 +18,6 @@
package logging
import (
"io/ioutil"
"os"
"path/filepath"
"sort"
@ -27,7 +26,7 @@ import (
)
func clearLogs(logDir string, maxLogs int, maxCrashes int) error {
files, err := ioutil.ReadDir(logDir)
files, err := os.ReadDir(logDir)
if err != nil {
return err
}

16
internal/logging/logging_test.go
View File

@ -18,7 +18,7 @@
package logging
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@ -27,14 +27,14 @@ import (
// TestClearLogs tests that cearLogs removes only bridge old log files keeping last three of them.
func TestClearLogs(t *testing.T) {
dir, err := ioutil.TempDir("", "clear-logs-test")
dir, err := os.MkdirTemp("", "clear-logs-test")
require.NoError(t, err)
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "other.log"), []byte("Hello"), 0o755))
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_10.log"), []byte("Hello"), 0o755))
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v1_11.log"), []byte("Hello"), 0o755))
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_12.log"), []byte("Hello"), 0o755))
require.NoError(t, ioutil.WriteFile(filepath.Join(dir, "v2_13.log"), []byte("Hello"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(dir, "other.log"), []byte("Hello"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(dir, "v1_10.log"), []byte("Hello"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(dir, "v1_11.log"), []byte("Hello"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(dir, "v2_12.log"), []byte("Hello"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(dir, "v2_13.log"), []byte("Hello"), 0o755))
require.NoError(t, clearLogs(dir, 3, 0))
checkFileNames(t, dir, []string{
@ -51,7 +51,7 @@ func checkFileNames(t *testing.T, dir string, expectedFileNames []string) {
}
func getFileNames(t *testing.T, dir string) []string {
files, err := ioutil.ReadDir(dir)
files, err := os.ReadDir(dir)
require.NoError(t, err)
fileNames := []string{}

7
internal/logging/rotator_test.go
View File

@ -20,7 +20,6 @@ package logging
import (
"bytes"
"io"
"io/ioutil"
"os"
"testing"
@ -77,7 +76,7 @@ func TestRotator(t *testing.T) {
}
func BenchmarkRotateRAMFile(b *testing.B) {
dir, err := ioutil.TempDir("", "rotate-benchmark")
dir, err := os.MkdirTemp("", "rotate-benchmark")
require.NoError(b, err)
defer os.RemoveAll(dir) //nolint:errcheck
@ -88,7 +87,7 @@ func BenchmarkRotateDiskFile(b *testing.B) {
cache, err := os.UserCacheDir()
require.NoError(b, err)
dir, err := ioutil.TempDir(cache, "rotate-benchmark")
dir, err := os.MkdirTemp(cache, "rotate-benchmark")
require.NoError(b, err)
defer os.RemoveAll(dir) //nolint:errcheck
@ -113,7 +112,7 @@ func getTestFile(b *testing.B, dir string, length int) func() (io.WriteCloser, e
b.StopTimer()
defer b.StartTimer()
f, err := ioutil.TempFile(dir, "log")
f, err := os.CreateTemp(dir, "log")
if err != nil {
return nil, err
}