Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: dependabot security updates #5608

Merged
merged 11 commits into from
Aug 9, 2024
Merged

fix: dependabot security updates #5608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
de0d20e
fix: Vulnerability Potential memory exhaustion attack due to sparse s…
Ash-exp Jul 30, 2024
209dac5
fix: ArgoCD Vulnerable to Use of Risky or Missing Cryptographic Algor…
Ash-exp Jul 30, 2024
dc7483d
fix: bumb authenticator version v0.4.35-0.20240607135426-c86e868ecee1…
Ash-exp Aug 1, 2024
bb8b609
fix: bumped k8s.io/kubernetes version v1.26.11 to v1.27.13
Ash-exp Aug 1, 2024
31309fe
dumped gopkg.in/square/go-jose.v2 dependency
Ash-exp Aug 2, 2024
ef387b3
Merge remote-tracking branch 'origin/main' into chore-dependabot-fixes
Ash-exp Aug 7, 2024
93c7450
common-lib version upgraded
Ash-exp Aug 7, 2024
5ca5c05
updated: authenticator version
Ash-exp Aug 7, 2024
4c8c012
common-lib version update
Ash-exp Aug 9, 2024
1dac6ca
authenticator version update
Ash-exp Aug 9, 2024
ac897bc
Merge remote-tracking branch 'origin/main' into chore-dependabot-fixes
Ash-exp Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ func InitializeApp() (*App, error) {
externalLink.ExternalLinkWireSet,
team.TeamsWireSet,
AuthWireSet,
util4.GetRuntimeConfig,
util4.NewK8sUtil,
wire.Bind(new(util4.K8sService), new(*util4.K8sServiceImpl)),
user.UserWireSet,
Expand Down
1 change: 1 addition & 0 deletions cmd/external-app/wire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ func InitializeApp() (*App, error) {
user.UserWireSet,
sso.SsoConfigWireSet,
AuthWireSet,
util4.GetRuntimeConfig,
util4.NewK8sUtil,
externalLink.ExternalLinkWireSet,
team.TeamsWireSet,
Expand Down
10 changes: 7 additions & 3 deletions cmd/external-app/wire_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions env_gen.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
| ORCH_HOST | http://devtroncd-orchestrator-service-prod.devtroncd/webhook/msg/nats | |
| ORCH_TOKEN | | |
| OTEL_COLLECTOR_URL | | |
| PARALLELISM_LIMIT_FOR_TAG_PROCESSING | | |
| PG_ADDR | 127.0.0.1 | |
| PG_DATABASE | orchestrator | |
| PG_EXPORT_PROM_METRICS | false | |
Expand Down
43 changes: 21 additions & 22 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.21.8
require (
github.com/Masterminds/semver v1.5.0
github.com/Pallinder/go-randomdata v1.2.0
github.com/argoproj/argo-cd/v2 v2.8.17
github.com/argoproj/argo-cd/v2 v2.8.19
github.com/argoproj/argo-workflows/v3 v3.4.3
github.com/argoproj/gitops-engine v0.7.1-0.20231013183858-f15cf615b814
github.com/aws/aws-sdk-go v1.44.290
Expand All @@ -18,11 +18,11 @@ require (
github.com/casbin/casbin/v2 v2.97.0
github.com/casbin/xorm-adapter v1.0.1-0.20190716004226-a317737a1007
github.com/casbin/xorm-adapter/v2 v2.5.1
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/coreos/go-oidc/v3 v3.11.0
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set v1.8.0
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
github.com/devtron-labs/common-lib v0.0.25-0.20240808104611-3301505b68a7
github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8
github.com/devtron-labs/common-lib v0.0.25-0.20240809073131-5cefb0e8a93a
github.com/devtron-labs/go-bitbucket v0.9.60-beta
github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80
github.com/evanphx/json-patch v5.7.0+incompatible
Expand All @@ -42,7 +42,7 @@ require (
github.com/google/uuid v1.3.1
github.com/google/wire v0.6.0
github.com/gorilla/mux v1.8.0
github.com/gorilla/schema v1.1.0
github.com/gorilla/schema v1.4.1
github.com/gorilla/sessions v1.2.1
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
Expand All @@ -62,7 +62,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tidwall/gjson v1.14.3
github.com/tidwall/sjson v1.2.4
github.com/xanzy/go-gitlab v0.86.0
github.com/xanzy/go-gitlab v0.107.0
github.com/xeipuuv/gojsonschema v1.2.0
github.com/yannh/kubeconform v0.5.0
github.com/zclconf/go-cty v1.13.2
Expand All @@ -74,9 +74,9 @@ require (
go.opentelemetry.io/otel/sdk v1.20.0
go.opentelemetry.io/otel/trace v1.20.0
go.uber.org/zap v1.21.0
golang.org/x/crypto v0.21.0
golang.org/x/crypto v0.25.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/oauth2 v0.11.0
golang.org/x/oauth2 v0.21.0
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.33.0
Expand All @@ -89,16 +89,15 @@ require (
k8s.io/client-go v0.29.0
k8s.io/helm v2.12.3+incompatible
k8s.io/kubectl v0.29.0
k8s.io/kubernetes v1.26.11
k8s.io/kubernetes v1.27.13
k8s.io/metrics v0.26.4
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/yaml v1.3.0
)

require (
cloud.google.com/go v0.110.7 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/storage v1.30.1 // indirect
dario.cat/mergo v1.0.0 // indirect
Expand Down Expand Up @@ -150,6 +149,7 @@ require (
github.com/gammazero/deque v0.2.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
Expand Down Expand Up @@ -179,7 +179,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
Expand Down Expand Up @@ -224,7 +224,6 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
Expand All @@ -233,7 +232,7 @@ require (
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
Expand All @@ -259,14 +258,14 @@ require (
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -279,7 +278,6 @@ require (
gopkg.in/jcmturner/goidentity.v2 v2.0.0 // indirect
gopkg.in/jcmturner/gokrb5.v5 v5.3.0 // indirect
gopkg.in/jcmturner/rpc.v0 v0.0.2 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.29.0 // indirect
Expand Down Expand Up @@ -326,6 +324,7 @@ replace (
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.2
k8s.io/kubectl => k8s.io/kubectl v0.26.4
k8s.io/kubelet => k8s.io/kubelet v0.24.2
k8s.io/kubernetes v1.27.13 => k8s.io/kubernetes v1.26.11
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.2
k8s.io/metrics => k8s.io/metrics v0.24.2
k8s.io/mount-utils => k8s.io/mount-utils v0.24.2
Expand Down
Loading
Loading