chore: remove gotestsum to reduce the number of transitive dependenci…

…es (#1303) * chore: remove gotestsum to reduce the number of transitive dependencies * chore: do not store jUnit test reports on the GH action * fix: wrong copy paste * Revert "chore: do not store jUnit test reports on the GH action" This reverts commit 82d8be8. * chore: install gotestsum at CI time, only * chore: mod tidy compose
testcontainers · Jun 23, 2023 · f5a4a54 · f5a4a54
1 parent c0e1c32
commit f5a4a54
Show file tree

Hide file tree

Showing 105 changed files with 120 additions and 1,566 deletions.
diff --git a/.github/workflows/bigtable-example.yml b/.github/workflows/bigtable-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/bigtable
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/bigtable
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/ci-reaper-off.yml b/.github/workflows/ci-reaper-off.yml
@@ -35,12 +35,14 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: gotestsum
+      - name: go test
         # only run tests on linux, there are a number of things that won't allow the tests to run on anything else
         # many (maybe, all?) images used can only be build on Linux, they don't have Windows in their manifest, and
         # we can't put Windows Server in "Linux Mode" in Github actions
         # another, host mode is only available on Linux, and we have tests around that, do we skip them?
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/ci-rootless-docker.yml b/.github/workflows/ci-rootless-docker.yml
@@ -53,13 +53,15 @@ jobs:
           GOOS: linux
         run: go build
 
-      - name: gotestsum
+      - name: go test
         # only run tests on linux, there are a number of things that won't allow the tests to run on anything else
         # many (maybe, all?) images used can only be build on Linux, they don't have Windows in their manifest, and
         # we can't put Windows Server in "Linux Mode" in Github actions
         # another, host mode is only available on Linux, and we have tests around that, do we skip them?
         if: ${{ matrix.platform == 'ubuntu-latest' }}
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,13 +47,15 @@ jobs:
           GOOS: linux
         run: go build
 
-      - name: gotestsum
+      - name: go test
         # only run tests on linux, there are a number of things that won't allow the tests to run on anything else
         # many (maybe, all?) images used can only be build on Linux, they don't have Windows in their manifest, and
         # we can't put Windows Server in "Linux Mode" in Github actions
         # another, host mode is only available on Linux, and we have tests around that, do we skip them?
         if: ${{ matrix.platform == 'ubuntu-latest' }}
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run module generator tests
         if: ${{ matrix.platform == 'ubuntu-latest' }}

diff --git a/.github/workflows/cockroachdb-example.yml b/.github/workflows/cockroachdb-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/cockroachdb
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/cockroachdb
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/consul-example.yml b/.github/workflows/consul-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/consul
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/consul
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/datastore-example.yml b/.github/workflows/datastore-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/datastore
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/datastore
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/firestore-example.yml b/.github/workflows/firestore-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/firestore
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/firestore
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-compose.yml b/.github/workflows/module-compose.yml
@@ -37,14 +37,11 @@ jobs:
         working-directory: ./modules/compose
         run: go mod tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/compose
         run: |
-          go run gotest.tools/gotestsum \
-            --format short-verbose \
-            --rerun-fails=5 \
-            --packages="./..." \
-            --junitfile TEST-compose.xml
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-couchbase.yml b/.github/workflows/module-couchbase.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/couchbase
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/couchbase
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-k3s.yml b/.github/workflows/module-k3s.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/k3s
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/k3s
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-localstack.yml b/.github/workflows/module-localstack.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/localstack
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/localstack
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-mysql.yml b/.github/workflows/module-mysql.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/mysql
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/mysql
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-neo4j.yml b/.github/workflows/module-neo4j.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/neo4j
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/neo4j
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-postgres.yml b/.github/workflows/module-postgres.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/postgres
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/postgres
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-pulsar.yml b/.github/workflows/module-pulsar.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/pulsar
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/pulsar
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-redis.yml b/.github/workflows/module-redis.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/redis
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/redis
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-redpanda.yml b/.github/workflows/module-redpanda.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/redpanda
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/redpanda
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/module-vault.yml b/.github/workflows/module-vault.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./modules/vault
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./modules/vault
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/mongodb-example.yml b/.github/workflows/mongodb-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/mongodb
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/mongodb
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/nats-example.yml b/.github/workflows/nats-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/nats
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/nats
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/nginx-example.yml b/.github/workflows/nginx-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/nginx
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/nginx
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/pubsub-example.yml b/.github/workflows/pubsub-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/pubsub
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/pubsub
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/spanner-example.yml b/.github/workflows/spanner-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/spanner
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/spanner
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/.github/workflows/toxiproxy-example.yml b/.github/workflows/toxiproxy-example.yml
@@ -41,9 +41,11 @@ jobs:
         working-directory: ./examples/toxiproxy
         run: make tools-tidy
 
-      - name: gotestsum
+      - name: go test
         working-directory: ./examples/toxiproxy
-        run: make test-unit
+        run: |
+          go install gotest.tools/gotestsum@latest
+          make test-unit
 
       - name: Run checker
         run: |

diff --git a/commons-test.mk b/commons-test.mk
@@ -6,7 +6,7 @@ dependencies-scan:
 .PHONY: test-%
 test-%:
 	@echo "Running $* tests..."
-	go run gotest.tools/gotestsum \
+	gotestsum \
 		--format short-verbose \
 		--rerun-fails=5 \
 		--packages="./..." \

diff --git a/docs/modules/index.md b/docs/modules/index.md
@@ -12,7 +12,6 @@ We have provided a command line tool to generate the scaffolding for the code of
     - a Go file for the creation of the container, using a dedicated struct in which the image flag is set as Docker image.
     - a Go test file for running a simple test for your container, consuming the above struct.
     - a Makefile to run the tests in a consistent manner
-    - a tools.go file including the build tools (i.e. `gotestsum`) used to build/run the example.
 - a markdown file in the docs/modules directory including the snippets for both the creation of the container and a simple test. By default, this generated file will contain all the documentation for the module, including:
     - the version of _Testcontainers for Go_ in which the module was added.
     - a short introduction to the module.