reactivated gci and thelper

.golangci.yml

@@ -10,12 +10,10 @@ linters:
     - cyclop
     - exhaustivestruct
     - funlen
-    - gci
     - gofumpt
     - interfacer
     - lll
     - maligned
     - scopelint
     - testpackage
-    - thelper
     - wrapcheck

internal/client/assets.go

@@ -20,8 +20,9 @@ along with Cider.  If not, see <http://www.gnu.org/licenses/>.
 
 package client
 
+// nolint: gosec
 import (
-	"crypto/md5" // #nosec
+	"crypto/md5"
 	"fmt"
 	"io"
 	"os"

internal/client/util_test.go

@@ -160,6 +160,8 @@ func (t *mockTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 }
 
 func newTestAsset(t *testing.T, name string) *testAsset {
+	t.Helper()
+
 	var path = filepath.Join(t.TempDir(), name)
 
 	err := os.WriteFile(path, []byte("TEST"), 0600)

internal/git/git_test.go

@@ -31,12 +31,16 @@ import (
 )
 
 func newMockGit(t *testing.T, commands ...shelltest.Command) *Git {
+	t.Helper()
+
 	ctx := context.New(config.Project{})
 
-	return newMockGitWithContext(ctx, t, commands...)
+	return newMockGitWithContext(t, ctx, commands...)
 }
 
-func newMockGitWithContext(ctx *context.Context, t *testing.T, commands ...shelltest.Command) *Git {
+func newMockGitWithContext(t *testing.T, ctx *context.Context, commands ...shelltest.Command) *Git {
+	t.Helper()
+
 	return &Git{
 		Shell: &shelltest.Shell{
 			T:        t,
@@ -67,8 +71,8 @@ func TestSanitizeProcess(t *testing.T) {
 	ctx := context.New(config.Project{})
 	ctx.CurrentDirectory = "test"
 	client := newMockGitWithContext(
-		ctx,
 		t,
+		ctx,
 		shelltest.Command{Stdout: "true", Stderr: "false"},
 		shelltest.Command{ReturnCode: 1, Stdout: "true", Stderr: "false"},
 	)