Skip to content

Commit f44a592

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feat-gitops-client-refactoring
2 parents 5bbe9c0 + b818952 commit f44a592

File tree

178 files changed

+11100
-2073
lines changed

Some content is hidden

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

178 files changed

+11100
-2073
lines changed

go.mod

+18-18
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
github.com/evanphx/json-patch v5.7.0+incompatible
2828
github.com/gammazero/workerpool v1.1.3
2929
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
30-
github.com/go-git/go-billy/v5 v5.5.0
31-
github.com/go-git/go-git/v5 v5.11.0
30+
github.com/go-git/go-billy/v5 v5.6.2
31+
github.com/go-git/go-git/v5 v5.13.2
3232
github.com/go-pg/pg v6.15.1+incompatible
3333
github.com/go-resty/resty/v2 v2.7.0
3434
github.com/gogo/protobuf v1.3.2
@@ -59,7 +59,7 @@ require (
5959
github.com/prometheus/client_golang v1.16.0
6060
github.com/robfig/cron/v3 v3.0.1
6161
github.com/satori/go.uuid v1.2.0
62-
github.com/stretchr/testify v1.8.4
62+
github.com/stretchr/testify v1.10.0
6363
github.com/tidwall/gjson v1.14.4
6464
github.com/tidwall/sjson v1.2.4
6565
github.com/xanzy/go-gitlab v0.107.0
@@ -74,9 +74,9 @@ require (
7474
go.opentelemetry.io/otel/sdk v1.20.0
7575
go.opentelemetry.io/otel/trace v1.20.0
7676
go.uber.org/zap v1.21.0
77-
golang.org/x/crypto v0.31.0
78-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
79-
golang.org/x/mod v0.17.0
77+
golang.org/x/crypto v0.32.0
78+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
79+
golang.org/x/mod v0.19.0
8080
golang.org/x/oauth2 v0.21.0
8181
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
8282
google.golang.org/grpc v1.59.0
@@ -116,7 +116,7 @@ require (
116116
github.com/MakeNowJust/heredoc v1.0.0 // indirect
117117
github.com/Masterminds/semver/v3 v3.2.1 // indirect
118118
github.com/Microsoft/go-winio v0.6.1 // indirect
119-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
119+
github.com/ProtonMail/go-crypto v1.1.5 // indirect
120120
github.com/agext/levenshtein v1.2.1 // indirect
121121
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
122122
github.com/apparentlymart/go-textseg v1.0.0 // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/cespare/xxhash/v2 v2.2.0 // indirect
133133
github.com/chai2010/gettext-go v1.0.2 // indirect
134134
github.com/cloudflare/circl v1.3.7 // indirect
135-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
135+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
136136
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
137137
github.com/distribution/reference v0.6.0 // indirect
138138
github.com/docker/cli v24.0.6+incompatible // indirect
@@ -215,20 +215,20 @@ require (
215215
github.com/opencontainers/go-digest v1.0.0
216216
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
217217
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
218-
github.com/pjbgf/sha1cd v0.3.0 // indirect
218+
github.com/pjbgf/sha1cd v0.3.2 // indirect
219219
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
220220
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
221221
github.com/prometheus/common v0.44.0 // indirect
222222
github.com/prometheus/procfs v0.11.1 // indirect
223223
github.com/redis/go-redis/v9 v9.0.5 // indirect
224224
github.com/russross/blackfriday/v2 v2.1.0 // indirect
225-
github.com/sergi/go-diff v1.2.0 // indirect
225+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
226226
github.com/sirupsen/logrus v1.9.3 // indirect
227-
github.com/skeema/knownhosts v1.2.2 // indirect
227+
github.com/skeema/knownhosts v1.3.0 // indirect
228228
github.com/spf13/cobra v1.8.0 // indirect
229229
github.com/spf13/pflag v1.0.5 // indirect
230230
github.com/stoewer/go-strcase v1.2.0 // indirect
231-
github.com/stretchr/objx v0.5.0 // indirect
231+
github.com/stretchr/objx v0.5.2 // indirect
232232
github.com/syndtr/goleveldb v1.0.0 // indirect
233233
github.com/tidwall/match v1.1.1 // indirect
234234
github.com/tidwall/pretty v1.2.0 // indirect
@@ -247,13 +247,13 @@ require (
247247
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
248248
go.uber.org/atomic v1.10.0 // indirect
249249
go.uber.org/multierr v1.11.0 // indirect
250-
golang.org/x/net v0.33.0 // indirect
250+
golang.org/x/net v0.34.0 // indirect
251251
golang.org/x/sync v0.10.0 // indirect
252-
golang.org/x/sys v0.28.0 // indirect
253-
golang.org/x/term v0.27.0 // indirect
252+
golang.org/x/sys v0.29.0 // indirect
253+
golang.org/x/term v0.28.0 // indirect
254254
golang.org/x/text v0.21.0 // indirect
255255
golang.org/x/time v0.5.0 // indirect
256-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
256+
golang.org/x/tools v0.23.0 // indirect
257257
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
258258
google.golang.org/api v0.126.0 // indirect
259259
google.golang.org/appengine v1.6.8 // indirect
@@ -288,8 +288,8 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
291-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250210055647-3ce7e36ba884
292-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250210055647-3ce7e36ba884
291+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250212120117-7e3d667325aa
292+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250212120117-7e3d667325aa
293293
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
294294
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
295295
k8s.io/api => k8s.io/api v0.29.7

0 commit comments

Comments
 (0)