Skip to content

Commit cff9054

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #6715 from devtron-labs/main-sync-develop-7july
sync: Main sync develop
2 parents 5626600 + 5cfa33f commit cff9054

File tree

24 files changed

+5949
-44
lines changed

24 files changed

+5949
-44
lines changed

‎api/cluster/ClusterRestHandler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
556556
common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
557557
return
558558
}
559-
var bean bean2.ClusterBean
559+
var bean bean2.DeleteClusterBean
560560
err = decoder.Decode(&bean)
561561
if err != nil {
562562
impl.logger.Errorw("request err, Delete", "error", err, "payload", bean)
@@ -580,7 +580,7 @@ func (impl ClusterRestHandlerImpl) DeleteCluster(w http.ResponseWriter, r *http.
580580
//RBAC enforcer Ends
581581
err = impl.deleteService.DeleteCluster(&bean, userId)
582582
if err != nil {
583-
impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id, "name", bean.ClusterName)
583+
impl.logger.Errorw("error in deleting cluster", "err", err, "id", bean.Id)
584584
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
585585
return
586586
}

‎api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,10 @@ func (handler *PipelineConfigRestHandlerImpl) validateCiTriggerRBAC(token string
625625
appObject := handler.enforcerUtil.GetAppRBACNameByAppId(ciPipeline.AppId)
626626
workflowObject := handler.enforcerUtil.GetWorkflowRBACByCiPipelineId(ciPipelineId, workflowName)
627627
triggerObject := handler.enforcerUtil.GetTeamEnvRBACNameByCiPipelineIdAndEnvIdOrName(ciPipelineId, triggerEnvironmentId, envName)
628-
appRbacOk := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
629-
if !appRbacOk {
628+
var appRbacOk bool
629+
if ciPipeline.App.AppType == helper.CustomApp {
630+
appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionTrigger, appObject)
631+
} else if ciPipeline.App.AppType == helper.Job {
630632
appRbacOk = handler.enforcer.Enforce(token, casbin.ResourceJobs, casbin.ActionTrigger, appObject) && handler.enforcer.Enforce(token, casbin.ResourceWorkflow, casbin.ActionTrigger, workflowObject) && handler.enforcer.Enforce(token, casbin.ResourceJobsEnv, casbin.ActionTrigger, triggerObject)
631633
}
632634

‎assets/plugin-icons/ic-plugin-aws-ecr-retag.png

2.35 KB
Loading

‎client/cron/CdApplicationStatusUpdateHandler.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ func NewCdApplicationStatusUpdateHandlerImpl(logger *zap.SugaredLogger, appServi
110110
logger.Errorw("error in starting argo application status update cron job", "err", err)
111111
return nil
112112
}
113+
_, err = cron.AddFunc("@every 1m", impl.ArgoPipelineTimelineUpdate)
114+
if err != nil {
115+
logger.Errorw("error in starting argo application status update cron job", "err", err)
116+
return nil
117+
}
113118
_, err = cron.AddFunc("@every 1m", impl.FluxApplicationStatusUpdate)
114119
if err != nil {
115120
logger.Errorw("error in starting argo application status update cron job", "err", err)

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ require (
324324
replace (
325325
github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
326326
github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
327-
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702124715-9fa1fd0f8fd3
328-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702124715-9fa1fd0f8fd3
327+
github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250707110047-5ce1ce150a76
328+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76
329329
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
330330
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
237237
github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
238238
github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
239239
github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
240-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702124715-9fa1fd0f8fd3 h1:c+CJxKtMhfjCiHHOmWAANMAH1OkDqfvT5o7QTabPH80=
241-
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250702124715-9fa1fd0f8fd3/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
242-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702124715-9fa1fd0f8fd3 h1:wFe3eGKaeyBI98NS7yClXiG7mRO04WEp8csMadiHABM=
243-
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250702124715-9fa1fd0f8fd3/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
240+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250707110047-5ce1ce150a76 h1:382wKs9a8Fpz2wK5egWhLKpI4a5i2iThvcWVL1Y6Rvk=
241+
github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250707110047-5ce1ce150a76/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
242+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76 h1:Oxx073Vec7hW3JPNsWsZGyC3gULHVluLKTLEfXgjfeY=
243+
github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250707110047-5ce1ce150a76/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
244244
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
245245
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
246246
github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

‎pkg/cluster/ClusterService.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ type ClusterService interface {
7070
FindAllExceptVirtual() ([]*bean.ClusterBean, error)
7171
FindAllWithoutConfig() ([]*bean.ClusterBean, error)
7272
FindAllActive() ([]bean.ClusterBean, error)
73-
DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error)
73+
DeleteFromDb(bean *clusterBean.DeleteClusterBean, userId int32) (string, error)
7474

7575
FindById(id int) (*bean.ClusterBean, error)
7676
FindByIdWithoutConfig(id int) (*bean.ClusterBean, error)
@@ -580,7 +580,7 @@ func (impl *ClusterServiceImpl) buildInformer() {
580580
impl.K8sInformerFactory.BuildInformer(clusterInfo)
581581
}
582582

583-
func (impl *ClusterServiceImpl) DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error) {
583+
func (impl *ClusterServiceImpl) DeleteFromDb(bean *clusterBean.DeleteClusterBean, userId int32) (string, error) {
584584
existingCluster, err := impl.clusterRepository.FindById(bean.Id)
585585
if err != nil {
586586
impl.logger.Errorw("No matching entry found for delete.", "id", bean.Id)

‎pkg/cluster/ClusterServiceExtended.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ func (impl *ClusterServiceImplExtended) Save(ctx context.Context, bean *bean.Clu
361361
return clusterBean, nil
362362
}
363363

364-
func (impl ClusterServiceImplExtended) DeleteFromDb(bean *bean.ClusterBean, userId int32) (string, error) {
364+
func (impl ClusterServiceImplExtended) DeleteFromDb(bean *bean.DeleteClusterBean, userId int32) (string, error) {
365365
existingCluster, err := impl.clusterRepository.FindById(bean.Id)
366366
if err != nil {
367367
impl.logger.Errorw("No matching entry found for delete.", "id", bean.Id)

‎pkg/cluster/bean/bean.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ func (bean ClusterBean) GetClusterConfig() *k8s.ClusterConfig {
5454
return clusterCfg
5555
}
5656

57+
type DeleteClusterBean struct {
58+
Id int `json:"id" validate:"number,required"`
59+
}
60+
5761
type UserInfo struct {
5862
UserName string `json:"userName,omitempty"`
5963
Config map[string]string `json:"config,omitempty"`

‎pkg/delete/DeleteService.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ import (
4141
)
4242

4343
type DeleteService interface {
44-
DeleteCluster(deleteRequest *bean2.ClusterBean, userId int32) error
44+
DeleteCluster(deleteRequest *bean2.DeleteClusterBean, userId int32) error
4545
DeleteEnvironment(deleteRequest *bean.EnvironmentBean, userId int32) error
4646
DeleteTeam(deleteRequest *bean3.TeamRequest) error
4747
DeleteChartRepo(deleteRequest *chartRepo.ChartRepoDto) error
4848
DeleteDockerRegistryConfig(deleteRequest *types.DockerArtifactStoreBean) error
4949
CanDeleteChartRegistryPullConfig(storeId string) bool
50-
DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error
50+
DeleteClusterConfigMap(deleteRequest *bean2.DeleteClusterBean) error
5151
}
5252

5353
type DeleteServiceImpl struct {
@@ -91,7 +91,7 @@ func NewDeleteServiceImpl(logger *zap.SugaredLogger,
9191
}
9292
}
9393

94-
func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, userId int32) error {
94+
func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.DeleteClusterBean, userId int32) error {
9595
clusterName, err := impl.clusterService.DeleteFromDb(deleteRequest, userId)
9696
if err != nil {
9797
impl.logger.Errorw("error im deleting cluster", "err", err, "deleteRequest", deleteRequest)
@@ -108,11 +108,11 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
108108
return nil
109109
}
110110

111-
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean) error {
111+
func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.DeleteClusterBean) error {
112112
// kubelink informers are listening this secret, deleting this secret will inform kubelink that this cluster is deleted
113113
k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
114114
if err != nil {
115-
impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterName", deleteRequest.ClusterName)
115+
impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterId", deleteRequest.Id)
116116
return nil
117117
}
118118
cmName := cluster.ParseCmNameForK8sInformerOnClusterEvent(deleteRequest.Id)

0 commit comments

Comments
 (0)