chore: simplify jUnit format generation with gotestsum (#549) | fix: …

…use golangci-lint in favour of go-critic (#550) backport for 7.x (#553)

* chore: simplify jUnit format generation with gotestsum (#549)

* fix: use golangci-lint in favour of go-critic (#550)

* fix: remove var type as per golint's suggestion

* chore: add golangci-lint precommit hook

* chore: remove go-critic in fafvour of golangci-lint

* chore: remove TOML hook

* chore: add go-vet hook

* fix: remove unused variable

Detected by golangci-lint

* fix: remove unused Go file, which caused lint errors

.ci/scripts/build-test.sh

@@ -10,10 +10,9 @@ set -euxo pipefail
 #
 
 # Prepare junit build context
-mkdir -p outputs
-export OUT_FILE="outputs/test-report.out"
+mkdir -p $(pwd)/outputs
 
-make -C cli install test | tee ${OUT_FILE}
+go get -v -u gotest.tools/gotestsum
 
-go get -v -u github.com/jstemmer/go-junit-report
-go-junit-report > outputs/TEST-unit.xml < ${OUT_FILE}
+# See https://pkg.go.dev/gotest.tools/gotestsum/#readme-junit-xml-output
+GOTESTSUM_JUNITFILE="$(pwd)/outputs/TEST-unit.xml" make -C cli install test

.ci/scripts/install-dependencies.sh

@@ -10,10 +10,9 @@ set -euxo pipefail
 #
 
 # Install some other dependencies required for the pre-commit
+curl -sSfL https://github.com/raw/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/Makefile

@@ -37,4 +37,4 @@ notice:
 
 .PHONY: test
 test:
-	go test -v -timeout=$(TEST_TIMEOUT) ./...
+	gotestsum --format testname -- -count=1 -timeout=$(TEST_TIMEOUT) ./...

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 {