client/cordium - add GetResourceShortName

Author: geokb

client/cordium/commands/ccommon/ccommon.go

@@ -0,0 +1,47 @@
+/*
+ * Copyright Octelium Labs, LLC. All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3,
+ * as published by the Free Software Foundation of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ccommon
+
+import (
+	"strings"
+
+	"github.com/octelium/octelium/apis/main/metav1"
+	"github.com/octelium/octelium/pkg/apiutils/umetav1"
+)
+
+func GetResourceShortName(rsc umetav1.ResourceObjectI) string {
+	if rsc == nil || rsc.GetMetadata() == nil {
+		return ""
+	}
+
+	return doGetShortName(rsc.GetMetadata().Name)
+}
+
+func GetResourceRefShortName(itm *metav1.ObjectReference) string {
+	if itm == nil {
+		return ""
+	}
+
+	return doGetShortName(itm.Name)
+}
+
+func doGetShortName(arg string) string {
+	if arg == "" {
+		return ""
+	}
+	return strings.Split(arg, ".")[0]
+}

client/cordium/commands/get/space/cmd.go

@@ -19,6 +19,7 @@ package space
 import (
 	"fmt"
 
+	"github.com/octelium/cordium/client/cordium/commands/ccommon"
 	pb "github.com/octelium/octelium/apis/main/cordiumv1"
 	"github.com/octelium/octelium/apis/main/metav1"
 	"github.com/octelium/octelium/client/common/client"
@@ -99,9 +100,10 @@ func doCmd(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	p := printer.NewPrinter("Name", "Description")
-	for _, net := range itmList.Items {
-		p.AppendRow(net.Metadata.Name, net.Metadata.Description)
+	p := printer.NewPrinter("Name", "Created")
+	for _, itm := range itmList.Items {
+		p.AppendRow(ccommon.GetResourceShortName(itm),
+			cliutils.GetResourceAge(itm))
 	}
 
 	p.Render()

client/cordium/commands/get/template/cmd.go

@@ -19,6 +19,7 @@ package template
 import (
 	"fmt"
 
+	"github.com/octelium/cordium/client/cordium/commands/ccommon"
 	pb "github.com/octelium/octelium/apis/main/cordiumv1"
 	"github.com/octelium/octelium/apis/main/metav1"
 	"github.com/octelium/octelium/client/common/client"
@@ -110,9 +111,11 @@ func doCmd(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	p := printer.NewPrinter("Name", "Description")
-	for _, net := range itmList.Items {
-		p.AppendRow(net.Metadata.Name, net.Metadata.Description)
+	p := printer.NewPrinter("Name", "Created", "Space")
+	for _, itm := range itmList.Items {
+		p.AppendRow(ccommon.GetResourceShortName(itm),
+			cliutils.GetResourceAge(itm),
+			ccommon.GetResourceRefShortName(itm.Status.SpaceRef))
 	}
 
 	p.Render()

client/cordium/commands/get/workspace/cmd.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/octelium/cordium/client/cordium/commands/ccommon"
 	pb "github.com/octelium/octelium/apis/main/cordiumv1"
 	"github.com/octelium/octelium/apis/main/metav1"
 	"github.com/octelium/octelium/client/common/client"
@@ -122,10 +123,12 @@ func doCmd(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	p := printer.NewPrinter("Name", "Created", "State", "Last Started")
+	p := printer.NewPrinter("Name", "Created", "Template", "Space", "State", "Last Started")
 	for _, itm := range itmList.Items {
 		p.AppendRow(itm.Metadata.Name,
 			cliutils.GetResourceAge(itm),
+			ccommon.GetResourceRefShortName(itm.Status.TemplateRef),
+			ccommon.GetResourceRefShortName(itm.Status.SpaceRef),
 			itm.Status.State.String(),
 			cliutils.GetAgeFromTimestampMust(itm.Status.LastInitializedAt.AsTime().Format(time.RFC3339Nano)))
 	}