Skip to content

Commit 0f149a8

Browse files
authored
Update integration tests dependencies (#425)
1 parent bba2f84 commit 0f149a8

File tree

712 files changed

+81194
-11731
lines changed

Some content is hidden

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

712 files changed

+81194
-11731
lines changed

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ require (
112112
github.com/docker/docker-credential-helpers v0.7.0 // indirect
113113
github.com/docker/go-connections v0.4.0 // indirect
114114
github.com/docker/go-units v0.5.0 // indirect
115+
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect
115116
github.com/emirpasic/gods v1.18.1 // indirect
116117
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
117118
github.com/esimonov/ifshort v1.0.4 // indirect
@@ -316,7 +317,7 @@ require (
316317
go.opentelemetry.io/otel/metric v1.16.0 // indirect
317318
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
318319
go.opentelemetry.io/otel/trace v1.16.0 // indirect
319-
go.uber.org/goleak v1.1.12 // indirect
320+
go.uber.org/goleak v1.2.1 // indirect
320321
go.uber.org/multierr v1.11.0 // indirect
321322
go.uber.org/zap v1.24.0 // indirect
322323
golang.org/x/crypto v0.11.0 // indirect

go.sum

+6-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,9 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
194194
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
195195
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
196196
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
197-
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
197+
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 h1:1L0aalTpPz7YlMxETKpmQoWMBkeiuorElZIXoNmgiPE=
198+
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
199+
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
198200
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
199201
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
200202
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -771,6 +773,7 @@ github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8
771773
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
772774
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
773775
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
776+
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
774777
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
775778
github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
776779
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
@@ -970,8 +973,8 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
970973
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
971974
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
972975
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
973-
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
974-
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
976+
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
977+
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
975978
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
976979
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
977980
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

go.work.sum

+16-41
Large diffs are not rendered by default.

test/integration/go.mod

+41-27
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,60 @@ go 1.19
55
require (
66
github.com/go-resty/resty/v2 v2.7.0
77
github.com/nginx/agent/sdk/v2 v2.0.0-00010101000000-000000000000
8-
github.com/nginx/agent/v2 v2.22.0
8+
github.com/nginx/agent/v2 v2.0.0-00010101000000-000000000000
99
github.com/sirupsen/logrus v1.9.3
1010
github.com/stretchr/testify v1.8.4
11-
github.com/testcontainers/testcontainers-go v0.17.0
12-
github.com/testcontainers/testcontainers-go/modules/compose v0.0.0-20230112145122-126aeb9ca036
13-
11+
github.com/testcontainers/testcontainers-go v0.21.0
12+
github.com/testcontainers/testcontainers-go/modules/compose v0.21.0
1413
)
1514

1615
require (
17-
cloud.google.com/go/compute v1.20.1 // indirect
1816
github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
1917
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2018
github.com/Microsoft/go-winio v0.6.1 // indirect
19+
github.com/aws/aws-sdk-go-v2 v1.16.3 // indirect
20+
github.com/aws/aws-sdk-go-v2/config v1.15.5 // indirect
21+
github.com/aws/aws-sdk-go-v2/credentials v1.12.0 // indirect
22+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.4 // indirect
23+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.10 // indirect
24+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.4 // indirect
25+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11 // indirect
26+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 // indirect
27+
github.com/aws/aws-sdk-go-v2/service/sso v1.11.4 // indirect
28+
github.com/aws/aws-sdk-go-v2/service/sts v1.16.4 // indirect
29+
github.com/aws/smithy-go v1.11.2 // indirect
2130
github.com/beorn7/perks v1.0.1 // indirect
2231
github.com/buger/goterm v1.0.4 // indirect
2332
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2433
github.com/cespare/xxhash/v2 v2.2.0 // indirect
25-
github.com/compose-spec/compose-go v1.8.2 // indirect
34+
github.com/compose-spec/compose-go v1.13.4 // indirect
2635
github.com/containerd/console v1.0.3 // indirect
27-
github.com/containerd/containerd v1.6.14 // indirect
36+
github.com/containerd/containerd v1.6.21 // indirect
2837
github.com/containerd/continuity v0.3.0 // indirect
29-
github.com/containerd/ttrpc v1.1.0 // indirect
38+
github.com/containerd/ttrpc v1.1.1 // indirect
3039
github.com/containerd/typeurl v1.0.2 // indirect
40+
github.com/cpuguy83/dockercfg v0.3.1 // indirect
3141
github.com/davecgh/go-spew v1.1.1 // indirect
32-
github.com/distribution/distribution/v3 v3.0.0-20221201083218-92d136e113cf // indirect
33-
github.com/docker/buildx v0.9.1 // indirect
42+
github.com/distribution/distribution/v3 v3.0.0-20230327091844-0c958010ace2 // indirect
43+
github.com/docker/buildx v0.10.4 // indirect
3444
github.com/docker/cli v24.0.4+incompatible // indirect
35-
github.com/docker/compose/v2 v2.15.0 // indirect
45+
github.com/docker/compose/v2 v2.17.3 // indirect
3646
github.com/docker/distribution v2.8.2+incompatible // indirect
3747
github.com/docker/docker v24.0.4+incompatible // indirect
3848
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3949
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
4050
github.com/docker/go-connections v0.4.0 // indirect
4151
github.com/docker/go-metrics v0.0.1 // indirect
4252
github.com/docker/go-units v0.5.0 // indirect
43-
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 // indirect
4453
github.com/felixge/httpsnoop v1.0.3 // indirect
45-
github.com/frankban/quicktest v1.14.5 // indirect
54+
github.com/fsnotify/fsevents v0.1.1 // indirect
4655
github.com/fsnotify/fsnotify v1.6.0 // indirect
4756
github.com/fvbommel/sortorder v1.0.2 // indirect
4857
github.com/go-logr/logr v1.2.4 // indirect
4958
github.com/go-logr/stdr v1.2.2 // indirect
5059
github.com/go-ole/go-ole v1.2.6 // indirect
5160
github.com/go-sql-driver/mysql v1.7.0 // indirect
5261
github.com/gofrs/flock v0.8.1 // indirect
53-
github.com/gofrs/uuid v4.4.0+incompatible // indirect
5462
github.com/gogo/googleapis v1.4.1 // indirect
5563
github.com/gogo/protobuf v1.3.2 // indirect
5664
github.com/golang/mock v1.6.0 // indirect
@@ -62,14 +70,15 @@ require (
6270
github.com/googleapis/gnostic v0.5.5 // indirect
6371
github.com/gorilla/mux v1.8.0 // indirect
6472
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
65-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
73+
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
6674
github.com/hashicorp/errwrap v1.1.0 // indirect
6775
github.com/hashicorp/go-multierror v1.1.1 // indirect
6876
github.com/hashicorp/go-version v1.6.0 // indirect
6977
github.com/hashicorp/hcl v1.0.0 // indirect
7078
github.com/imdario/mergo v0.3.16 // indirect
7179
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7280
github.com/jinzhu/inflection v1.0.0 // indirect
81+
github.com/jonboulle/clockwork v0.4.0 // indirect
7382
github.com/json-iterator/go v1.1.12 // indirect
7483
github.com/jstemmer/go-junit-report v1.0.0 // indirect
7584
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
@@ -86,10 +95,11 @@ require (
8695
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
8796
github.com/miekg/pkcs11 v1.1.1 // indirect
8897
github.com/mitchellh/mapstructure v1.5.0 // indirect
89-
github.com/moby/buildkit v0.10.4 // indirect
98+
github.com/moby/buildkit v0.11.6 // indirect
9099
github.com/moby/locker v1.0.1 // indirect
91100
github.com/moby/patternmatcher v0.5.0 // indirect
92101
github.com/moby/spdystream v0.2.0 // indirect
102+
github.com/moby/sys/mountinfo v0.6.2 // indirect
93103
github.com/moby/sys/sequential v0.5.0 // indirect
94104
github.com/moby/sys/signal v0.7.0 // indirect
95105
github.com/moby/sys/symlink v0.2.0 // indirect
@@ -100,9 +110,7 @@ require (
100110
github.com/nginxinc/nginx-go-crossplane v0.4.17 // indirect
101111
github.com/opencontainers/go-digest v1.0.0 // indirect
102112
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
103-
github.com/opencontainers/runc v1.1.7 // indirect
104-
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
105-
github.com/opencontainers/selinux v1.11.0 // indirect
113+
github.com/opencontainers/runc v1.1.5 // indirect
106114
github.com/opentracing/opentracing-go v1.2.0 // indirect
107115
github.com/orcaman/concurrent-map v1.0.0 // indirect
108116
github.com/pelletier/go-toml v1.9.5 // indirect
@@ -127,9 +135,10 @@ require (
127135
github.com/stretchr/objx v0.5.0 // indirect
128136
github.com/subosito/gotenv v1.4.2 // indirect
129137
github.com/theupdateframework/notary v0.7.0 // indirect
138+
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375 // indirect
130139
github.com/tklauser/go-sysconf v0.3.11 // indirect
131140
github.com/tklauser/numcpus v0.6.0 // indirect
132-
github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5 // indirect
141+
github.com/tonistiigi/fsutil v0.0.0-20230105215944-fb433841cbfa // indirect
133142
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
134143
github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect
135144
github.com/vardius/message-bus v1.1.5 // indirect
@@ -141,15 +150,16 @@ require (
141150
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect
142151
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
143152
go.opentelemetry.io/otel v1.16.0 // indirect
144-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
145-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
153+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1 // indirect
154+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1 // indirect
146155
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1 // indirect
147-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
156+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1 // indirect
148157
go.opentelemetry.io/otel/metric v1.16.0 // indirect
149158
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
150159
go.opentelemetry.io/otel/trace v1.16.0 // indirect
151-
go.opentelemetry.io/proto/otlp v0.20.0 // indirect
160+
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
152161
golang.org/x/crypto v0.11.0 // indirect
162+
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
153163
golang.org/x/mod v0.12.0 // indirect
154164
golang.org/x/net v0.12.0 // indirect
155165
golang.org/x/oauth2 v0.8.0 // indirect
@@ -160,6 +170,7 @@ require (
160170
golang.org/x/time v0.3.0 // indirect
161171
golang.org/x/tools v0.11.0 // indirect
162172
google.golang.org/appengine v1.6.7 // indirect
173+
google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect
163174
google.golang.org/genproto/googleapis/api v0.0.0-20230710151506-e685fd7b542b // indirect
164175
google.golang.org/genproto/googleapis/rpc v0.0.0-20230710151506-e685fd7b542b // indirect
165176
google.golang.org/grpc v1.56.2 // indirect
@@ -174,15 +185,15 @@ require (
174185
k8s.io/klog/v2 v2.60.1 // indirect
175186
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
176187
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
177-
sigs.k8s.io/yaml v1.2.0 // indirect
188+
sigs.k8s.io/yaml v1.3.0 // indirect
178189
)
179190

180191
replace (
181192
// https://github.com/cucumber/godog/releases/tag/v0.12.0 - this version breaks
182193
github.com/cucumber/godog => github.com/cucumber/godog v0.11.0
183194
github.com/docker/cli => github.com/docker/cli v20.10.3-0.20221013132413-1d6c6e2367e2+incompatible // 22.06 master branch
184195
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
185-
github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx
196+
// github.com/moby/buildkit => github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a // same as buildx
186197
// For k8s dependencies, we use a replace directive, to prevent them being
187198
// upgraded to the version specified in containerd, which is not relevant to the
188199
// version needed.
@@ -194,4 +205,7 @@ replace (
194205

195206
)
196207

197-
replace github.com/nginx/agent/sdk/v2 => ./../../sdk
208+
replace (
209+
github.com/nginx/agent/sdk/v2 => ./../../sdk
210+
github.com/nginx/agent/v2 => ./../../
211+
)

0 commit comments

Comments
 (0)