slice.ToStringEnums

mafredri · mafredri · commit 4f898d9ba7d3 · 2024-12-31T12:42:59.000Z
diff --git a/cli/provisionerjobs.go b/cli/provisionerjobs.go
@@ -6,6 +6,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/cli/cliui"
+	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/serpent"
 )
@@ -59,7 +60,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 			}
 
 			jobs, err := client.OrganizationProvisionerJobs(ctx, org.ID, &codersdk.OrganizationProvisionerJobsOptions{
-				Status: convertSlice([]codersdk.ProvisionerJobStatus{}, status),
+				Status: slice.ToStringEnums[codersdk.ProvisionerJobStatus](status),
 				Limit:  int(limit),
 			})
 			if err != nil {
@@ -100,7 +101,7 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 			FlagShorthand: "s",
 			Env:           "CODER_PROVISIONER_JOB_LIST_STATUS",
 			Description:   "Filter by job status.",
-			Value:         serpent.EnumArrayOf(&status, convertSlice([]string{}, codersdk.ProvisionerJobStatusEnums())...),
+			Value:         serpent.EnumArrayOf(&status, slice.ToStrings(codersdk.ProvisionerJobStatusEnums())...),
 		},
 		{
 			Flag:          "limit",
@@ -117,10 +118,3 @@ func (r *RootCmd) provisionerJobsList() *serpent.Command {
 
 	return cmd
 }
-
-func convertSlice[D, S ~string](dstType []D, src []S) []D {
-	for _, item := range src {
-		dstType = append(dstType, D(item))
-	}
-	return dstType
-}
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -20,6 +20,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database/pubsub"
 	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/httpmw"
+	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/wsjson"
 	"github.com/coder/coder/v2/provisionersdk"
@@ -55,7 +56,7 @@ func (api *API) provisionerJobs(rw http.ResponseWriter, r *http.Request) {
 
 	jobs, err := api.Database.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner(ctx, database.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerParams{
 		OrganizationID: uuid.NullUUID{UUID: org.ID, Valid: true},
-		Status:         convertSlice([]database.ProvisionerJobStatus(nil), status),
+		Status:         slice.ToStringEnums[database.ProvisionerJobStatus](status),
 		Limit:          sql.NullInt32{Int32: limit, Valid: limit > 0},
 	})
 	if err != nil {
@@ -77,13 +78,6 @@ func (api *API) provisionerJobs(rw http.ResponseWriter, r *http.Request) {
 	}))
 }
 
-func convertSlice[D, S ~string](dstType []D, src []S) []D {
-	for _, item := range src {
-		dstType = append(dstType, D(item))
-	}
-	return dstType
-}
-
 // Returns provisioner logs based on query parameters.
 // The intended usage for a client to stream all logs (with JS API):
 // GET /logs
diff --git a/coderd/util/slice/slice.go b/coderd/util/slice/slice.go
@@ -13,6 +13,14 @@ func ToStrings[T ~string](a []T) []string {
 	return tmp
 }
 
+func ToStringEnums[E ~string](a []string) []E {
+	tmp := make([]E, 0, len(a))
+	for _, v := range a {
+		tmp = append(tmp, E(v))
+	}
+	return tmp
+}
+
 // Omit creates a new slice with the arguments omitted from the list.
 func Omit[T comparable](a []T, omits ...T) []T {
 	tmp := make([]T, 0, len(a))
