Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 18 additions & 1 deletion internal/notification/healthcomment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package notification

import (
"fmt"
"strings"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/health"
Expand Down Expand Up @@ -50,13 +51,29 @@ func generateCommentBodyOnHealthChanged(app argocdv1alpha1.Application, argocdUR
sourceRevision.Revision,
)
case health.HealthStatusDegraded:
return fmt.Sprintf("## %s %s: [%s](%s)\nDeployed %s",
return fmt.Sprintf("## %s %s: [%s](%s)\nError while deploying %s:\n%s",
":x:",
app.Status.Health.Status,
app.Name,
argocdApplicationURL,
sourceRevision.Revision,
generateCommentResourcesHealth(app),
)
}
return ""
}

func generateCommentResourcesHealth(app argocdv1alpha1.Application) string {
var b strings.Builder
for _, r := range app.Status.Resources {
if r.Health == nil {
continue
}
namespacedName := r.Namespace + "/" + r.Name
switch r.Health.Status {
case health.HealthStatusDegraded, health.HealthStatusMissing:
b.WriteString(fmt.Sprintf("- %s `%s`: %s\n", r.Health.Status, namespacedName, r.Health.Message))
}
}
return b.String()
}
27 changes: 22 additions & 5 deletions internal/notification/healthdeployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package notification

import (
"fmt"
"strings"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/health"
Expand Down Expand Up @@ -32,10 +33,7 @@ func generateHealthDeploymentStatus(app argocdv1alpha1.Application, argocdURL st
if len(app.Status.Summary.ExternalURLs) > 0 {
ds.EnvironmentURL = app.Status.Summary.ExternalURLs[0]
}
ds.Description = trimDescription(fmt.Sprintf("%s:\n%s",
app.Status.Health.Status,
app.Status.Health.Message,
))
ds.Description = trimDescription(generateHealthDeploymentStatusDescription(app))
switch app.Status.Health.Status {
case health.HealthStatusHealthy:
ds.State = "success"
Expand All @@ -47,6 +45,25 @@ func generateHealthDeploymentStatus(app argocdv1alpha1.Application, argocdURL st
return nil
}

func generateHealthDeploymentStatusDescription(app argocdv1alpha1.Application) string {
var b strings.Builder
b.WriteString(fmt.Sprintf("%s:\n%s\n",
app.Status.Health.Status,
app.Status.Health.Message,
))
for _, r := range app.Status.Resources {
if r.Health == nil {
continue
}
namespacedName := r.Namespace + "/" + r.Name
switch r.Health.Status {
case health.HealthStatusDegraded, health.HealthStatusMissing:
b.WriteString(fmt.Sprintf("%s: %s: %s\n", namespacedName, r.Health.Status, r.Health.Message))
}
}
return b.String()
}

func NewDeploymentStatusOnDeletion(app argocdv1alpha1.Application, argocdURL string) *DeploymentStatus {
deploymentURL := argocd.GetDeploymentURL(app)
deployment := github.ParseDeploymentURL(deploymentURL)
Expand All @@ -65,7 +82,7 @@ func NewDeploymentStatusOnDeletion(app argocdv1alpha1.Application, argocdURL str

func trimDescription(s string) string {
// The maximum description length is 140 characters.
// https://docs.github.com/en/rest/reference/deployments#create-a-deployment-status
// https://docs.github.com/en/rest/deployments/statuses?apiVersion=2022-11-28#create-a-deployment-status
if len(s) < 140 {
return s
}
Expand Down
4 changes: 2 additions & 2 deletions internal/notification/phasecomment.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ func generateCommentBodyOnPhaseChanged(app argocdv1alpha1.Application, argocdURL
app.Name,
argocdApplicationURL,
sourceRevision.Revision,
generateSyncResultComment(app.Status.OperationState.SyncResult),
generateCommentSyncResultResources(app.Status.OperationState.SyncResult),
)
}
return ""
}

func generateSyncResultComment(syncResult *argocdv1alpha1.SyncOperationResult) string {
func generateCommentSyncResultResources(syncResult *argocdv1alpha1.SyncOperationResult) string {
if syncResult == nil {
return ""
}
Expand Down