feat(kumactl) get commands with age column (#702)

kumahq · May 8, 2020 · 08e608d · 08e608d
1 parent b3ba0f0
commit 08e608d
Show file tree

Hide file tree

Showing 64 changed files with 268 additions and 134 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # CHANGELOG
 
 ## master
+* feat(kumactl) added age column for get commands and updated `inspect dataplanes` lastConnected and lastUpdated to the new format. 
+  [#702](https://github.com/Kong/kuma/pull/702)
 * feat(kuma-cp) friendly response in K8s mode
   [#712](https://github.com/Kong/kuma/pull/712)
 * chore: upgrade go-control-plane up to v0.9.5

diff --git a/app/kumactl/cmd/get/get_dataplane.go b/app/kumactl/cmd/get/get_dataplane.go
@@ -40,7 +40,7 @@ func newGetDataplaneCmd(pctx *getContext) *cobra.Command {
 			}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printDataplanes(&dataplanes, cmd.OutOrStdout())
+				return printDataplanes(pctx.Now(), &dataplanes, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_dataplanes.go b/app/kumactl/cmd/get/get_dataplanes.go
@@ -3,6 +3,7 @@ package get
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -33,7 +34,7 @@ func newGetDataplanesCmd(pctx *listContext) *cobra.Command {
 
 			switch format := output.Format(pctx.getContext.args.outputFormat); format {
 			case output.TableFormat:
-				return printDataplanes(&dataplanes, cmd.OutOrStdout())
+				return printDataplanes(pctx.Now(), &dataplanes, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -46,9 +47,9 @@ func newGetDataplanesCmd(pctx *listContext) *cobra.Command {
 	return cmd
 }
 
-func printDataplanes(dataplanes *mesh.DataplaneResourceList, out io.Writer) error {
+func printDataplanes(rootTime time.Time, dataplanes *mesh.DataplaneResourceList, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"MESH", "NAME", "TAGS"},
+		Headers: []string{"MESH", "NAME", "TAGS", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -59,9 +60,11 @@ func printDataplanes(dataplanes *mesh.DataplaneResourceList, out io.Writer) erro
 				dataplane := dataplanes.Items[i]
 
 				return []string{
-					dataplane.Meta.GetMesh(),       // MESH
-					dataplane.Meta.GetName(),       // NAME,
-					dataplane.Spec.Tags().String(), // TAGS
+					dataplane.Meta.GetMesh(),                                        // MESH
+					dataplane.Meta.GetName(),                                        // NAME,
+					dataplane.Spec.Tags().String(),                                  // TAGS
+					table.TimeSince(dataplane.Meta.GetModificationTime(), rootTime), // AGE
+
 				}
 			}
 		}(),

diff --git a/app/kumactl/cmd/get/get_dataplanes_test.go b/app/kumactl/cmd/get/get_dataplanes_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/Kong/kuma/app/kumactl/cmd"
 
@@ -92,12 +93,13 @@ var _ = Describe("kumactl get dataplanes", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
+		rootTime, _ := time.Parse(time.RFC3339, "2008-04-27T16:05:36.995Z")
 		BeforeEach(func() {
 			// setup
 
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
+					Now: func() time.Time { return rootTime },
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 						return store, nil
 					},

diff --git a/app/kumactl/cmd/get/get_fault_injection.go b/app/kumactl/cmd/get/get_fault_injection.go
@@ -40,7 +40,7 @@ func newGetFaultInjectionCmd(pctx *getContext) *cobra.Command {
 			}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printFaultInjections(faultInjections, cmd.OutOrStdout())
+				return printFaultInjections(pctx.Now(), faultInjections, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_fault_injections.go b/app/kumactl/cmd/get/get_fault_injections.go
@@ -3,6 +3,7 @@ package get
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/Kong/kuma/app/kumactl/pkg/output/table"
 
@@ -34,7 +35,7 @@ func newGetFaultInjectionsCmd(pctx *listContext) *cobra.Command {
 
 			switch format := output.Format(pctx.getContext.args.outputFormat); format {
 			case output.TableFormat:
-				return printFaultInjections(&faultInjections, cmd.OutOrStdout())
+				return printFaultInjections(pctx.Now(), &faultInjections, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -47,9 +48,9 @@ func newGetFaultInjectionsCmd(pctx *listContext) *cobra.Command {
 	return cmd
 }
 
-func printFaultInjections(faultInjections *mesh.FaultInjectionResourceList, out io.Writer) error {
+func printFaultInjections(rootTime time.Time, faultInjections *mesh.FaultInjectionResourceList, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"MESH", "NAME"},
+		Headers: []string{"MESH", "NAME", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -60,8 +61,9 @@ func printFaultInjections(faultInjections *mesh.FaultInjectionResourceList, out
 				faultInjection := faultInjections.Items[i]
 
 				return []string{
-					faultInjection.GetMeta().GetMesh(), // MESH
-					faultInjection.GetMeta().GetName(), // NAME
+					faultInjection.GetMeta().GetMesh(),                                        // MESH
+					faultInjection.GetMeta().GetName(),                                        // NAME
+					table.TimeSince(faultInjection.GetMeta().GetModificationTime(), rootTime), // AGE
 				}
 			}
 		}(),

diff --git a/app/kumactl/cmd/get/get_fault_injections_test.go b/app/kumactl/cmd/get/get_fault_injections_test.go
@@ -112,11 +112,12 @@ var _ = Describe("kumactl get fault-injections", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
+		rootTime, _ := time.Parse(time.RFC3339, "2008-04-27T16:05:36.995Z")
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
-					Now: time.Now,
+					Now: func() time.Time { return rootTime },
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 						return store, nil
 					},

diff --git a/app/kumactl/cmd/get/get_health_check.go b/app/kumactl/cmd/get/get_health_check.go
@@ -38,7 +38,7 @@ func newGetHealthCheckCmd(pctx *getContext) *cobra.Command {
 			}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printHealthChecks(healthchecks, cmd.OutOrStdout())
+				return printHealthChecks(pctx.Now(), healthchecks, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_healthchecks.go b/app/kumactl/cmd/get/get_healthchecks.go
@@ -3,6 +3,7 @@ package get
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/Kong/kuma/app/kumactl/pkg/output/table"
 
@@ -34,7 +35,7 @@ func newGetHealthChecksCmd(pctx *listContext) *cobra.Command {
 
 			switch format := output.Format(pctx.getContext.args.outputFormat); format {
 			case output.TableFormat:
-				return printHealthChecks(healthChecks, cmd.OutOrStdout())
+				return printHealthChecks(pctx.Now(), healthChecks, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -47,9 +48,9 @@ func newGetHealthChecksCmd(pctx *listContext) *cobra.Command {
 	return cmd
 }
 
-func printHealthChecks(healthChecks *mesh_core.HealthCheckResourceList, out io.Writer) error {
+func printHealthChecks(rootTime time.Time, healthChecks *mesh_core.HealthCheckResourceList, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"MESH", "NAME"},
+		Headers: []string{"MESH", "NAME", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -60,8 +61,9 @@ func printHealthChecks(healthChecks *mesh_core.HealthCheckResourceList, out io.W
 				healthCheck := healthChecks.Items[i]
 
 				return []string{
-					healthCheck.Meta.GetMesh(), // MESH
-					healthCheck.Meta.GetName(), // NAME
+					healthCheck.Meta.GetMesh(),                                        // MESH
+					healthCheck.Meta.GetName(),                                        // NAME
+					table.TimeSince(healthCheck.Meta.GetModificationTime(), rootTime), //AGE
 				}
 			}
 		}(),

diff --git a/app/kumactl/cmd/get/get_healthchecks_test.go b/app/kumactl/cmd/get/get_healthchecks_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"strings"
+	"time"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -61,10 +62,12 @@ var _ = Describe("kumactl get healthchecks", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
+		rootTime, _ := time.Parse(time.RFC3339, "2008-04-27T16:05:36.995Z")
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
+					Now: func() time.Time { return rootTime },
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 						return store, nil
 					},

diff --git a/app/kumactl/cmd/get/get_mesh.go b/app/kumactl/cmd/get/get_mesh.go
@@ -40,7 +40,7 @@ func newGetMeshCmd(pctx *getContext) *cobra.Command {
 			}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printMeshes(meshes, cmd.OutOrStdout())
+				return printMeshes(pctx.Now(), meshes, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_meshes.go b/app/kumactl/cmd/get/get_meshes.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"time"
 
 	"github.com/Kong/kuma/app/kumactl/pkg/output/table"
 	core_store "github.com/Kong/kuma/pkg/core/resources/store"
@@ -35,7 +36,7 @@ func newGetMeshesCmd(pctx *listContext) *cobra.Command {
 
 			switch format := output.Format(pctx.getContext.args.outputFormat); format {
 			case output.TableFormat:
-				return printMeshes(&meshes, cmd.OutOrStdout())
+				return printMeshes(pctx.Now(), &meshes, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -48,9 +49,9 @@ func newGetMeshesCmd(pctx *listContext) *cobra.Command {
 	return cmd
 }
 
-func printMeshes(meshes *mesh.MeshResourceList, out io.Writer) error {
+func printMeshes(rootTime time.Time, meshes *mesh.MeshResourceList, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"NAME", "mTLS", "METRICS", "LOGGING", "TRACING"},
+		Headers: []string{"NAME", "mTLS", "METRICS", "LOGGING", "TRACING", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -91,6 +92,7 @@ func printMeshes(meshes *mesh.MeshResourceList, out io.Writer) error {
 					metrics,                  // METRICS
 					logging,                  // LOGGING
 					tracing,                  // TRACING
+					table.TimeSince(mesh.GetMeta().GetModificationTime(), rootTime), // AGE
 				}
 			}
 		}(),

diff --git a/app/kumactl/cmd/get/get_meshes_test.go b/app/kumactl/cmd/get/get_meshes_test.go
@@ -132,11 +132,12 @@ var _ = Describe("kumactl get meshes", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
+		rootTime, _ := time.Parse(time.RFC3339, "2008-04-27T16:05:36.995Z")
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
-					Now: time.Now,
+					Now: func() time.Time { return rootTime },
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 						return store, nil
 					},

diff --git a/app/kumactl/cmd/get/get_proxytemplate.go b/app/kumactl/cmd/get/get_proxytemplate.go
@@ -40,7 +40,7 @@ func newGetProxyTemplateCmd(pctx *getContext) *cobra.Command {
 			}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printProxyTemplates(proxyTemplates, cmd.OutOrStdout())
+				return printProxyTemplates(pctx.Now(), proxyTemplates, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_proxytemplates.go b/app/kumactl/cmd/get/get_proxytemplates.go
@@ -3,6 +3,7 @@ package get
 import (
 	"context"
 	"io"
+	"time"
 
 	"github.com/Kong/kuma/app/kumactl/pkg/output/table"
 
@@ -34,7 +35,7 @@ func newGetProxyTemplatesCmd(pctx *listContext) *cobra.Command {
 
 			switch format := output.Format(pctx.getContext.args.outputFormat); format {
 			case output.TableFormat:
-				return printProxyTemplates(proxyTemplates, cmd.OutOrStdout())
+				return printProxyTemplates(pctx.Now(), proxyTemplates, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -47,9 +48,9 @@ func newGetProxyTemplatesCmd(pctx *listContext) *cobra.Command {
 	return cmd
 }
 
-func printProxyTemplates(proxyTemplates *mesh_core.ProxyTemplateResourceList, out io.Writer) error {
+func printProxyTemplates(rootTime time.Time, proxyTemplates *mesh_core.ProxyTemplateResourceList, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"MESH", "NAME"},
+		Headers: []string{"MESH", "NAME", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -60,8 +61,9 @@ func printProxyTemplates(proxyTemplates *mesh_core.ProxyTemplateResourceList, ou
 				proxyTemplate := proxyTemplates.Items[i]
 
 				return []string{
-					proxyTemplate.GetMeta().GetMesh(), // MESH
-					proxyTemplate.GetMeta().GetName(), // NAME
+					proxyTemplate.GetMeta().GetMesh(),                                        // MESH
+					proxyTemplate.GetMeta().GetName(),                                        // NAME
+					table.TimeSince(proxyTemplate.GetMeta().GetModificationTime(), rootTime), //AGE
 				}
 			}
 		}(),

diff --git a/app/kumactl/cmd/get/get_proxytemplates_test.go b/app/kumactl/cmd/get/get_proxytemplates_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"strings"
+	"time"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -60,10 +61,12 @@ var _ = Describe("kumactl get proxytemplates", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
+		rootTime, _ := time.Parse(time.RFC3339, "2008-04-27T16:05:36.995Z")
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
+					Now: func() time.Time { return rootTime },
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 						return store, nil
 					},

diff --git a/app/kumactl/cmd/get/get_secret.go b/app/kumactl/cmd/get/get_secret.go
@@ -37,7 +37,7 @@ func newGetSecretCmd(pctx *getContext) *cobra.Command {
 			secrets := []*system.SecretResource{secret}
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printSecrets(secrets, cmd.OutOrStdout())
+				return printSecrets(pctx.Now(), secrets, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {

diff --git a/app/kumactl/cmd/get/get_secrets.go b/app/kumactl/cmd/get/get_secrets.go
@@ -3,6 +3,9 @@ package get
 import (
 	"context"
 	"io"
+	"time"
+
+	"github.com/Kong/kuma/app/kumactl/pkg/output/table"
 
 	"github.com/Kong/kuma/pkg/core/resources/apis/system"
 
@@ -33,7 +36,7 @@ func newGetSecretsCmd(pctx *getContext) *cobra.Command {
 
 			switch format := output.Format(pctx.args.outputFormat); format {
 			case output.TableFormat:
-				return printSecrets(secrets.Items, cmd.OutOrStdout())
+				return printSecrets(pctx.Now(), secrets.Items, cmd.OutOrStdout())
 			default:
 				printer, err := printers.NewGenericPrinter(format)
 				if err != nil {
@@ -46,9 +49,9 @@ func newGetSecretsCmd(pctx *getContext) *cobra.Command {
 	return cmd
 }
 
-func printSecrets(secrets []*system.SecretResource, out io.Writer) error {
+func printSecrets(rootTime time.Time, secrets []*system.SecretResource, out io.Writer) error {
 	data := printers.Table{
-		Headers: []string{"MESH", "NAME"},
+		Headers: []string{"MESH", "NAME", "AGE"},
 		NextRow: func() func() []string {
 			i := 0
 			return func() []string {
@@ -61,6 +64,7 @@ func printSecrets(secrets []*system.SecretResource, out io.Writer) error {
 				return []string{
 					secret.Meta.GetMesh(), // MESH
 					secret.Meta.GetName(), // NAME
+					table.TimeSince(secret.Meta.GetModificationTime(), rootTime), //AGE
 				}
 			}
 		}(),