From 9f12416c3b1948dd44e999b17792e5a3d7385160 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:28:45 +0200
Subject: [PATCH] chore(deps): bump github.com/testcontainers/testcontainers-go
 from 0.33.0 to 0.34.0 (#11812)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[github.com/testcontainers/testcontainers-go](https://github.com/testcontainers/testcontainers-go)
from 0.33.0 to 0.34.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/testcontainers/testcontainers-go/releases">github.com/testcontainers/testcontainers-go's
releases</a>.</em></p>
<blockquote>
<h2>v0.34.0</h2>
<h1>What's Changed</h1>
<h2>🚀 Features</h2>
<ul>
<li>feat: add meilisearch-module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2835">#2835</a>)
<a href="https://github.com/mashail"><code>@​mashail</code></a></li>
<li>feat: add yugabytedb module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2825">#2825</a>)
<a href="https://github.com/henripqt"><code>@​henripqt</code></a></li>
<li>feat: add etcd module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2788">#2788</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
<li>feat: add dynamodb-local module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2799">#2799</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
<li>feat: support databend module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2779">#2779</a>)
<a href="https://github.com/hantmac"><code>@​hantmac</code></a></li>
<li>feat(mongodb): Wait for mongodb module with a replicaset to finish
(<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2777">#2777</a>)
<a href="https://github.com/smgt"><code>@​smgt</code></a></li>
<li>feat: expose functions for resource clean up in tests and examples
(<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2738">#2738</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>feat(wait): for file (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2731">#2731</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>feat(compose): select services via profiles (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2758">#2758</a>)
<a href="https://github.com/ngrash"><code>@​ngrash</code></a></li>
</ul>
<h2>🐛 Bug Fixes</h2>
<ul>
<li>fix(postgres): duplicate snapshot name (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2840">#2840</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix(reaper): refactor to allow retries and fix races (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2728">#2728</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix: update module container struct name and missing imports (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2831">#2831</a>)
<a href="https://github.com/henripqt"><code>@​henripqt</code></a></li>
<li>fix(redpanda): wait for (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2794">#2794</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix(elasticsearch): wait for (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2724">#2724</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix(grafana): update module path (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2797">#2797</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
<li>fix: container logging deadlocks (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2791">#2791</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix: parallel containers clean race (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2790">#2790</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix(registry): wait for (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2793">#2793</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix: handle 127 error code for podman compatibility (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2778">#2778</a>)
<a href="https://github.com/vchandela"><code>@​vchandela</code></a></li>
<li>fix: do not override ImageBuildOptions.Labels when building from a
Dockerfile (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2775">#2775</a>)
<a href="https://github.com/rzajac"><code>@​rzajac</code></a></li>
<li>fix(postgres): Apply default snapshot name if no name specified (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2783">#2783</a>)
<a href="https://github.com/kiview"><code>@​kiview</code></a></li>
<li>fix: docker config error handling when config file does not exist
(<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2772">#2772</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>fix: check if the discovered docker socket responds (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2741">#2741</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
<li>Fix trailing slash on Image Prefix (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2747">#2747</a>)
<a href="https://github.com/driverpt"><code>@​driverpt</code></a></li>
</ul>
<h2>📖 Documentation</h2>
<ul>
<li>docs: document redpanda options (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2789">#2789</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
<li>docs: refine heading badges in README (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2770">#2770</a>)
<a
href="https://github.com/mdelapenya"><code>@​mdelapenya</code></a></li>
</ul>
<h2>🧹 Housekeeping</h2>
<ul>
<li>fix: use <code>Contains</code> or <code>ErrorContains</code> with
testify (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2839">#2839</a>)
<a href="https://github.com/mmorel-35"><code>@​mmorel-35</code></a></li>
<li>golangci-lint: enable thelper linter (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2834">#2834</a>)
<a href="https://github.com/mmorel-35"><code>@​mmorel-35</code></a></li>
<li>chore: update ryuk to 0.10.2 (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2833">#2833</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>chore: replace 'assert' with 'require' (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2827">#2827</a>)
<a href="https://github.com/JoelLau"><code>@​JoelLau</code></a></li>
<li>chore: replace 'assert' with 'require' for critical checks (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2824">#2824</a>)
<a href="https://github.com/JoelLau"><code>@​JoelLau</code></a></li>
<li>feat: add require for critical checks (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2812">#2812</a>)
<a
href="https://github.com/AshutoshKD"><code>@​AshutoshKD</code></a></li>
<li>fix: container timeout test (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2792">#2792</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>chore: golangci-lint 1.61.0 (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2787">#2787</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>ci: add generate for mocks (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2774">#2774</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
<li>chore: avoid using of log.Fatal in main in tests (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2739">#2739</a>)
<a href="https://github.com/stevenh"><code>@​stevenh</code></a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/7d0f970ea5e25911e2f67f5fd4aff969067185a0"><code>7d0f970</code></a>
chore: use new version (v0.34.0) in modules and examples</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/2c66f202c5cf6605cbc4cf32329dc065d9cc4d95"><code>2c66f20</code></a>
feat: add meilisearch-module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2835">#2835</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/235ab07d4c22fb7bf5ed735731d7a1aeb68018d5"><code>235ab07</code></a>
fix(postgres): duplicate snapshot name (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2840">#2840</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/f1632b35b3a241818697aa338d54b61eb3550f39"><code>f1632b3</code></a>
chore: use Contains or ErrorContains checks (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2839">#2839</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/b74984d043f27c31e3611b7d61dfb34e04ef0480"><code>b74984d</code></a>
golangci-lint: enable thelper linter (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2834">#2834</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/5e988ffd21778f56f494cd744a0a288c2c8f3f6d"><code>5e988ff</code></a>
fix(reaper): refactor to allow retries and fix races (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2728">#2728</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/56bb5015d460f67e7c185293a62b2707bd1e2ddb"><code>56bb501</code></a>
chore: update ryuk to 0.10.2 (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2833">#2833</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/27f699b43aa02e1d0bf7fe6efd7631f00e768319"><code>27f699b</code></a>
feat: add yugabytedb module (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2825">#2825</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/00e7002d6cf57519e482796186a1f664dad48c07"><code>00e7002</code></a>
fix: update module container struct name and missing imports (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2831">#2831</a>)</li>
<li><a
href="https://github.com/testcontainers/testcontainers-go/commit/fb6a4ba574ecfebc2a14de987e3fe958f04a14f0"><code>fb6a4ba</code></a>
chore: replace 'assert' with 'require' (<a
href="https://redirect.github.com/testcontainers/testcontainers-go/issues/2827">#2827</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/testcontainers/testcontainers-go/compare/v0.33.0...v0.34.0">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/testcontainers/testcontainers-go&package-manager=go_modules&previous-version=0.33.0&new-version=0.34.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 22 ++++++++++++++++++++++
 go.sum | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/go.mod b/go.mod
index 098e5028e8e8..c6deada0a72e 100644
--- a/go.mod
+++ b/go.mod
@@ -41,6 +41,7 @@ require (
 	github.com/onsi/gomega v1.31.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
+<<<<<<< HEAD
 	github.com/prometheus/client_golang v1.18.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/prometheus/common v0.46.0
@@ -53,6 +54,20 @@ require (
 	github.com/testcontainers/testcontainers-go v0.32.0
 	github.com/tonglil/opentelemetry-go-datadog-propagator v0.1.1
 	github.com/vishvananda/netlink v1.2.1-beta.2
+=======
+	github.com/prometheus/client_golang v1.20.5
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.60.0
+	github.com/sethvargo/go-retry v0.3.0
+	github.com/shopspring/decimal v1.4.0
+	github.com/slok/go-http-metrics v0.13.0
+	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5
+	github.com/spiffe/go-spiffe/v2 v2.4.0
+	github.com/testcontainers/testcontainers-go v0.34.0
+	github.com/tonglil/opentelemetry-go-datadog-propagator v0.1.3
+	github.com/vishvananda/netlink v1.3.0
+>>>>>>> 40097dadf (chore(deps): bump github.com/testcontainers/testcontainers-go from 0.33.0 to 0.34.0 (#11812))
 	github.com/vishvananda/netns v0.0.4
 	go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.47.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0
@@ -109,9 +124,16 @@ require (
 	github.com/containerd/containerd v1.7.18 // indirect
 	github.com/containerd/errdefs v0.1.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
+<<<<<<< HEAD
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+=======
+	github.com/containerd/platforms v0.2.1 // indirect
+	github.com/cpuguy83/dockercfg v0.3.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.1 // indirect
+>>>>>>> 40097dadf (chore(deps): bump github.com/testcontainers/testcontainers-go from 0.33.0 to 0.34.0 (#11812))
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/docker v27.1.1+incompatible // indirect
diff --git a/go.sum b/go.sum
index 93d2384672ae..c4dbdd47cb8b 100644
--- a/go.sum
+++ b/go.sum
@@ -67,12 +67,23 @@ github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5Z
 github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+<<<<<<< HEAD
 github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ=
 github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw=
 github.com/containernetworking/plugins v1.4.0 h1:+w22VPYgk7nQHw7KT92lsRmuToHvb7wwSv9iTbXzzic=
 github.com/containernetworking/plugins v1.4.0/go.mod h1:UYhcOyjefnrQvKvmmyEKsUA+M9Nfn7tqULPpH0Pkcj0=
 github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E=
 github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
+=======
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
+github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=
+github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
+github.com/containernetworking/plugins v1.6.0 h1:lrsUrLF7QODLx6gncHOqk/pnCiC7c6bvDAskV4KUifQ=
+github.com/containernetworking/plugins v1.6.0/go.mod h1:rYLQWMJz/dYuW1XhHdc9xuzdkgbkWEEjwOhUm84+288=
+github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
+github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
+>>>>>>> 40097dadf (chore(deps): bump github.com/testcontainers/testcontainers-go from 0.33.0 to 0.34.0 (#11812))
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
@@ -462,8 +473,13 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+<<<<<<< HEAD
 github.com/testcontainers/testcontainers-go v0.32.0 h1:ug1aK08L3gCHdhknlTTwWjPHPS+/alvLJU/DRxTD/ME=
 github.com/testcontainers/testcontainers-go v0.32.0/go.mod h1:CRHrzHLQhlXUsa5gXjTOfqIEJcrK5+xMDmBr/WMI88E=
+=======
+github.com/testcontainers/testcontainers-go v0.34.0 h1:5fbgF0vIN5u+nD3IWabQwRybuB4GY8G2HHgCkbMzMHo=
+github.com/testcontainers/testcontainers-go v0.34.0/go.mod h1:6P/kMkQe8yqPHfPWNulFGdFHTD8HB2vLq/231xY2iPQ=
+>>>>>>> 40097dadf (chore(deps): bump github.com/testcontainers/testcontainers-go from 0.33.0 to 0.34.0 (#11812))
 github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U=
 github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8=
 github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=