Merge pull request #3052 from simonbaird/update-golang-main

Update golang to 1.24.6 (main)

Author: simonbaird

.golangci.yaml

@@ -33,11 +33,4 @@ linters-settings:
       - prefix(github.com/conforma/cli)
 
 issues:
-  exclude-rules:
-    # Some function in acceptance, e.g. ImageReferenceInStubRegistry, take a string parameter which
-    # is used in call to a string format call, e.g. fmt.Sprintf(...). Golinter started complaining
-    # starting on version v1.60. Since these are acceptance tests, there isn't a lot of harm in
-    # allowing this.
-    - path: acceptance
-      linters: [govet]
-      text: "printf: non-constant format string in call"
+  exclude-rules: []

.tool-versions

@@ -1 +1 @@
-golang 1.24.4
+golang 1.24.6

Dockerfile

@@ -16,7 +16,7 @@
 
 ## Build
 
-FROM docker.io/library/golang:1.24.4 AS build
+FROM docker.io/library/golang:1.24.6 AS build
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
 
 ## Final image
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:161a4e29ea482bab6048c2b36031b4f302ae81e4ff18b83e61785f40dc576f5d
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:6fc28bcb6776e387d7a35a2056d9d2b985dc4e26031e98a2bd35a7137cd6fd71
 
 ARG TARGETOS
 ARG TARGETARCH

Dockerfile.dist

@@ -16,7 +16,7 @@
 
 ## Build
 
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24.4@sha256:3ce6311380d5180599a3016031a9112542d43715244816d1d0eabc937952667b AS build
+FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6@sha256:6234f572204d672a0ee0686d748fbb9b7b05679368bf0d7a4446e13970e58060 AS build
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
 
 ## Final image
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:161a4e29ea482bab6048c2b36031b4f302ae81e4ff18b83e61785f40dc576f5d
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:6fc28bcb6776e387d7a35a2056d9d2b985dc4e26031e98a2bd35a7137cd6fd71
 
 ARG TARGETOS
 ARG TARGETARCH

acceptance/go.mod

@@ -1,6 +1,6 @@
 module github.com/conforma/cli/acceptance
 
-go 1.24.4
+go 1.24.6
 
 require (
 	cuelang.org/go v0.11.1

acceptance/image/image.go

@@ -198,7 +198,7 @@ func CreateAndPushImageSignature(ctx context.Context, imageName string, keyName
 	}
 
 	// the name of the image + the <hash>.sig tag
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName+":%s-%s.sig", digest.Algorithm, digest.Hex)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, fmt.Sprintf("%s:%s-%s.sig", imageName, digest.Algorithm, digest.Hex))
 	if err != nil {
 		return ctx, err
 	}
@@ -306,7 +306,7 @@ func createAndPushAttestationWithPatches(ctx context.Context, imageName, keyName
 	}
 
 	// the name of the image + the <hash>.att tag
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName+":%s-%s.att", digest.Algorithm, digest.Hex)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, fmt.Sprintf("%s:%s-%s.att", imageName, digest.Algorithm, digest.Hex))
 	if err != nil {
 		return ctx, err
 	}
@@ -401,7 +401,7 @@ func createAndPushImageWithLayer(ctx context.Context, imageName string, files *g
 func createAndPushLayer(ctx context.Context, content string, imageName string) (context.Context, error) {
 	l := s.NewLayer([]byte(content), types.OCIUncompressedLayer)
 
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, "%s", imageName)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName)
 	if err != nil {
 		return ctx, err
 	}
@@ -489,7 +489,7 @@ func createAndPushPlainImage(ctx context.Context, imageName string, patch patchF
 		return ctx, "", err
 	}
 
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, "%s", imageName)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName)
 	if err != nil {
 		return ctx, "", err
 	}
@@ -535,7 +535,7 @@ func resolveRefDigest(url string) (string, error) {
 // createAndPushKeylessImage loads an existing image from disk, along its signature and attestation
 // into the docker registry.
 func createAndPushKeylessImage(ctx context.Context, imageName string) (context.Context, error) {
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, "%s", imageName)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName)
 	if err != nil {
 		return ctx, err
 	}
@@ -705,7 +705,7 @@ func createAndPushPolicyBundle(ctx context.Context, imageName string, files *god
 		}
 	}
 
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, "%s", imageName)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, imageName)
 	if err != nil {
 		return ctx, err
 	}
@@ -912,7 +912,7 @@ func steal(what string) func(context.Context, string, string) (context.Context,
 			return ctx, err
 		}
 
-		fromRef, err := registry.ImageReferenceInStubRegistry(ctx, signatureFrom+":%s-%s.%s", fromDigest.Algorithm, fromDigest.Hex, what)
+		fromRef, err := registry.ImageReferenceInStubRegistry(ctx, fmt.Sprintf("%s:%s-%s.%s", signatureFrom, fromDigest.Algorithm, fromDigest.Hex, what))
 		if err != nil {
 			return ctx, err
 		}
@@ -932,7 +932,7 @@ func steal(what string) func(context.Context, string, string) (context.Context,
 			return ctx, err
 		}
 
-		toRef, err := registry.ImageReferenceInStubRegistry(ctx, imageName+":%s-%s.%s", toDigest.Algorithm, toDigest.Hex, what)
+		toRef, err := registry.ImageReferenceInStubRegistry(ctx, fmt.Sprintf("%s:%s-%s.%s", imageName, toDigest.Algorithm, toDigest.Hex, what))
 		if err != nil {
 			return ctx, err
 		}

acceptance/registry/registry.go

@@ -99,14 +99,14 @@ func startStubRegistry(ctx context.Context) (context.Context, error) {
 }
 
 // ImageReferenceInStubRegistry returns a reference for an image constructed by concatenating
-// the host:port/`name` where the name is formatted by the given format and arguments
-func ImageReferenceInStubRegistry(ctx context.Context, format string, args ...interface{}) (name.Reference, error) {
+// the host:port/`imageName`
+func ImageReferenceInStubRegistry(ctx context.Context, imageName string) (name.Reference, error) {
 	registry, err := StubRegistry(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	imageRef := registry + "/" + fmt.Sprintf(format, args...)
+	imageRef := registry + "/" + imageName
 
 	ref, err := name.ParseReference(imageRef)
 	if err != nil {

acceptance/tekton/bundles.go

@@ -78,7 +78,7 @@ func createTektonBundle(ctx context.Context, name string, data *godog.Table) (co
 		}
 	}
 
-	ref, err := registry.ImageReferenceInStubRegistry(ctx, "%s", name)
+	ref, err := registry.ImageReferenceInStubRegistry(ctx, name)
 	if err != nil {
 		return ctx, err
 	}

go.mod

@@ -1,6 +1,6 @@
 module github.com/conforma/cli
 
-go 1.24.4
+go 1.24.6
 
 require (
 	cuelang.org/go v0.13.2

tools/go.mod

@@ -1,6 +1,6 @@
 module github.com/conforma/cli/tools
 
-go 1.24.4
+go 1.24.6
 
 require (
 	github.com/daixiang0/gci v0.13.5