Merge branch 'main' into pg-query-fail-1

Author: prakash100198

CHANGELOG/release-notes-v1.2.0.md

@@ -0,0 +1,35 @@
+## v1.2.0
+
+
+
+## Bugs
+- fix: Application listing panic handling (#6199)
+- fix: Copy image plugin panic handling (#6220)
+- fix: Remove gaps between image scanning V1 & V2  (#6213)
+- fix: Select Query errors in Postgres Pod Logs (#6238)
+- fix: Graceful shutdown handling and logs flush (#6239)
+- fix: Remove unused variable causing double register in prometheus (#6279)
+## Enhancements
+- feat: Ignore workflow cache config (#6218)
+- feat: Build infra support (#6151)
+- feat: Helm type pipeline app status (#6262)
+- feat: Added labels to manual sync job (#6269)
+## Others
+- chore: Changes in CD trigger plugin condition v1.3.0 (#6233)
+- misc: GetDockerRegistryIdForCiPipeline (#6231)
+- chore: Merging user service with connection manager (#6225)
+- chore: Argocd repository secret creation service refactoring (#6229)
+- chore: Added sql migraiton for searchable key (#6252)
+- misc: Adds the required env variables to set up devtron (#6254)
+- misc: Added schme json for cronjobs (#6260)
+- misc: Error handling when template is empty in ExtractVariables (#6261)
+- misc: Nil check in envOverride.chart (#6263)
+- misc: PG enable metrics (#6243)
+- chore: Patch infra merge (#6274)
+- chore: Argo common client (#6266)
+- chore: Optimised Dockerfile by removing extra layers (#6293)
+- chore: Updated ApplistingRestHandler oss/ent function (#6307)
+- chore: Added env generator changes (#6302)
+- chore: Deployment config methods add (#6297)
+- misc: Deployment, reference and statefulset updated versions (#6284)
+- chore: Scoped var oss/ent changes (#6319)

CHANGELOG/release-notes-v1.2.1.md

@@ -0,0 +1,6 @@
+## v1.2.1
+
+## Bugs
+- fix: Auto cd trigger even if pre-cd fails (#6338)
+
+

CHANGELOG/release-notes-v1.2.2.md

@@ -0,0 +1,6 @@
+## v1.2.2
+
+## Bugs
+- fix: Failure to trigger cd set on auto after pre-cd is success which is also on auto which got triggered after ci  (#6361)
+
+

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

@@ -125,7 +125,7 @@ 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"
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
@@ -155,6 +155,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"
@@ -355,8 +357,8 @@ 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)),
+		service.NewBulkUpdateServiceImpl,
+		wire.Bind(new(service.BulkUpdateService), new(*service.BulkUpdateServiceImpl)),
 
 		repository.NewImageTagRepository,
 		wire.Bind(new(repository.ImageTagRepository), new(*repository.ImageTagRepositoryImpl)),
@@ -471,6 +473,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)),
 

api/bean/UserRequest.go

@@ -19,6 +19,7 @@ package bean
 import (
 	"encoding/json"
 	"github.com/devtron-labs/devtron/pkg/auth/user/bean"
+	"github.com/devtron-labs/devtron/pkg/sql"
 	"time"
 )
 
@@ -168,3 +169,40 @@ type BulkDeleteRequest struct {
 type UserRoleGroup struct {
 	RoleGroup *RoleGroup `json:"roleGroup"`
 }
+
+type GroupPermissionsAuditDto struct {
+	RoleGroupInfo *RoleGroup   `json:"roleGroupInfo,omitempty"`
+	EntityAudit   sql.AuditLog `json:"entityAudit,omitempty"`
+}
+
+func NewGroupPermissionsAuditDto() *GroupPermissionsAuditDto {
+	return &GroupPermissionsAuditDto{}
+}
+
+func (pa *GroupPermissionsAuditDto) WithRoleGroupInfo(roleGroupInfo *RoleGroup) *GroupPermissionsAuditDto {
+	pa.RoleGroupInfo = roleGroupInfo
+	return pa
+}
+func (pa *GroupPermissionsAuditDto) WithEntityAudit(entityAudit sql.AuditLog) *GroupPermissionsAuditDto {
+	pa.EntityAudit = entityAudit
+	return pa
+}
+
+type UserPermissionsAuditDto struct {
+	UserInfo    *UserInfo    `json:"userInfo,omitempty"`
+	EntityAudit sql.AuditLog `json:"entityAudit,omitempty"`
+}
+
+func NewUserPermissionsAuditDto() *UserPermissionsAuditDto {
+	return &UserPermissionsAuditDto{}
+}
+
+func (pa *UserPermissionsAuditDto) WithUserInfo(userInfo *UserInfo) *UserPermissionsAuditDto {
+	pa.UserInfo = userInfo
+	return pa
+}
+
+func (pa *UserPermissionsAuditDto) WithEntityAudit(entityAudit sql.AuditLog) *UserPermissionsAuditDto {
+	pa.EntityAudit = entityAudit
+	return pa
+}

api/deployment/DeploymentConfigRestHandler.go

@@ -82,7 +82,7 @@ func (handler *DeploymentConfigRestHandlerImpl) CreateChartFromFile(w http.Respo
 	}
 
 	token := r.Header.Get("token")
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionUpdate, "*"); !ok {
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*"); !ok {
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
@@ -177,7 +177,7 @@ func (handler *DeploymentConfigRestHandlerImpl) SaveChart(w http.ResponseWriter,
 	}
 
 	token := r.Header.Get("token")
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionDelete, "*"); !ok {
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionCreate, "*"); !ok {
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
@@ -234,7 +234,7 @@ func (handler *DeploymentConfigRestHandlerImpl) DownloadChart(w http.ResponseWri
 	}
 
 	token := r.Header.Get("token")
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionUpdate, "*"); !ok {
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*"); !ok {
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}