Pluralize vCPU (#988)

* Remove sorting of SKUs, they are returned in order

* Pluralize vCPU

* Fix typo

* More pluralization

* Filter out PS-DEV from autocomplete for branch cluster sizes

Author: iheanyi

internal/cmd/size/cluster.go

@@ -1,10 +1,8 @@
 package size
 
 import (
-	"cmp"
 	"encoding/json"
 	"fmt"
-	"slices"
 
 	"github.com/planetscale/cli/internal/cmdutil"
 	"github.com/planetscale/planetscale-go/planetscale"
@@ -49,10 +47,6 @@ func ListCmd(ch *cmdutil.Helper) *cobra.Command {
 				return err
 			}
 
-			slices.SortFunc(clusterSKUs, func(a, b *planetscale.ClusterSKU) int {
-				return cmp.Compare(a.SortOrder, b.SortOrder)
-			})
-
 			return ch.Printer.PrintResource(toClusterSKUs(clusterSKUs))
 		},
 	}
@@ -90,7 +84,7 @@ func toClusterSKU(clusterSKU *planetscale.ClusterSKU) *ClusterSKU {
 		storage = cmdutil.FormatPartsGB(*clusterSKU.Storage).IntString()
 	}
 
-	cpu := fmt.Sprintf("%s vCPU", clusterSKU.CPU)
+	cpu := fmt.Sprintf("%s vCPUs", clusterSKU.CPU)
 	memory := cmdutil.FormatParts(clusterSKU.Memory).IntString()
 	rate := ""
 	if *clusterSKU.Rate > 0 {

internal/cmdutil/completions.go

@@ -1,9 +1,7 @@
 package cmdutil
 
 import (
-	"cmp"
 	"fmt"
-	"slices"
 	"strings"
 
 	ps "github.com/planetscale/planetscale-go/planetscale"
@@ -37,10 +35,6 @@ func ClusterSizesCompletionFunc(ch *Helper, cmd *cobra.Command, args []string, t
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 
-	slices.SortFunc(clusterSKUs, func(a, b *ps.ClusterSKU) int {
-		return cmp.Compare(a.SortOrder, b.SortOrder)
-	})
-
 	clusterSizes := make([]cobra.Completion, 0)
 	for _, c := range clusterSKUs {
 		if c.Enabled && strings.Contains(c.Name, toComplete) && c.Rate != nil && c.Name != "PS_DEV" {
@@ -51,7 +45,7 @@ func ClusterSizesCompletionFunc(ch *Helper, cmd *cobra.Command, args []string, t
 			}
 
 			if c.CPU != "" {
-				description.WriteString(fmt.Sprintf(" · %s vCPU", c.CPU))
+				description.WriteString(fmt.Sprintf(" · %s vCPUs", c.CPU))
 			}
 
 			if c.Memory > 0 {
@@ -97,21 +91,17 @@ func BranchClusterSizesCompletionFunc(ch *Helper, cmd *cobra.Command, args []str
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 
-	slices.SortFunc(clusterSKUs, func(a, b *ps.ClusterSKU) int {
-		return cmp.Compare(a.SortOrder, b.SortOrder)
-	})
-
 	clusterSizes := make([]cobra.Completion, 0)
 	for _, c := range clusterSKUs {
-		if c.Enabled && strings.Contains(c.Name, toComplete) && c.Rate != nil {
+		if c.Enabled && strings.Contains(c.Name, toComplete) && c.Rate != nil && c.Name != "PS_DEV" {
 			var description strings.Builder
 			description.WriteString(c.DisplayName)
 			if *c.Rate > 0 {
 				description.WriteString(fmt.Sprintf(" · $%d/month", *c.Rate))
 			}
 
 			if c.CPU != "" {
-				description.WriteString(fmt.Sprintf(" · %s vCPU", c.CPU))
+				description.WriteString(fmt.Sprintf(" · %s vCPUs", c.CPU))
 			}
 
 			if c.Memory > 0 {