From 21f0d5d82ca041ba56472a32b6fcc2b09188e923 Mon Sep 17 00:00:00 2001
From: Sunny <darkowlzz@protonmail.com>
Date: Thu, 24 Feb 2022 04:21:47 +0530
Subject: [PATCH] Move MESSAGE to the end of `get` subcommand output
Message content could be long compared to other fields. Moving it to
the end helps improve the visibility of the other fields.
Signed-off-by: Sunny <darkowlzz@protonmail.com>
---
cmd/flux/get_alert.go | 4 ++--
cmd/flux/get_helmrelease.go | 4 ++--
cmd/flux/get_image_policy.go | 4 ++--
cmd/flux/get_image_repository.go | 4 ++--
cmd/flux/get_image_update.go | 4 ++--
cmd/flux/get_kustomization.go | 4 ++--
cmd/flux/get_receiver.go | 4 ++--
cmd/flux/get_source_bucket.go | 4 ++--
cmd/flux/get_source_chart.go | 4 ++--
cmd/flux/get_source_git.go | 4 ++--
cmd/flux/get_source_helm.go | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/cmd/flux/get_alert.go b/cmd/flux/get_alert.go
index 126dbe56..b23a7637 100644
--- a/cmd/flux/get_alert.go
+++ b/cmd/flux/get_alert.go
@@ -77,11 +77,11 @@ func init() {
func (s alertListAdapter) summariseItem(i int, includeNamespace bool, includeKind bool) []string {
item := s.Items[i]
status, msg := statusAndMessage(item.Status.Conditions)
- return append(nameColumns(&item, includeNamespace, includeKind), status, msg, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ return append(nameColumns(&item, includeNamespace, includeKind), strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (s alertListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Suspended"}
+ headers := []string{"Name", "Suspended", "Ready", "Message"}
if includeNamespace {
return append(namespaceHeader, headers...)
}
diff --git a/cmd/flux/get_helmrelease.go b/cmd/flux/get_helmrelease.go
index 5478e29c..0689757e 100644
--- a/cmd/flux/get_helmrelease.go
+++ b/cmd/flux/get_helmrelease.go
@@ -75,11 +75,11 @@ func (a helmReleaseListAdapter) summariseItem(i int, includeNamespace bool, incl
revision := item.Status.LastAppliedRevision
status, msg := statusAndMessage(item.Status.Conditions)
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a helmReleaseListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
diff --git a/cmd/flux/get_image_policy.go b/cmd/flux/get_image_policy.go
index 7974c380..a853817e 100644
--- a/cmd/flux/get_image_policy.go
+++ b/cmd/flux/get_image_policy.go
@@ -74,11 +74,11 @@ func init() {
func (s imagePolicyListAdapter) summariseItem(i int, includeNamespace bool, includeKind bool) []string {
item := s.Items[i]
status, msg := statusAndMessage(item.Status.Conditions)
- return append(nameColumns(&item, includeNamespace, includeKind), status, msg, item.Status.LatestImage)
+ return append(nameColumns(&item, includeNamespace, includeKind), item.Status.LatestImage, status, msg)
}
func (s imagePolicyListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Latest image"}
+ headers := []string{"Name", "Latest image", "Ready", "Message"}
if includeNamespace {
return append(namespaceHeader, headers...)
}
diff --git a/cmd/flux/get_image_repository.go b/cmd/flux/get_image_repository.go
index 0878a29c..3b190b7d 100644
--- a/cmd/flux/get_image_repository.go
+++ b/cmd/flux/get_image_repository.go
@@ -82,11 +82,11 @@ func (s imageRepositoryListAdapter) summariseItem(i int, includeNamespace bool,
lastScan = item.Status.LastScanResult.ScanTime.Time.Format(time.RFC3339)
}
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, lastScan, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ lastScan, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (s imageRepositoryListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Last scan", "Suspended"}
+ headers := []string{"Name", "Last scan", "Suspended", "Ready", "Message"}
if includeNamespace {
return append(namespaceHeader, headers...)
}
diff --git a/cmd/flux/get_image_update.go b/cmd/flux/get_image_update.go
index da16c576..dd84b6d8 100644
--- a/cmd/flux/get_image_update.go
+++ b/cmd/flux/get_image_update.go
@@ -81,11 +81,11 @@ func (s imageUpdateAutomationListAdapter) summariseItem(i int, includeNamespace
if item.Status.LastAutomationRunTime != nil {
lastRun = item.Status.LastAutomationRunTime.Time.Format(time.RFC3339)
}
- return append(nameColumns(&item, includeNamespace, includeKind), status, msg, lastRun, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ return append(nameColumns(&item, includeNamespace, includeKind), lastRun, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (s imageUpdateAutomationListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Last run", "Suspended"}
+ headers := []string{"Name", "Last run", "Suspended", "Ready", "Message"}
if includeNamespace {
return append(namespaceHeader, headers...)
}
diff --git a/cmd/flux/get_kustomization.go b/cmd/flux/get_kustomization.go
index d2991e93..5d20f639 100644
--- a/cmd/flux/get_kustomization.go
+++ b/cmd/flux/get_kustomization.go
@@ -85,11 +85,11 @@ func (a kustomizationListAdapter) summariseItem(i int, includeNamespace bool, in
msg = shortenCommitSha(msg)
}
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a kustomizationListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
diff --git a/cmd/flux/get_receiver.go b/cmd/flux/get_receiver.go
index d2147d1b..ef7eb376 100644
--- a/cmd/flux/get_receiver.go
+++ b/cmd/flux/get_receiver.go
@@ -74,11 +74,11 @@ func init() {
func (s receiverListAdapter) summariseItem(i int, includeNamespace bool, includeKind bool) []string {
item := s.Items[i]
status, msg := statusAndMessage(item.Status.Conditions)
- return append(nameColumns(&item, includeNamespace, includeKind), status, msg, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ return append(nameColumns(&item, includeNamespace, includeKind), strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (s receiverListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Suspended"}
+ headers := []string{"Name", "Suspended", "Ready", "Message"}
if includeNamespace {
return append(namespaceHeader, headers...)
}
diff --git a/cmd/flux/get_source_bucket.go b/cmd/flux/get_source_bucket.go
index 963a8ed4..87c7f86b 100644
--- a/cmd/flux/get_source_bucket.go
+++ b/cmd/flux/get_source_bucket.go
@@ -81,11 +81,11 @@ func (a *bucketListAdapter) summariseItem(i int, includeNamespace bool, includeK
}
status, msg := statusAndMessage(item.Status.Conditions)
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a bucketListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
diff --git a/cmd/flux/get_source_chart.go b/cmd/flux/get_source_chart.go
index f5401791..5179dad3 100644
--- a/cmd/flux/get_source_chart.go
+++ b/cmd/flux/get_source_chart.go
@@ -81,11 +81,11 @@ func (a *helmChartListAdapter) summariseItem(i int, includeNamespace bool, inclu
}
status, msg := statusAndMessage(item.Status.Conditions)
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a helmChartListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
diff --git a/cmd/flux/get_source_git.go b/cmd/flux/get_source_git.go
index 95b8ab4f..9690ee3a 100644
--- a/cmd/flux/get_source_git.go
+++ b/cmd/flux/get_source_git.go
@@ -86,11 +86,11 @@ func (a *gitRepositoryListAdapter) summariseItem(i int, includeNamespace bool, i
msg = shortenCommitSha(msg)
}
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a gitRepositoryListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
diff --git a/cmd/flux/get_source_helm.go b/cmd/flux/get_source_helm.go
index cf98246b..d23ecd32 100644
--- a/cmd/flux/get_source_helm.go
+++ b/cmd/flux/get_source_helm.go
@@ -81,11 +81,11 @@ func (a *helmRepositoryListAdapter) summariseItem(i int, includeNamespace bool,
}
status, msg := statusAndMessage(item.Status.Conditions)
return append(nameColumns(&item, includeNamespace, includeKind),
- status, msg, revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)))
+ revision, strings.Title(strconv.FormatBool(item.Spec.Suspend)), status, msg)
}
func (a helmRepositoryListAdapter) headers(includeNamespace bool) []string {
- headers := []string{"Name", "Ready", "Message", "Revision", "Suspended"}
+ headers := []string{"Name", "Revision", "Suspended", "Ready", "Message"}
if includeNamespace {
headers = append([]string{"Namespace"}, headers...)
}
--
GitLab