From 48ea429ad7caa300aa02caf3ebe489ed29922459 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 12 May 2023 12:47:19 +0530 Subject: [PATCH 1/2] handling for pre deployed apps --- pkg/app/status/PipelineStatusTimelineService.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/app/status/PipelineStatusTimelineService.go b/pkg/app/status/PipelineStatusTimelineService.go index cf2ad35ce0..d0609d27f8 100644 --- a/pkg/app/status/PipelineStatusTimelineService.go +++ b/pkg/app/status/PipelineStatusTimelineService.go @@ -253,8 +253,13 @@ func (impl *PipelineStatusTimelineServiceImpl) FetchTimelinesForAppStore(install return nil, err } } - deploymentStartedOn = installedAppVersionHistory.StartedOn - deploymentFinishedOn = installedAppVersionHistory.FinishedOn + if installedAppVersionHistory.StartedOn.IsZero() && installedAppVersionHistory.FinishedOn.IsZero() { + deploymentStartedOn = installedAppVersionHistory.CreatedOn + deploymentFinishedOn = installedAppVersionHistory.UpdatedOn + } else { + deploymentStartedOn = installedAppVersionHistory.StartedOn + deploymentFinishedOn = installedAppVersionHistory.FinishedOn + } installedAppVersionHistoryStatus = installedAppVersionHistory.Status deploymentAppType = installedAppVersion.InstalledApp.DeploymentAppType triggeredByUser, err := impl.userService.GetById(installedAppVersionHistory.CreatedBy) From d6e3702b4453190e5de0ff348af01dfa40b957f1 Mon Sep 17 00:00:00 2001 From: Prakash Kumar Date: Fri, 12 May 2023 16:37:58 +0530 Subject: [PATCH 2/2] removed rbac from deployment status timeline story --- api/appStore/AppStoreStatusTimelineRestHandler.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/api/appStore/AppStoreStatusTimelineRestHandler.go b/api/appStore/AppStoreStatusTimelineRestHandler.go index 6c6dfe2c60..afaf9a9724 100644 --- a/api/appStore/AppStoreStatusTimelineRestHandler.go +++ b/api/appStore/AppStoreStatusTimelineRestHandler.go @@ -1,7 +1,6 @@ package appStore import ( - "fmt" "github.com/devtron-labs/devtron/api/restHandler/common" "github.com/devtron-labs/devtron/pkg/app/status" "github.com/devtron-labs/devtron/pkg/user/casbin" @@ -56,13 +55,7 @@ func (handler AppStoreStatusTimelineRestHandlerImpl) FetchTimelinesForAppStore(w return } } - resourceName := handler.enforcerUtil.GetAppRBACNameByAppId(installedAppId) - token := r.Header.Get("token") - if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, resourceName); !ok { - common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden) - return - } - + //rbac will already be handled at app level timelines, err := handler.pipelineStatusTimelineService.FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId) if err != nil { handler.logger.Errorw("error in getting pipeline status timelines by installedAppVersionHistoryId", "err", err, "installedAppVersionHistoryId", installedAppVersionHistoryId, "installedAppId", installedAppId, "envId", envId)