build(deps): bump all dependencies

Signed-off-by: Jan-Otto Kröpke <joe@cloudeteer.de>
project-zot · Jul 18, 2024 · 279f98d · 279f98d
1 parent 714d8c4
commit 279f98d
Show file tree

Hide file tree

Showing 17 changed files with 370 additions and 351 deletions.
diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/storage/common/common.go b/pkg/storage/common/common.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	godigest "github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/schema"
 	imeta "github.com/opencontainers/image-spec/specs-go"

diff --git a/pkg/storage/gc/gc.go b/pkg/storage/gc/gc.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 

diff --git a/pkg/storage/gc/gc_test.go b/pkg/storage/gc/gc_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver/factory"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 	guuid "github.com/gofrs/uuid"
 	. "github.com/smartystreets/goconvey/convey"
 	"gopkg.in/resty.v1"

diff --git a/pkg/storage/imagestore/imagestore.go b/pkg/storage/imagestore/imagestore.go
@@ -14,7 +14,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	guuid "github.com/gofrs/uuid"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -376,7 +376,7 @@ func (is *ImageStore) GetNextRepository(repo string) (string, error) {
 	}
 
 	if errors.Is(err, io.EOF) ||
-		(errors.As(err, driverErr) && errors.Is(driverErr.Enclosed, io.EOF)) {
+		(errors.As(err, driverErr) && errors.Is(driverErr.Detail, io.EOF)) {
 		return store, nil
 	}
 
@@ -845,7 +845,7 @@ func (is *ImageStore) FinishBlobUpload(repo, uuid string, body io.Reader, dstDig
 		return zerr.ErrUploadNotFound
 	}
 
-	if err := fileWriter.Commit(); err != nil {
+	if err := fileWriter.Commit(context.Background()); err != nil {
 		is.log.Error().Err(err).Msg("failed to commit file")
 
 		return err
@@ -942,7 +942,7 @@ func (is *ImageStore) FullBlobUpload(repo string, body io.Reader, dstDigest godi
 		return "", -1, err
 	}
 
-	if err := blobFile.Commit(); err != nil {
+	if err := blobFile.Commit(context.Background()); err != nil {
 		is.log.Error().Err(err).Str("blob", src).Msg("failed to commit blob")
 
 		return "", -1, err
@@ -1100,7 +1100,7 @@ func (is *ImageStore) DeleteBlobUpload(repo, uuid string) error {
 
 	defer writer.Close()
 
-	if err := writer.Cancel(); err != nil {
+	if err := writer.Cancel(context.Background()); err != nil {
 		is.log.Error().Err(err).Str("blobUploadPath", blobUploadPath).Msg("failed to delete blob upload")
 
 		return err

diff --git a/pkg/storage/local/driver.go b/pkg/storage/local/driver.go
@@ -3,6 +3,7 @@ package local
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"errors"
 	"io"
 	"os"
@@ -11,7 +12,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 
 	zerr "zotregistry.dev/zot/errors"
 	storageConstants "zotregistry.dev/zot/pkg/storage/constants"
@@ -176,7 +177,7 @@ func (driver *Driver) WriteFile(filepath string, content []byte) (int, error) {
 
 	nbytes, err := io.Copy(writer, bytes.NewReader(content))
 	if err != nil {
-		_ = writer.Cancel()
+		_ = writer.Cancel(context.Background())
 
 		return -1, driver.formatErr(err)
 	}
@@ -315,7 +316,7 @@ func (driver *Driver) formatErr(err error) error {
 	default:
 		storageError := storagedriver.Error{
 			DriverName: driver.Name(),
-			Enclosed:   err,
+			Detail:     err,
 		}
 
 		return storageError
@@ -420,7 +421,7 @@ func (fw *fileWriter) Close() error {
 	return nil
 }
 
-func (fw *fileWriter) Cancel() error {
+func (fw *fileWriter) Cancel(_ context.Context) error {
 	if fw.closed {
 		return zerr.ErrFileAlreadyClosed
 	}
@@ -431,7 +432,7 @@ func (fw *fileWriter) Cancel() error {
 	return os.Remove(fw.file.Name())
 }
 
-func (fw *fileWriter) Commit() error {
+func (fw *fileWriter) Commit(_ context.Context) error {
 	//nolint: gocritic
 	if fw.closed {
 		return zerr.ErrFileAlreadyClosed

diff --git a/pkg/storage/local/driver_test.go b/pkg/storage/local/driver_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	. "github.com/smartystreets/goconvey/convey"
 
 	storageConstants "zotregistry.dev/zot/pkg/storage/constants"

diff --git a/pkg/storage/s3/driver.go b/pkg/storage/s3/driver.go
@@ -5,8 +5,8 @@ import (
 	"io"
 
 	// Add s3 support.
-	"github.com/docker/distribution/registry/storage/driver"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 
 	storageConstants "zotregistry.dev/zot/pkg/storage/constants"
 )
@@ -65,7 +65,7 @@ func (driver *Driver) WriteFile(filepath string, content []byte) (int, error) {
 			return -1, err
 		}
 
-		if err := stwr.Commit(); err != nil {
+		if err := stwr.Commit(context.Background()); err != nil {
 			return -1, err
 		}
 	} else {

diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go
@@ -2,9 +2,9 @@ package s3
 
 import (
 	// Add s3 support.
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	// Load s3 driver.
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 
 	"zotregistry.dev/zot/pkg/extensions/monitoring"
 	zlog "zotregistry.dev/zot/pkg/log"

diff --git a/pkg/storage/s3/s3_test.go b/pkg/storage/s3/s3_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/factory"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 	guuid "github.com/gofrs/uuid"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/storage/scrub_test.go b/pkg/storage/scrub_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 	guuid "github.com/gofrs/uuid"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -1,11 +1,12 @@
 package storage
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"strings"
 
-	"github.com/docker/distribution/registry/storage/driver/factory"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 
@@ -68,7 +69,7 @@ func New(config *config.Config, linter common.Lint, metrics monitoring.MetricSer
 			return storeController, fmt.Errorf("storageDriver '%s' unsupported storage driver: %w", storeName, zerr.ErrBadConfig)
 		}
 		// Init a Storager from connection string.
-		store, err := factory.Create(storeName, config.Storage.StorageDriver)
+		store, err := factory.Create(context.Background(), storeName, config.Storage.StorageDriver)
 		if err != nil {
 			log.Error().Err(err).Str("rootDir", config.Storage.RootDirectory).Msg("failed to create s3 service")
 
@@ -183,7 +184,7 @@ func getSubStore(cfg *config.Config, subPaths map[string]config.StorageConfig,
 			}
 
 			// Init a Storager from connection string.
-			store, err := factory.Create(storeName, storageConfig.StorageDriver)
+			store, err := factory.Create(context.Background(), storeName, storageConfig.StorageDriver)
 			if err != nil {
 				log.Error().Err(err).Str("rootDir", storageConfig.RootDirectory).Msg("failed to create s3 service")
 

diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
@@ -17,9 +17,9 @@ import (
 	"time"
 
 	// Add s3 support.
-	"github.com/docker/distribution/registry/storage/driver"
-	"github.com/docker/distribution/registry/storage/driver/factory"
-	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver/factory"
+	_ "github.com/distribution/distribution/v3/registry/storage/driver/s3-aws"
 	guuid "github.com/gofrs/uuid"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -81,7 +81,7 @@ func createObjectsStore(rootDir string, cacheDir string) (
 
 	storeName := fmt.Sprintf("%v", storageDriverParams["name"])
 
-	store, err := factory.Create(storeName, storageDriverParams)
+	store, err := factory.Create(context.Background(), storeName, storageDriverParams)
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/storage/types/types.go b/pkg/storage/types/types.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	storagedriver "github.com/distribution/distribution/v3/registry/storage/driver"
 	godigest "github.com/opencontainers/go-digest"
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 

diff --git a/pkg/test/mocks/storage_driver_mock.go b/pkg/test/mocks/storage_driver_mock.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/distribution/registry/storage/driver"
+	"github.com/distribution/distribution/v3/registry/storage/driver"
 )
 
 type StorageDriverMock struct {