Merge pull request #6699 from devtron-labs/main-sync-develop-2jul

vikramdevtron · web-flow · commit 0c2ff5ce87e2 · 2025-07-02T14:34:03.000+05:30
sync: Main sync develop
diff --git a/go.mod b/go.mod
@@ -324,7 +324,7 @@ require (
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
 	github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702071405-c03dcfbe9993
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702071405-c03dcfbe9993
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702074224-9bda00b1f155
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702074224-9bda00b1f155
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
 )
diff --git a/go.sum b/go.sum
@@ -237,10 +237,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702071405-c03dcfbe9993 h1:A6skojaZO1hgGjCAkT2dpswiYRki7ovjqt+D7BAcpTQ=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702071405-c03dcfbe9993/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702071405-c03dcfbe9993 h1:E9qUM7XtDBVnHgjqm1IQzwGd54JzLR/u8921ZZcXggY=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702071405-c03dcfbe9993/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702074224-9bda00b1f155 h1:+rWT+TjIKMif8IBvwDg545h7UPBxI+d94r9sCxC+1GE=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702074224-9bda00b1f155/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702074224-9bda00b1f155 h1:/hdnSB/SGOsiIKw9/BH9kg5eg/Ov60IQj8Gjc8cVWgE=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702074224-9bda00b1f155/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=
diff --git a/pkg/appClone/AppCloneService.go b/pkg/appClone/AppCloneService.go
@@ -41,6 +41,7 @@ import (
 	bean3 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	globalUtil "github.com/devtron-labs/devtron/util"
 	"github.com/go-pg/pg"
+	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"net/http"
 	"strings"
@@ -767,6 +768,9 @@ func (impl *AppCloneServiceImpl) createWfInstances(refWfMappings []bean4.AppWork
 			impl.logger.Errorw("error in creating ci pipeline, app clone", "err", err)
 			return createWorkflowMappingDto, err
 		}
+		if ci == nil || ci.CiPipelines == nil || len(ci.CiPipelines) == 0 {
+			return createWorkflowMappingDto, errors.New("ci pipeline not created")
+		}
 		impl.logger.Debugw("ci created", "ci", ci)
 	}
 
@@ -812,6 +816,7 @@ type cloneCiPipelineRequest struct {
 func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (*bean.CiConfigRequest, error) {
 	refCiConfig, err := impl.pipelineBuilder.GetCiPipeline(req.refAppId)
 	if err != nil {
+		impl.logger.Errorw("error in fetching ci config", "err", err)
 		return nil, err
 	}
 
@@ -825,6 +830,7 @@ func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (
 		}
 	}
 	if refCiPipeline == nil {
+		impl.logger.Errorw("error in fetching ci pipeline", "err", err)
 		return nil, nil
 	}
 	pipelineName := refCiPipeline.Name
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -523,15 +523,15 @@ github.com/davecgh/go-spew/spew
 # github.com/deckarep/golang-set v1.8.0
 ## explicit; go 1.17
 github.com/deckarep/golang-set
-# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702071405-c03dcfbe9993
+# github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702074224-9bda00b1f155
 ## explicit; go 1.24.0
 github.com/devtron-labs/authenticator/apiToken
 github.com/devtron-labs/authenticator/client
 github.com/devtron-labs/authenticator/jwt
 github.com/devtron-labs/authenticator/middleware
 github.com/devtron-labs/authenticator/oidc
 github.com/devtron-labs/authenticator/password
-# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702071405-c03dcfbe9993
+# github.com/devtron-labs/common-lib v0.18.1-0.20241001061923-eda545dc839e => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702074224-9bda00b1f155
 ## explicit; go 1.24.0
 github.com/devtron-labs/common-lib/async
 github.com/devtron-labs/common-lib/blob-storage
@@ -2596,5 +2596,5 @@ xorm.io/xorm/log
 xorm.io/xorm/names
 xorm.io/xorm/schemas
 xorm.io/xorm/tags
-# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702071405-c03dcfbe9993
-# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702071405-c03dcfbe9993
+# github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702074224-9bda00b1f155
+# github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702074224-9bda00b1f155

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ import (`
`41`	`41`	`bean3 "github.com/devtron-labs/devtron/pkg/pipeline/bean"`
`42`	`42`	`globalUtil "github.com/devtron-labs/devtron/util"`
`43`	`43`	`"github.com/go-pg/pg"`
	`44`	`+ "github.com/pkg/errors"`
`44`	`45`	`"go.uber.org/zap"`
`45`	`46`	`"net/http"`
`46`	`47`	`"strings"`
`@@ -767,6 +768,9 @@ func (impl *AppCloneServiceImpl) createWfInstances(refWfMappings []bean4.AppWork`
`767`	`768`	`impl.logger.Errorw("error in creating ci pipeline, app clone", "err", err)`
`768`	`769`	`return createWorkflowMappingDto, err`
`769`	`770`	`}`
	`771`	`+ if ci == nil \|\| ci.CiPipelines == nil \|\| len(ci.CiPipelines) == 0 {`
	`772`	`+ return createWorkflowMappingDto, errors.New("ci pipeline not created")`
	`773`	`+ }`
`770`	`774`	`impl.logger.Debugw("ci created", "ci", ci)`
`771`	`775`	`}`
`772`	`776`
`@@ -812,6 +816,7 @@ type cloneCiPipelineRequest struct {`
`812`	`816`	`func (impl AppCloneServiceImpl) CreateCiPipeline(req cloneCiPipelineRequest) (*bean.CiConfigRequest, error) {`
`813`	`817`	`refCiConfig, err := impl.pipelineBuilder.GetCiPipeline(req.refAppId)`
`814`	`818`	`if err != nil {`
	`819`	`+ impl.logger.Errorw("error in fetching ci config", "err", err)`
`815`	`820`	`return nil, err`
`816`	`821`	`}`
`817`	`822`
`@@ -825,6 +830,7 @@ func (impl AppCloneServiceImpl) CreateCiPipeline(req cloneCiPipelineRequest) (`
`825`	`830`	`}`
`826`	`831`	`}`
`827`	`832`	`if refCiPipeline == nil {`
	`833`	`+ impl.logger.Errorw("error in fetching ci pipeline", "err", err)`
`828`	`834`	`return nil, nil`
`829`	`835`	`}`
`830`	`836`	`pipelineName := refCiPipeline.Name`