Skip to content

fix: 28feb packet common bug fix #4724

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 4 commits into from
Feb 29, 2024
Merged

fix: 28feb packet common bug fix #4724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d13a56
fix: shortened git commit hash returned from git cli
Ash-exp Feb 28, 2024
79539c3
handle permission error when getting argocd app in case of trigger of…
prakash100198 Feb 28, 2024
a5ad08c
Merge branch 'fix-git-cli-commit-hash' into 28feb-packet-common-bug-fix
Ash-exp Feb 28, 2024
f67704b
permission denied changed to failed status
prakash100198 Feb 28, 2024
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
8 changes: 7 additions & 1 deletion pkg/appStore/installedApp/service/FullMode/InstalledAppDeploymentTypeChangeService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,13 @@ func (impl *InstalledAppDeploymentTypeChangeServiceImpl) fetchDeletedInstalledAp
if err != nil && util2.CheckAppReleaseNotExist(err) {
successfulInstalledApps = appendToDeploymentChangeStatusList(successfulInstalledApps, installedApp, "", bean.Success)
} else {
failedInstalledApps = appendToDeploymentChangeStatusList(failedInstalledApps, installedApp, appStoreBean.APP_NOT_DELETED_YET_ERROR, bean.NOT_YET_DELETED)
failError := appStoreBean.APP_NOT_DELETED_YET_ERROR
failStatus := bean.NOT_YET_DELETED
if util2.CheckPermissionErrorForArgoCd(err) {
failError = string(bean.PermissionDenied)
failStatus = bean.Failed
}
failedInstalledApps = appendToDeploymentChangeStatusList(failedInstalledApps, installedApp, failError, failStatus)
}
}

Expand Down
5 changes: 5 additions & 0 deletions pkg/appStore/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

const RELEASE_NOT_EXIST = "release not exist"
const NOT_FOUND = "not found"
const PermissionDenied = "permission denied"

func MoveFileToDestination(filePath, destinationPath string) error {
err := os.Rename(filePath, destinationPath)
Expand Down Expand Up @@ -42,3 +43,7 @@ func CheckAppReleaseNotExist(err error) bool {
// RELEASE_NOT_EXIST check for helm App and NOT_FOUND check for argo app
return strings.Contains(err.Error(), NOT_FOUND) || strings.Contains(err.Error(), RELEASE_NOT_EXIST)
}

func CheckPermissionErrorForArgoCd(err error) bool {
return strings.Contains(err.Error(), PermissionDenied)
}
9 changes: 5 additions & 4 deletions pkg/bean/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,10 +722,11 @@ func IsHelmApp(deploymentType string) bool {
type Status string

const (
Success Status = "Success"
Failed Status = "Failed"
INITIATED Status = "Migration initiated"
NOT_YET_DELETED Status = "Not yet deleted"
Success Status = "Success"
Failed Status = "Failed"
INITIATED Status = "Migration initiated"
NOT_YET_DELETED Status = "Not yet deleted"
PermissionDenied Status = "permission denied"
)

const RELEASE_NOT_EXIST = "release not exist"
Expand Down
2 changes: 1 addition & 1 deletion pkg/deployment/gitOps/git/commandManager/GitCliManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (impl *GitCliManagerImpl) commit(ctx GitContext, rootDir string, commitMsg

func (impl *GitCliManagerImpl) lastCommitHash(ctx GitContext, rootDir string) (response, errMsg string, err error) {
impl.logger.Debugw("git log ", "location", rootDir)
cmd, cancel := impl.createCmdWithContext(ctx, "git", "-C", rootDir, "log", "--pretty=format:'%h'", "-n", "1")
cmd, cancel := impl.createCmdWithContext(ctx, "git", "-C", rootDir, "log", "--format=format:%H", "-n", "1")
defer cancel()
output, errMsg, err := impl.runCommandWithCred(cmd, ctx.auth)
impl.logger.Debugw("git commit output", "root", rootDir, "opt", output, "errMsg", errMsg, "error", err)
Expand Down