tweaks

utils/display/resources.go

@@ -131,45 +131,52 @@ func PrintResourcesTable(resources []*meroxa.Resource, hideHeaders bool) {
 }
 
 func ResourceTypesTable(types []meroxa.ResourceType, hideHeaders bool) string {
-	gaResourceTypes := []string{}
-	betaResourceTypes := []string{}
+	gaResourceNames := []string{}
+	gaResourceTypes := make(map[string]string)
+	betaResourceNames := []string{}
+	betaResourceTypes := make(map[string]string)
 
 	for _, t := range types {
 		val := fmt.Sprintf("%s", t.FormConfig[meroxa.ResourceTypeFormConfigHumanReadableKey])
 		if val == "" {
 			continue
 		}
 		if t.ReleaseStage == meroxa.ResourceTypeReleaseStageGA {
-			gaResourceTypes = append(gaResourceTypes, val)
+			gaResourceNames = append(gaResourceNames, val)
+			gaResourceTypes[val] = t.Name
 		} else if t.ReleaseStage == meroxa.ResourceTypeReleaseStageBeta {
-			betaResourceTypes = append(betaResourceTypes, val)
+			betaResourceNames = append(betaResourceNames, val)
+			betaResourceTypes[val] = t.Name
 		}
 	}
-	sort.Strings(gaResourceTypes)
-	sort.Strings(betaResourceTypes)
+	sort.Strings(gaResourceNames)
+	sort.Strings(betaResourceNames)
 
 	table := simpletable.New()
 
 	if !hideHeaders {
 		table.Header = &simpletable.Header{
 			Cells: []*simpletable.Cell{
-				{Align: simpletable.AlignRight, Text: "Resource Type"},
-				{Align: simpletable.AlignLeft, Text: "Release Stage"},
+				{Align: simpletable.AlignCenter, Text: "NAME"},
+				{Align: simpletable.AlignCenter, Text: "TYPE"},
+				{Align: simpletable.AlignCenter, Text: "RELEASE STAGE"},
 			},
 		}
 	}
 
-	for _, t := range gaResourceTypes {
+	for _, t := range gaResourceNames {
 		r := []*simpletable.Cell{
-			{Align: simpletable.AlignRight, Text: t},
+			{Align: simpletable.AlignLeft, Text: t},
+			{Align: simpletable.AlignLeft, Text: gaResourceTypes[t]},
 			{Align: simpletable.AlignLeft, Text: string(meroxa.ResourceTypeReleaseStageGA)},
 		}
 
 		table.Body.Cells = append(table.Body.Cells, r)
 	}
-	for _, t := range betaResourceTypes {
+	for _, t := range betaResourceNames {
 		r := []*simpletable.Cell{
-			{Align: simpletable.AlignRight, Text: t},
+			{Align: simpletable.AlignLeft, Text: t},
+			{Align: simpletable.AlignLeft, Text: betaResourceTypes[t]},
 			{Align: simpletable.AlignLeft, Text: string(meroxa.ResourceTypeReleaseStageBeta)},
 		}