Merge branch 'master' into dependabot/go_modules/github.com/fatih/col…

…or-1.18.0
bcyran · Dec 1, 2024 · 40cc7f0 · 40cc7f0
2 parents 421ced0 + c9f234d
commit 40cc7f0
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 286 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,8 +14,8 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: stable
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+      - name: Golangci-lint
+        uses: golangci/golangci-lint-action@v6.1.1
 
   test:
     name: Test Suite

diff --git a/bumper/bump_test.go b/bumper/bump_test.go
@@ -1,7 +1,7 @@
 package bumper
 
 import (
-	"fmt"
+	"errors"
 	"os"
 	"strings"
 	"testing"
@@ -119,9 +119,9 @@ func TestBumpAction_FailUpdpkgsums(t *testing.T) {
 	err := os.WriteFile(pkg.PkgbuildPath(), []byte(pkgbuildString("", "")), 0o644)
 	require.Nil(t, err)
 
-	expectedErr := "omg, updpkgsums failed"
+	const expectedErr = "omg, updpkgsums failed"
 	commandRetvals := []testutils.CommandRunnerRetval{
-		{Stdout: []byte{}, Err: fmt.Errorf(expectedErr)}, // retval for updpkgsums
+		{Stdout: []byte{}, Err: errors.New(expectedErr)}, // retval for updpkgsums
 	}
 	fakeCommandRunner, _ := testutils.MakeFakeCommandRunner(&commandRetvals)
 
@@ -139,10 +139,10 @@ func TestBumpAction_FailMakepkg(t *testing.T) {
 	err := os.WriteFile(pkg.PkgbuildPath(), []byte(pkgbuildString("", "")), 0o644)
 	require.Nil(t, err)
 
-	expectedErr := "oh no, poor makepkg error"
+	const expectedErr = "oh no, poor makepkg error"
 	commandRetvals := []testutils.CommandRunnerRetval{
 		{Stdout: []byte{}, Err: nil},                     // retval for updpkgsums
-		{Stdout: []byte{}, Err: fmt.Errorf(expectedErr)}, // retval for makepkg
+		{Stdout: []byte{}, Err: errors.New(expectedErr)}, // retval for makepkg
 	}
 	fakeCommandRunner, _ := testutils.MakeFakeCommandRunner(&commandRetvals)
 

diff --git a/bumper/check_test.go b/bumper/check_test.go
@@ -1,6 +1,7 @@
 package bumper
 
 import (
+	"errors"
 	"fmt"
 	"strings"
 	"testing"
@@ -123,9 +124,9 @@ func TestCheckAction_FailNoProvider(t *testing.T) {
 }
 
 func TestCheckAction_FailProviderFailed(t *testing.T) {
-	expectedErr := "some random error"
+	const expectedErr = "some random error"
 	verProvFactory := func(_url string, _providersConfig config.Value) upstream.VersionProvider {
-		return &fakeVersionProvider{err: fmt.Errorf(expectedErr)}
+		return &fakeVersionProvider{err: errors.New(expectedErr)}
 	}
 	action := NewCheckAction(verProvFactory, emptyCheckConfig)
 	pkg := pack.Package{Srcinfo: &pack.Srcinfo{URL: "foo"}}
@@ -138,11 +139,11 @@ func TestCheckAction_FailProviderFailed(t *testing.T) {
 }
 
 func TestCheckAction_FailChecksMultipleURLs(t *testing.T) {
-	expectedErr := "some random error"
+	const expectedErr = "some random error"
 	checkedURLs := []string{}
 	verProvFactory := func(url string, _providersConfig config.Value) upstream.VersionProvider {
 		checkedURLs = append(checkedURLs, url)
-		return &fakeVersionProvider{err: fmt.Errorf(expectedErr)}
+		return &fakeVersionProvider{err: errors.New(expectedErr)}
 	}
 	action := NewCheckAction(verProvFactory, emptyCheckConfig)
 	pkg := pack.Package{

diff --git a/bumper/make_test.go b/bumper/make_test.go
@@ -1,7 +1,7 @@
 package bumper
 
 import (
-	"fmt"
+	"errors"
 	"testing"
 
 	"github.com/bcyran/bumper/internal/testutils"
@@ -68,9 +68,9 @@ func TestMakeAction_Fail(t *testing.T) {
 	}
 
 	// mock return value for run command
-	expectedErr := "oooh makepkg crashed"
+	const expectedErr = "oooh makepkg crashed"
 	commandRetvals := []testutils.CommandRunnerRetval{
-		{Stdout: []byte{}, Err: fmt.Errorf(expectedErr)},
+		{Stdout: []byte{}, Err: errors.New(expectedErr)},
 	}
 	fakeCommandRunner, commandRuns := testutils.MakeFakeCommandRunner(&commandRetvals)
 

diff --git a/bumper/push_test.go b/bumper/push_test.go
@@ -1,7 +1,7 @@
 package bumper
 
 import (
-	"fmt"
+	"errors"
 	"testing"
 
 	"github.com/bcyran/bumper/internal/testutils"
@@ -100,9 +100,9 @@ func TestPushAction_FailGitError(t *testing.T) {
 	}
 
 	// mock return values for commands
-	expectedErr := "uh oh, git push failed"
+	const expectedErr = "uh oh, git push failed"
 	commandRetvals := []testutils.CommandRunnerRetval{
-		{Stdout: []byte{}, Err: fmt.Errorf(expectedErr)}, // checking branch
+		{Stdout: []byte{}, Err: errors.New(expectedErr)}, // checking branch
 	}
 	fakeCommandRunner, _ := testutils.MakeFakeCommandRunner(&commandRetvals)