gofumpt

linter fixes

build/mage/build.go

@@ -104,7 +104,7 @@ var binaries = map[string]binaryConfig{
 		},
 		useProto: true,
 		// NOTE: restore in case alpine createrepo_c package is broken again
-		//baseImage: "debian:bullseye-slim",
+		// baseImage: "debian:bullseye-slim",
 		integrationTest: &integrationTest{
 			isPlugin: true,
 			envs: map[string]string{

cmd/beskar-ostree/main.go

@@ -6,12 +6,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/ostreerepository"
 	"log"
 	"net"
 	"os"
 	"syscall"
 
+	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/ostreerepository"
+
 	"go.ciq.dev/beskar/internal/pkg/pluginsrv"
 	"go.ciq.dev/beskar/internal/plugins/ostree"
 	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/config"

cmd/beskar-static/main.go

@@ -6,12 +6,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"go.ciq.dev/beskar/internal/plugins/static/pkg/staticrepository"
 	"log"
 	"net"
 	"os"
 	"syscall"
 
+	"go.ciq.dev/beskar/internal/plugins/static/pkg/staticrepository"
+
 	"go.ciq.dev/beskar/internal/pkg/pluginsrv"
 	"go.ciq.dev/beskar/internal/plugins/static"
 	"go.ciq.dev/beskar/internal/plugins/static/pkg/config"

cmd/beskar-yum/main.go

@@ -6,12 +6,13 @@ package main
 import (
 	"flag"
 	"fmt"
-	"go.ciq.dev/beskar/internal/plugins/yum/pkg/yumrepository"
 	"log"
 	"net"
 	"os"
 	"syscall"
 
+	"go.ciq.dev/beskar/internal/plugins/yum/pkg/yumrepository"
+
 	"go.ciq.dev/beskar/internal/pkg/pluginsrv"
 	"go.ciq.dev/beskar/internal/plugins/yum"
 	"go.ciq.dev/beskar/internal/plugins/yum/pkg/config"

cmd/beskarctl/ostree/repo.go

@@ -5,6 +5,7 @@ package ostree
 
 import (
 	"context"
+
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"

internal/pkg/repository/handler.go

@@ -6,7 +6,6 @@ package repository
 import (
 	"context"
 	"errors"
-	"go.ciq.dev/beskar/internal/pkg/gossip"
 	"io"
 	"net"
 	"os"
@@ -16,6 +15,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"go.ciq.dev/beskar/internal/pkg/gossip"
+
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	eventv1 "go.ciq.dev/beskar/pkg/api/event/v1"

internal/plugins/ostree/api.go

@@ -5,6 +5,7 @@ package ostree
 
 import (
 	"context"
+
 	"github.com/RussellLuo/kun/pkg/werror"
 	"github.com/RussellLuo/kun/pkg/werror/gcode"
 

internal/plugins/ostree/pkg/libostree/errors.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 type Err string

internal/plugins/ostree/pkg/libostree/glib_helpers.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 // #cgo pkg-config: glib-2.0 gobject-2.0
@@ -7,6 +10,7 @@ package libostree
 // #include <stdlib.h>
 // #include "glib_helpers.go.h"
 import "C"
+
 import (
 	"errors"
 )

internal/plugins/ostree/pkg/libostree/options.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 // #cgo pkg-config: ostree-1 glib-2.0 gobject-2.0
@@ -13,12 +16,13 @@ import "unsafe"
 // Option defines an option for pulling ostree repos.
 // It is used to build a *C.GVariant via a *C.GVariantBuilder.
 // free is an optional function that frees the memory allocated by the option. free may be called more than once.
-type Option func(builder *C.GVariantBuilder, free freeFunc)
-type freeFunc func(...unsafe.Pointer)
+type (
+	Option   func(builder *C.GVariantBuilder, free freeFunc)
+	freeFunc func(...unsafe.Pointer)
+)
 
 // ToGVariant converts the given Options to a GVariant using a GVaraintBuilder.
 func toGVariant(opts ...Option) *C.GVariant {
-
 	typeStr := (*C.gchar)(C.CString("a{sv}"))
 	defer C.free(unsafe.Pointer(typeStr))
 

internal/plugins/ostree/pkg/libostree/ostree.go

@@ -1 +1,4 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree

internal/plugins/ostree/pkg/libostree/pull.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 // #cgo pkg-config: ostree-1 glib-2.0 gobject-2.0
@@ -6,6 +9,7 @@ package libostree
 // #include <ostree.h>
 // #include "pull.go.h"
 import "C"
+
 import (
 	"context"
 	"unsafe"

internal/plugins/ostree/pkg/libostree/pull_test.go

@@ -1,15 +1,19 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"log"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMain(m *testing.M) {
@@ -22,7 +26,6 @@ func TestMain(m *testing.M) {
 }
 
 func TestRepo_Pull(t *testing.T) {
-
 	fmt.Println(os.Getwd())
 	svr := httptest.NewServer(http.FileServer(http.Dir("testdata/repo")))
 	defer svr.Close()
@@ -40,7 +43,7 @@ func TestRepo_Pull(t *testing.T) {
 		RepoModeBare,
 		RepoModeBareUser,
 		RepoModeBareUserOnly,
-		//RepoModeBareSplitXAttrs,
+		// RepoModeBareSplitXAttrs,
 	}
 
 	// Test pull for each mode
@@ -118,7 +121,7 @@ func TestRepo_Pull(t *testing.T) {
 				}
 			})
 
-			//TODO: Repeat the following tests for only a specific ref
+			// TODO: Repeat the following tests for only a specific ref
 			t.Run("should pull entire repo", func(t *testing.T) {
 				err := repo.Pull(
 					context.TODO(),
@@ -153,7 +156,7 @@ func TestRepo_Pull(t *testing.T) {
 				for _, ref := range refs {
 					checksum := ref.Checksum
 					assert.NotEmpty(t, checksum)
-					for sum, _ := range expectedChecksums {
+					for sum := range expectedChecksums {
 						if sum == checksum {
 							expectedChecksums[sum] = true
 						}

internal/plugins/ostree/pkg/libostree/repo.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package libostree
 
 // #cgo pkg-config: ostree-1 glib-2.0 gobject-2.0
@@ -7,6 +10,7 @@ package libostree
 // #include <gio/gio.h>
 // #include <ostree.h>
 import "C"
+
 import (
 	"runtime"
 	"unsafe"

internal/plugins/ostree/pkg/ostreerepository/api.go

@@ -1,17 +1,21 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package ostreerepository
 
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+
 	"go.ciq.dev/beskar/cmd/beskarctl/ctl"
 	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/libostree"
 	"go.ciq.dev/beskar/pkg/orasostree"
 	apiv1 "go.ciq.dev/beskar/pkg/plugins/ostree/api/v1"
 	"go.ciq.dev/beskar/pkg/utils"
 	"golang.org/x/sync/errgroup"
-	"os"
-	"path/filepath"
-	"time"
 )
 
 func (h *Handler) CreateRepository(ctx context.Context, properties *apiv1.OSTreeRepositoryProperties) (err error) {
@@ -33,7 +37,6 @@ func (h *Handler) CreateRepository(ctx context.Context, properties *apiv1.OSTree
 	defer h.clearState()
 
 	return h.BeginLocalRepoTransaction(ctx, func(ctx context.Context, repo *libostree.Repo) (bool, error) {
-
 		// Add user provided remotes
 		// We do not need to add beskar remote here
 		for _, remote := range properties.Remotes {
@@ -51,7 +54,6 @@ func (h *Handler) CreateRepository(ctx context.Context, properties *apiv1.OSTree
 		}
 
 		return true, nil
-
 	}, SkipPull())
 }
 
@@ -81,7 +83,6 @@ func (h *Handler) DeleteRepository(ctx context.Context) (err error) {
 		h.logger.Debug("deleting repository")
 
 		err := h.BeginLocalRepoTransaction(context.Background(), func(ctx context.Context, repo *libostree.Repo) (bool, error) {
-
 			// Create a worker pool to deleting each file in the repository concurrently.
 			// ctx will be cancelled on error, and the error will be returned.
 			eg, ctx := errgroup.WithContext(ctx)
@@ -125,9 +126,7 @@ func (h *Handler) DeleteRepository(ctx context.Context) (err error) {
 
 			// We don't want to push any changes to beskar.
 			return false, eg.Wait()
-
 		})
-
 		if err != nil {
 			h.logger.Error("deleting repository", "error", err.Error())
 		}
@@ -159,7 +158,6 @@ func (h *Handler) AddRemote(ctx context.Context, remote *apiv1.OSTreeRemotePrope
 		}
 
 		return true, nil
-
 	}, SkipPull())
 }
 
@@ -209,7 +207,6 @@ func (h *Handler) SyncRepository(ctx context.Context, properties *apiv1.OSTreeRe
 			}
 
 			return true, nil
-
 		})
 	}()
 

internal/plugins/ostree/pkg/ostreerepository/handler.go

@@ -1,13 +1,11 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package ostreerepository
 
 import (
 	"context"
 	"fmt"
-	"github.com/RussellLuo/kun/pkg/werror"
-	"github.com/RussellLuo/kun/pkg/werror/gcode"
-	"go.ciq.dev/beskar/cmd/beskarctl/ctl"
-	"go.ciq.dev/beskar/internal/pkg/repository"
-	eventv1 "go.ciq.dev/beskar/pkg/api/event/v1"
 	"io"
 	"log/slog"
 	"net/http"
@@ -16,6 +14,12 @@ import (
 	"path/filepath"
 	"sync"
 	"sync/atomic"
+
+	"github.com/RussellLuo/kun/pkg/werror"
+	"github.com/RussellLuo/kun/pkg/werror/gcode"
+	"go.ciq.dev/beskar/cmd/beskarctl/ctl"
+	"go.ciq.dev/beskar/internal/pkg/repository"
+	eventv1 "go.ciq.dev/beskar/pkg/api/event/v1"
 )
 
 const (
@@ -127,7 +131,7 @@ func (h *Handler) Start(ctx context.Context) {
 
 // pullConfig pulls the config file from beskar.
 func (h *Handler) pullFile(_ context.Context, filename string) error {
-	//TODO: Replace with appropriate puller mechanism
+	// TODO: Replace with appropriate puller mechanism
 	url := "http://" + h.Params.GetBeskarRegistryHostPort() + path.Join("/", h.Repository, "repo", filename)
 	resp, err := http.Get(url)
 	if err != nil {

internal/plugins/ostree/pkg/ostreerepository/local.go

@@ -1,13 +1,17 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package ostreerepository
 
 import (
 	"context"
-	"go.ciq.dev/beskar/cmd/beskarctl/ctl"
-	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/libostree"
-	"go.ciq.dev/beskar/pkg/orasostree"
 	"os"
 	"path"
 	"path/filepath"
+
+	"go.ciq.dev/beskar/cmd/beskarctl/ctl"
+	"go.ciq.dev/beskar/internal/plugins/ostree/pkg/libostree"
+	"go.ciq.dev/beskar/pkg/orasostree"
 )
 
 // checkRepoExists checks if the ostree repository exists in beskar.
@@ -19,10 +23,12 @@ func (h *Handler) checkRepoExists(_ context.Context) bool {
 	return err == nil
 }
 
-type TransactionFn func(ctx context.Context, repo *libostree.Repo) (commit bool, err error)
-type TransactionOptions struct {
-	skipPull bool
-}
+type (
+	TransactionFn      func(ctx context.Context, repo *libostree.Repo) (commit bool, err error)
+	TransactionOptions struct {
+		skipPull bool
+	}
+)
 
 type TransactionOption func(*TransactionOptions)
 
@@ -41,7 +47,6 @@ func SkipPull() TransactionOption {
 // 5. If the transactorFn returns true, the local ostree repository is pushed to beskar. If false, all local changes are discarded.
 // 6. The temporary directory is removed.
 func (h *Handler) BeginLocalRepoTransaction(ctx context.Context, tFn TransactionFn, opts ...TransactionOption) error {
-
 	options := TransactionOptions{}
 	for _, opt := range opts {
 		opt(&options)

internal/plugins/ostree/pkg/ostreerepository/sync.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright (c) 2023, CIQ, Inc. All rights reserved
+// SPDX-License-Identifier: Apache-2.0
+
 package ostreerepository
 
 import (