From 6fae4f65d42c57f43fac3624a4ce9cf98330a279 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Tue, 19 Nov 2024 11:39:31 +0530 Subject: [PATCH 01/22] fixed develop build --- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 +- chart-sync/vendor/modules.txt | 4 +- chart-sync/wire_gen.go | 2 +- ci-runner/go.mod | 4 +- ci-runner/go.sum | 7 ++-- .../github.com/golang-jwt/jwt/v4/parser.go | 41 +++++++++---------- ci-runner/vendor/modules.txt | 6 +-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 +- git-sensor/vendor/modules.txt | 4 +- git-sensor/wire_gen.go | 2 +- image-scanner/Makefile | 7 +++- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 +- image-scanner/vendor/modules.txt | 4 +- kubelink/go.mod | 4 +- kubelink/go.sum | 4 +- kubelink/vendor/modules.txt | 6 +-- kubelink/wire_gen.go | 2 +- kubewatch/go.mod | 4 +- kubewatch/go.sum | 7 ++-- .../github.com/golang-jwt/jwt/v4/parser.go | 41 +++++++++---------- kubewatch/vendor/modules.txt | 6 +-- lens/go.mod | 2 +- lens/go.sum | 4 +- lens/vendor/modules.txt | 4 +- lens/wire_gen.go | 2 +- 28 files changed, 95 insertions(+), 90 deletions(-) diff --git a/chart-sync/go.mod b/chart-sync/go.mod index cc18fcdc2..2c0382a0e 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 783a482a2..59e55056f 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index 77e582802..471e13aa0 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/helmLib/registry github.com/devtron-labs/common-lib/utils/http @@ -785,4 +785,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/chart-sync/wire_gen.go b/chart-sync/wire_gen.go index a17c7ac6a..92e4203e8 100644 --- a/chart-sync/wire_gen.go +++ b/chart-sync/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:generate go run github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/ci-runner/go.mod b/ci-runner/go.mod index faff11dbf..25be4e430 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b require ( github.com/Knetic/govaluate v3.0.0+incompatible @@ -49,7 +49,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect diff --git a/ci-runner/go.sum b/ci-runner/go.sum index a2cdc9251..af673679f 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= @@ -97,8 +97,9 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= diff --git a/ci-runner/vendor/github.com/golang-jwt/jwt/v4/parser.go b/ci-runner/vendor/github.com/golang-jwt/jwt/v4/parser.go index c0a6f6927..9dd36e5a5 100644 --- a/ci-runner/vendor/github.com/golang-jwt/jwt/v4/parser.go +++ b/ci-runner/vendor/github.com/golang-jwt/jwt/v4/parser.go @@ -36,19 +36,21 @@ func NewParser(options ...ParserOption) *Parser { return p } -// Parse parses, validates, verifies the signature and returns the parsed token. -// keyFunc will receive the parsed token and should return the key for validating. +// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will +// receive the parsed token and should return the key for validating. func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) } -// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object implementing the Claims -// interface. This provides default values which can be overridden and allows a caller to use their own type, rather -// than the default MapClaims implementation of Claims. +// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object +// implementing the Claims interface. This provides default values which can be overridden and +// allows a caller to use their own type, rather than the default MapClaims implementation of +// Claims. // -// Note: If you provide a custom claim implementation that embeds one of the standard claims (such as RegisteredClaims), -// make sure that a) you either embed a non-pointer version of the claims or b) if you are using a pointer, allocate the -// proper memory for it before passing in the overall claims, otherwise you might run into a panic. +// Note: If you provide a custom claim implementation that embeds one of the standard claims (such +// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or +// b) if you are using a pointer, allocate the proper memory for it before passing in the overall +// claims, otherwise you might run into a panic. func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { token, parts, err := p.ParseUnverified(tokenString, claims) if err != nil { @@ -85,12 +87,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} } + // Perform validation + token.Signature = parts[2] + if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { + return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} + } + vErr := &ValidationError{} // Validate Claims if !p.SkipClaimsValidation { if err := token.Claims.Valid(); err != nil { - // If the Claims Valid returned an error, check if it is a validation error, // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set if e, ok := err.(*ValidationError); !ok { @@ -98,22 +105,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf } else { vErr = e } + return token, vErr } } - // Perform validation - token.Signature = parts[2] - if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { - vErr.Inner = err - vErr.Errors |= ValidationErrorSignatureInvalid - } - - if vErr.valid() { - token.Valid = true - return token, nil - } + // No errors so far, token is valid. + token.Valid = true - return token, vErr + return token, nil } // ParseUnverified parses the token but doesn't validate the signature. diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 06ec83a12..71eaacbb9 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -201,7 +201,7 @@ github.com/go-resty/resty/v2 ## explicit; go 1.15 github.com/gogo/protobuf/proto github.com/gogo/protobuf/sortkeys -# github.com/golang-jwt/jwt/v4 v4.5.0 +# github.com/golang-jwt/jwt/v4 v4.5.1 ## explicit; go 1.16 github.com/golang-jwt/jwt/v4 # github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da @@ -841,4 +841,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/git-sensor/go.mod b/git-sensor/go.mod index cf9ce7ae9..f0abee75b 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index dacebba08..03a8a035f 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index 8e4f908cf..1c54e8c1d 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -487,4 +487,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/git-sensor/wire_gen.go b/git-sensor/wire_gen.go index f2bff30b2..341f4f58b 100644 --- a/git-sensor/wire_gen.go +++ b/git-sensor/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:generate go run github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/image-scanner/Makefile b/image-scanner/Makefile index fbaeca999..fdee91c23 100644 --- a/image-scanner/Makefile +++ b/image-scanner/Makefile @@ -26,4 +26,9 @@ run: build .PHONY: build docker-build-image: build - docker build -t image-scanner:$(TAG) . \ No newline at end of file + docker build -t image-scanner:$(TAG) . + +dep-update-oss: + go mod edit -replace=github.com/devtron-labs/common-lib=github.com/devtron-labs/devtron-services/common-lib@$(TARGET_BRANCH) + go mod tidy + go mod vendor \ No newline at end of file diff --git a/image-scanner/go.mod b/image-scanner/go.mod index ade4f3d55..37667cfcf 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/image-scanner/go.sum b/image-scanner/go.sum index 7ecef703a..5d7a58ad6 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -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/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136 h1:rNGxjU5L6NvObxGMt0+vNFmjkqstm7zDASiS+pakrgQ= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= 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= diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index d3fba4ba7..9cfc08e0f 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ 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.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -438,4 +438,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/kubelink/go.mod b/kubelink/go.mod index 52039c4fa..e1cc1d69a 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -166,7 +166,7 @@ require ( k8s.io/kube-aggregator v0.26.4 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect k8s.io/kubectl v0.29.0 // indirect - k8s.io/kubernetes v1.29.6 // indirect + k8s.io/kubernetes v1.29.10 // indirect k8s.io/metrics v0.29.7 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect mellium.im/sasl v0.3.1 // indirect @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index fc88e80b2..9cf92ddb2 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index ff8f2a505..b0005a9e7 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1214,7 +1214,7 @@ k8s.io/kubectl/pkg/util/podutils k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubernetes v1.29.6 => k8s.io/kubernetes v1.26.11 +# k8s.io/kubernetes v1.29.10 => k8s.io/kubernetes v1.26.11 ## explicit; go 1.19 k8s.io/kubernetes/pkg/api/legacyscheme # k8s.io/metrics v0.29.7 => k8s.io/metrics v0.25.0 @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubelink/wire_gen.go b/kubelink/wire_gen.go index 2ded63c44..c8075adb9 100644 --- a/kubelink/wire_gen.go +++ b/kubelink/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:generate go run github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 3d69f998f..1d1ce6194 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -101,7 +101,7 @@ require ( github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/gnostic-models v0.6.8 // indirect @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 041003bdf..f7c89bfbe 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= @@ -846,8 +846,9 @@ github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= diff --git a/kubewatch/vendor/github.com/golang-jwt/jwt/v4/parser.go b/kubewatch/vendor/github.com/golang-jwt/jwt/v4/parser.go index c0a6f6927..9dd36e5a5 100644 --- a/kubewatch/vendor/github.com/golang-jwt/jwt/v4/parser.go +++ b/kubewatch/vendor/github.com/golang-jwt/jwt/v4/parser.go @@ -36,19 +36,21 @@ func NewParser(options ...ParserOption) *Parser { return p } -// Parse parses, validates, verifies the signature and returns the parsed token. -// keyFunc will receive the parsed token and should return the key for validating. +// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will +// receive the parsed token and should return the key for validating. func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) } -// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object implementing the Claims -// interface. This provides default values which can be overridden and allows a caller to use their own type, rather -// than the default MapClaims implementation of Claims. +// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object +// implementing the Claims interface. This provides default values which can be overridden and +// allows a caller to use their own type, rather than the default MapClaims implementation of +// Claims. // -// Note: If you provide a custom claim implementation that embeds one of the standard claims (such as RegisteredClaims), -// make sure that a) you either embed a non-pointer version of the claims or b) if you are using a pointer, allocate the -// proper memory for it before passing in the overall claims, otherwise you might run into a panic. +// Note: If you provide a custom claim implementation that embeds one of the standard claims (such +// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or +// b) if you are using a pointer, allocate the proper memory for it before passing in the overall +// claims, otherwise you might run into a panic. func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { token, parts, err := p.ParseUnverified(tokenString, claims) if err != nil { @@ -85,12 +87,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} } + // Perform validation + token.Signature = parts[2] + if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { + return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} + } + vErr := &ValidationError{} // Validate Claims if !p.SkipClaimsValidation { if err := token.Claims.Valid(); err != nil { - // If the Claims Valid returned an error, check if it is a validation error, // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set if e, ok := err.(*ValidationError); !ok { @@ -98,22 +105,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf } else { vErr = e } + return token, vErr } } - // Perform validation - token.Signature = parts[2] - if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { - vErr.Inner = err - vErr.Errors |= ValidationErrorSignatureInvalid - } - - if vErr.valid() { - token.Valid = true - return token, nil - } + // No errors so far, token is valid. + token.Valid = true - return token, vErr + return token, nil } // ParseUnverified parses the token but doesn't validate the signature. diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index fbd0dafa3..557d923c6 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -386,7 +386,7 @@ github.com/gobwas/glob/util/strings ## explicit; go 1.15 github.com/gogo/protobuf/proto github.com/gogo/protobuf/sortkeys -# github.com/golang-jwt/jwt/v4 v4.5.0 +# github.com/golang-jwt/jwt/v4 v4.5.1 ## explicit; go 1.16 github.com/golang-jwt/jwt/v4 # github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/lens/go.mod b/lens/go.mod index 01584dc94..cf8876975 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/lens/go.sum b/lens/go.sum index c741c6ac7..139b56647 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 h1:8fW1BLQ0YqIE5J8sQjKk+6pOG8JTVp/EGHYn3PM9WX4= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b h1:KYXZVydYcxQ8OWqDuUFIGt1cOa4FCyBJgVjwOzGpyJY= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index 0c296dc62..40aec518e 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -282,4 +282,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241113143019-dcdbe3a4ace0 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241118121350-821bb2942f1b diff --git a/lens/wire_gen.go b/lens/wire_gen.go index d1526fb45..a95e8302a 100644 --- a/lens/wire_gen.go +++ b/lens/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:generate go run github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject From 3eec9fe65c52ac0eaf6ba8b49fd4a7c73cea6a0c Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 13:41:48 +0530 Subject: [PATCH 02/22] added func for sourcebashrc --- ci-runner/executor/stage/ciStages.go | 2 +- ci-runner/helper/DockerHelper.go | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index e120ce30a..7031e3904 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -422,7 +422,7 @@ func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest st digest, err = impl.dockerHelper.ExtractDigestForBuildx(dest, ciCdRequest.CommonWorkflowRequest) } else { // push to dest - log.Println(util.DEVTRON, "Docker push Artifact", "dest", dest) + log.Println(util.DEVTRON, "Docker `push Artifact", "dest", dest) err = impl.pushArtifact(ciCdRequest, dest, digest, metrics, artifactUploaded) if err != nil { return err diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index de4081849..61846128e 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -275,9 +275,26 @@ func (impl *DockerHelperImpl) DockerLogin(ciContext cicxt.CiContext, dockerCrede return util.ExecuteWithStageInfoLog(util.DOCKER_LOGIN_STAGE, performDockerLogin) } +func (impl *DockerHelperImpl) sourceBashrc(ciContext cicxt.CiContext) error { + dockerTag := "source ~/.bashrc" + log.Println(" -----> " + dockerTag) + dockerTagCMD := impl.GetCommandToExecute(dockerTag) + err := impl.cmdExecutor.RunCommand(ciContext, dockerTagCMD) + if err != nil { + log.Println(err) + return err + } + return nil +} + func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (string, error) { + ciContext := cicxt.BuildCiContext(context.Background(), ciRequest.EnableSecretMasking) - err := impl.DockerLogin(ciContext, &DockerCredentials{ + err := impl.sourceBashrc(ciContext) + if err != nil { + log.Println("Error while sourceBashrc", err) + } + err = impl.DockerLogin(ciContext, &DockerCredentials{ DockerUsername: ciRequest.DockerUsername, DockerPassword: ciRequest.DockerPassword, AwsRegion: ciRequest.AwsRegion, From a156321364bdeadb474b57d1c9f2b8095ec30a77 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 15:21:20 +0530 Subject: [PATCH 03/22] enabling support for envs in build artifact --- ci-runner/helper/DockerHelper.go | 51 ++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 61846128e..22dbe0614 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -64,7 +64,7 @@ const ( type DockerHelper interface { StartDockerDaemon(commonWorkflowRequest *CommonWorkflowRequest) DockerLogin(ciContext cicxt.CiContext, dockerCredentials *DockerCredentials) error - BuildArtifact(ciRequest *CommonWorkflowRequest) (string, error) + BuildArtifact(ciRequest *CommonWorkflowRequest, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) (string, error) StopDocker(ciContext cicxt.CiContext) error PushArtifact(ciContext cicxt.CiContext, dest string) error ExtractDigestForBuildx(dest string, ciRequest *CommonWorkflowRequest) (string, error) @@ -287,14 +287,10 @@ func (impl *DockerHelperImpl) sourceBashrc(ciContext cicxt.CiContext) error { return nil } -func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (string, error) { +func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) (string, error) { ciContext := cicxt.BuildCiContext(context.Background(), ciRequest.EnableSecretMasking) - err := impl.sourceBashrc(ciContext) - if err != nil { - log.Println("Error while sourceBashrc", err) - } - err = impl.DockerLogin(ciContext, &DockerCredentials{ + err := impl.DockerLogin(ciContext, &DockerCredentials{ DockerUsername: ciRequest.DockerUsername, DockerPassword: ciRequest.DockerPassword, AwsRegion: ciRequest.AwsRegion, @@ -340,7 +336,8 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s } } - dockerBuildFlags := getDockerBuildFlagsMap(dockerBuildConfig) + + dockerBuildFlags := getDockerBuildFlagsMap(dockerBuildConfig, scriptEnvs, preCiStageOutVariable) for key, value := range dockerBuildFlags { dockerBuild = dockerBuild + " " + key + value } @@ -493,25 +490,53 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest) (s return dest, nil } -func getDockerBuildFlagsMap(dockerBuildConfig *DockerBuildConfig) map[string]string { +func getDockerBuildFlagsMap(dockerBuildConfig *DockerBuildConfig, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) map[string]string { dockerBuildFlags := make(map[string]string) dockerBuildArgsMap := dockerBuildConfig.Args for k, v := range dockerBuildArgsMap { flagKey := fmt.Sprintf("%s %s", BUILD_ARG_FLAG, k) - dockerBuildFlags[flagKey] = parseDockerFlagParam(v) + dockerBuildFlags[flagKey] = parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) } dockerBuildOptionsMap := dockerBuildConfig.DockerBuildOptions for k, v := range dockerBuildOptionsMap { flagKey := "--" + k - dockerBuildFlags[flagKey] = parseDockerFlagParam(v) + dockerBuildFlags[flagKey] = parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) } return dockerBuildFlags } -func parseDockerFlagParam(param string) string { +func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) string { value := param + log.Println("--- parseDockerFlagParam scriptEnvs", scriptEnvs) + log.Println("--- parseDockerFlagParam preCiStageOutVariable", preCiStageOutVariable) if strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { - value = os.Getenv(strings.TrimPrefix(param, DEVTRON_ENV_VAR_PREFIX)) + key := strings.TrimPrefix(param, DEVTRON_ENV_VAR_PREFIX) + + if preCiStageOutVariable != nil { + for k, task := range preCiStageOutVariable { + if _, ok := preCiStageOutVariable[k]; ok { + for variable, details := range task { + if variable == key { + outputVariableEnv := details.Value + if len(outputVariableEnv) > 0 { + value = outputVariableEnv + } + } + + } + } + } + } + if len(value) == 0 && scriptEnvs != nil { + scriptEnvVal, ok := scriptEnvs[key] + if ok { + value = scriptEnvVal + } + } + + if len(value) == 0 { + value = os.Getenv(key) + } } return wrapSingleOrDoubleQuotedValue(value) From ef3fdcd35ff16b426c2072db7e3340c5103fcdb2 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 15:46:09 +0530 Subject: [PATCH 04/22] compile fix --- ci-runner/executor/stage/ciStages.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 7031e3904..d2d2654dc 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -387,7 +387,7 @@ func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metr // build start := time.Now() metrics.BuildStartTime = start - dest, err := impl.dockerHelper.BuildArtifact(ciCdRequest.CommonWorkflowRequest) // TODO make it skipable + dest, err := impl.dockerHelper.BuildArtifact(ciCdRequest.CommonWorkflowRequest, scriptEnvs, preCiStageOutVariable) // TODO make it skipable metrics.BuildDuration = time.Since(start).Seconds() if err != nil { log.Println("Error in building artifact", "err", err) From 20f53f8e66c64706700eb37e55b240d2214791df Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 19:14:59 +0530 Subject: [PATCH 05/22] handle empty check --- ci-runner/helper/DockerHelper.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 22dbe0614..1d05fa1bc 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -495,12 +495,18 @@ func getDockerBuildFlagsMap(dockerBuildConfig *DockerBuildConfig, scriptEnvs map dockerBuildArgsMap := dockerBuildConfig.Args for k, v := range dockerBuildArgsMap { flagKey := fmt.Sprintf("%s %s", BUILD_ARG_FLAG, k) - dockerBuildFlags[flagKey] = parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) + parsedDockerFlagValue := parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) + if len(parsedDockerFlagValue) > 0 { + dockerBuildFlags[flagKey] = parsedDockerFlagValue + } } dockerBuildOptionsMap := dockerBuildConfig.DockerBuildOptions for k, v := range dockerBuildOptionsMap { flagKey := "--" + k - dockerBuildFlags[flagKey] = parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) + parsedDockerFlagValue := parseDockerFlagParam(v, scriptEnvs, preCiStageOutVariable) + if len(parsedDockerFlagValue) > 0 { + dockerBuildFlags[flagKey] = parsedDockerFlagValue + } } return dockerBuildFlags } From 621af289942dacf3de9e36b9bcded580a14b3a23 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 21:06:56 +0530 Subject: [PATCH 06/22] handle not configure env variable --- ci-runner/helper/DockerHelper.go | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 1d05fa1bc..b79d48fe0 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -543,6 +543,7 @@ func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStage if len(value) == 0 { value = os.Getenv(key) } + return "" } return wrapSingleOrDoubleQuotedValue(value) From 60563a9d1cc322922052c1844ea3ec2f6550e0f2 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 21:21:18 +0530 Subject: [PATCH 07/22] if check --- ci-runner/helper/DockerHelper.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index b79d48fe0..cd51ea156 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -543,7 +543,9 @@ func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStage if len(value) == 0 { value = os.Getenv(key) } - return "" + if len(value) == 0 { + return "" + } } return wrapSingleOrDoubleQuotedValue(value) From 46b4d63c902a91af93f39825867209d7c6b295b5 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 21:37:32 +0530 Subject: [PATCH 08/22] handle not changed val --- ci-runner/helper/DockerHelper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index cd51ea156..df7544940 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -543,7 +543,7 @@ func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStage if len(value) == 0 { value = os.Getenv(key) } - if len(value) == 0 { + if len(value) == 0 || strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { return "" } } From 08db9201baa2449cd5055dfc00665f7cc3575f84 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 21:38:57 +0530 Subject: [PATCH 09/22] remove empty check --- ci-runner/helper/DockerHelper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index df7544940..3f8bcfb39 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -543,7 +543,7 @@ func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStage if len(value) == 0 { value = os.Getenv(key) } - if len(value) == 0 || strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { + if strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { return "" } } From 32f1a6b18b4557191884514a306608e05d678c50 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Fri, 22 Nov 2024 21:52:18 +0530 Subject: [PATCH 10/22] bug fix --- ci-runner/helper/DockerHelper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 3f8bcfb39..a13faec19 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -543,7 +543,7 @@ func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStage if len(value) == 0 { value = os.Getenv(key) } - if strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { + if strings.HasPrefix(value, DEVTRON_ENV_VAR_PREFIX) { return "" } } From 4cc6b42934de58d972ae215311c66e380de929e2 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Mon, 25 Nov 2024 14:51:56 +0530 Subject: [PATCH 11/22] add multi tag support build and push non-buildx --- ci-runner/executor/stage/ciStages.go | 30 +++++++++++-- ci-runner/helper/DockerHelper.go | 63 ++++++++++++++++++++++++++-- 2 files changed, 85 insertions(+), 8 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index d2d2654dc..19a2e4952 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -410,7 +410,7 @@ func (impl *CiStage) runBuildArtifact(ciCdRequest *helper.CiCdTriggerEvent, metr return dest, err } -func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest string, metrics *helper.CIMetrics, artifactUploaded bool) (string, error) { +func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest string, metrics *helper.CIMetrics, artifactUploaded bool, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*helper.VariableObject) (string, error) { var digest string var err error @@ -423,7 +423,7 @@ func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest st } else { // push to dest log.Println(util.DEVTRON, "Docker `push Artifact", "dest", dest) - err = impl.pushArtifact(ciCdRequest, dest, digest, metrics, artifactUploaded) + err = impl.pushArtifact(ciCdRequest, dest, digest, metrics, artifactUploaded, scriptEnvs, preCiStageOutVariable) if err != nil { return err } @@ -496,7 +496,7 @@ func (impl *CiStage) getImageDestAndDigest(ciCdRequest *helper.CiCdTriggerEvent, if err != nil { return "", "", err } - digest, err := impl.extractDigest(ciCdRequest, dest, metrics, artifactUploaded) + digest, err := impl.extractDigest(ciCdRequest, dest, metrics, artifactUploaded, scriptEnvs, preCiStageOutVariable) if err != nil { log.Println("Error in extracting digest", "err", err) return "", "", err @@ -564,9 +564,10 @@ func sendCDFailureEvent(ciRequest *helper.CommonWorkflowRequest, err *helper.CdS } } -func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest string, digest string, metrics *helper.CIMetrics, artifactUploaded bool) error { +func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest string, digest string, metrics *helper.CIMetrics, artifactUploaded bool, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*helper.VariableObject) error { imageRetryCountValue := ciCdRequest.CommonWorkflowRequest.ImageRetryCount imageRetryIntervalValue := ciCdRequest.CommonWorkflowRequest.ImageRetryInterval + var err error for i := 0; i < imageRetryCountValue+1; i++ { if i != 0 { @@ -585,6 +586,27 @@ func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest str WithFailureMessage(workFlow.PushFailed.String()). WithArtifactUploaded(artifactUploaded) } + multiDockerTagsValue := helper.GetMultiDockerTagsValue(scriptEnvs, preCiStageOutVariable) + if len(multiDockerTagsValue) > 0 { + tags := strings.Split(multiDockerTagsValue, `,`) + for _, tmpDockerTag := range tags { + if !strings.Contains(tmpDockerTag, ":") { + fullImageUrl, err := helper.BuildDockerImagePath(ciCdRequest.CommonWorkflowRequest) + if err != nil { + log.Println("Error in building docker image", "err", err) + return err + } + tmpDockerTag = fullImageUrl + } + ciContext := cicxt.BuildCiContext(context.Background(), ciCdRequest.CommonWorkflowRequest.EnableSecretMasking) + err = impl.dockerHelper.PushArtifact(ciContext, tmpDockerTag) + if err == nil { + break + } + log.Println("Error in pushing artifact", "artifact", tmpDockerTag, "err", err) + } + + } return err } diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index a13faec19..aafcb83be 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -59,6 +59,7 @@ const ( BUILDX_K8S_DRIVER_NAME = "devtron-buildx-builder" BUILDX_NODE_NAME = "devtron-buildx-node-" DOCKERD_OUTPUT_FILE_PATH = "/usr/local/bin/nohup.out" + MULTI_TAG_ENV = "docker_env_multi_tags" ) type DockerHelper interface { @@ -440,7 +441,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, sc } if !useBuildx { - err = impl.tagDockerBuild(ciContext, ciRequest.DockerRepository, dest) + err = impl.tagDockerBuild(ciContext, ciRequest, dest, scriptEnvs, preCiStageOutVariable) if err != nil { return "", err } @@ -773,18 +774,72 @@ func (impl *DockerHelperImpl) executeCmd(ciContext cicxt.CiContext, dockerBuild return err } -func (impl *DockerHelperImpl) tagDockerBuild(ciContext cicxt.CiContext, dockerRepository string, dest string) error { - dockerTag := "docker tag " + dockerRepository + ":latest" + " " + dest - log.Println(" -----> " + dockerTag) +func (impl *DockerHelperImpl) tagDockerBuild(ciContext cicxt.CiContext, ciRequest *CommonWorkflowRequest, dest string, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) error { + dockerTag := "docker tag " + ciRequest.DockerRepository + ":latest" + " " + dest dockerTagCMD := impl.GetCommandToExecute(dockerTag) err := impl.cmdExecutor.RunCommand(ciContext, dockerTagCMD) if err != nil { log.Println(err) return err } + + log.Println(" -----> " + dockerTag) + multiDockerTagsValue := GetMultiDockerTagsValue(scriptEnvs, preCiStageOutVariable) + if len(multiDockerTagsValue) > 0 { + tags := strings.Split(multiDockerTagsValue, `,`) + for _, tmpDockerTag := range tags { + tmpDockerTag = strings.TrimSpace(tmpDockerTag) + if !strings.Contains(tmpDockerTag, ":") { + fullImageUrl, err := BuildDockerImagePath(ciRequest) + if err != nil { + log.Println("Error in building docker image", "err", err) + return err + } + tmpDockerTag = fullImageUrl + } + tmpDockerTagCommand := "docker tag " + ciRequest.DockerRepository + ":latest" + " " + tmpDockerTag + tmpDockerTagCMD := impl.GetCommandToExecute(tmpDockerTagCommand) + err := impl.cmdExecutor.RunCommand(ciContext, tmpDockerTagCMD) + if err != nil { + log.Println(err) + return err + } + } + + } + return nil } +func GetMultiDockerTagsValue(scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) string { + multiDockerTagsValue := "" + log.Println("--- GetMultiDockerTagsValue scriptEnvs", scriptEnvs) + log.Println("--- GetMultiDockerTagsValue preCiStageOutVariable", preCiStageOutVariable) + if preCiStageOutVariable != nil { + for k, task := range preCiStageOutVariable { + if _, ok := preCiStageOutVariable[k]; ok { + for variable, details := range task { + if variable == MULTI_TAG_ENV { + outputVariableEnv := details.Value + if len(outputVariableEnv) > 0 { + multiDockerTagsValue = outputVariableEnv + } + } + + } + } + } + } + if len(multiDockerTagsValue) == 0 && scriptEnvs != nil { + scriptEnvVal, ok := scriptEnvs[MULTI_TAG_ENV] + if ok { + multiDockerTagsValue = scriptEnvVal + } + } + log.Println("--- GetMultiDockerTagsValue multiDockerTagsValue", multiDockerTagsValue) + return multiDockerTagsValue +} + func (impl *DockerHelperImpl) setupCacheForBuildx(ciContext cicxt.CiContext, localCachePath string, oldCacheBuildxPath string) error { err := impl.checkAndCreateDirectory(ciContext, localCachePath) if err != nil { From 8608a136839958ec11886c59f225c4b16da28d1a Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Mon, 25 Nov 2024 15:07:35 +0530 Subject: [PATCH 12/22] build full url for custom tag --- ci-runner/executor/stage/ciStages.go | 3 ++- ci-runner/helper/DockerHelper.go | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 19a2e4952..6d9c44db3 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -591,13 +591,14 @@ func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest str tags := strings.Split(multiDockerTagsValue, `,`) for _, tmpDockerTag := range tags { if !strings.Contains(tmpDockerTag, ":") { - fullImageUrl, err := helper.BuildDockerImagePath(ciCdRequest.CommonWorkflowRequest) + fullImageUrl, err := helper.BuildDockerImagePathForCustomTag(ciCdRequest.CommonWorkflowRequest, tmpDockerTag) if err != nil { log.Println("Error in building docker image", "err", err) return err } tmpDockerTag = fullImageUrl } + log.Println(" -----> custom-tag push " + tmpDockerTag) ciContext := cicxt.BuildCiContext(context.Background(), ciCdRequest.CommonWorkflowRequest.EnableSecretMasking) err = impl.dockerHelper.PushArtifact(ciContext, tmpDockerTag) if err == nil { diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index aafcb83be..30d4c2572 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -790,13 +790,14 @@ func (impl *DockerHelperImpl) tagDockerBuild(ciContext cicxt.CiContext, ciReques for _, tmpDockerTag := range tags { tmpDockerTag = strings.TrimSpace(tmpDockerTag) if !strings.Contains(tmpDockerTag, ":") { - fullImageUrl, err := BuildDockerImagePath(ciRequest) + fullImageUrl, err := BuildDockerImagePathForCustomTag(ciRequest, tmpDockerTag) if err != nil { log.Println("Error in building docker image", "err", err) return err } tmpDockerTag = fullImageUrl } + log.Println(" -----> custom-tag " + tmpDockerTag) tmpDockerTagCommand := "docker tag " + ciRequest.DockerRepository + ":latest" + " " + tmpDockerTag tmpDockerTagCMD := impl.GetCommandToExecute(tmpDockerTagCommand) err := impl.cmdExecutor.RunCommand(ciContext, tmpDockerTagCMD) @@ -924,6 +925,17 @@ func BuildDockerImagePath(ciRequest *CommonWorkflowRequest) (string, error) { } +func BuildDockerImagePathForCustomTag(ciRequest *CommonWorkflowRequest, dockerTag string) (string, error) { + return utils.BuildDockerImagePath(bean.DockerRegistryInfo{ + DockerImageTag: dockerTag, + DockerRegistryId: ciRequest.DockerRegistryId, + DockerRegistryType: ciRequest.DockerRegistryType, + DockerRegistryURL: ciRequest.IntermediateDockerRegistryUrl, + DockerRepository: ciRequest.DockerRepository, + }) + +} + func (impl *DockerHelperImpl) PushArtifact(ciContext cicxt.CiContext, dest string) error { //awsLogin := "$(aws ecr get-login --no-include-email --region " + ciRequest.AwsRegion + ")" dockerPush := "docker push " + dest From 71388e4d3a040ee088e93d72de797296f0d31545 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Mon, 25 Nov 2024 16:06:14 +0530 Subject: [PATCH 13/22] support for buildx --- ci-runner/executor/stage/ciStages.go | 4 ++-- ci-runner/helper/DockerHelper.go | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 6d9c44db3..467adbbe1 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -601,8 +601,8 @@ func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest str log.Println(" -----> custom-tag push " + tmpDockerTag) ciContext := cicxt.BuildCiContext(context.Background(), ciCdRequest.CommonWorkflowRequest.EnableSecretMasking) err = impl.dockerHelper.PushArtifact(ciContext, tmpDockerTag) - if err == nil { - break + if err != nil { + log.Println("Error in pushing artifact", "artifact", tmpDockerTag, "err", err) } log.Println("Error in pushing artifact", "artifact", tmpDockerTag, "err", err) } diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 30d4c2572..b9d7a5d9e 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -401,6 +401,27 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, sc multiNodeK8sDriver := useBuildxK8sDriver && len(eligibleK8sDriverNodes) > 1 exportBuildxCacheAfterBuild := ciRequest.AsyncBuildxCacheExport && multiNodeK8sDriver dockerBuild, buildxExportCacheFunc = impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath) + multiDockerTagsValue := GetMultiDockerTagsValue(scriptEnvs, preCiStageOutVariable) + if len(multiDockerTagsValue) > 0 { + tags := strings.Split(multiDockerTagsValue, `,`) + for _, tmpDockerTag := range tags { + tmpDockerTag = strings.TrimSpace(tmpDockerTag) + if !strings.Contains(tmpDockerTag, ":") { + fullImageUrl, err := BuildDockerImagePathForCustomTag(ciRequest, tmpDockerTag) + if err != nil { + log.Println("Error in building docker image", "err", err) + return "", err + } + tmpDockerTag = fullImageUrl + } + log.Println(" -----> custom-tag " + tmpDockerTag) + dockerBuildxForMultiTag, _ := impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, tmpDockerTag, dockerBuildConfig, dockerfilePath) + err = impl.executeCmd(ciContext, dockerBuildxForMultiTag) + if err != nil { + return "", err + } + } + } } else { dockerBuild = fmt.Sprintf("%s -f %s --network host -t %s %s", dockerBuild, dockerfilePath, ciRequest.DockerRepository, dockerBuildConfig.BuildContext) } From ab2b1daf107db1f5859ede1764dd5af1106a30b2 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Mon, 25 Nov 2024 16:21:26 +0530 Subject: [PATCH 14/22] fix log --- ci-runner/executor/stage/ciStages.go | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index 467adbbe1..a44d261e4 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -604,7 +604,6 @@ func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest str if err != nil { log.Println("Error in pushing artifact", "artifact", tmpDockerTag, "err", err) } - log.Println("Error in pushing artifact", "artifact", tmpDockerTag, "err", err) } } From bd2320655200edff8cd53e0a77e34af4c1577da0 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Tue, 26 Nov 2024 12:18:01 +0530 Subject: [PATCH 15/22] improve code for buildx support --- ci-runner/helper/DockerHelper.go | 45 ++++++++++++++------------------ 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index b9d7a5d9e..4fdb49cb6 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -400,28 +400,13 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, sc multiNodeK8sDriver := useBuildxK8sDriver && len(eligibleK8sDriverNodes) > 1 exportBuildxCacheAfterBuild := ciRequest.AsyncBuildxCacheExport && multiNodeK8sDriver - dockerBuild, buildxExportCacheFunc = impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath) + multiDockerTagsValue := GetMultiDockerTagsValue(scriptEnvs, preCiStageOutVariable) + dockerTags := []string{} if len(multiDockerTagsValue) > 0 { - tags := strings.Split(multiDockerTagsValue, `,`) - for _, tmpDockerTag := range tags { - tmpDockerTag = strings.TrimSpace(tmpDockerTag) - if !strings.Contains(tmpDockerTag, ":") { - fullImageUrl, err := BuildDockerImagePathForCustomTag(ciRequest, tmpDockerTag) - if err != nil { - log.Println("Error in building docker image", "err", err) - return "", err - } - tmpDockerTag = fullImageUrl - } - log.Println(" -----> custom-tag " + tmpDockerTag) - dockerBuildxForMultiTag, _ := impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, tmpDockerTag, dockerBuildConfig, dockerfilePath) - err = impl.executeCmd(ciContext, dockerBuildxForMultiTag) - if err != nil { - return "", err - } - } + dockerTags = strings.Split(multiDockerTagsValue, `,`) } + dockerBuild, buildxExportCacheFunc = impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath, dockerTags) } else { dockerBuild = fmt.Sprintf("%s -f %s --network host -t %s %s", dockerBuild, dockerfilePath, ciRequest.DockerRepository, dockerBuildConfig.BuildContext) } @@ -651,7 +636,7 @@ func getSourceCaches(targetPlatforms, oldCachePathLocation string) string { return strings.Join(allCachePaths, " ") } -func (impl *DockerHelperImpl) getBuildxBuildCommandV2(ciContext cicxt.CiContext, cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string) (string, func() error) { +func (impl *DockerHelperImpl) getBuildxBuildCommandV2(ciContext cicxt.CiContext, cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string, additionalImageTags []string) (string, func() error) { dockerBuild = fmt.Sprintf("%s %s -f %s --network host --allow network.host --allow security.insecure", dockerBuild, dockerBuildConfig.BuildContext, dockerfilePath) exportCacheCmds := make(map[string]string) @@ -673,18 +658,26 @@ func (impl *DockerHelperImpl) getBuildxBuildCommandV2(ciContext cicxt.CiContext, } manifestLocation := util.LOCAL_BUILDX_LOCATION + "/manifest.json" - dockerBuild = fmt.Sprintf("%s -t %s --push --metadata-file %s", dockerBuild, dest, manifestLocation) + dockerBuild = fmt.Sprintf("%s %s --push --metadata-file %s", dockerBuild, GetTagArgumentFlagForBuildx(dest, additionalImageTags), manifestLocation) return dockerBuild, impl.getBuildxExportCacheFunc(ciContext, exportCacheCmds) } -func (impl *DockerHelperImpl) getBuildxBuildCommandV1(cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string) (string, func() error) { +func GetTagArgumentFlagForBuildx(dest string, additionalTags []string) string { + flagCmd := fmt.Sprintf("-t %s", dest) + for _, tag := range additionalTags { + flagCmd = fmt.Sprintf("%s -t %s", flagCmd, tag) + } + return flagCmd +} + +func (impl *DockerHelperImpl) getBuildxBuildCommandV1(cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string, additionalImageTags []string) (string, func() error) { cacheMode := CacheModeMax if useCacheMin { cacheMode = CacheModeMin } - dockerBuild = fmt.Sprintf("%s -f %s -t %s --push %s --network host --allow network.host --allow security.insecure", dockerBuild, dockerfilePath, dest, dockerBuildConfig.BuildContext) + dockerBuild = fmt.Sprintf("%s -f %s %s --push %s --network host --allow network.host --allow security.insecure", dockerBuild, dockerfilePath, GetTagArgumentFlagForBuildx(dest, additionalImageTags), dockerBuildConfig.BuildContext) if cacheEnabled { dockerBuild = fmt.Sprintf("%s --cache-to=type=local,dest=%s,mode=%s --cache-from=type=local,src=%s", dockerBuild, localCachePath, cacheMode, oldCacheBuildxPath) } @@ -702,11 +695,11 @@ func (impl *DockerHelperImpl) getBuildxBuildCommandV1(cacheEnabled bool, useCach return dockerBuild, nil } -func (impl *DockerHelperImpl) getBuildxBuildCommand(ciContext cicxt.CiContext, exportBuildxCacheAfterBuild bool, cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string) (string, func() error) { +func (impl *DockerHelperImpl) getBuildxBuildCommand(ciContext cicxt.CiContext, exportBuildxCacheAfterBuild bool, cacheEnabled bool, useCacheMin bool, dockerBuild, oldCacheBuildxPath, localCachePath, dest string, dockerBuildConfig *DockerBuildConfig, dockerfilePath string, additionalImageTags []string) (string, func() error) { if exportBuildxCacheAfterBuild { - return impl.getBuildxBuildCommandV2(ciContext, cacheEnabled, useCacheMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath) + return impl.getBuildxBuildCommandV2(ciContext, cacheEnabled, useCacheMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath, additionalImageTags) } - return impl.getBuildxBuildCommandV1(cacheEnabled, useCacheMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath) + return impl.getBuildxBuildCommandV1(cacheEnabled, useCacheMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath, additionalImageTags) } func (impl *DockerHelperImpl) handleLanguageVersion(ciContext cicxt.CiContext, projectPath string, buildpackConfig *BuildPackConfig) { From c3a63aa110141000f3af33852d9e437192bba275 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Tue, 26 Nov 2024 13:36:24 +0530 Subject: [PATCH 16/22] using full image url for buildx --- ci-runner/helper/DockerHelper.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 4fdb49cb6..8eab71dd5 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -402,11 +402,23 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, sc exportBuildxCacheAfterBuild := ciRequest.AsyncBuildxCacheExport && multiNodeK8sDriver multiDockerTagsValue := GetMultiDockerTagsValue(scriptEnvs, preCiStageOutVariable) - dockerTags := []string{} + fullUrlDockerTags := []string{} if len(multiDockerTagsValue) > 0 { - dockerTags = strings.Split(multiDockerTagsValue, `,`) + dockerTags := strings.Split(multiDockerTagsValue, `,`) + for _, tmpDockerTag := range dockerTags { + tmpDockerTag = strings.TrimSpace(tmpDockerTag) + if !strings.Contains(tmpDockerTag, ":") { + fullImageUrl, err := BuildDockerImagePathForCustomTag(ciRequest, tmpDockerTag) + if err != nil { + log.Println("Error in building docker image multiple tags", "err", err) + return "", err + } + tmpDockerTag = fullImageUrl + } + fullUrlDockerTags = append(fullUrlDockerTags, tmpDockerTag) + } } - dockerBuild, buildxExportCacheFunc = impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath, dockerTags) + dockerBuild, buildxExportCacheFunc = impl.getBuildxBuildCommand(ciContext, exportBuildxCacheAfterBuild, cacheEnabled, ciRequest.BuildxCacheModeMin, dockerBuild, oldCacheBuildxPath, localCachePath, dest, dockerBuildConfig, dockerfilePath, fullUrlDockerTags) } else { dockerBuild = fmt.Sprintf("%s -f %s --network host -t %s %s", dockerBuild, dockerfilePath, ciRequest.DockerRepository, dockerBuildConfig.BuildContext) } From 0cbad7a855df334b475ccc34b4ae5b596677426b Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Tue, 26 Nov 2024 18:21:33 +0530 Subject: [PATCH 17/22] use GetGitRepoNameFromGitRepoUrl for getting project name from git url --- common-lib/git-manager/GitCliManager.go | 2 +- common-lib/git-manager/util/Util.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common-lib/git-manager/GitCliManager.go b/common-lib/git-manager/GitCliManager.go index 38b27f4d7..40fd3cfdc 100644 --- a/common-lib/git-manager/GitCliManager.go +++ b/common-lib/git-manager/GitCliManager.go @@ -290,7 +290,7 @@ func (impl *GitCliManagerImpl) Clone(gitContext GitContext, prj CiProjectDetails logrus.Error("could not clone repo ", "msgMsg: ", msgMsg, " err: ", cErr) return "", msgMsg, cErr } - projectName := util.GetProjectName(prj.GitRepository) + projectName := util.GetGitRepoNameFromGitRepoUrl(prj.GitRepository) projRootDir := filepath.Join(checkoutPath, projectName) _, msgMsg, cErr = impl.moveFilesFromSourceToDestination(projRootDir, checkoutPath) diff --git a/common-lib/git-manager/util/Util.go b/common-lib/git-manager/util/Util.go index c438c19a8..4cf872b97 100644 --- a/common-lib/git-manager/util/Util.go +++ b/common-lib/git-manager/util/Util.go @@ -148,4 +148,9 @@ func GetProjectName(url string) string { return projectName } +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") +} + const DEVTRON = "DEVTRON" From f2df4a22ebb856e7da1529be95d6e965057c2d80 Mon Sep 17 00:00:00 2001 From: ayu-devtron Date: Wed, 27 Nov 2024 10:50:19 +0530 Subject: [PATCH 18/22] remove unnecessary logs and functions --- ci-runner/executor/stage/ciStages.go | 4 ++-- ci-runner/helper/DockerHelper.go | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/ci-runner/executor/stage/ciStages.go b/ci-runner/executor/stage/ciStages.go index a44d261e4..885b073e5 100644 --- a/ci-runner/executor/stage/ciStages.go +++ b/ci-runner/executor/stage/ciStages.go @@ -422,7 +422,7 @@ func (impl *CiStage) extractDigest(ciCdRequest *helper.CiCdTriggerEvent, dest st digest, err = impl.dockerHelper.ExtractDigestForBuildx(dest, ciCdRequest.CommonWorkflowRequest) } else { // push to dest - log.Println(util.DEVTRON, "Docker `push Artifact", "dest", dest) + log.Println(util.DEVTRON, "Docker push Artifact", "dest", dest) err = impl.pushArtifact(ciCdRequest, dest, digest, metrics, artifactUploaded, scriptEnvs, preCiStageOutVariable) if err != nil { return err @@ -593,7 +593,7 @@ func (impl *CiStage) pushArtifact(ciCdRequest *helper.CiCdTriggerEvent, dest str if !strings.Contains(tmpDockerTag, ":") { fullImageUrl, err := helper.BuildDockerImagePathForCustomTag(ciCdRequest.CommonWorkflowRequest, tmpDockerTag) if err != nil { - log.Println("Error in building docker image", "err", err) + log.Println("Error in building docker image", "fullImageUrl", fullImageUrl, "err", err) return err } tmpDockerTag = fullImageUrl diff --git a/ci-runner/helper/DockerHelper.go b/ci-runner/helper/DockerHelper.go index 8eab71dd5..1463976ae 100644 --- a/ci-runner/helper/DockerHelper.go +++ b/ci-runner/helper/DockerHelper.go @@ -276,18 +276,6 @@ func (impl *DockerHelperImpl) DockerLogin(ciContext cicxt.CiContext, dockerCrede return util.ExecuteWithStageInfoLog(util.DOCKER_LOGIN_STAGE, performDockerLogin) } -func (impl *DockerHelperImpl) sourceBashrc(ciContext cicxt.CiContext) error { - dockerTag := "source ~/.bashrc" - log.Println(" -----> " + dockerTag) - dockerTagCMD := impl.GetCommandToExecute(dockerTag) - err := impl.cmdExecutor.RunCommand(ciContext, dockerTagCMD) - if err != nil { - log.Println(err) - return err - } - return nil -} - func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) (string, error) { ciContext := cicxt.BuildCiContext(context.Background(), ciRequest.EnableSecretMasking) @@ -410,7 +398,7 @@ func (impl *DockerHelperImpl) BuildArtifact(ciRequest *CommonWorkflowRequest, sc if !strings.Contains(tmpDockerTag, ":") { fullImageUrl, err := BuildDockerImagePathForCustomTag(ciRequest, tmpDockerTag) if err != nil { - log.Println("Error in building docker image multiple tags", "err", err) + log.Println("Error in building docker image multiple tags", "fullImageUrl", fullImageUrl, "err", err) return "", err } tmpDockerTag = fullImageUrl @@ -532,8 +520,6 @@ func getDockerBuildFlagsMap(dockerBuildConfig *DockerBuildConfig, scriptEnvs map func parseDockerFlagParam(param string, scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) string { value := param - log.Println("--- parseDockerFlagParam scriptEnvs", scriptEnvs) - log.Println("--- parseDockerFlagParam preCiStageOutVariable", preCiStageOutVariable) if strings.HasPrefix(param, DEVTRON_ENV_VAR_PREFIX) { key := strings.TrimPrefix(param, DEVTRON_ENV_VAR_PREFIX) @@ -840,8 +826,6 @@ func (impl *DockerHelperImpl) tagDockerBuild(ciContext cicxt.CiContext, ciReques func GetMultiDockerTagsValue(scriptEnvs map[string]string, preCiStageOutVariable map[int]map[string]*VariableObject) string { multiDockerTagsValue := "" - log.Println("--- GetMultiDockerTagsValue scriptEnvs", scriptEnvs) - log.Println("--- GetMultiDockerTagsValue preCiStageOutVariable", preCiStageOutVariable) if preCiStageOutVariable != nil { for k, task := range preCiStageOutVariable { if _, ok := preCiStageOutVariable[k]; ok { @@ -863,7 +847,6 @@ func GetMultiDockerTagsValue(scriptEnvs map[string]string, preCiStageOutVariable multiDockerTagsValue = scriptEnvVal } } - log.Println("--- GetMultiDockerTagsValue multiDockerTagsValue", multiDockerTagsValue) return multiDockerTagsValue } From 3e6023e2e645d863f9324253252f25804ebf7b61 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 27 Nov 2024 12:05:24 +0530 Subject: [PATCH 19/22] remove unused func --- common-lib/git-manager/util/Util.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common-lib/git-manager/util/Util.go b/common-lib/git-manager/util/Util.go index 4cf872b97..0c3855d33 100644 --- a/common-lib/git-manager/util/Util.go +++ b/common-lib/git-manager/util/Util.go @@ -139,15 +139,6 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName -} - func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] return strings.TrimSuffix(gitRepoUrl, ".git") From bb7d0c4ee9bd930281032403471771eba9652d33 Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Wed, 27 Nov 2024 16:56:14 +0530 Subject: [PATCH 20/22] go mod vendor update --- Makefile | 2 +- chart-sync/go.mod | 2 +- chart-sync/go.sum | 4 ++-- chart-sync/vendor/modules.txt | 4 ++-- ci-runner/go.mod | 2 +- ci-runner/go.sum | 4 ++-- .../common-lib/git-manager/GitCliManager.go | 2 +- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- ci-runner/vendor/modules.txt | 4 ++-- git-sensor/go.mod | 2 +- git-sensor/go.sum | 4 ++-- .../common-lib/git-manager/GitCliManager.go | 2 +- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- git-sensor/vendor/modules.txt | 4 ++-- image-scanner/go.mod | 2 +- image-scanner/go.sum | 4 ++-- .../common-lib/git-manager/GitCliManager.go | 2 +- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- image-scanner/vendor/modules.txt | 4 ++-- kubelink/go.mod | 2 +- kubelink/go.sum | 4 ++-- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- kubelink/vendor/modules.txt | 4 ++-- kubewatch/go.mod | 2 +- kubewatch/go.sum | 4 ++-- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- kubewatch/vendor/modules.txt | 4 ++-- lens/go.mod | 2 +- lens/go.sum | 4 ++-- .../devtron-labs/common-lib/git-manager/util/Util.go | 10 +++------- lens/vendor/modules.txt | 4 ++-- 31 files changed, 57 insertions(+), 81 deletions(-) diff --git a/Makefile b/Makefile index b7c31a836..039ee4a22 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -TARGET_BRANCH?=main +TARGET_BRANCH?=develop # TARGET_BRANCH=feature-branch make dep-update-oss all: build diff --git a/chart-sync/go.mod b/chart-sync/go.mod index 1bb3a4218..bce49496a 100644 --- a/chart-sync/go.mod +++ b/chart-sync/go.mod @@ -5,7 +5,7 @@ go 1.22.4 toolchain go1.22.6 replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca helm.sh/helm/v3 v3.14.3 => github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 ) diff --git a/chart-sync/go.sum b/chart-sync/go.sum index 333fe99d6..1e627069a 100644 --- a/chart-sync/go.sum +++ b/chart-sync/go.sum @@ -54,8 +54,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42 h1:pJmK44QaSztOiZe0iQHNf0sdy5KwkAeceydyhOG4RaY= github.com/devtron-labs/helm/v3 v3.14.1-0.20240401080259-90238cf69e42/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= diff --git a/chart-sync/vendor/modules.txt b/chart-sync/vendor/modules.txt index eefc21711..7bce307c2 100644 --- a/chart-sync/vendor/modules.txt +++ b/chart-sync/vendor/modules.txt @@ -93,7 +93,7 @@ github.com/containerd/platforms # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/helmLib/registry github.com/devtron-labs/common-lib/utils/http @@ -785,4 +785,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/ci-runner/go.mod b/ci-runner/go.mod index e4101cb8f..8ed251ddd 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.21.8 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca require ( github.com/Knetic/govaluate v3.0.0+incompatible diff --git a/ci-runner/go.sum b/ci-runner/go.sum index 9fbd9b807..55b7f5078 100644 --- a/ci-runner/go.sum +++ b/ci-runner/go.sum @@ -57,8 +57,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go index 38b27f4d7..40fd3cfdc 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go @@ -290,7 +290,7 @@ func (impl *GitCliManagerImpl) Clone(gitContext GitContext, prj CiProjectDetails logrus.Error("could not clone repo ", "msgMsg: ", msgMsg, " err: ", cErr) return "", msgMsg, cErr } - projectName := util.GetProjectName(prj.GitRepository) + projectName := util.GetGitRepoNameFromGitRepoUrl(prj.GitRepository) projRootDir := filepath.Join(checkoutPath, projectName) _, msgMsg, cErr = impl.moveFilesFromSourceToDestination(projRootDir, checkoutPath) diff --git a/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/ci-runner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/ci-runner/vendor/modules.txt b/ci-runner/vendor/modules.txt index 0a5225cc8..82d144d29 100644 --- a/ci-runner/vendor/modules.txt +++ b/ci-runner/vendor/modules.txt @@ -118,7 +118,7 @@ github.com/cespare/xxhash/v2 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/blob-storage github.com/devtron-labs/common-lib/constants @@ -841,4 +841,4 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/git-sensor/go.mod b/git-sensor/go.mod index 761264572..f407761ea 100644 --- a/git-sensor/go.mod +++ b/git-sensor/go.mod @@ -4,7 +4,7 @@ go 1.21 toolchain go1.22.4 -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca require ( github.com/caarlos0/env v3.5.0+incompatible diff --git a/git-sensor/go.sum b/git-sensor/go.sum index b0c5db3fd..2a6a5ceb8 100644 --- a/git-sensor/go.sum +++ b/git-sensor/go.sum @@ -29,8 +29,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169 h1:9OMZv0/fOWKK9s9BLTofFL/BO79TdyvC1Sc1HsC4esQ= github.com/devtron-labs/protos v0.0.3-0.20240809072909-83171af34169/go.mod h1:1TqULGlTey+VNhAu/ag7NJuUvByJemkqodsc9L5PHJk= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go index 38b27f4d7..40fd3cfdc 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go @@ -290,7 +290,7 @@ func (impl *GitCliManagerImpl) Clone(gitContext GitContext, prj CiProjectDetails logrus.Error("could not clone repo ", "msgMsg: ", msgMsg, " err: ", cErr) return "", msgMsg, cErr } - projectName := util.GetProjectName(prj.GitRepository) + projectName := util.GetGitRepoNameFromGitRepoUrl(prj.GitRepository) projRootDir := filepath.Join(checkoutPath, projectName) _, msgMsg, cErr = impl.moveFilesFromSourceToDestination(projRootDir, checkoutPath) diff --git a/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/git-sensor/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/git-sensor/vendor/modules.txt b/git-sensor/vendor/modules.txt index d08d04140..587132d58 100644 --- a/git-sensor/vendor/modules.txt +++ b/git-sensor/vendor/modules.txt @@ -62,7 +62,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -487,4 +487,4 @@ gopkg.in/yaml.v3 # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/image-scanner/go.mod b/image-scanner/go.mod index 4516688aa..025093580 100644 --- a/image-scanner/go.mod +++ b/image-scanner/go.mod @@ -74,4 +74,4 @@ require ( mellium.im/sasl v0.3.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/image-scanner/go.sum b/image-scanner/go.sum index ecc12e786..c38096761 100644 --- a/image-scanner/go.sum +++ b/image-scanner/go.sum @@ -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/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= 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= diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go index 38b27f4d7..40fd3cfdc 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/GitCliManager.go @@ -290,7 +290,7 @@ func (impl *GitCliManagerImpl) Clone(gitContext GitContext, prj CiProjectDetails logrus.Error("could not clone repo ", "msgMsg: ", msgMsg, " err: ", cErr) return "", msgMsg, cErr } - projectName := util.GetProjectName(prj.GitRepository) + projectName := util.GetGitRepoNameFromGitRepoUrl(prj.GitRepository) projRootDir := filepath.Join(checkoutPath, projectName) _, msgMsg, cErr = impl.moveFilesFromSourceToDestination(projRootDir, checkoutPath) diff --git a/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/image-scanner/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/image-scanner/vendor/modules.txt b/image-scanner/vendor/modules.txt index 74dc4e63f..d5c5ebdcf 100644 --- a/image-scanner/vendor/modules.txt +++ b/image-scanner/vendor/modules.txt @@ -72,7 +72,7 @@ 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.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.19.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager @@ -438,4 +438,4 @@ google.golang.org/protobuf/types/known/wrapperspb # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/kubelink/go.mod b/kubelink/go.mod index 235978e7e..3d04e3651 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -177,7 +177,7 @@ require ( ) replace ( - github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 + github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 // https://github.com/kubernetes/kubernetes/issues/79384#issuecomment-505627280 k8s.io/api => k8s.io/api v0.29.0 diff --git a/kubelink/go.sum b/kubelink/go.sum index 29357a78c..282962155 100644 --- a/kubelink/go.sum +++ b/kubelink/go.sum @@ -79,8 +79,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/distribution/v3 v3.0.0-beta.1 h1:X+ELTxPuZ1Xe5MsD3kp2wfGUhc8I+MPfRis8dZ818Ic= diff --git a/kubelink/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/kubelink/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/kubelink/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/kubelink/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/kubelink/vendor/modules.txt b/kubelink/vendor/modules.txt index 5cc9462cb..9a39b443e 100644 --- a/kubelink/vendor/modules.txt +++ b/kubelink/vendor/modules.txt @@ -127,7 +127,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/async github.com/devtron-labs/common-lib/constants @@ -1353,7 +1353,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca # go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.18.0 # k8s.io/api => k8s.io/api v0.29.0 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0 diff --git a/kubewatch/go.mod b/kubewatch/go.mod index a77c07886..1212e3c57 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -245,4 +245,4 @@ replace ( k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 431599092..23633273a 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -719,8 +719,8 @@ github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= diff --git a/kubewatch/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/kubewatch/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/kubewatch/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/kubewatch/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 3ff2f2a64..413d65e91 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -211,7 +211,7 @@ github.com/cyphar/filepath-securejoin # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -1753,4 +1753,4 @@ upper.io/db.v3/postgresql # k8s.io/mount-utils => k8s.io/mount-utils v0.29.7 # k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.7 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.7 -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/lens/go.mod b/lens/go.mod index 51629cee9..a1a548227 100644 --- a/lens/go.mod +++ b/lens/go.mod @@ -59,4 +59,4 @@ require ( github.com/onsi/gomega v1.18.1 // indirect ) -replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +replace github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca diff --git a/lens/go.sum b/lens/go.sum index 817e88ae9..59091c176 100644 --- a/lens/go.sum +++ b/lens/go.sum @@ -22,8 +22,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 h1:9sDRVxcJwgfMQrQTqzwO6qgpRAaOqcauuUdtgFsmoTE= -github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca h1:WXh3S0n1Bu26lWEB05CvH9Lc3NzUlqa9gbWeVCVGkhE= +github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca/go.mod h1:NJSMdv+zTUK3p7rML12RZSeAUKHeLaoY3sR/oK0xhwo= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb h1:CkfQQgZc950/hTPqtQSiHV2RmZgkBLGCzwR02FZYjAU= github.com/devtron-labs/protos v0.0.3-0.20240130061723-7b2e12ab0abb/go.mod h1:pjLjgoa1GzbkOkvbMyP4SAKsaiK7eG6GoQCNauG03JA= github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= diff --git a/lens/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go b/lens/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go index c438c19a8..0c3855d33 100644 --- a/lens/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go +++ b/lens/vendor/github.com/devtron-labs/common-lib/git-manager/util/Util.go @@ -139,13 +139,9 @@ func ParseUrl(rawURL string) (parsedURL *url.URL, err error) { return parsedURL, err } -// GetProjectName this function has been designed for returning project name of git-lab and git-hub providers only -// do not remove this function -func GetProjectName(url string) string { - //if url = https://github.com/devtron-labs/git-sensor.git then it will return git-sensor - projName := strings.Split(url, ".")[1] - projectName := projName[strings.LastIndex(projName, "/")+1:] - return projectName +func GetGitRepoNameFromGitRepoUrl(gitRepoUrl string) string { + gitRepoUrl = gitRepoUrl[strings.LastIndex(gitRepoUrl, "/")+1:] + return strings.TrimSuffix(gitRepoUrl, ".git") } const DEVTRON = "DEVTRON" diff --git a/lens/vendor/modules.txt b/lens/vendor/modules.txt index ca0934f2b..0b7d298f2 100644 --- a/lens/vendor/modules.txt +++ b/lens/vendor/modules.txt @@ -7,7 +7,7 @@ github.com/caarlos0/env # github.com/cespare/xxhash/v2 v2.2.0 ## explicit; go 1.11 github.com/cespare/xxhash/v2 -# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib v0.0.0 => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca ## explicit; go 1.21 github.com/devtron-labs/common-lib/constants github.com/devtron-labs/common-lib/git-manager/util @@ -282,4 +282,4 @@ google.golang.org/protobuf/types/known/timestamppb # mellium.im/sasl v0.3.1 ## explicit; go 1.18 mellium.im/sasl -# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241119061046-90ec3a641878 +# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241127070215-76c4a4abfeca From c666c49bfdedb0cabb8613e5a30c6907504208fd Mon Sep 17 00:00:00 2001 From: Vikram Singh Date: Wed, 27 Nov 2024 16:59:53 +0530 Subject: [PATCH 21/22] build fix --- Makefile | 2 +- ci-runner/go.mod | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 039ee4a22..b7c31a836 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -TARGET_BRANCH?=develop +TARGET_BRANCH?=main # TARGET_BRANCH=feature-branch make dep-update-oss all: build diff --git a/ci-runner/go.mod b/ci-runner/go.mod index 8ed251ddd..5ce085e2d 100644 --- a/ci-runner/go.mod +++ b/ci-runner/go.mod @@ -125,6 +125,4 @@ require ( sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect -) - -replace github.com/devtron-labs/ci-runner => github.com/devtron-labs/devtron-services/ci-runner v0.0.0-20241024131256-7d3ba621dece +) \ No newline at end of file From 8edd543d8bdfb09dcea7e5e811a682512687bd61 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Wed, 27 Nov 2024 17:20:34 +0530 Subject: [PATCH 22/22] remove github.com/devtron-labs/kubelink from kubeoink --- kubelink/go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/kubelink/go.mod b/kubelink/go.mod index 3d04e3651..4459ee955 100644 --- a/kubelink/go.mod +++ b/kubelink/go.mod @@ -208,5 +208,3 @@ replace ( k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0 k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0 ) - -replace github.com/devtron-labs/kubelink => github.com/devtron-labs/devtron-services/kubelink v0.0.0-20241103151131-e0ee0068cae4