ci: fixed formatting

Signed-off-by: Allen Conlon <[email protected]>

Author: a1994sc

src/internal/agent/hooks/common.go

@@ -57,7 +57,7 @@ func getManifestConfigMediaType(ctx context.Context, zarfState *state.State, ima
 	_, b, err := oras.FetchBytes(ctx, registry, imageAddress, oras.DefaultFetchBytesOptions)
 
 	if err != nil {
-		return "", fmt.Errorf("got an error when trying to access the manifest for %s, error %v", imageAddress, err)
+		return "", fmt.Errorf("got an error when trying to access the manifest for %s, error %w", imageAddress, err)
 	}
 
 	var manifest ocispec.Manifest

src/internal/agent/hooks/common_test.go

@@ -18,8 +18,8 @@ import (
 	"oras.land/oras-go/v2/registry/remote"
 )
 
-func populateLocalRegistry(t *testing.T, ctx context.Context, localUrl string, artifact transform.Image, copyOpts oras.CopyOptions) {
-	localReg, err := remote.NewRegistry(localUrl)
+func populateLocalRegistry(ctx context.Context, t *testing.T, localURL string, artifact transform.Image, copyOpts oras.CopyOptions) {
+	localReg, err := remote.NewRegistry(localURL)
 	require.NoError(t, err)
 
 	localReg.PlainHTTP = true
@@ -36,21 +36,21 @@ func populateLocalRegistry(t *testing.T, ctx context.Context, localUrl string, a
 	_, err = oras.Copy(ctx, src, artifact.Tag, dst, artifact.Tag, copyOpts)
 	require.NoError(t, err)
 
-	hashedTag, err := transform.ImageTransformHost(localUrl, fmt.Sprintf("%s/%s:%s", artifact.Host, artifact.Path, artifact.Tag))
+	hashedTag, err := transform.ImageTransformHost(localURL, fmt.Sprintf("%s/%s:%s", artifact.Host, artifact.Path, artifact.Tag))
 	require.NoError(t, err)
 
 	_, err = oras.Copy(ctx, src, artifact.Tag, dst, hashedTag, copyOpts)
 	require.NoError(t, err)
 }
 
-func setupRegistry(t *testing.T, ctx context.Context, port int, artifacts []transform.Image, copyOpts oras.CopyOptions) (string, error) {
-	localUrl := testutil.SetupInMemoryRegistry(ctx, t, port)
+func setupRegistry(ctx context.Context, t *testing.T, port int, artifacts []transform.Image, copyOpts oras.CopyOptions) (string, error) {
+	localURL := testutil.SetupInMemoryRegistry(ctx, t, port)
 
 	for _, art := range artifacts {
-		populateLocalRegistry(t, ctx, localUrl, art, copyOpts)
+		populateLocalRegistry(ctx, t, localURL, art, copyOpts)
 	}
 
-	return localUrl, nil
+	return localURL, nil
 }
 
 type mediaTypeTest struct {
@@ -122,7 +122,7 @@ func TestConfigMediaTypes(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			ctx := testutil.TestContext(t)
-			url, err := setupRegistry(t, ctx, port, tt.artifact, tt.Opts)
+			url, err := setupRegistry(ctx, t, port, tt.artifact, tt.Opts)
 			require.NoError(t, err)
 
 			s := &state.State{RegistryInfo: state.RegistryInfo{Address: url}}

src/internal/agent/hooks/flux-ocirepo_test.go

@@ -347,7 +347,7 @@ func TestFluxOCIMutationWebhook(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	url, err := setupRegistry(t, ctx, port, artifacts, oras.DefaultCopyOptions)
+	url, err := setupRegistry(ctx, t, port, artifacts, oras.DefaultCopyOptions)
 	require.NoError(t, err)
 
 	for _, tt := range tests {

src/internal/packager/images/common.go

@@ -121,6 +121,7 @@ func Ping(ctx context.Context, plainHTTP bool, registryURL string, client *auth.
 	return fmt.Errorf("could not connect to registry %s over %s. status code: %d", registryURL, buildScheme(plainHTTP), resp.StatusCode)
 }
 
+// ShouldUsePlainHTTP returns true if the registryURL is an http endpoint
 // This is inspired by the Crane functionality to determine the schema to be used - https://github.com/google/go-containerregistry/blob/main/pkg/v1/remote/transport/ping.go
 // Zarf relies heavily on this logic, as the internal registry communicates over HTTP, however we want Zarf to be flexible should the registry be over https in the future
 func ShouldUsePlainHTTP(ctx context.Context, registryURL string, client *auth.Client) (bool, error) {