Merge branch 'develop' into app-template-oss-ent

Author: kartik-579

CHANGELOG/release-notes-v1.3.0.md

@@ -0,0 +1,37 @@
+## v1.3.0
+
+## Bugs
+- fix: panic fixes  (#6411)
+- fix: auto pre-cd not getting triggered (if cd is manual) after webhook ci event is captured (#6407)
+- fix: Base update (#6405)
+- fix: devtron apps deployed via helm showing in helm apps list (#6397)
+- fix: when a helm app is managed by argocd then skip argo app update when same name ext helm app is installed (#6389)
+- fix: upgraded to go-git/v5 v5.13.0 (#6388)
+- fix: fix for ci cd workflow fake success status and multiple post/pre cd success notifications (#6370)
+- fix: fix for while cloning app or workflow when external secret is present in any pipeline then that pipeline is not cloned (#6368)
+- fix: fix for while cloning app or workflow when external secret is present in any pipeline then that pipeline is not cloned (#6366)
+- fix: buildx driver opt using k8s driver even if not enabled (#6349)
+- fix: Auto trigger even if pre-cd fails (#6338)
+- fix: role group listing fix (#6343)
+- fix: sql injection fixes (#6334)
+- fix: role group k8s permissions duplication (#6336)
+## Enhancements
+- feat: hibernate devtron app (#6356)
+- feat: separate build worker status timeline (#6320)
+- feat: send notification with chosen config (#6331)
+- feat: sql script changes for operation audit  (#6342)
+## Documentation
+- doc: updated devtron user list in users.md (#6363)
+## Others
+- misc: pipeline listing in app Group (#6410)
+- misc: Notif back com (#6398)
+- sync: Main sync develop (#6396)
+- sync: vendor update on release 29 (#6395)
+- sync: Release candidate v0.29.0 (#6394)
+- sync: Main sync develop (#6375)
+- misc: common-lib change (#6347)
+- sync: Release candidate v0.28.0 (#6340)
+- misc: Fix typo: Cronjob → CronJob (#6335)
+- sync: Main sync develop  (#6358)
+
+

Dockerfile

@@ -14,7 +14,7 @@ ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendo
 RUN GOOS=linux make build
 
 # uncomment this post build arg
-FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-all
+FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 as  devtron-all
 
 RUN apt update && \
     apt install ca-certificates git curl -y && \
@@ -43,4 +43,4 @@ RUN chmod +x /git-ask-pass.sh
 
 USER devtron
 
-CMD ["./devtron"]
+CMD ["./devtron"]

DockerfileEA

@@ -13,7 +13,7 @@ ADD ./vendor/github.com/Microsoft/ /go/src/github.com/devtron-labs/devtron/vendo
 
 RUN GOOS=linux make build-all
 
-FROM ubuntu:22.04@sha256:1b8d8ff4777f36f19bfe73ee4df61e3a0b789caeff29caa019539ec7c9a57f95 as  devtron-ea
+FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 as  devtron-ea
 
 RUN apt update && \
     apt install ca-certificates curl -y && \

USERS.md

@@ -5,20 +5,34 @@ As the community grows, we want to keep track of the users and organizations usi
 Currently, Devtron is being used by the following organizations:
 
 1. [73strings](https://www.73strings.com/)
-2. [Ather Energy](https://www.atherenergy.com/)
-3. [BharatPe](https://bharatpe.com/)
-4. [Birdeye](https://birdeye.com/)
-5. [Bluecopa](https://www.bluecopa.com/) 
-6. [Chitale Bandhu](https://www.chitalebandhu.in/) 
-7. [Centricity](https://centricity.co.in/) 
-8. [Delhivery](https://www.delhivery.com/)
-9. [KHELGroup](https://thekhelgroup.com/)
-10. [Lemnisk](https://www.lemnisk.co/) 
-11. [OTPLess](https://otpless.com/)
-12. [Spinny](https://www.spinny.com/)
-13. [Tata 1Mg](https://www.1mg.com/)
-14. [TravClan](https://www.travclan.com/) 
-15. [Xoxoday](https://www.xoxoday.com/)
-
-
-
+2. [Apica](https://www.apica.io/)
+3. [Ather Energy](https://www.atherenergy.com/)
+4. [BharatPe](https://bharatpe.com/)
+5. [Birdeye](https://birdeye.com/)
+6. [Bluecopa](https://www.bluecopa.com/) 
+7. [Careers 360](https://www.careers360.com/)
+8. [Chitale Bandhu](https://www.chitalebandhu.in/) 
+9.  [Comcast](https://corporate.comcast.com/)
+10. [Delhivery](https://www.delhivery.com/)
+11. [Empuls](https://www.empuls.io/)
+12. [EMT Madrid](https://www.emtmadrid.es/Home)
+13. [Encircle Marketing](https://encircle-marketing.com/)
+14. [FTL Express](https://www.ftl-express.com/)
+15. [Genwise](https://www.genwise.club/)
+16. [HCL Tech](https://www.hcltech.com/)
+17. [Indiamart](https://www.indiamart.com/)
+18. [IPCortex](https://ipcortex.co.uk/)
+19. [Jivi.ai](https://www.jivi.ai/)
+20. [KHELGroup](https://thekhelgroup.com/)
+21. [Kenny LLC](https://kennyl.dev/)
+22. [Lemnisk](https://www.lemnisk.co/) 
+23. [MobileID](https://www.mobileid.ch/en)
+24. [OTPLess](https://otpless.com/)
+25. [University of Albany](https://www.albany.edu/)
+26. [Shiprocket](https://www.shiprocket.in/)
+27. [Spinny](https://www.spinny.com/)
+28. [Tata 1Mg](https://www.1mg.com/)
+29. [Texas Tech University](https://www.ttu.edu/)
+30. [TravClan](https://www.travclan.com/) 
+31. [Xoxoday](https://www.xoxoday.com/)
+32. [Zupee](https://www.zupee.com/)

Wire.go

@@ -73,6 +73,7 @@ import (
 	"github.com/devtron-labs/devtron/api/sse"
 	"github.com/devtron-labs/devtron/api/team"
 	"github.com/devtron-labs/devtron/api/terminal"
+	"github.com/devtron-labs/devtron/api/userResource"
 	util5 "github.com/devtron-labs/devtron/api/util"
 	webhookHelm "github.com/devtron-labs/devtron/api/webhook/helm"
 	"github.com/devtron-labs/devtron/cel"
@@ -102,14 +103,14 @@ import (
 	appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
 	"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
-	"github.com/devtron-labs/devtron/internal/sql/repository/deploymentConfig"
 	dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
 	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	repository8 "github.com/devtron-labs/devtron/internal/sql/repository/imageTagging"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
+	read4 "github.com/devtron-labs/devtron/pkg/app/appDetails/read"
 	"github.com/devtron-labs/devtron/pkg/app/dbMigration"
 	"github.com/devtron-labs/devtron/pkg/app/status"
 	"github.com/devtron-labs/devtron/pkg/appClone"
@@ -125,9 +126,10 @@ import (
 	"github.com/devtron-labs/devtron/pkg/build"
 	"github.com/devtron-labs/devtron/pkg/build/artifacts/imageTagging"
 	pipeline6 "github.com/devtron-labs/devtron/pkg/build/pipeline"
-	"github.com/devtron-labs/devtron/pkg/bulkAction"
+	"github.com/devtron-labs/devtron/pkg/bulkAction/service"
 	"github.com/devtron-labs/devtron/pkg/chart"
 	"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
+	read2 "github.com/devtron-labs/devtron/pkg/chart/read"
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/commonService"
 	"github.com/devtron-labs/devtron/pkg/config"
@@ -155,6 +157,8 @@ import (
 	repository3 "github.com/devtron-labs/devtron/pkg/pipeline/history/repository"
 	repository5 "github.com/devtron-labs/devtron/pkg/pipeline/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline/types"
+	"github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus"
+	repository6 "github.com/devtron-labs/devtron/pkg/pipeline/workflowStatus/repository"
 	"github.com/devtron-labs/devtron/pkg/plugin"
 	"github.com/devtron-labs/devtron/pkg/policyGovernance"
 	resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
@@ -167,6 +171,7 @@ import (
 	workflow3 "github.com/devtron-labs/devtron/pkg/workflow"
 	"github.com/devtron-labs/devtron/pkg/workflow/dag"
 	util2 "github.com/devtron-labs/devtron/util"
+	"github.com/devtron-labs/devtron/util/commonEnforcementFunctionsUtil"
 	cron2 "github.com/devtron-labs/devtron/util/cron"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/google/wire"
@@ -210,6 +215,7 @@ func InitializeApp() (*App, error) {
 		workflow3.WorkflowWireSet,
 		imageTagging.WireSet,
 		devtronResource.DevtronResourceWireSet,
+		userResource.UserResourceWireSet,
 		policyGovernance.PolicyGovernanceWireSet,
 		resourceScan.ScanningResultWireSet,
 
@@ -355,8 +361,10 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(gitOpsConfig.DevtronAppGitOpConfigService), new(*gitOpsConfig.DevtronAppGitOpConfigServiceImpl)),
 		chart.NewChartServiceImpl,
 		wire.Bind(new(chart.ChartService), new(*chart.ChartServiceImpl)),
-		bulkAction.NewBulkUpdateServiceImpl,
-		wire.Bind(new(bulkAction.BulkUpdateService), new(*bulkAction.BulkUpdateServiceImpl)),
+		read2.NewChartReadServiceImpl,
+		wire.Bind(new(read2.ChartReadService), new(*read2.ChartReadServiceImpl)),
+		service.NewBulkUpdateServiceImpl,
+		wire.Bind(new(service.BulkUpdateService), new(*service.BulkUpdateServiceImpl)),
 
 		repository.NewImageTagRepository,
 		wire.Bind(new(repository.ImageTagRepository), new(*repository.ImageTagRepositoryImpl)),
@@ -373,6 +381,10 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(appList.AppListingRouter), new(*appList.AppListingRouterImpl)),
 		appList2.NewAppListingRestHandlerImpl,
 		wire.Bind(new(appList2.AppListingRestHandler), new(*appList2.AppListingRestHandlerImpl)),
+
+		read4.NewAppDetailsReadServiceImpl,
+		wire.Bind(new(read4.AppDetailsReadService), new(*read4.AppDetailsReadServiceImpl)),
+
 		app.NewAppListingServiceImpl,
 		wire.Bind(new(app.AppListingService), new(*app.AppListingServiceImpl)),
 		repository.NewAppListingRepositoryImpl,
@@ -471,6 +483,11 @@ func InitializeApp() (*App, error) {
 		pipeline.NewCiServiceImpl,
 		wire.Bind(new(pipeline.CiService), new(*pipeline.CiServiceImpl)),
 
+		workflowStatus.NewWorkflowStageFlowStatusServiceImpl,
+		wire.Bind(new(workflowStatus.WorkFlowStageStatusService), new(*workflowStatus.WorkFlowStageStatusServiceImpl)),
+		repository6.NewWorkflowStageRepositoryImpl,
+		wire.Bind(new(repository6.WorkflowStageRepository), new(*repository6.WorkflowStageRepositoryImpl)),
+
 		pipelineConfig.NewCiWorkflowRepositoryImpl,
 		wire.Bind(new(pipelineConfig.CiWorkflowRepository), new(*pipelineConfig.CiWorkflowRepositoryImpl)),
 
@@ -488,6 +505,9 @@ func InitializeApp() (*App, error) {
 		rbac.NewEnforcerUtilImpl,
 		wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
 
+		commonEnforcementFunctionsUtil.NewCommonEnforcementUtilImpl,
+		wire.Bind(new(commonEnforcementFunctionsUtil.CommonEnforcementUtil), new(*commonEnforcementFunctionsUtil.CommonEnforcementUtilImpl)),
+
 		chartConfig.NewPipelineConfigRepository,
 		wire.Bind(new(chartConfig.PipelineConfigRepository), new(*chartConfig.PipelineConfigRepositoryImpl)),
 
@@ -615,6 +635,7 @@ func InitializeApp() (*App, error) {
 		repository9.NewClusterInstalledAppsRepositoryImpl,
 		wire.Bind(new(repository9.ClusterInstalledAppsRepository), new(*repository9.ClusterInstalledAppsRepositoryImpl)),
 
+		commonService.NewCommonBaseServiceImpl,
 		commonService.NewCommonServiceImpl,
 		wire.Bind(new(commonService.CommonService), new(*commonService.CommonServiceImpl)),
 
@@ -652,8 +673,8 @@ func InitializeApp() (*App, error) {
 
 		router.NewCommonRouterImpl,
 		wire.Bind(new(router.CommonRouter), new(*router.CommonRouterImpl)),
-		restHandler.NewCommonRestHanlderImpl,
-		wire.Bind(new(restHandler.CommonRestHanlder), new(*restHandler.CommonRestHanlderImpl)),
+		restHandler.NewCommonRestHandlerImpl,
+		wire.Bind(new(restHandler.CommonRestHandler), new(*restHandler.CommonRestHandlerImpl)),
 
 		router.NewScopedVariableRouterImpl,
 		wire.Bind(new(router.ScopedVariableRouter), new(*router.ScopedVariableRouterImpl)),
@@ -934,11 +955,7 @@ func InitializeApp() (*App, error) {
 		cel.NewCELServiceImpl,
 		wire.Bind(new(cel.EvaluatorService), new(*cel.EvaluatorServiceImpl)),
 
-		deploymentConfig.NewRepositoryImpl,
-		wire.Bind(new(deploymentConfig.Repository), new(*deploymentConfig.RepositoryImpl)),
-
-		common.NewDeploymentConfigServiceImpl,
-		wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
+		common.WireSet,
 
 		repoCredsK8sClient.NewRepositoryCredsK8sClientImpl,
 		wire.Bind(new(repoCredsK8sClient.RepositoryCredsK8sClient), new(*repoCredsK8sClient.RepositoryCredsK8sClientImpl)),

WiringNilCheck.go

@@ -114,6 +114,8 @@ func skipUnnecessaryFieldsForCheck(fieldName, valName string) bool {
 		"modulecronserviceimpl":        {"cron"},
 		"oteltracingserviceimpl":       {"traceprovider"},
 		"terminalaccessrepositoryimpl": {"templatescache"},
+		"grpcapiclientimpl":            {"serviceclient"},
+		"serverenvconfig":              {"errorencounteredongettingdevtronhelmrelease"},
 	}
 	if _, ok := fieldAndValName[valName]; ok {
 		for _, ignoreFieldName := range fieldAndValName[valName] {

api/appStore/chartGroup/ChartGroupRestHandler.go

@@ -274,7 +274,7 @@ func (impl *ChartGroupRestHandlerImpl) GetChartGroupList(w http.ResponseWriter,
 			return
 		}
 	}
-	res, err := impl.ChartGroupService.ChartGroupList(maxCount)
+	res, err := impl.ChartGroupService.GetChartGroupList(maxCount)
 	if err != nil {
 		impl.Logger.Errorw("service err, GetChartGroupList", "err", err, "max", max)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/argoApplication/ArgoApplicationRestHandler.go

@@ -17,6 +17,7 @@
 package argoApplication
 
 import (
+	"context"
 	"errors"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
@@ -89,6 +90,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
+	ctx := r.Context()
+	ctx = context.WithValue(ctx, "token", token)
+
 	var err error
 	v := r.URL.Query()
 	resourceName := v.Get("name")
@@ -104,7 +108,7 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 			return
 		}
 	}
-	resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
+	resp, err := handler.readService.GetAppDetailEA(ctx, resourceName, namespace, clusterId)
 	if err != nil {
 		handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/argoApplication/wire_argoApplication.go

@@ -30,6 +30,7 @@ var ArgoApplicationWireSetFull = wire.NewSet(
 	config.NewArgoApplicationConfigServiceImpl,
 	wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),
 
+	argoApplication.NewArgoApplicationServiceImpl,
 	argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
 	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
 

api/auth/sso/SsoLoginHandler.go

@@ -19,10 +19,10 @@ package sso
 import (
 	"encoding/json"
 	"errors"
+	"github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"net/http"
 	"strconv"
 
-	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/sso"