Go 1.24

.github/workflows/docker.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
     - name: Log in to the container registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ secrets.DOCKER_REGISTRY_USER }}
@@ -31,13 +31,13 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up Go 1.22
+    - name: Set up Go 1.24
       uses: actions/setup-go@v5
       with:
-        go-version: '1.22'
+        go-version: '1.24'
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
         args: --build-tags integration -p bugs -p unused --timeout=3m
 
@@ -48,7 +48,7 @@ jobs:
         [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
 
     - name: Build and push image
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: true

.gitignore

@@ -1,2 +1,3 @@
 bin
-.vscode
+.vscode
+coverage.out

Dockerfile

@@ -1,6 +1,9 @@
-FROM ghcr.io/metal-stack/builder:latest as builder
+FROM golang:1.24-bookworm AS builder
 
-FROM alpine:3.19
-RUN apk add --no-cache tini ca-certificates
+WORKDIR /work
+COPY . .
+RUN make all
+
+FROM gcr.io/distroless/static-debian12
 COPY --from=builder /work/bin/metal-image-cache-sync /metal-image-cache-sync
 CMD ["/metal-image-cache-sync"]

Makefile

@@ -1,23 +1,38 @@
 BINARY := metal-image-cache-sync
 MAINMODULE := github.com/metal-stack/metal-image-cache-sync/cmd
-COMMONDIR := $(or ${COMMONDIR},../builder)
+
+SHA := $(shell git rev-parse --short=8 HEAD)
+GITVERSION := $(shell git describe --long --all)
+BUILDDATE := $(shell date -Iseconds)
+VERSION := $(or ${VERSION},$(shell git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD))
+
 
 # default points to mini-lab
 METAL_API_ENDPOINT := $(or ${METALCTL_API_URL},http://api.0.0.0.0.nip.io:8080/metal)
 METAL_API_HMAC := $(or ${METALCTL_HMAC},metal-view)
 
-include $(COMMONDIR)/Makefile.inc
+LINKMODE := -extldflags '-static -s -w'
+
+all: test build
 
-.PHONY: all
-all::
-	go mod tidy
+.PHONY: build
+build:
+	go build -tags netgo,osusergo,urfave_cli_no_docs \
+		 -ldflags "$(LINKMODE) -X 'github.com/metal-stack/v.Version=$(VERSION)' \
+								   -X 'github.com/metal-stack/v.Revision=$(GITVERSION)' \
+								   -X 'github.com/metal-stack/v.GitSHA1=$(SHA)' \
+								   -X 'github.com/metal-stack/v.BuildDate=$(BUILDDATE)'" \
+	   -o bin/$(BINARY) $(MAINMODULE)
+	strip bin/$(BINARY)
 
-release:: all;
+.PHONY: test
+test:
+	go test ./... -coverprofile=coverage.out -covermode=atomic && go tool cover -func=coverage.out
 
 .PHONY: start
 start: all
 	mkdir -p /tmp/metal-image-cache
-	bin/metal-image-cache-sync \
+	bin/$(BINARY) \
 	  --log-level debug \
 	  --metal-api-endpoint $(METAL_API_ENDPOINT) \
 	  --metal-api-hmac $(METAL_API_HMAC) \

cmd/internal/determine-sync-images/lister.go

@@ -55,7 +55,7 @@ func (s *SyncLister) DetermineImageSyncList() ([]api.OS, error) {
 
 	s.imageCollector.SetMetalAPIImageCount(len(resp.Payload))
 
-	expirationGraceDays := 24 * time.Hour * time.Duration(s.config.ExpirationGraceDays)
+	expirationGraceDays := 24 * time.Hour * time.Duration(s.config.ExpirationGraceDays) // nolint:gosec
 
 	images := api.OSImagesByOS{}
 	for _, img := range resp.Payload {
@@ -73,7 +73,7 @@ func (s *SyncLister) DetermineImageSyncList() ([]api.OS, error) {
 
 		os, ver, err := utils.GetOsAndSemver(*img.ID)
 		if err != nil {
-			s.logger.Error("could not extract os and version, skipping", "error", err)
+			s.logger.Error("could not extract os and version, skipping", "image", img.ID, "error", err)
 			continue
 		}
 
@@ -292,7 +292,7 @@ func retrieveContentLength(ctx context.Context, c *http.Client, url string) (int
 		return 0, fmt.Errorf("content-length header value could not be converted to integer:%w", err)
 	}
 
-	return int64(size), nil
+	return int64(size), nil // nolint:gosec
 }
 
 func (s *SyncLister) reduce(images []api.OS, sizeCount int64) ([]api.OS, int64, error) {

cmd/internal/sync/syncer_test.go

@@ -47,22 +47,22 @@ func Test_currentFileIndex(t *testing.T) {
 		{
 			name: "lists cached images",
 			fsModFunc: func(t *testing.T, fs afero.Fs) {
-				createTestFile(t, fs, cacheRoot+"/ubuntu/19.04/20201025/img.tar.lz4")
-				createTestFile(t, fs, cacheRoot+"/ubuntu/19.04/20201026/img.tar.lz4")
-				createTestFile(t, fs, cacheRoot+"/ubuntu/19.04/20201025/img.tar.lz4.md5")
-				createTestFile(t, fs, cacheRoot+"/ubuntu/19.04/20201026/img.tar.lz4.md5")
+				createTestFile(t, fs, cacheRoot+"/ubuntu/19.4/20201025/img.tar.lz4")
+				createTestFile(t, fs, cacheRoot+"/ubuntu/19.4/20201026/img.tar.lz4")
+				createTestFile(t, fs, cacheRoot+"/ubuntu/19.4/20201025/img.tar.lz4.md5")
+				createTestFile(t, fs, cacheRoot+"/ubuntu/19.4/20201026/img.tar.lz4.md5")
 				createTestFile(t, fs, cacheRoot+"/ubuntu/20.10/20201026/img.tar.lz4")
 				createTestFile(t, fs, cacheRoot+"/ubuntu/20.10/20201026/img.tar.lz4.md5")
 			},
 			want: api.CacheEntities{
 				api.LocalFile{
 					Name:    "img.tar.lz4",
-					SubPath: "ubuntu/19.04/20201025/img.tar.lz4",
+					SubPath: "ubuntu/19.4/20201025/img.tar.lz4",
 					Size:    4,
 				},
 				api.LocalFile{
 					Name:    "img.tar.lz4",
-					SubPath: "ubuntu/19.04/20201026/img.tar.lz4",
+					SubPath: "ubuntu/19.4/20201026/img.tar.lz4",
 					Size:    4,
 				},
 				api.LocalFile{
@@ -170,12 +170,12 @@ func TestSyncer_defineImageDiff(t *testing.T) {
 			name: "remove unexisting images",
 			currentImages: api.CacheEntities{
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201026/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201026/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
@@ -184,12 +184,12 @@ func TestSyncer_defineImageDiff(t *testing.T) {
 			add:        nil,
 			remove: api.CacheEntities{
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201026/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201026/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
@@ -202,28 +202,28 @@ func TestSyncer_defineImageDiff(t *testing.T) {
 			wantImages: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 				},
 				api.OS{
 					Name:       "debian",
-					Version:    semver.MustParse("20.04"),
-					BucketKey:  "metal-os/master/ubuntu/20.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("20.4"),
+					BucketKey:  "metal-os/master/ubuntu/20.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 				},
 			},
 			add: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 				},
 				api.OS{
 					Name:       "debian",
-					Version:    semver.MustParse("20.04"),
-					BucketKey:  "metal-os/master/ubuntu/20.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("20.4"),
+					BucketKey:  "metal-os/master/ubuntu/20.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 				},
 			},
@@ -234,34 +234,34 @@ func TestSyncer_defineImageDiff(t *testing.T) {
 			name: "don't download existing images when checksum is proper",
 			currentImages: api.CacheEntities{
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
 			},
 			wantImages: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04.20201025"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4.20201025"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					MD5Ref: s3.Object{
-						Key: strPtr("metal-os/master/ubuntu/19.04/20201025/img.tar.lz4.md5"),
+						Key: strPtr("metal-os/master/ubuntu/19.4/20201025/img.tar.lz4.md5"),
 					},
 				},
 			},
 			fsModFunc: func(t *testing.T, fs afero.Fs) {
-				createTestFile(t, fs, cacheRoot+"/metal-os/master/ubuntu/19.04/20201025/img.tar.lz4")
+				createTestFile(t, fs, cacheRoot+"/metal-os/master/ubuntu/19.4/20201025/img.tar.lz4")
 			},
 			add: nil,
 			keep: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04.20201025"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4.20201025"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					MD5Ref: s3.Object{
-						Key: strPtr("metal-os/master/ubuntu/19.04/20201025/img.tar.lz4.md5"),
+						Key: strPtr("metal-os/master/ubuntu/19.4/20201025/img.tar.lz4.md5"),
 					},
 				},
 			},
@@ -272,34 +272,34 @@ func TestSyncer_defineImageDiff(t *testing.T) {
 			name: "download existing images when checksum is incorrect",
 			currentImages: api.CacheEntities{
 				api.OS{
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					Version:    &semver.Version{},
 				},
 			},
 			wantImages: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04.20201025"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4.20201025"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					MD5Ref: s3.Object{
-						Key: strPtr("metal-os/master/ubuntu/19.04/20201025/img.tar.lz4.md5"),
+						Key: strPtr("metal-os/master/ubuntu/19.4/20201025/img.tar.lz4.md5"),
 					},
 				},
 			},
 			fsModFunc: func(t *testing.T, fs afero.Fs) {
-				createTestFile(t, fs, cacheRoot+"/metal-os/master/ubuntu/19.04/20201025/img.tar.lz4")
+				createTestFile(t, fs, cacheRoot+"/metal-os/master/ubuntu/19.4/20201025/img.tar.lz4")
 			},
 			remoteChecksumFile: "not-equal",
 			add: api.CacheEntities{
 				api.OS{
 					Name:       "ubuntu",
-					Version:    semver.MustParse("19.04.20201025"),
-					BucketKey:  "metal-os/master/ubuntu/19.04/20201025/img.tar.lz4",
+					Version:    semver.MustParse("19.4.20201025"),
+					BucketKey:  "metal-os/master/ubuntu/19.4/20201025/img.tar.lz4",
 					BucketName: "metal-os",
 					MD5Ref: s3.Object{
-						Key: strPtr("metal-os/master/ubuntu/19.04/20201025/img.tar.lz4.md5"),
+						Key: strPtr("metal-os/master/ubuntu/19.4/20201025/img.tar.lz4.md5"),
 					},
 				},
 			},
@@ -399,7 +399,7 @@ func Test_cleanEmptyDirs(t *testing.T) {
 		{
 			name: "recursive deletion 2",
 			fsModFunc: func(t *testing.T, fs afero.Fs) {
-				createTestFile(t, fs, cacheRoot+"/ubuntu/20.04/20201028/img.tar.lz4")
+				createTestFile(t, fs, cacheRoot+"/ubuntu/20.4/20201028/img.tar.lz4")
 				createTestDir(t, fs, cacheRoot+"/ubuntu/20.10/20201027")
 			},
 			fsCheckFunc: func(t *testing.T, fs afero.Fs) {