Filter out semver incompatible tags

Author: Nuckal777

cloudprofilesync/runnable.go

@@ -9,6 +9,7 @@ import (
 	"slices"
 	"time"
 
+	"github.com/blang/semver/v4"
 	"github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/types"
@@ -56,10 +57,31 @@ func (r *Runnable) patchCloudProfile(ctx context.Context) error {
 	return nil
 }
 
-func (r *Runnable) CheckSource(ctx context.Context, cloudProfile *v1beta1.CloudProfile) error {
+func (r *Runnable) getVersions(ctx context.Context) ([]SourceImage, error) {
 	versions, err := r.Source.GetVersions(ctx)
 	if err != nil {
-		return fmt.Errorf("failed to get versions from source: %w", err)
+		return nil, fmt.Errorf("failed to get versions from source: %w", err)
+	}
+	filtered := make([]SourceImage, 0, len(versions))
+	for _, version := range versions {
+		_, err := semver.Parse(version.Version)
+		if err != nil {
+			r.Log.Info("skipping invalid version", "version", version.Version)
+			continue
+		}
+		if len(version.Architectures) == 0 {
+			r.Log.Info("skipping version with no architectures", "version", version.Version)
+			continue
+		}
+		filtered = append(filtered, version)
+	}
+	return filtered, nil
+}
+
+func (r *Runnable) CheckSource(ctx context.Context, cloudProfile *v1beta1.CloudProfile) error {
+	versions, err := r.getVersions(ctx)
+	if err != nil {
+		return err
 	}
 	imageIndex := slices.IndexFunc(cloudProfile.Spec.MachineImages, func(mi v1beta1.MachineImage) bool {
 		return mi.Name == r.Source.Name

cloudprofilesync/runnable_test.go

@@ -14,20 +14,20 @@ import (
 var _ = Describe("Runnable", func() {
 
 	It("adds an image from the source to the CloudProfile spec", func(ctx SpecContext) {
-		mockSource.images = []cloudprofilesync.SourceImage{{Version: "v1.0.0", Architectures: []string{"amd64"}}}
+		mockSource.images = []cloudprofilesync.SourceImage{{Version: "1.0.0", Architectures: []string{"amd64"}}}
 		var cloudProfile v1beta1.CloudProfile
 		Expect(runnable.CheckSource(ctx, &cloudProfile)).To(Succeed())
 		Expect(cloudProfile.Spec.MachineImages).To(HaveLen(1))
 		Expect(cloudProfile.Spec.MachineImages[0].Name).To(Equal("test"))
 		Expect(cloudProfile.Spec.MachineImages[0].Versions).To(HaveLen(1))
-		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Version).To(Equal("v1.0.0"))
+		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Version).To(Equal("1.0.0"))
 		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Architectures).To(Equal([]string{"amd64"}))
 	})
 
 	It("adds multiple images from the source to the CloudProfile spec", func(ctx SpecContext) {
 		mockSource.images = []cloudprofilesync.SourceImage{
-			{Version: "v1.0.0", Architectures: []string{"amd64"}},
-			{Version: "v2.0.0", Architectures: []string{"arm64", "amd64"}},
+			{Version: "1.0.0", Architectures: []string{"amd64"}},
+			{Version: "2.0.0", Architectures: []string{"arm64", "amd64"}},
 		}
 		var cloudProfile v1beta1.CloudProfile
 		Expect(runnable.CheckSource(ctx, &cloudProfile)).To(Succeed())
@@ -36,13 +36,13 @@ var _ = Describe("Runnable", func() {
 		Expect(cloudProfile.Spec.MachineImages[0].Versions).To(ConsistOf([]v1beta1.MachineImageVersion{
 			{
 				ExpirableVersion: v1beta1.ExpirableVersion{
-					Version: "v1.0.0",
+					Version: "1.0.0",
 				},
 				Architectures: []string{"amd64"},
 			},
 			{
 				ExpirableVersion: v1beta1.ExpirableVersion{
-					Version: "v2.0.0",
+					Version: "2.0.0",
 				},
 				Architectures: []string{"arm64", "amd64"},
 			},
@@ -58,7 +58,7 @@ var _ = Describe("Runnable", func() {
 						Versions: []v1beta1.MachineImageVersion{
 							{
 								ExpirableVersion: v1beta1.ExpirableVersion{
-									Version: "v1.0.0",
+									Version: "1.0.0",
 								},
 								Architectures: []string{"amd64"},
 							},
@@ -68,12 +68,12 @@ var _ = Describe("Runnable", func() {
 			},
 		}
 
-		mockSource.images = []cloudprofilesync.SourceImage{{Version: "v2.0.0", Architectures: []string{"arm64"}}}
+		mockSource.images = []cloudprofilesync.SourceImage{{Version: "2.0.0", Architectures: []string{"arm64"}}}
 		Expect(runnable.CheckSource(ctx, &cloudProfile)).To(Succeed())
 		Expect(cloudProfile.Spec.MachineImages).To(HaveLen(1))
 		Expect(cloudProfile.Spec.MachineImages[0].Name).To(Equal("test"))
 		Expect(cloudProfile.Spec.MachineImages[0].Versions).To(HaveLen(1))
-		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Version).To(Equal("v2.0.0"))
+		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Version).To(Equal("2.0.0"))
 		Expect(cloudProfile.Spec.MachineImages[0].Versions[0].Architectures).To(Equal([]string{"arm64"}))
 	})
 
@@ -86,7 +86,7 @@ var _ = Describe("Runnable", func() {
 						Versions: []v1beta1.MachineImageVersion{
 							{
 								ExpirableVersion: v1beta1.ExpirableVersion{
-									Version: "v1.0.0",
+									Version: "1.0.0",
 								},
 								Architectures: []string{"amd64"},
 							},
@@ -97,7 +97,7 @@ var _ = Describe("Runnable", func() {
 						Versions: []v1beta1.MachineImageVersion{
 							{
 								ExpirableVersion: v1beta1.ExpirableVersion{
-									Version: "v2.0.0",
+									Version: "2.0.0",
 								},
 								Architectures: []string{"arm64"},
 							},
@@ -107,15 +107,15 @@ var _ = Describe("Runnable", func() {
 			},
 		}
 
-		mockSource.images = []cloudprofilesync.SourceImage{{Version: "v1.1.0", Architectures: []string{"arm64"}}}
+		mockSource.images = []cloudprofilesync.SourceImage{{Version: "1.1.0", Architectures: []string{"arm64"}}}
 		Expect(runnable.CheckSource(ctx, &cloudProfile)).To(Succeed())
 		Expect(cloudProfile.Spec.MachineImages).To(ConsistOf([]v1beta1.MachineImage{
 			{
 				Name: "test",
 				Versions: []v1beta1.MachineImageVersion{
 					{
 						ExpirableVersion: v1beta1.ExpirableVersion{
-							Version: "v1.1.0",
+							Version: "1.1.0",
 						},
 						Architectures: []string{"arm64"},
 					},
@@ -126,7 +126,7 @@ var _ = Describe("Runnable", func() {
 				Versions: []v1beta1.MachineImageVersion{
 					{
 						ExpirableVersion: v1beta1.ExpirableVersion{
-							Version: "v2.0.0",
+							Version: "2.0.0",
 						},
 						Architectures: []string{"arm64"},
 					},

cloudprofilesync/source_test.go

@@ -32,11 +32,11 @@ var _ = Describe("OCISource", func() {
 					MediaType: ocispec.MediaTypeImageManifest,
 					Size:      0,
 					Digest:    ocispec.DescriptorEmptyJSON.Digest,
-					Platform: &ocispec.Platform{
-						Architecture: "amd64",
-					},
 				},
 			},
+			Annotations: map[string]string{
+				"architecture": "amd64",
+			},
 		}
 		indexBlob, err := json.Marshal(index)
 		Expect(err).To(Succeed())

go.mod

@@ -3,6 +3,7 @@ module github.com/cobaltcore-dev/cloud-profile-sync
 go 1.24.0
 
 require (
+	github.com/blang/semver/v4 v4.0.0
 	github.com/distribution/distribution/v3 v3.0.0
 	github.com/gardener/gardener v1.118.1
 	github.com/go-logr/logr v1.4.2

go.sum

@@ -16,6 +16,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70=
 github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
 github.com/bsm/ginkgo/v2 v2.7.0/go.mod h1:AiKlXPm7ItEHNc/2+OkrNG4E0ITzojb9/xWzvQ9XZ9w=