CR Fixes

treeverse · Feb 3, 2025 · 218664c · 218664c
1 parent e3afbe0
commit 218664c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/cmd/lakefs/cmd/run.go b/cmd/lakefs/cmd/run.go
@@ -212,7 +212,7 @@ var runCmd = &cobra.Command{
 		bufferedCollector.CollectMetadata(metadata)
 
 		c, err := catalog.New(ctx, catalog.Config{
-			Config:       baseCfg,
+			Config:       cfg,
 			KVStore:      kvStore,
 			PathProvider: upload.DefaultPathProvider,
 		})

diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -1928,7 +1928,7 @@ func (c *Controller) getStorageConfigList() apigen.StorageConfigList {
 			c.Logger.WithError(err).Error("no storage config found for id: %s", id)
 			continue
 		}
-
+		info.BlockstoreId = swag.String(id)
 		configList = append(configList, *info)
 	}
 	return configList

diff --git a/pkg/block/azure/adapter_test.go b/pkg/block/azure/adapter_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/treeverse/lakefs/pkg/block/azure"
 	"github.com/treeverse/lakefs/pkg/block/blocktest"
 	"github.com/treeverse/lakefs/pkg/block/params"
+	"github.com/treeverse/lakefs/pkg/config"
 )
 
 func TestAzureAdapter(t *testing.T) {
@@ -135,7 +136,7 @@ func TestAdapterNamespace(t *testing.T) {
 			}
 			require.NoError(t, err, "create new adapter")
 
-			namespaceInfo := adapter.GetStorageNamespaceInfo("")
+			namespaceInfo := adapter.GetStorageNamespaceInfo(config.SingleBlockstoreID)
 			expr, err := regexp.Compile(namespaceInfo.ValidityRegex)
 			require.NoError(t, err)
 

diff --git a/pkg/block/gs/adapter_test.go b/pkg/block/gs/adapter_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/treeverse/lakefs/pkg/block/blocktest"
 	"github.com/treeverse/lakefs/pkg/block/gs"
+	"github.com/treeverse/lakefs/pkg/config"
 )
 
 func newAdapter() *gs.Adapter {
@@ -36,7 +37,7 @@ func TestAdapterNamespace(t *testing.T) {
 		require.NoError(t, adapter.Close())
 	}()
 
-	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo("").ValidityRegex)
+	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo(config.SingleBlockstoreID).ValidityRegex)
 	require.NoError(t, err)
 
 	tests := []struct {

diff --git a/pkg/block/local/adapter_test.go b/pkg/block/local/adapter_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/treeverse/lakefs/pkg/block"
 	"github.com/treeverse/lakefs/pkg/block/blocktest"
 	"github.com/treeverse/lakefs/pkg/block/local"
+	"github.com/treeverse/lakefs/pkg/config"
 )
 
 const testStorageNamespace = "local://test"
@@ -31,7 +32,7 @@ func TestAdapterNamespace(t *testing.T) {
 	localPath := path.Join(tmpDir, "lakefs")
 	adapter, err := local.NewAdapter(localPath, local.WithRemoveEmptyDir(false))
 	require.NoError(t, err, "create new adapter")
-	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo("").ValidityRegex)
+	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo(config.SingleBlockstoreID).ValidityRegex)
 	require.NoError(t, err)
 
 	tests := []struct {

diff --git a/pkg/block/s3/adapter_test.go b/pkg/block/s3/adapter_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/treeverse/lakefs/pkg/block/blocktest"
 	"github.com/treeverse/lakefs/pkg/block/params"
 	s3a "github.com/treeverse/lakefs/pkg/block/s3"
+	"github.com/treeverse/lakefs/pkg/config"
 )
 
 func getS3BlockAdapter(t *testing.T, opts []s3a.AdapterOption) *s3a.Adapter {
@@ -66,7 +67,7 @@ func TestS3AdapterPresignedOverride(t *testing.T) {
 // TestAdapterNamespace tests the namespace validity regex with various paths
 func TestAdapterNamespace(t *testing.T) {
 	adapter := getS3BlockAdapter(t, nil)
-	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo("").ValidityRegex)
+	expr, err := regexp.Compile(adapter.GetStorageNamespaceInfo(config.SingleBlockstoreID).ValidityRegex)
 	require.NoError(t, err)
 
 	tests := []struct {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -32,6 +32,7 @@ const (
 	UseLocalConfiguration   = "local-settings"
 	QuickstartConfiguration = "quickstart"
 
+	// SingleBlockstoreID - Represents a single blockstore system
 	SingleBlockstoreID = ""
 )
 
@@ -226,6 +227,10 @@ type Blockstore struct {
 	} `mapstructure:"gs"`
 }
 
+func (b *Blockstore) GetStorageIDs() []string {
+	return nil
+}
+
 func (b *Blockstore) GetStorageByID(id string) AdapterConfig {
 	if id != "" {
 		return nil
@@ -344,10 +349,6 @@ func (b *Blockstore) BlockstoreDescription() string {
 	return ""
 }
 
-func (b *Blockstore) GetStorageIDs() []string {
-	return nil
-}
-
 func (b *Blockstore) BlockstoreExtras() map[string]string {
 	return nil
 }