Skip to content

Commit 8391e55

Browse files
Ash-expAsh-exp
authored
fix: dependabot security updates (#5608)
* fix: Vulnerability Potential memory exhaustion attack due to sparse slice deserialization (#5572) * fix: Vulnerability Potential memory exhaustion attack due to sparse slice deserialization * added vendor files * fix: ArgoCD Vulnerable to Use of Risky or Missing Cryptographic Algorithms in Redis Cache (#5570) * fix: bumb authenticator version v0.4.35-0.20240607135426-c86e868ecee1 to v0.4.35-0.20240731093814-ae0cb999d5d0 and go-gitlab version v0.86.0 to v0.107.0 * fix: bumped k8s.io/kubernetes version v1.26.11 to v1.27.13 * dumped gopkg.in/square/go-jose.v2 dependency * common-lib version upgraded * updated: authenticator version
1 parent 761efaa commit 8391e55

File tree

390 files changed

+37582
-12732
lines changed

Some content is hidden

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

390 files changed

+37582
-12732
lines changed

‎Wire.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ func InitializeApp() (*App, error) {
176176
externalLink.ExternalLinkWireSet,
177177
team.TeamsWireSet,
178178
AuthWireSet,
179+
util4.GetRuntimeConfig,
179180
util4.NewK8sUtil,
180181
wire.Bind(new(util4.K8sService), new(*util4.K8sServiceImpl)),
181182
user.UserWireSet,

‎cmd/external-app/wire.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ func InitializeApp() (*App, error) {
9292
user.UserWireSet,
9393
sso.SsoConfigWireSet,
9494
AuthWireSet,
95+
util4.GetRuntimeConfig,
9596
util4.NewK8sUtil,
9697
externalLink.ExternalLinkWireSet,
9798
team.TeamsWireSet,

‎cmd/external-app/wire_gen.go

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎env_gen.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
| ORCH_HOST | http://devtroncd-orchestrator-service-prod.devtroncd/webhook/msg/nats | |
200200
| ORCH_TOKEN | | |
201201
| OTEL_COLLECTOR_URL | | |
202+
| PARALLELISM_LIMIT_FOR_TAG_PROCESSING | | |
202203
| PG_ADDR | 127.0.0.1 | |
203204
| PG_DATABASE | orchestrator | |
204205
| PG_EXPORT_PROM_METRICS | false | |

‎go.mod

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.21.8
77
require (
88
github.com/Masterminds/semver v1.5.0
99
github.com/Pallinder/go-randomdata v1.2.0
10-
github.com/argoproj/argo-cd/v2 v2.8.17
10+
github.com/argoproj/argo-cd/v2 v2.8.19
1111
github.com/argoproj/argo-workflows/v3 v3.4.3
1212
github.com/argoproj/gitops-engine v0.7.1-0.20231013183858-f15cf615b814
1313
github.com/aws/aws-sdk-go v1.44.290
@@ -18,11 +18,11 @@ require (
1818
github.com/casbin/casbin/v2 v2.97.0
1919
github.com/casbin/xorm-adapter v1.0.1-0.20190716004226-a317737a1007
2020
github.com/casbin/xorm-adapter/v2 v2.5.1
21-
github.com/coreos/go-oidc v2.2.1+incompatible
21+
github.com/coreos/go-oidc/v3 v3.11.0
2222
github.com/davecgh/go-spew v1.1.1
2323
github.com/deckarep/golang-set v1.8.0
24-
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
25-
github.com/devtron-labs/common-lib v0.0.25-0.20240808104611-3301505b68a7
24+
github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8
25+
github.com/devtron-labs/common-lib v0.0.25-0.20240809073131-5cefb0e8a93a
2626
github.com/devtron-labs/go-bitbucket v0.9.60-beta
2727
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80
2828
github.com/evanphx/json-patch v5.7.0+incompatible
@@ -42,7 +42,7 @@ require (
4242
github.com/google/uuid v1.3.1
4343
github.com/google/wire v0.6.0
4444
github.com/gorilla/mux v1.8.0
45-
github.com/gorilla/schema v1.1.0
45+
github.com/gorilla/schema v1.4.1
4646
github.com/gorilla/sessions v1.2.1
4747
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
4848
github.com/grpc-ecosystem/grpc-gateway v1.16.0
@@ -62,7 +62,7 @@ require (
6262
github.com/stretchr/testify v1.8.4
6363
github.com/tidwall/gjson v1.14.3
6464
github.com/tidwall/sjson v1.2.4
65-
github.com/xanzy/go-gitlab v0.86.0
65+
github.com/xanzy/go-gitlab v0.107.0
6666
github.com/xeipuuv/gojsonschema v1.2.0
6767
github.com/yannh/kubeconform v0.5.0
6868
github.com/zclconf/go-cty v1.13.2
@@ -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.21.0
77+
golang.org/x/crypto v0.25.0
7878
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
79-
golang.org/x/oauth2 v0.11.0
79+
golang.org/x/oauth2 v0.21.0
8080
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
8181
google.golang.org/grpc v1.59.0
8282
google.golang.org/protobuf v1.33.0
@@ -89,16 +89,15 @@ require (
8989
k8s.io/client-go v0.29.0
9090
k8s.io/helm v2.12.3+incompatible
9191
k8s.io/kubectl v0.29.0
92-
k8s.io/kubernetes v1.26.11
92+
k8s.io/kubernetes v1.27.13
9393
k8s.io/metrics v0.26.4
9494
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
9595
sigs.k8s.io/yaml v1.3.0
9696
)
9797

9898
require (
9999
cloud.google.com/go v0.110.7 // indirect
100-
cloud.google.com/go/compute v1.23.0 // indirect
101-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
100+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
102101
cloud.google.com/go/iam v1.1.1 // indirect
103102
cloud.google.com/go/storage v1.30.1 // indirect
104103
dario.cat/mergo v1.0.0 // indirect
@@ -150,6 +149,7 @@ require (
150149
github.com/gammazero/deque v0.2.0 // indirect
151150
github.com/go-errors/errors v1.4.2 // indirect
152151
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
152+
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
153153
github.com/go-logr/logr v1.3.0 // indirect
154154
github.com/go-logr/stdr v1.2.2 // indirect
155155
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -179,7 +179,7 @@ require (
179179
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
180180
github.com/hashicorp/errwrap v1.1.0 // indirect
181181
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
182-
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
182+
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
183183
github.com/hashicorp/go-uuid v1.0.2 // indirect
184184
github.com/huandu/xstrings v1.4.0 // indirect
185185
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
@@ -224,7 +224,6 @@ require (
224224
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
225225
github.com/pjbgf/sha1cd v0.3.0 // indirect
226226
github.com/pmezard/go-difflib v1.0.0 // indirect
227-
github.com/pquerna/cachecontrol v0.1.0 // indirect
228227
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
229228
github.com/prometheus/common v0.44.0 // indirect
230229
github.com/prometheus/procfs v0.11.1 // indirect
@@ -233,7 +232,7 @@ require (
233232
github.com/sergi/go-diff v1.1.0 // indirect
234233
github.com/shopspring/decimal v1.3.1 // indirect
235234
github.com/sirupsen/logrus v1.9.3 // indirect
236-
github.com/skeema/knownhosts v1.2.1 // indirect
235+
github.com/skeema/knownhosts v1.2.2 // indirect
237236
github.com/spf13/cast v1.5.0 // indirect
238237
github.com/spf13/cobra v1.8.0 // indirect
239238
github.com/spf13/pflag v1.0.5 // indirect
@@ -259,14 +258,14 @@ require (
259258
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
260259
go.uber.org/atomic v1.10.0 // indirect
261260
go.uber.org/multierr v1.11.0 // indirect
262-
golang.org/x/mod v0.15.0 // indirect
263-
golang.org/x/net v0.23.0 // indirect
264-
golang.org/x/sync v0.6.0 // indirect
265-
golang.org/x/sys v0.18.0 // indirect
266-
golang.org/x/term v0.18.0 // indirect
267-
golang.org/x/text v0.14.0 // indirect
261+
golang.org/x/mod v0.17.0 // indirect
262+
golang.org/x/net v0.27.0 // indirect
263+
golang.org/x/sync v0.7.0 // indirect
264+
golang.org/x/sys v0.22.0 // indirect
265+
golang.org/x/term v0.22.0 // indirect
266+
golang.org/x/text v0.16.0 // indirect
268267
golang.org/x/time v0.3.0 // indirect
269-
golang.org/x/tools v0.18.0 // indirect
268+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
270269
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
271270
google.golang.org/api v0.126.0 // indirect
272271
google.golang.org/appengine v1.6.7 // indirect
@@ -279,7 +278,6 @@ require (
279278
gopkg.in/jcmturner/goidentity.v2 v2.0.0 // indirect
280279
gopkg.in/jcmturner/gokrb5.v5 v5.3.0 // indirect
281280
gopkg.in/jcmturner/rpc.v0 v0.0.2 // indirect
282-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
283281
gopkg.in/warnings.v0 v0.1.2 // indirect
284282
gopkg.in/yaml.v3 v3.0.1 // indirect
285283
k8s.io/apiextensions-apiserver v0.29.0 // indirect
@@ -326,6 +324,7 @@ replace (
326324
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.2
327325
k8s.io/kubectl => k8s.io/kubectl v0.26.4
328326
k8s.io/kubelet => k8s.io/kubelet v0.24.2
327+
k8s.io/kubernetes v1.27.13 => k8s.io/kubernetes v1.26.11
329328
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.2
330329
k8s.io/metrics => k8s.io/metrics v0.24.2
331330
k8s.io/mount-utils => k8s.io/mount-utils v0.24.2

0 commit comments

Comments
 (0)