Skip to content

Commit 6dcebf2

Browse files
committed
Merge branch 'main' into db/dolt
* main: (115 commits) chore: create TLS certs in a consistent manner (testcontainers#2478) chore(deps): bump idna from 3.6 to 3.7 (testcontainers#2480) Elasticsearch disable CA retrieval when ssl is disabled (testcontainers#2475) fix: handle dockerignore exclusions properly (testcontainers#2476) chore: prepare for next minor development cycle (0.31.0) chore: use new version (v0.30.0) in modules and examples Fix url creation to handle query params when using HTTP wait strategy (testcontainers#2466) fix: data race on container run (testcontainers#2345) fix: logging deadlock (testcontainers#2346) feat(k6):Add remote test scripts (testcontainers#2350) feat: optimizes file copies to and from containers (testcontainers#2450) fix(exec): updates the `Multiplexed` opt to combine stdout and stderr (testcontainers#2452) Upgrade neo4j module to use features from v0.29.1 of testcontainers-go (testcontainers#2463) bug:Fix AMQPS url (testcontainers#2462) chore: more compose updates in comments chore: use "docker compose" (v2) instead of "docker-compose" (v1) (testcontainers#2464) chore(deps): bump github/codeql-action from 2.22.12 to 3.24.9 (testcontainers#2459) refactor: Add Weaviate modules tests (testcontainers#2447) feat(exitcode): Add exit code sugar method (testcontainers#2342) feat: add module to support InfluxDB v1.x (testcontainers#1703) ...
2 parents 09c4f55 + 0a268b3 commit 6dcebf2

File tree

353 files changed

+15031
-4241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+15031
-4241
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/go
33
{
44
"name": "Go",
5-
"image": "mcr.microsoft.com/devcontainers/go:0-1.20-bullseye",
5+
"image": "mcr.microsoft.com/devcontainers/go:0-1.21-bullseye",
66

77
// Features to add to the dev container. More info: https://containers.dev/features.
88
// "features": {},

.github/dependabot.yml

-238
Original file line numberDiff line numberDiff line change
@@ -9,248 +9,10 @@ updates:
99
day: sunday
1010
open-pull-requests-limit: 3
1111
rebase-strategy: disabled
12-
- package-ecosystem: gomod
13-
directory: /
14-
schedule:
15-
interval: monthly
16-
day: sunday
17-
open-pull-requests-limit: 3
18-
rebase-strategy: disabled
1912
- package-ecosystem: pip
2013
directory: /
2114
schedule:
2215
interval: monthly
2316
day: sunday
2417
open-pull-requests-limit: 3
2518
rebase-strategy: disabled
26-
- package-ecosystem: gomod
27-
directory: /examples/consul
28-
schedule:
29-
interval: monthly
30-
day: sunday
31-
open-pull-requests-limit: 3
32-
rebase-strategy: disabled
33-
- package-ecosystem: gomod
34-
directory: /examples/nginx
35-
schedule:
36-
interval: monthly
37-
day: sunday
38-
open-pull-requests-limit: 3
39-
rebase-strategy: disabled
40-
- package-ecosystem: gomod
41-
directory: /examples/toxiproxy
42-
schedule:
43-
interval: monthly
44-
day: sunday
45-
open-pull-requests-limit: 3
46-
rebase-strategy: disabled
47-
- package-ecosystem: gomod
48-
directory: /modulegen
49-
schedule:
50-
interval: monthly
51-
day: sunday
52-
open-pull-requests-limit: 3
53-
rebase-strategy: disabled
54-
- package-ecosystem: gomod
55-
directory: /modules/artemis
56-
schedule:
57-
interval: monthly
58-
day: sunday
59-
open-pull-requests-limit: 3
60-
rebase-strategy: disabled
61-
- package-ecosystem: gomod
62-
directory: /modules/cassandra
63-
schedule:
64-
interval: monthly
65-
day: sunday
66-
open-pull-requests-limit: 3
67-
rebase-strategy: disabled
68-
- package-ecosystem: gomod
69-
directory: /modules/clickhouse
70-
schedule:
71-
interval: monthly
72-
day: sunday
73-
open-pull-requests-limit: 3
74-
rebase-strategy: disabled
75-
- package-ecosystem: gomod
76-
directory: /modules/cockroachdb
77-
schedule:
78-
interval: monthly
79-
day: sunday
80-
open-pull-requests-limit: 3
81-
rebase-strategy: disabled
82-
- package-ecosystem: gomod
83-
directory: /modules/compose
84-
schedule:
85-
interval: monthly
86-
day: sunday
87-
open-pull-requests-limit: 3
88-
rebase-strategy: disabled
89-
- package-ecosystem: gomod
90-
directory: /modules/couchbase
91-
schedule:
92-
interval: monthly
93-
day: sunday
94-
open-pull-requests-limit: 3
95-
rebase-strategy: disabled
96-
- package-ecosystem: gomod
97-
directory: /modules/dolt
98-
schedule:
99-
interval: monthly
100-
day: sunday
101-
open-pull-requests-limit: 3
102-
rebase-strategy: disabled
103-
- package-ecosystem: gomod
104-
directory: /modules/elasticsearch
105-
schedule:
106-
interval: monthly
107-
day: sunday
108-
open-pull-requests-limit: 3
109-
rebase-strategy: disabled
110-
- package-ecosystem: gomod
111-
directory: /modules/gcloud
112-
schedule:
113-
interval: monthly
114-
day: sunday
115-
open-pull-requests-limit: 3
116-
rebase-strategy: disabled
117-
- package-ecosystem: gomod
118-
directory: /modules/inbucket
119-
schedule:
120-
interval: monthly
121-
day: sunday
122-
open-pull-requests-limit: 3
123-
rebase-strategy: disabled
124-
- package-ecosystem: gomod
125-
directory: /modules/k3s
126-
schedule:
127-
interval: monthly
128-
day: sunday
129-
open-pull-requests-limit: 3
130-
rebase-strategy: disabled
131-
- package-ecosystem: gomod
132-
directory: /modules/k6
133-
schedule:
134-
interval: monthly
135-
day: sunday
136-
open-pull-requests-limit: 3
137-
rebase-strategy: disabled
138-
- package-ecosystem: gomod
139-
directory: /modules/kafka
140-
schedule:
141-
interval: monthly
142-
day: sunday
143-
open-pull-requests-limit: 3
144-
rebase-strategy: disabled
145-
- package-ecosystem: gomod
146-
directory: /modules/localstack
147-
schedule:
148-
interval: monthly
149-
day: sunday
150-
open-pull-requests-limit: 3
151-
rebase-strategy: disabled
152-
- package-ecosystem: gomod
153-
directory: /modules/mariadb
154-
schedule:
155-
interval: monthly
156-
day: sunday
157-
open-pull-requests-limit: 3
158-
rebase-strategy: disabled
159-
- package-ecosystem: gomod
160-
directory: /modules/minio
161-
schedule:
162-
interval: monthly
163-
day: sunday
164-
open-pull-requests-limit: 3
165-
rebase-strategy: disabled
166-
- package-ecosystem: gomod
167-
directory: /modules/mockserver
168-
schedule:
169-
interval: monthly
170-
day: sunday
171-
open-pull-requests-limit: 3
172-
rebase-strategy: disabled
173-
- package-ecosystem: gomod
174-
directory: /modules/mongodb
175-
schedule:
176-
interval: monthly
177-
day: sunday
178-
open-pull-requests-limit: 3
179-
rebase-strategy: disabled
180-
- package-ecosystem: gomod
181-
directory: /modules/mssql
182-
schedule:
183-
interval: monthly
184-
day: sunday
185-
open-pull-requests-limit: 3
186-
rebase-strategy: disabled
187-
- package-ecosystem: gomod
188-
directory: /modules/mysql
189-
schedule:
190-
interval: monthly
191-
day: sunday
192-
open-pull-requests-limit: 3
193-
rebase-strategy: disabled
194-
- package-ecosystem: gomod
195-
directory: /modules/nats
196-
schedule:
197-
interval: monthly
198-
day: sunday
199-
open-pull-requests-limit: 3
200-
rebase-strategy: disabled
201-
- package-ecosystem: gomod
202-
directory: /modules/neo4j
203-
schedule:
204-
interval: monthly
205-
day: sunday
206-
open-pull-requests-limit: 3
207-
rebase-strategy: disabled
208-
- package-ecosystem: gomod
209-
directory: /modules/openldap
210-
schedule:
211-
interval: monthly
212-
day: sunday
213-
open-pull-requests-limit: 3
214-
rebase-strategy: disabled
215-
- package-ecosystem: gomod
216-
directory: /modules/postgres
217-
schedule:
218-
interval: monthly
219-
day: sunday
220-
open-pull-requests-limit: 3
221-
rebase-strategy: disabled
222-
- package-ecosystem: gomod
223-
directory: /modules/pulsar
224-
schedule:
225-
interval: monthly
226-
day: sunday
227-
open-pull-requests-limit: 3
228-
rebase-strategy: disabled
229-
- package-ecosystem: gomod
230-
directory: /modules/rabbitmq
231-
schedule:
232-
interval: monthly
233-
day: sunday
234-
open-pull-requests-limit: 3
235-
rebase-strategy: disabled
236-
- package-ecosystem: gomod
237-
directory: /modules/redis
238-
schedule:
239-
interval: monthly
240-
day: sunday
241-
open-pull-requests-limit: 3
242-
rebase-strategy: disabled
243-
- package-ecosystem: gomod
244-
directory: /modules/redpanda
245-
schedule:
246-
interval: monthly
247-
day: sunday
248-
open-pull-requests-limit: 3
249-
rebase-strategy: disabled
250-
- package-ecosystem: gomod
251-
directory: /modules/vault
252-
schedule:
253-
interval: monthly
254-
day: sunday
255-
open-pull-requests-limit: 3
256-
rebase-strategy: disabled

.github/workflows/ci-test-go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
if: ${{ inputs.rootless-docker }}
5656
uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886 # v0.2.2
5757

58-
- name: Remove Docket root socket
58+
- name: Remove Docker root socket
5959
if: ${{ inputs.rootless-docker }}
6060
run: sudo rm -rf /var/run/docker.sock
6161

.github/workflows/ci.yml

+10-25
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ concurrency:
2424

2525
jobs:
2626
test:
27-
# do not run this job if it's a PR from dependabot that is not approved yet
28-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
2927
strategy:
3028
matrix:
31-
go-version: [1.20.x, 1.x]
29+
go-version: [1.21.x, 1.x]
3230
platform: [ubuntu-latest, macos-latest]
3331
uses: ./.github/workflows/ci-test-go.yml
3432
with:
@@ -43,16 +41,14 @@ jobs:
4341
# The job below is a copy of the job above, but with ryuk disabled.
4442
# It's executed in the first stage to avoid concurrency issues.
4543
test-reaper-off:
46-
# do not run this job if it's a PR from dependabot that is not approved yet
47-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
4844
name: "Test with reaper off"
4945
strategy:
5046
matrix:
51-
go-version: [1.20.x, 1.x]
47+
go-version: [1.21.x, 1.x]
5248
uses: ./.github/workflows/ci-test-go.yml
5349
with:
5450
go-version: ${{ matrix.go-version }}
55-
fail-fast: true
51+
fail-fast: false
5652
platform: "ubuntu-latest"
5753
project-directory: "."
5854
rootless-docker: false
@@ -62,29 +58,25 @@ jobs:
6258
# The job below is a copy of the job above, but with Docker rootless.
6359
# It's executed in the first stage to avoid concurrency issues.
6460
test-rootless-docker:
65-
# do not run this job if it's a PR from dependabot that is not approved yet
66-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
6761
name: "Test with Rootless Docker"
6862
strategy:
6963
matrix:
70-
go-version: [1.20.x, 1.x]
64+
go-version: [1.21.x, 1.x]
7165
platform: [ubuntu-latest]
7266
uses: ./.github/workflows/ci-test-go.yml
7367
with:
7468
go-version: ${{ matrix.go-version }}
75-
fail-fast: true
69+
fail-fast: false
7670
platform: "ubuntu-latest"
7771
project-directory: "."
7872
rootless-docker: true
7973
run-tests: true
8074
ryuk-disabled: false
8175

8276
test-module-generator:
83-
# do not run this job if it's a PR from dependabot that is not approved yet
84-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
8577
strategy:
8678
matrix:
87-
go-version: [1.20.x, 1.x]
79+
go-version: [1.21.x, 1.x]
8880
platform: [ubuntu-latest, macos-latest, windows-latest]
8981
uses: ./.github/workflows/ci-test-go.yml
9082
with:
@@ -97,17 +89,12 @@ jobs:
9789
ryuk-disabled: false
9890

9991
test-modules:
100-
# do not run this job if it's a PR from dependabot that is not approved yet
101-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
10292
needs: test
10393
strategy:
10494
matrix:
105-
go-version: [1.20.x, 1.x]
95+
go-version: [1.21.x, 1.x]
10696
platform: [ubuntu-latest]
107-
module: [artemis, cassandra, clickhouse, cockroachdb, compose, couchbase, dolt, elasticsearch, gcloud, inbucket, k3s, k6, kafka, localstack, mariadb, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, openldap, postgres, pulsar, rabbitmq, redis, redpanda, vault]
108-
exclude:
109-
- go-version: 1.20.x
110-
module: compose
97+
module: [artemis, cassandra, chroma, clickhouse, cockroachdb, compose, consul, couchbase, dolt, elasticsearch, gcloud, inbucket, influxdb, k3s, k6, kafka, localstack, mariadb, milvus, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, ollama, openfga, openldap, opensearch, postgres, pulsar, qdrant, rabbitmq, redis, redpanda, registry, surrealdb, vault, weaviate]
11198
uses: ./.github/workflows/ci-test-go.yml
11299
with:
113100
go-version: ${{ matrix.go-version }}
@@ -119,15 +106,13 @@ jobs:
119106
ryuk-disabled: false
120107

121108
test-examples:
122-
# do not run this job if it's a PR from dependabot that is not approved yet
123-
if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.state != 'approved' && github.triggering_actor == 'dependabot[bot]') }}
124109
needs: test-modules
125110
strategy:
126111
matrix:
127-
module: [consul, nginx, toxiproxy]
112+
module: [nginx, toxiproxy]
128113
uses: ./.github/workflows/ci-test-go.yml
129114
with:
130-
go-version: "1.20.x"
115+
go-version: "1.21.x"
131116
fail-fast: true
132117
platform: 'ubuntu-latest'
133118
project-directory: examples/${{ matrix.module }}

.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
# Initializes the CodeQL tools for scanning.
5555
- name: Initialize CodeQL
56-
uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
56+
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
5757
with:
5858
languages: ${{ matrix.language }}
5959
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +67,7 @@ jobs:
6767
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6868
# If this step fails, then you should remove it and run the build manually (see below)
6969
- name: Autobuild
70-
uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
70+
uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
7171

7272
# ℹ️ Command-line programs to run using the OS shell.
7373
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -80,6 +80,6 @@ jobs:
8080
# ./location_of_script_within_repo/buildscript.sh
8181

8282
- name: Perform CodeQL Analysis
83-
uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
83+
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
8484
with:
8585
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)