build(deps): bump all dependencies

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
project-zot · Aug 1, 2024 · 9efcf14 · 9efcf14
1 parent 019a9f5
commit 9efcf14
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/pkg/cli/server/root.go b/pkg/cli/server/root.go
@@ -668,16 +668,32 @@ func applyDefaultValues(config *config.Config, viperInstance *viper.Viper, log z
 		config.Storage.RemoteCache = true
 	}
 
-	// s3 dedup=false, check for previous dedupe usage and set to true if cachedb found
-	if !config.Storage.Dedupe && config.Storage.StorageDriver != nil {
-		cacheDir, _ := config.Storage.StorageDriver["rootdirectory"].(string)
-		cachePath := path.Join(cacheDir, storageConstants.BoltdbName+storageConstants.DBExtensionName)
+	if config.Storage.StorageDriver != nil {
+		// s3 dedup=false, check for previous dedupe usage and set to true if cachedb found
+		if !config.Storage.Dedupe {
+			cacheDir, _ := config.Storage.StorageDriver["rootdirectory"].(string)
+			cachePath := path.Join(cacheDir, storageConstants.BoltdbName+storageConstants.DBExtensionName)
 
-		if _, err := os.Stat(cachePath); err == nil {
-			log.Info().Str("component", "config").Msg("dedupe set to false for s3 driver but used to be true.")
-			log.Info().Str("cache path", cachePath).Msg("found cache database")
+			if _, err := os.Stat(cachePath); err == nil {
+				log.Info().Str("component", "config").Msg("dedupe set to false for s3 driver but used to be true.")
+				log.Info().Str("cache path", cachePath).Msg("found cache database")
 
-			config.Storage.RemoteCache = false
+				config.Storage.RemoteCache = false
+			}
+		}
+
+		// backward compatibility for s3 storage driver
+		// if regionendpoint is provided, forcepathstyle should be set to true
+		// ref: https://github.com/distribution/distribution/pull/4291
+		if config.Storage.StorageDriver["name"] == storageConstants.S3StorageDriverName {
+			_, hasRegionEndpoint := config.Storage.StorageDriver["regionendpoint"]
+			_, hasForcePathStyle := config.Storage.StorageDriver["forcepathstyle"]
+
+			if hasRegionEndpoint && !hasForcePathStyle {
+				log.Warn().
+					Msg("DEPRECATED: automatically setting forcepathstyle to true for s3 storage driver.") //nolint: check-logs
+				config.Storage.StorageDriver["forcepathstyle"] = true
+			}
 		}
 	}
 

diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
@@ -62,19 +62,7 @@ func New(config *config.Config, linter common.Lint, metrics monitoring.MetricSer
 		)
 	} else {
 		storeName := fmt.Sprintf("%v", config.Storage.StorageDriver["name"])
-		switch storeName {
-		case constants.S3StorageDriverName:
-			// backward compatibility for s3 storage driver
-			// if regionendpoint is provided, forcepathstyle should be set to true
-			// ref: https://github.com/distribution/distribution/pull/4291
-			if _, ok := config.Storage.StorageDriver["regionendpoint"]; ok {
-				if _, ok = config.Storage.StorageDriver["forcepathstyle"]; !ok {
-					log.Warn().
-						Msg("DEPRECATED: automatically setting forcepathstyle to true for s3 storage driver.") //nolint: check-logs
-					config.Storage.StorageDriver["forcepathstyle"] = true
-				}
-			}
-		default:
+		if storeName != constants.S3StorageDriverName {
 			log.Error().Err(zerr.ErrBadConfig).Str("storageDriver", storeName).
 				Msg("unsupported storage driver")
 
@@ -189,19 +177,7 @@ func getSubStore(cfg *config.Config, subPaths map[string]config.StorageConfig,
 			}
 		} else {
 			storeName := fmt.Sprintf("%v", storageConfig.StorageDriver["name"])
-			switch storeName {
-			case constants.S3StorageDriverName:
-				// backward compatibility for s3 storage driver
-				// if regionendpoint is provided, forcepathstyle should be set to true
-				// ref: https://github.com/distribution/distribution/pull/4291
-				if _, ok := storageConfig.StorageDriver["regionendpoint"]; ok {
-					if _, ok = storageConfig.StorageDriver["forcepathstyle"]; !ok {
-						log.Warn().
-							Msg("DEPRECATED: automatically setting forcepathstyle to true for s3 storage driver.") //nolint: check-logs
-						storageConfig.StorageDriver["forcepathstyle"] = true
-					}
-				}
-			default:
+			if storeName != constants.S3StorageDriverName {
 				log.Error().Err(zerr.ErrBadConfig).Str("storageDriver", storeName).
 					Msg("unsupported storage driver")