fix(cdn): rename sortBy params, use EnumSliceToStringSlice

Author: cgoetz-inovex

internal/cmd/beta/cdn/distribution/list/list.go

@@ -16,6 +16,7 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/services/cdn/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
+	sdkUtils "github.com/stackitcloud/stackit-sdk-go/core/utils"
 	"github.com/stackitcloud/stackit-sdk-go/services/cdn"
 )
 
@@ -70,11 +71,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 	return cmd
 }
 
-var sortByFlagOptions = []string{"id", "created", "updated", "origin-url", "status"}
+var sortByFlagOptions = []string{"id", "createdAt", "updatedAt", "originUrl", "status", "originUrlRelated"}
 
 func configureFlags(cmd *cobra.Command) {
 	// same default as apiClient
-	cmd.Flags().Var(flags.EnumFlag(false, "created", sortByFlagOptions...), sortByFlag, fmt.Sprintf("Sort entries by a specific field, one of %q", sortByFlagOptions))
+	cmd.Flags().Var(flags.EnumFlag(false, "createdAt", sortByFlagOptions...), sortByFlag, fmt.Sprintf("Sort entries by a specific field, one of %q", sortByFlagOptions))
 }
 
 func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, error) {
@@ -94,31 +95,14 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
 
 func buildRequest(ctx context.Context, model *inputModel, apiClient *cdn.APIClient, nextPageID cdn.ListDistributionsResponseGetNextPageIdentifierAttributeType) cdn.ApiListDistributionsRequest {
 	req := apiClient.ListDistributions(ctx, model.GlobalFlagModel.ProjectId)
-	req = req.SortBy(toAPISortBy(model.SortBy))
+	req = req.SortBy(model.SortBy)
 	req = req.PageSize(100)
 	if nextPageID != nil {
 		req = req.PageIdentifier(*nextPageID)
 	}
 	return req
 }
 
-func toAPISortBy(sortBy string) string {
-	switch sortBy {
-	case "id":
-		return "id"
-	case "created":
-		return "createdAt"
-	case "updated":
-		return "updatedAt"
-	case "origin-url":
-		return "originUrl"
-	case "status":
-		return "status"
-	default:
-		panic("invalid sortBy value, programmer error")
-	}
-}
-
 func outputResult(p *print.Printer, outputFormat string, distributions []cdn.Distribution) error {
 	if distributions == nil {
 		distributions = make([]cdn.Distribution, 0) // otherwise prints null in json output
@@ -133,11 +117,7 @@ func outputResult(p *print.Printer, outputFormat string, distributions []cdn.Dis
 		table.SetHeader("ID", "REGIONS", "STATUS")
 		for i := range distributions {
 			d := &distributions[i]
-			regions := make([]string, 0, len(*d.Config.Regions))
-			for _, r := range *d.Config.Regions {
-				regions = append(regions, string(r))
-			}
-			joinedRegions := strings.Join(regions, ", ")
+			joinedRegions := strings.Join(sdkUtils.EnumSliceToStringSlice(*d.Config.Regions), ", ")
 			table.AddRow(
 				utils.PtrString(d.Id),
 				joinedRegions,

internal/cmd/beta/cdn/distribution/list/list_test.go

@@ -60,7 +60,7 @@ func fixtureInputModel(mods ...func(m *inputModel)) *inputModel {
 			ProjectId: testProjectId,
 			Verbosity: globalflags.VerbosityDefault,
 		},
-		SortBy: "created",
+		SortBy: "createdAt",
 	}
 	for _, mod := range mods {
 		mod(m)
@@ -123,9 +123,9 @@ func TestParseInput(t *testing.T) {
 		},
 		{
 			description: "sort by origin-url",
-			flagValues:  fixtureFlagValues(flagSortBy("origin-url")),
+			flagValues:  fixtureFlagValues(flagSortBy("originUrl")),
 			isValid:     true,
-			expected:    fixtureInputModel(inputSortBy("origin-url")),
+			expected:    fixtureInputModel(inputSortBy("originUrl")),
 		},
 		{
 			description: "sort by status",
@@ -135,15 +135,21 @@ func TestParseInput(t *testing.T) {
 		},
 		{
 			description: "sort by created",
-			flagValues:  fixtureFlagValues(flagSortBy("created")),
+			flagValues:  fixtureFlagValues(flagSortBy("createdAt")),
 			isValid:     true,
-			expected:    fixtureInputModel(inputSortBy("created")),
+			expected:    fixtureInputModel(inputSortBy("createdAt")),
 		},
 		{
 			description: "sort by updated",
-			flagValues:  fixtureFlagValues(flagSortBy("updated")),
+			flagValues:  fixtureFlagValues(flagSortBy("updatedAt")),
 			isValid:     true,
-			expected:    fixtureInputModel(inputSortBy("updated")),
+			expected:    fixtureInputModel(inputSortBy("updatedAt")),
+		},
+		{
+			description: "sort by originUrlRelated",
+			flagValues:  fixtureFlagValues(flagSortBy("originUrlRelated")),
+			isValid:     true,
+			expected:    fixtureInputModel(inputSortBy("originUrlRelated")),
 		},
 		{
 			description: "invalid sort by",
@@ -158,7 +164,7 @@ func TestParseInput(t *testing.T) {
 				},
 			),
 			isValid:  true,
-			expected: fixtureInputModel(inputSortBy("created")),
+			expected: fixtureInputModel(inputSortBy("createdAt")),
 		},
 	}
 
@@ -183,7 +189,7 @@ func TestBuildRequest(t *testing.T) {
 		},
 		{
 			description: "sort by updatedAt",
-			inputModel:  fixtureInputModel(inputSortBy("updated")),
+			inputModel:  fixtureInputModel(inputSortBy("updatedAt")),
 			expected:    fixtureRequest(requestSortBy("updatedAt")),
 		},
 		{