Modify CI to use the new modules

Signed-off-by: Piotr Piotrowski <[email protected]>

.github/workflows/ci.yaml

@@ -30,11 +30,20 @@ jobs:
             - name: Run linters
               shell: bash --noprofile --norc -x -eo pipefail {0}
               run: |
-                $(exit $(go fmt -modfile=go_test.mod  ./... | wc -l))
-                go vet -modfile=go_test.mod ./... 
-                GOFLAGS="-mod=mod -modfile=go_test.mod" staticcheck ./...
+                MODULE_DIRS=(
+                  "."
+                  "test"
+                  "jetstream/test"
+                  "micro/test"
+                )
+                for modDir in "${MODULE_DIRS[@]}"; do
+                  $(exit $(cd "$modDir" && go fmt ./... | wc -l))
+                done
+                $(exit $(go fmt ./... | wc -l))
+                go vet ./... ./test/... ./jetstream/test/... ./micro/test/...
+                staticcheck ./... ./test/... ./jetstream/test/... ./micro/test/...
                 find . -type f -name "*.go" | xargs misspell -error -locale US
-                golangci-lint run --timeout 5m0s ./jetstream/...
+                golangci-lint run --timeout 5m0s ./jetstream/... ./jetstream/test/...
 
     test:
         runs-on: ubuntu-latest
@@ -60,11 +69,14 @@ jobs:
             - name: Test and coverage
               shell: bash --noprofile --norc -x -eo pipefail {0}
               run: |
-                go test -modfile=go_test.mod -v -run=TestNoRace -p=1 ./... --failfast -vet=off
+                go test -v -run=TestNoRace -p=1 ./test/... --failfast -vet=off
                 if [ "${{ matrix.go }}" = "1.23" ]; then
                   ./scripts/cov.sh CI
                 else
-                  go test -modfile=go_test.mod -race -v -p=1 ./... --failfast -vet=off -tags=internal_testing
+                  go test -race -v -p=1 ./... --failfast -vet=off -tags=internal_testing
+                  go test -race -v -p=1 ./test/... --failfast -vet=off
+                  go test -race -v -p=1 ./jetstream/test/... --failfast -vet=off
+                  go test -race -v -p=1 ./micro/test/... --failfast -vet=off
                 fi
 
             - name: Coveralls

CONTRIBUTING.md

