Skip to content

fix: sync with changes from YashasviDevtron-patch-1 of common-lib #59

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/aws/aws-sdk-go v1.44.116
github.com/caarlos0/env v3.5.0+incompatible
github.com/caarlos0/env/v6 v6.10.1
github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63
github.com/devtron-labs/common-lib v0.18.1-0.20240923100800-5ddd15253061
github.com/go-pg/pg v6.15.1+incompatible
github.com/google/go-containerregistry v0.6.0
github.com/google/wire v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63 h1:C5SMozwP2rVIKItqEZs3PtWkBhNnEeHIm9xtnDkK5VA=
github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63/go.mod h1:rAY9Xd6iz+OqNQ3nO3reVHapAVr1N6Osf4Irdc0A08Q=
github.com/devtron-labs/common-lib v0.18.1-0.20240923100800-5ddd15253061 h1:EWFREGVj8nHi456MUeBWpTJjPIjV3i0LQxGI0JZ/6yA=
github.com/devtron-labs/common-lib v0.18.1-0.20240923100800-5ddd15253061/go.mod h1:rAY9Xd6iz+OqNQ3nO3reVHapAVr1N6Osf4Irdc0A08Q=
github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
Expand Down
151 changes: 151 additions & 0 deletions vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go

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

35 changes: 35 additions & 0 deletions vendor/github.com/devtron-labs/common-lib/utils/CommonUtils.go

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

63 changes: 63 additions & 0 deletions vendor/github.com/devtron-labs/common-lib/utils/bean/bean.go

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

4 changes: 3 additions & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ github.com/cespare/xxhash/v2
github.com/coreos/clair/api/v3/clairpb
github.com/coreos/clair/database
github.com/coreos/clair/ext/versionfmt
# github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63
# github.com/devtron-labs/common-lib v0.18.1-0.20240923100800-5ddd15253061
## explicit; go 1.21
github.com/devtron-labs/common-lib/constants
github.com/devtron-labs/common-lib/git-manager/util
github.com/devtron-labs/common-lib/middlewares
github.com/devtron-labs/common-lib/monitoring
github.com/devtron-labs/common-lib/monitoring/pprof
Expand All @@ -83,6 +84,7 @@ github.com/devtron-labs/common-lib/pubsub-lib
github.com/devtron-labs/common-lib/pubsub-lib/metrics
github.com/devtron-labs/common-lib/pubsub-lib/model
github.com/devtron-labs/common-lib/utils
github.com/devtron-labs/common-lib/utils/bean
github.com/devtron-labs/common-lib/utils/remoteConnection/bean
# github.com/docker/cli v24.0.6+incompatible
## explicit
Expand Down