fix: use golangci-lint in favour of go-critic

.ci/scripts/install-dependencies.sh

@@ -10,10 +10,9 @@ set -euxo pipefail
 #
 
 # Install some other dependencies required for the pre-commit
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.34.1
+
 go get -v golang.org/x/lint/golint
-go get -v github.com/go-lintpack/lintpack/...
-go get -v github.com/go-critic/go-critic/...
-lintpack build -o bin/gocritic -linter.version='v0.3.4' -linter.name='gocritic' github.com/go-critic/go-critic/checkers
 
 # Install project dependencies
 make -C cli install

.pre-commit-config.yaml

@@ -21,9 +21,9 @@ repos:
     hooks:
     -   id: go-fmt
     -   id: go-lint
-    -   id: validate-toml
+    -   id: go-vet
     -   id: no-go-testing
-    -   id: go-critic
+    -   id: golangci-lint
 
 -   repo: git@github.com:elastic/apm-pipeline-library
     rev: current

cli/internal/state.go

@@ -90,17 +90,13 @@ func Update(id string, workdir string, composeFilePaths []string, env map[string
 		}
 	}
 
-	args := []string{}
 	for i, f := range composeFilePaths {
-		args = append(args, "-f", f)
-
 		if i > 0 {
 			run.Services = append(run.Services, stateService{
 				Name: filepath.Base(filepath.Dir(f)),
 			})
 		}
 	}
-	args = append(args, "config")
 
 	bytes, err := yaml.Marshal(&run)
 	if err != nil {

e2e/utils.go

@@ -28,8 +28,7 @@ import (
 const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
 //nolint:unused
-var seededRand *rand.Rand = rand.New(
-	rand.NewSource(time.Now().UnixNano()))
+var seededRand = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 // GetExponentialBackOff returns a preconfigured exponential backoff instance
 func GetExponentialBackOff(elapsedTime time.Duration) *backoff.ExponentialBackOff {