Skip to content

fix: deployment triggered time handling for pre deployed apps #3378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2023
Merged

fix: deployment triggered time handling for pre deployed apps #3378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48ea429
handling for pre deployed apps
prakash100198 May 12, 2023
d6e3702
removed rbac from deployment status timeline story
prakash100198 May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions api/appStore/AppStoreStatusTimelineRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions pkg/app/status/PipelineStatusTimelineService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down