Skip to content

Commit a45f358

Browse files
authored
chore: upgrade testingcontainers (#1779)
Signed-off-by: Miguel Martinez <[email protected]>
1 parent 2b912ab commit a45f358

File tree

6 files changed

+72
-80
lines changed

6 files changed

+72
-80
lines changed

app/controlplane/pkg/biz/testhelpers/database.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,7 @@ func NewPolicyProviderConfig(in *conf.Bootstrap) []*policies.NewRegistryConfig {
233233
}
234234

235235
func (db *TestDatabase) Close(t *testing.T) {
236-
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
237-
defer cancel()
238-
require.NoError(t, db.instance.Terminate(ctx))
236+
testcontainers.CleanupContainer(t, db.instance, testcontainers.StopTimeout(time.Minute))
239237
}
240238

241239
// We use an env variable because testing flags will require us to add them to each testing package

go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/spf13/pflag v1.0.5
4949
github.com/spf13/viper v1.19.0
5050
github.com/stretchr/testify v1.10.0
51-
github.com/testcontainers/testcontainers-go v0.32.0
51+
github.com/testcontainers/testcontainers-go v0.35.0
5252
go.uber.org/automaxprocs v1.5.3
5353
go.uber.org/zap v1.27.0
5454
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
@@ -100,14 +100,13 @@ require (
100100
cloud.google.com/go/kms v1.19.0 // indirect
101101
cloud.google.com/go/longrunning v0.6.0 // indirect
102102
cloud.google.com/go/pubsub v1.42.0 // indirect
103-
dario.cat/mergo v1.0.0 // indirect
103+
dario.cat/mergo v1.0.1 // indirect
104104
filippo.io/edwards25519 v1.1.0 // indirect
105105
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
106106
github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
107107
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect
108108
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 // indirect
109109
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
110-
github.com/Microsoft/hcsshim v0.11.7 // indirect
111110
github.com/OneOfOne/xxhash v1.2.8 // indirect
112111
github.com/agnivade/levenshtein v1.1.1 // indirect
113112
github.com/anchore/go-struct-converter v0.0.0-20230627203149-c72ef8859ca9 // indirect
@@ -121,7 +120,7 @@ require (
121120
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
122121
github.com/containerd/log v0.1.0 // indirect
123122
github.com/containerd/platforms v0.2.1 // indirect
124-
github.com/cpuguy83/dockercfg v0.3.1 // indirect
123+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
125124
github.com/creack/pty v1.1.21 // indirect
126125
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
127126
github.com/distribution/reference v0.6.0 // indirect
@@ -133,7 +132,7 @@ require (
133132
github.com/go-git/go-billy/v5 v5.6.1 // indirect
134133
github.com/go-ini/ini v1.67.0 // indirect
135134
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
136-
github.com/go-ole/go-ole v1.2.6 // indirect
135+
github.com/go-ole/go-ole v1.3.0 // indirect
137136
github.com/go-playground/assert/v2 v2.2.0 // indirect
138137
github.com/go-sql-driver/mysql v1.8.1 // indirect
139138
github.com/goadesign/goa v2.2.5+incompatible // indirect
@@ -155,7 +154,7 @@ require (
155154
github.com/kevinburke/ssh_config v1.2.0 // indirect
156155
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
157156
github.com/kylelemons/godebug v1.1.0 // indirect
158-
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
157+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
159158
github.com/minio/md5-simd v1.1.2 // indirect
160159
github.com/minio/sha256-simd v1.0.1 // indirect
161160
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -172,33 +171,34 @@ require (
172171
github.com/pjbgf/sha1cd v0.3.0 // indirect
173172
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
174173
github.com/pkg/xattr v0.4.9 // indirect
175-
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
174+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
176175
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
177176
github.com/rs/xid v1.5.0 // indirect
178177
github.com/sagikazarmark/locafero v0.4.0 // indirect
179178
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
180179
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
181-
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
180+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
182181
github.com/shoenig/go-m1cpu v0.1.6 // indirect
183182
github.com/shoenig/test v0.6.6 // indirect
184183
github.com/skeema/knownhosts v1.3.0 // indirect
185184
github.com/sourcegraph/conc v0.3.0 // indirect
186185
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
187186
github.com/stoewer/go-strcase v1.3.0 // indirect
188187
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
189-
github.com/tklauser/go-sysconf v0.3.12 // indirect
190-
github.com/tklauser/numcpus v0.6.1 // indirect
188+
github.com/tklauser/go-sysconf v0.3.14 // indirect
189+
github.com/tklauser/numcpus v0.9.0 // indirect
191190
github.com/xanzy/ssh-agent v0.3.3 // indirect
192191
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
193192
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
194193
github.com/yashtewari/glob-intersection v0.2.0 // indirect
195-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
194+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
196195
gitlab.com/gitlab-org/security-products/analyzers/common/v3 v3.2.1 // indirect
197196
gitlab.com/gitlab-org/security-products/analyzers/ruleset/v3 v3.0.0 // indirect
197+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
198198
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
199-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
199+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
200200
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
201-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
201+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
202202
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
203203
go.step.sm/crypto v0.51.2 // indirect
204204
goa.design/goa v2.2.5+incompatible // indirect
@@ -211,7 +211,7 @@ require (
211211
cloud.google.com/go/compute/metadata v0.5.0 // indirect
212212
cloud.google.com/go/iam v1.2.0 // indirect
213213
github.com/Azure/azure-sdk-for-go/sdk/keyvault/azsecrets v0.12.0
214-
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
214+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
215215
github.com/IguteChung/casbin-psql-watcher v1.0.0
216216
github.com/Microsoft/go-winio v0.6.2 // indirect
217217
github.com/ProtonMail/go-crypto v1.1.3 // indirect
@@ -231,15 +231,14 @@ require (
231231
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
232232
github.com/cespare/xxhash/v2 v2.3.0 // indirect
233233
github.com/cloudflare/circl v1.3.7 // indirect
234-
github.com/containerd/containerd v1.7.21 // indirect
235234
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
236235
github.com/cyberphone/json-canonicalization v0.0.0-20231011164504-785e29786b46 // indirect
237236
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
238237
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
239238
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
240239
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
241240
github.com/docker/cli v27.1.1+incompatible // indirect
242-
github.com/docker/docker v27.1.1+incompatible // indirect
241+
github.com/docker/docker v27.5.1+incompatible // indirect
243242
github.com/docker/docker-credential-helpers v0.8.0 // indirect
244243
github.com/docker/go-units v0.5.0 // indirect
245244
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -293,9 +292,9 @@ require (
293292
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
294293
github.com/josharian/intern v1.0.0 // indirect
295294
github.com/json-iterator/go v1.1.12 // indirect
296-
github.com/klauspost/compress v1.17.9 // indirect
295+
github.com/klauspost/compress v1.17.11 // indirect
297296
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect
298-
github.com/magiconair/properties v1.8.7 // indirect
297+
github.com/magiconair/properties v1.8.9 // indirect
299298
github.com/mailru/easyjson v0.7.7 // indirect
300299
github.com/mattn/go-colorable v0.1.13 // indirect
301300
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -306,8 +305,8 @@ require (
306305
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
307306
github.com/mitchellh/mapstructure v1.5.0 // indirect
308307
github.com/moby/patternmatcher v0.6.0 // indirect
309-
github.com/moby/sys/sequential v0.5.0 // indirect
310-
github.com/moby/term v0.5.0 // indirect
308+
github.com/moby/sys/sequential v0.6.0 // indirect
309+
github.com/moby/term v0.5.2 // indirect
311310
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
312311
github.com/modern-go/reflect2 v1.0.2 // indirect
313312
github.com/morikuni/aec v1.0.0 // indirect
@@ -344,8 +343,8 @@ require (
344343
github.com/zclconf/go-cty v1.15.0 // indirect
345344
go.mongodb.org/mongo-driver v1.14.0 // indirect
346345
go.opencensus.io v0.24.0 // indirect
347-
go.opentelemetry.io/otel v1.29.0 // indirect
348-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
346+
go.opentelemetry.io/otel v1.34.0 // indirect
347+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
349348
go.uber.org/multierr v1.11.0 // indirect
350349
golang.org/x/crypto v0.32.0
351350
golang.org/x/mod v0.22.0 // indirect

0 commit comments

Comments
 (0)