Use version sort for k3d version list output

Signed-off-by: Martin Kravec <[email protected]>

Author: kravciak

cmd/root.go

@@ -35,6 +35,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/writer"
 	"github.com/spf13/cobra"
+	"golang.org/x/mod/semver"
 
 	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/k3d-io/k3d/v5/cmd/cluster"
@@ -369,10 +370,13 @@ func NewCmdVersionLs() *cobra.Command {
 			// Sort
 			if sortMode != VersionLsSortOff {
 				sort.Slice(filteredTags, func(i, j int) bool {
+					// Remove the "v" prefix for comparison, only k3s images have prefix
+					vi, vj := strings.TrimPrefix(filteredTags[i], "v"), strings.TrimPrefix(filteredTags[j], "v")
+
 					if sortMode == VersionLsSortAsc {
-						return filteredTags[i] < filteredTags[j]
+						return semver.Compare("v"+vi, "v"+vj) < 0
 					}
-					return filteredTags[i] > filteredTags[j]
+					return semver.Compare("v"+vi, "v"+vj) > 0
 				})
 			}
 
@@ -384,7 +388,7 @@ func NewCmdVersionLs() *cobra.Command {
 	}
 
 	cmd.Flags().StringVarP(&flags.includeRegexp, "include", "i", ".*", "Include Regexp (default includes everything")
-	cmd.Flags().StringVarP(&flags.excludeRegexp, "exclude", "e", ".+(rc|engine|alpha|beta|dev|test|arm|arm64|amd64|s390x).*", "Exclude Regexp (default excludes pre-releases and arch-specific tags)")
+	cmd.Flags().StringVarP(&flags.excludeRegexp, "exclude", "e", "^sha-|.+(rc|engine|dind|alpha|beta|dev|test|arm|arm64|amd64|s390x).*", "Exclude Regexp (default excludes pre-releases, arch-specific tags and digests)")
 	cmd.Flags().StringVarP(&flags.format, "format", "f", string(VersionLsOutputFormatRaw), "[DEPRECATED] Use --output instead")
 	cmd.Flags().StringVarP(&flags.outputFormat, "output", "o", string(VersionLsOutputFormatRaw), "Output Format [raw | repo]")
 	cmd.MarkFlagsMutuallyExclusive("format", "output")

docs/usage/commands/k3d_version_list.md

@@ -9,7 +9,7 @@ k3d version list COMPONENT [flags]
 ### Options
 
 ```
-  -e, --exclude string   Exclude Regexp (default excludes pre-releases and arch-specific tags) (default ".+(rc|engine|alpha|beta|dev|test|arm|arm64|amd64|s390x).*")
+  -e, --exclude string   Exclude Regexp (default excludes pre-releases, arch-specific tags and digests) (default "^sha-|.+(rc|engine|dind|alpha|beta|dev|test|arm|arm64|amd64|s390x).*")
   -f, --format string    [DEPRECATED] Use --output instead (default "raw")
   -h, --help             help for list
   -i, --include string   Include Regexp (default includes everything (default ".*")

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
+	golang.org/x/mod v0.17.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
 )

go.sum

@@ -383,6 +383,8 @@ golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjs
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=