@@ -66,15 +66,6 @@ send your question to the [NATS Google Group](https://groups.google.com/forum/#!
 
 ## Testing
 
-You should use `go_test.mod` to manage your testing dependencies. Please use the following command to update your
-dependencies and avoid changing the main `go.mod` in a PR:
-
-```shell
-go mod tidy -modfile=go_test.mod
-```
-
-To the tests you can pass `-modfile=go_test.mod` flag to `go test` or instead you can also set `GOFLAGS="-modfile=go_test.mod"` as an environment variable:
-
-```shell
-go test ./... -modfile=go_test.mod
-```
+All tests utilizing `nats-server` should be placed in the appropriate package's
+`test` directory. This is to ensure that the test dependencies are isolated from
+the main package dependencies as each test package is its own module.

cov/internal.out

@@ -0,0 +1,67 @@
+mode: atomic
+github.com/nats-io/nats.go/internal/parser/parse.go:37.36,38.17 1 12
+github.com/nats-io/nats.go/internal/parser/parse.go:38.17,40.3 1 1
+github.com/nats-io/nats.go/internal/parser/parse.go:43.2,48.24 2 11
+github.com/nats-io/nats.go/internal/parser/parse.go:48.24,49.41 1 60
+github.com/nats-io/nats.go/internal/parser/parse.go:49.41,51.4 1 5
+github.com/nats-io/nats.go/internal/parser/parse.go:52.3,52.37 1 55
+github.com/nats-io/nats.go/internal/parser/parse.go:54.2,54.8 1 6
+github.com/nats-io/nats.go/internal/parser/parse.go:57.58,62.36 4 7
+github.com/nats-io/nats.go/internal/parser/parse.go:62.36,63.24 1 292
+github.com/nats-io/nats.go/internal/parser/parse.go:63.24,66.4 2 51
+github.com/nats-io/nats.go/internal/parser/parse.go:68.2,85.93 3 7
+github.com/nats-io/nats.go/internal/parser/parse.go:85.93,87.3 1 3
+github.com/nats-io/nats.go/internal/parser/parse.go:88.2,88.46 1 4
+github.com/nats-io/nats.go/internal/parser/parse.go:88.46,90.3 1 1
+github.com/nats-io/nats.go/internal/parser/parse.go:93.2,93.32 1 3
+github.com/nats-io/nats.go/internal/parser/parse.go:93.32,99.3 2 1
+github.com/nats-io/nats.go/internal/parser/parse.go:99.8,99.45 1 2
+github.com/nats-io/nats.go/internal/parser/parse.go:99.45,102.3 1 1
+github.com/nats-io/nats.go/internal/parser/parse.go:103.2,103.20 1 3
+github.com/nats-io/nats.go/internal/syncx/map.go:25.43,27.9 2 0
+github.com/nats-io/nats.go/internal/syncx/map.go:27.9,30.3 2 0
+github.com/nats-io/nats.go/internal/syncx/map.go:31.2,31.20 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:34.43,36.2 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:38.35,40.2 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:42.56,43.38 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:43.38,45.3 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:48.59,51.2 2 0
+github.com/nats-io/nats.go/internal/syncx/map.go:53.52,55.9 2 0
+github.com/nats-io/nats.go/internal/syncx/map.go:55.9,58.3 2 0
+github.com/nats-io/nats.go/internal/syncx/map.go:59.2,59.20 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:62.60,64.2 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:66.59,68.2 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:70.52,73.2 2 0
+github.com/nats-io/nats.go/internal/parser/parse.go:37.36,38.17 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:38.17,40.3 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:43.2,48.24 2 0
+github.com/nats-io/nats.go/internal/parser/parse.go:48.24,49.41 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:49.41,51.4 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:52.3,52.37 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:54.2,54.8 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:57.58,62.36 4 0
+github.com/nats-io/nats.go/internal/parser/parse.go:62.36,63.24 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:63.24,66.4 2 0
+github.com/nats-io/nats.go/internal/parser/parse.go:68.2,85.93 3 0
+github.com/nats-io/nats.go/internal/parser/parse.go:85.93,87.3 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:88.2,88.46 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:88.46,90.3 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:93.2,93.32 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:93.32,99.3 2 0
+github.com/nats-io/nats.go/internal/parser/parse.go:99.8,99.45 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:99.45,102.3 1 0
+github.com/nats-io/nats.go/internal/parser/parse.go:103.2,103.20 1 0
+github.com/nats-io/nats.go/internal/syncx/map.go:25.43,27.9 2 8
+github.com/nats-io/nats.go/internal/syncx/map.go:27.9,30.3 2 4
+github.com/nats-io/nats.go/internal/syncx/map.go:31.2,31.20 1 4
+github.com/nats-io/nats.go/internal/syncx/map.go:34.43,36.2 1 9
+github.com/nats-io/nats.go/internal/syncx/map.go:38.35,40.2 1 1
+github.com/nats-io/nats.go/internal/syncx/map.go:42.56,43.38 1 1
+github.com/nats-io/nats.go/internal/syncx/map.go:43.38,45.3 1 2
+github.com/nats-io/nats.go/internal/syncx/map.go:48.59,51.2 2 2
+github.com/nats-io/nats.go/internal/syncx/map.go:53.52,55.9 2 2
+github.com/nats-io/nats.go/internal/syncx/map.go:55.9,58.3 2 1
+github.com/nats-io/nats.go/internal/syncx/map.go:59.2,59.20 1 1
+github.com/nats-io/nats.go/internal/syncx/map.go:62.60,64.2 1 1
+github.com/nats-io/nats.go/internal/syncx/map.go:66.59,68.2 1 1
+github.com/nats-io/nats.go/internal/syncx/map.go:70.52,73.2 2 1

scripts/cov.sh

@@ -1,20 +1,22 @@
 #!/bin/bash -e
 # Run from directory above via ./scripts/cov.sh
 
-rm -rf ./cov
-mkdir cov
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/nats.out . -tags=skip_no_race_tests
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/test.out -coverpkg=github.com/nats-io/nats.go ./test -tags=skip_no_race_tests,internal_testing
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/jetstream.out -coverpkg=github.com/nats-io/nats.go/jetstream ./jetstream/...
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/service.out -coverpkg=github.com/nats-io/nats.go/micro ./micro/...
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/builtin.out -coverpkg=github.com/nats-io/nats.go/encoders/builtin ./test -run EncBuiltin -tags=skip_no_race_tests
-go test -modfile=go_test.mod --failfast -vet=off -v -covermode=atomic -coverprofile=./cov/protobuf.out -coverpkg=github.com/nats-io/nats.go/encoders/protobuf ./test -run EncProto -tags=skip_no_race_tests
-gocovmerge ./cov/*.out > acc.out
-rm -rf ./cov
+MODULE_DIRS=(
+    "."
+    "test"
+    "jetstream/test"
+    "micro/test"
+)
+exitCode=0
 
-# Without argument, launch browser results. We are going to push to coveralls only
-# from ci.yml and after success of the build (and result of pushing will not affect
-# build result).
-if [[ $1 == "" ]]; then
-    go tool cover -html=acc.out
-fi
+for modDir in "${MODULE_DIRS[@]}"; do
+    changed=$(cd "$modDir" && go fmt ./...)
+
+    if [ -n "$changed" ]; then
+    exitCode=1
+    fi
+done
+
+if [ "$exitCode" -eq 1 ]; then
+    exit 1
+fi

test/configs/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM golang:1.22
 WORKDIR /usr/src/nats.go
 COPY . /usr/src/nats.go
-RUN go mod tidy -modfile go_test.mod
-RUN go test -run TestNone -modfile go_test.mod -tags compat ./test/...
+RUN go mod tidy
+RUN go test -run TestNone -tags compat ./test/...
 ENV NATS_URL=localhost:4222
-ENTRYPOINT ["go", "test", "-v", "-modfile", "go_test.mod", "-tags", "compat", "./test/...", "-count", "1", "-parallel", "10", "-run"]
+ENTRYPOINT ["go", "test", "-v", "-tags", "compat", "./test/...", "-count", "1", "-parallel", "10", "-run"]