Update testcontainers to compose module (#321)

* Update testcontainers to compose module

* ignore deprecation warning

core/test/compose/compose.go

@@ -6,13 +6,14 @@ import (
  "testing"
 
  "github.com/google/uuid"
- tc "github.com/testcontainers/testcontainers-go"
+ tc "github.com/testcontainers/testcontainers-go/modules/compose"
 )
 
 // Up executes compose up.
 func Up(t *testing.T, paths []string, env map[string]string) *tc.LocalDockerCompose {
  t.Helper()
  identifier := strings.ToLower(uuid.New().String())
+ // nolint
  compose := tc.NewLocalDockerCompose(paths, identifier)
  execError := compose.
  WithCommand([]string{"up", "-d"}).

go.mod

@@ -2,6 +2,21 @@ module github.com/peter-evans/kdef
 
 go 1.18
 
+replace (
+ //
+ cloud.google.com/go => cloud.google.com/go v0.100.2
+ github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7
+
+ // For k8s dependencies, we use a replace directive, to prevent them being
+ // upgraded to the version specified in containerd, which is not relevant to the
+ // version needed.
+ // See https://github.com/docker/buildx/pull/948 for details.
+ // https://github.com/docker/buildx/blob/v0.8.1/go.mod#L62-L64
+ k8s.io/api => k8s.io/api v0.22.4
+ k8s.io/apimachinery => k8s.io/apimachinery v0.22.4
+ k8s.io/client-go => k8s.io/client-go v0.22.4
+)
+
 require (
  github.com/aws/aws-sdk-go v1.44.258
  github.com/bmatcuk/doublestar/v4 v4.6.0
@@ -16,56 +31,158 @@ require (
  github.com/knadh/koanf v1.5.0
  github.com/peter-evans/patience v0.3.0
  github.com/spf13/cobra v1.7.0
- github.com/testcontainers/testcontainers-go v0.15.0
+ github.com/testcontainers/testcontainers-go/modules/compose v0.20.1
  github.com/twmb/franz-go v1.13.3
  github.com/twmb/franz-go/pkg/kmsg v1.5.0
 )
 
 require (
+ github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/Microsoft/go-winio v0.5.2 // indirect
- github.com/Microsoft/hcsshim v0.9.6 // indirect
- github.com/cenkalti/backoff/v4 v4.1.3 // indirect
- github.com/containerd/cgroups v1.0.4 // indirect
- github.com/containerd/containerd v1.6.18 // indirect
+ github.com/aws/aws-sdk-go-v2 v1.16.3 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.15.5 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.12.0 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.4 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.10 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.4 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 // indirect
+ github.com/aws/smithy-go v1.11.2 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/buger/goterm v1.0.4 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/compose-spec/compose-go v1.13.4 // indirect
+ github.com/containerd/console v1.0.3 // indirect
+ github.com/containerd/containerd v1.6.19 // indirect
+ github.com/containerd/continuity v0.3.0 // indirect
+ github.com/containerd/ttrpc v1.1.0 // indirect
+ github.com/containerd/typeurl v1.0.2 // indirect
+ github.com/cpuguy83/dockercfg v0.3.1 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/distribution/distribution/v3 v3.0.0-20230327091844-0c958010ace2 // indirect
+ github.com/docker/buildx v0.10.4 // indirect
+ github.com/docker/cli v23.0.5+incompatible // indirect
+ github.com/docker/compose/v2 v2.17.3 // indirect
  github.com/docker/distribution v2.8.1+incompatible // indirect
- github.com/docker/docker v20.10.24+incompatible // indirect
+ github.com/docker/docker v23.0.5+incompatible // indirect
+ github.com/docker/docker-credential-helpers v0.7.0 // indirect
+ github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
  github.com/docker/go-connections v0.4.0 // indirect
+ github.com/docker/go-metrics v0.0.1 // indirect
  github.com/docker/go-units v0.5.0 // indirect
- github.com/fsnotify/fsnotify v1.5.4 // indirect
+ github.com/felixge/httpsnoop v1.0.2 // indirect
+ github.com/fsnotify/fsevents v0.1.1 // indirect
+ github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/fvbommel/sortorder v1.0.2 // indirect
+ github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-logr/stdr v1.2.2 // indirect
+ github.com/gofrs/flock v0.8.1 // indirect
+ github.com/gogo/googleapis v1.4.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/mock v1.6.0 // indirect
  github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/googleapis/gnostic v0.5.5 // indirect
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+ github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+ github.com/hashicorp/errwrap v1.1.0 // indirect
+ github.com/hashicorp/go-multierror v1.1.1 // indirect
+ github.com/hashicorp/go-version v1.6.0 // indirect
+ github.com/imdario/mergo v0.3.15 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/jonboulle/clockwork v0.4.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
  github.com/klauspost/compress v1.16.3 // indirect
- github.com/magiconair/properties v1.8.6 // indirect
+ github.com/magiconair/properties v1.8.7 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.17 // indirect
- github.com/mattn/go-runewidth v0.0.13 // indirect
+ github.com/mattn/go-runewidth v0.0.14 // indirect
+ github.com/mattn/go-shellwords v1.0.12 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+ github.com/miekg/pkcs11 v1.1.1 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
- github.com/moby/sys/mount v0.3.3 // indirect
+ github.com/moby/buildkit v0.11.5 // indirect
+ github.com/moby/locker v1.0.1 // indirect
+ github.com/moby/patternmatcher v0.5.0 // indirect
+ github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/sys/mountinfo v0.6.2 // indirect
- github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
+ github.com/moby/sys/sequential v0.5.0 // indirect
+ github.com/moby/sys/signal v0.7.0 // indirect
+ github.com/moby/sys/symlink v0.2.0 // indirect
+ github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/morikuni/aec v1.0.0 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+ github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
  github.com/opencontainers/runc v1.1.5 // indirect
+ github.com/pelletier/go-toml v1.9.5 // indirect
  github.com/pierrec/lz4/v4 v4.1.17 // indirect
  github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/prometheus/client_golang v1.14.0 // indirect
+ github.com/prometheus/client_model v0.3.0 // indirect
+ github.com/prometheus/common v0.37.0 // indirect
+ github.com/prometheus/procfs v0.8.0 // indirect
  github.com/rivo/uniseg v0.2.0 // indirect
- github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
+ github.com/sirupsen/logrus v1.9.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- go.opencensus.io v0.23.0 // indirect
- go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
+ github.com/stretchr/testify v1.8.2 // indirect
+ github.com/testcontainers/testcontainers-go v0.20.1 // indirect
+ github.com/theupdateframework/notary v0.7.0 // indirect
+ github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 // indirect
+ github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
+ github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
+ github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
+ github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+ github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
+ go.opentelemetry.io/otel v1.14.0 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect
+ go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
+ go.opentelemetry.io/otel/metric v0.27.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.4.1 // indirect
+ go.opentelemetry.io/otel/trace v1.14.0 // indirect
+ go.opentelemetry.io/proto/otlp v0.12.0 // indirect
+ go4.org v0.0.0-20230225012048-214862532bf5 // indirect
  golang.org/x/crypto v0.7.0 // indirect
  golang.org/x/net v0.8.0 // indirect
- golang.org/x/sys v0.6.0 // indirect
- google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
- google.golang.org/grpc v1.47.0 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
+ golang.org/x/sync v0.2.0 // indirect
+ golang.org/x/sys v0.7.0 // indirect
+ golang.org/x/term v0.6.0 // indirect
+ golang.org/x/text v0.8.0 // indirect
+ golang.org/x/time v0.1.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
+ google.golang.org/grpc v1.50.1 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
+ k8s.io/api v0.24.1 // indirect
+ k8s.io/apimachinery v0.24.1 // indirect
+ k8s.io/client-go v0.24.1 // indirect
+ k8s.io/klog/v2 v2.60.1 // indirect
+ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+ sigs.k8s.io/yaml v1.2.0 // indirect
 )