Skip to content

Commit ea6526e

Browse files
authored
integration-tests: Use docker compose directly and introduce a stateful mode (#4240)
* integration-tests: Use docker compose directly and introduce a stateful mode * Remove superficial log line * Switch to 10s wait when not using stateful for consistency
1 parent cae4684 commit ea6526e

File tree

12 files changed

+175
-420
lines changed

12 files changed

+175
-420
lines changed

‎go.mod‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ require (
212212
github.com/spf13/pflag v1.0.7
213213
github.com/stretchr/testify v1.10.0
214214
github.com/testcontainers/testcontainers-go v0.37.0
215-
github.com/testcontainers/testcontainers-go/modules/compose v0.36.0
216215
github.com/tilinna/clock v1.1.0
217216
github.com/uber/jaeger-client-go v2.30.0+incompatible
218217
github.com/vincent-petithory/dataurl v1.0.0
@@ -321,8 +320,6 @@ require (
321320
filippo.io/edwards25519 v1.1.0 // indirect
322321
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
323322
github.com/99designs/keyring v1.2.2 // indirect
324-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
325-
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
326323
github.com/AlekSi/pointer v1.2.0 // indirect
327324
github.com/AlessandroPomponio/go-gibberish v0.0.0-20191004143433-a2d4156f0396 // indirect
328325
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
@@ -450,7 +447,6 @@ require (
450447
github.com/DataDog/viper v1.14.0 // indirect
451448
github.com/DataDog/zstd v1.5.6 // indirect
452449
github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect
453-
github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e // indirect
454450
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
455451
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
456452
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.27.0 // indirect
@@ -462,7 +458,6 @@ require (
462458
github.com/Shopify/sarama v1.38.1 // indirect
463459
github.com/Showmax/go-fqdn v1.0.0 // indirect
464460
github.com/Workiva/go-datastructures v1.1.5 // indirect
465-
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
466461
github.com/alecthomas/participle/v2 v2.1.4 // indirect
467462
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
468463
github.com/andybalholm/brotli v1.1.1 // indirect
@@ -471,7 +466,6 @@ require (
471466
github.com/apache/arrow-go/v18 v18.3.1 // indirect
472467
github.com/apache/thrift v0.22.0 // indirect
473468
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
474-
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
475469
github.com/armon/go-metrics v0.4.1 // indirect
476470
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
477471
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.4 // indirect
@@ -515,7 +509,6 @@ require (
515509
github.com/bits-and-blooms/bloom/v3 v3.7.0 // indirect
516510
github.com/bmatcuk/doublestar/v4 v4.9.0 // indirect
517511
github.com/briandowns/spinner v1.23.0 // indirect
518-
github.com/buger/goterm v1.0.4 // indirect
519512
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect
520513
github.com/caarlos0/env/v9 v9.0.0 // indirect
521514
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -529,18 +522,14 @@ require (
529522
github.com/cloudflare/circl v1.6.1 // indirect
530523
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
531524
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
532-
github.com/compose-spec/compose-go/v2 v2.6.2 // indirect
533525
github.com/containerd/cgroups/v3 v3.0.5 // indirect
534526
github.com/containerd/console v1.0.4 // indirect
535-
github.com/containerd/containerd/api v1.8.0 // indirect
536-
github.com/containerd/containerd/v2 v2.0.5 // indirect
537527
github.com/containerd/continuity v0.4.5 // indirect
538528
github.com/containerd/errdefs v1.0.0 // indirect
539529
github.com/containerd/errdefs/pkg v0.3.0 // indirect
540530
github.com/containerd/log v0.1.0 // indirect
541531
github.com/containerd/platforms v1.0.0-rc.1 // indirect
542532
github.com/containerd/ttrpc v1.2.7 // indirect
543-
github.com/containerd/typeurl/v2 v2.2.3 // indirect
544533
github.com/containers/common v0.63.1 // indirect
545534
github.com/coreos/go-semver v0.3.1 // indirect
546535
github.com/cpuguy83/dockercfg v0.3.2 // indirect
@@ -557,14 +546,7 @@ require (
557546
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
558547
github.com/digitalocean/godo v1.144.0 // indirect
559548
github.com/distribution/reference v0.6.0 // indirect
560-
github.com/docker/buildx v0.23.0 // indirect
561549
github.com/docker/cli v28.1.1+incompatible // indirect
562-
github.com/docker/cli-docs-tool v0.9.0 // indirect
563-
github.com/docker/compose/v2 v2.36.0 // indirect
564-
github.com/docker/distribution v2.8.3+incompatible // indirect
565-
github.com/docker/docker-credential-helpers v0.9.3 // indirect
566-
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
567-
github.com/docker/go-metrics v0.0.1 // indirect
568550
github.com/docker/go-units v0.5.0 // indirect
569551
github.com/drone/envsubst v1.0.3 // indirect
570552
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -575,7 +557,6 @@ require (
575557
github.com/ebitengine/purego v0.8.4 // indirect
576558
github.com/edsrzf/mmap-go v1.2.0 // indirect
577559
github.com/efficientgo/core v1.0.0-rc.3 // indirect
578-
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 // indirect
579560
github.com/elastic/go-grok v0.3.1 // indirect
580561
github.com/elastic/go-perf v0.0.0-20241029065020-30bec95324b8 // indirect
581562
github.com/elastic/go-sysinfo v1.8.1 // indirect
@@ -594,8 +575,6 @@ require (
594575
github.com/felixge/fgprof v0.9.5 // indirect
595576
github.com/felixge/httpsnoop v1.0.4 // indirect
596577
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
597-
github.com/fsnotify/fsevents v0.2.0 // indirect
598-
github.com/fvbommel/sortorder v1.1.0 // indirect
599578
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
600579
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
601580
github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 // indirect
@@ -688,7 +667,6 @@ require (
688667
github.com/ianlancetaylor/demangle v0.0.0-20250628045327-2d64ad6b7ec5 // indirect
689668
github.com/illumos/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect
690669
github.com/imdario/mergo v0.3.16 // indirect
691-
github.com/in-toto/in-toto-golang v0.9.0 // indirect; Update from v0.5.0 to v0.9.0
692670
github.com/inconshreveable/mousetrap v1.1.0 // indirect
693671
github.com/infinityworks/go-common v0.0.0-20170820165359-7f20a140fd37 // indirect
694672
github.com/influxdata/influxdb-observability/common v0.5.12 // indirect
@@ -697,7 +675,6 @@ require (
697675
github.com/influxdata/line-protocol/v2 v2.2.1 // indirect
698676
github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect
699677
github.com/influxdata/telegraf v1.35.2 // indirect
700-
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
701678
github.com/ionos-cloud/sdk-go/v6 v6.3.3 // indirect
702679
github.com/itchyny/timefmt-go v0.1.6 // indirect
703680
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
@@ -725,7 +702,6 @@ require (
725702
github.com/kamstrup/intmap v0.5.1 // indirect
726703
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
727704
github.com/karrick/godirwalk v1.17.0 // indirect
728-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
729705
github.com/kevinburke/ssh_config v1.2.0 // indirect
730706
github.com/klauspost/asmfmt v1.3.2 // indirect
731707
github.com/klauspost/cpuid/v2 v2.2.11 // indirect
@@ -746,7 +722,6 @@ require (
746722
github.com/mattn/go-colorable v0.1.14 // indirect
747723
github.com/mattn/go-isatty v0.0.20 // indirect
748724
github.com/mattn/go-runewidth v0.0.16 // indirect
749-
github.com/mattn/go-shellwords v1.0.12 // indirect
750725
github.com/mattn/go-xmlrpc v0.0.3 // indirect
751726
github.com/mdlayher/ethtool v0.1.0 // indirect
752727
github.com/mdlayher/genetlink v1.3.2 // indirect
@@ -756,30 +731,20 @@ require (
756731
github.com/mdlayher/vsock v1.2.1 // indirect
757732
github.com/mdlayher/wifi v0.1.0 // indirect
758733
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
759-
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
760734
github.com/microsoft/go-mssqldb v1.9.2 // indirect
761-
github.com/miekg/pkcs11 v1.1.1 // indirect
762735
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
763736
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
764737
github.com/minio/sha256-simd v1.0.1 // indirect
765738
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
766739
github.com/mitchellh/copystructure v1.2.0 // indirect
767740
github.com/mitchellh/go-homedir v1.1.0 // indirect
768-
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
769741
github.com/mitchellh/reflectwalk v1.0.2 // indirect
770742
github.com/mna/redisc v1.4.0 // indirect
771-
github.com/moby/buildkit v0.21.1 // indirect
772743
github.com/moby/docker-image-spec v1.3.1 // indirect
773744
github.com/moby/go-archive v0.1.0 // indirect
774-
github.com/moby/locker v1.0.1 // indirect
775745
github.com/moby/patternmatcher v0.6.0 // indirect
776-
github.com/moby/spdystream v0.5.0 // indirect
777-
github.com/moby/sys/atomicwriter v0.1.0 // indirect
778-
github.com/moby/sys/capability v0.4.0 // indirect
779746
github.com/moby/sys/mountinfo v0.7.2 // indirect
780747
github.com/moby/sys/sequential v0.6.0 // indirect
781-
github.com/moby/sys/signal v0.7.1 // indirect
782-
github.com/moby/sys/symlink v0.3.0 // indirect
783748
github.com/moby/sys/user v0.4.0 // indirect
784749
github.com/moby/sys/userns v0.1.0 // indirect
785750
github.com/moby/term v0.5.2 // indirect
@@ -793,7 +758,6 @@ require (
793758
github.com/mrunalp/fileutils v0.5.1 // indirect
794759
github.com/mtibben/percent v0.2.1 // indirect
795760
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
796-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
797761
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect
798762
github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2 // indirect
799763
github.com/oapi-codegen/runtime v1.1.1 // indirect
@@ -875,15 +839,12 @@ require (
875839
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
876840
github.com/sercand/kuberesolver/v6 v6.0.0 // indirect
877841
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
878-
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b // indirect
879-
github.com/shibumi/go-pathspec v1.3.0 // indirect
880842
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
881843
github.com/shoenig/go-m1cpu v0.1.6 // indirect
882844
github.com/shopspring/decimal v1.4.0 // indirect
883845
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
884846
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
885847
github.com/skeema/knownhosts v1.3.1 // indirect
886-
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
887848
github.com/snowflakedb/gosnowflake v1.14.1 // indirect
888849
github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect
889850
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -898,23 +859,16 @@ require (
898859
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.480 // indirect
899860
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.480 // indirect
900861
github.com/tg123/go-htpasswd v1.2.4 // indirect
901-
github.com/theupdateframework/notary v0.7.0 // indirect
902862
github.com/tidwall/gjson v1.18.0 // indirect
903863
github.com/tidwall/match v1.1.1 // indirect
904864
github.com/tidwall/pretty v1.2.1 // indirect
905865
github.com/tidwall/tinylru v1.2.1 // indirect
906866
github.com/tidwall/wal v1.1.8 // indirect
907-
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 // indirect
908867
github.com/tinylib/msgp v1.3.0 // indirect
909868
github.com/tjhop/slog-gokit v0.1.4 // indirect
910869
github.com/tklauser/go-sysconf v0.3.15 // indirect
911870
github.com/tklauser/numcpus v0.10.0 // indirect
912871
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
913-
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect
914-
github.com/tonistiigi/fsutil v0.0.0-20250410151801-5b74a7ad7583 // indirect
915-
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
916-
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
917-
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
918872
github.com/twmb/franz-go v1.18.1 // indirect
919873
github.com/twmb/franz-go/pkg/kmsg v1.11.2 // indirect
920874
github.com/twmb/franz-go/pkg/sasl/kerberos v1.1.0 // indirect
@@ -943,7 +897,6 @@ require (
943897
github.com/yl2chen/cidranger v1.0.2 // indirect
944898
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
945899
github.com/yusufpapurcu/wmi v1.2.4 // indirect
946-
github.com/zclconf/go-cty v1.16.0 // indirect
947900
go.etcd.io/bbolt v1.4.2 // indirect
948901
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
949902
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
@@ -1004,7 +957,6 @@ require (
1004957
go.opentelemetry.io/otel/sdk/log v0.12.2 // indirect
1005958
go.uber.org/dig v1.19.0 // indirect
1006959
go.uber.org/fx v1.24.0 // indirect
1007-
go.uber.org/mock v0.5.2 // indirect
1008960
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
1009961
golang.design/x/chann v0.1.2 // indirect
1010962
golang.org/x/arch v0.18.0 // indirect
@@ -1031,7 +983,6 @@ require (
1031983
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
1032984
sigs.k8s.io/randfill v1.0.0 // indirect
1033985
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
1034-
tags.cncf.io/container-device-interface v1.0.1 // indirect
1035986
)
1036987

1037988
require (
@@ -1040,9 +991,11 @@ require (
1040991
)
1041992

1042993
require github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.128.0 // indirect
994+
1043995
require cloud.google.com/go/pubsub/v2 v2.0.0
1044996

1045997
require (
998+
github.com/creack/pty v1.1.24 // indirect
1046999
go.yaml.in/yaml/v2 v2.4.2 // indirect
10471000
go.yaml.in/yaml/v3 v3.0.3 // indirect
10481001
)

0 commit comments

Comments
 (0)