From 82e261d1b2e6a9ef4919507ce4097be61cfe7bce Mon Sep 17 00:00:00 2001 From: Itai Gilo Date: Wed, 29 Jan 2025 19:38:57 +0200 Subject: [PATCH] Remove storageID from BlockstoreMetadata --- pkg/block/adapter.go | 2 +- pkg/block/azure/adapter.go | 2 +- pkg/block/gs/adapter.go | 2 +- pkg/block/local/adapter.go | 2 +- pkg/block/mem/adapter.go | 2 +- pkg/block/metrics.go | 4 ++-- pkg/block/s3/adapter.go | 2 +- pkg/block/transient/adapter.go | 2 +- pkg/block/validations.go | 2 +- pkg/testutil/adapter.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/block/adapter.go b/pkg/block/adapter.go index 03e1cd2c5b5..fa70226f8a0 100644 --- a/pkg/block/adapter.go +++ b/pkg/block/adapter.go @@ -195,7 +195,7 @@ type Adapter interface { CompleteMultiPartUpload(ctx context.Context, obj ObjectPointer, uploadID string, multipartList *MultipartUploadCompletion) (*CompleteMultiPartUploadResponse, error) BlockstoreType() string - BlockstoreMetadata(ctx context.Context, storageID string) (*BlockstoreMetadata, error) + BlockstoreMetadata(ctx context.Context) (*BlockstoreMetadata, error) GetStorageNamespaceInfo(storageID string) (StorageNamespaceInfo, error) ResolveNamespace(storageID, storageNamespace, key string, identifierType IdentifierType) (QualifiedKey, error) diff --git a/pkg/block/azure/adapter.go b/pkg/block/azure/adapter.go index 06b2209f248..7e43989d5f6 100644 --- a/pkg/block/azure/adapter.go +++ b/pkg/block/azure/adapter.go @@ -587,7 +587,7 @@ func (a *Adapter) BlockstoreType() string { return block.BlockstoreTypeAzure } -func (a *Adapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *Adapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { return nil, block.ErrOperationNotSupported } diff --git a/pkg/block/gs/adapter.go b/pkg/block/gs/adapter.go index 4b876047923..cfc59f9ea61 100644 --- a/pkg/block/gs/adapter.go +++ b/pkg/block/gs/adapter.go @@ -654,7 +654,7 @@ func (a *Adapter) BlockstoreType() string { return block.BlockstoreTypeGS } -func (a *Adapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *Adapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { return nil, block.ErrOperationNotSupported } diff --git a/pkg/block/local/adapter.go b/pkg/block/local/adapter.go index fa0f111e27c..d4aaeeda80a 100644 --- a/pkg/block/local/adapter.go +++ b/pkg/block/local/adapter.go @@ -541,7 +541,7 @@ func (l *Adapter) BlockstoreType() string { return block.BlockstoreTypeLocal } -func (l *Adapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (l *Adapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { return nil, block.ErrOperationNotSupported } diff --git a/pkg/block/mem/adapter.go b/pkg/block/mem/adapter.go index 419d3302702..022627ca425 100644 --- a/pkg/block/mem/adapter.go +++ b/pkg/block/mem/adapter.go @@ -339,7 +339,7 @@ func (a *Adapter) BlockstoreType() string { return block.BlockstoreTypeMem } -func (a *Adapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *Adapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { return nil, block.ErrOperationNotSupported } diff --git a/pkg/block/metrics.go b/pkg/block/metrics.go index b3e8d085be9..75eae719f3b 100644 --- a/pkg/block/metrics.go +++ b/pkg/block/metrics.go @@ -110,9 +110,9 @@ func (m *MetricsAdapter) BlockstoreType() string { return m.adapter.BlockstoreType() } -func (m *MetricsAdapter) BlockstoreMetadata(ctx context.Context, storageID string) (*BlockstoreMetadata, error) { +func (m *MetricsAdapter) BlockstoreMetadata(ctx context.Context) (*BlockstoreMetadata, error) { ctx = httputil.SetClientTrace(ctx, m.adapter.BlockstoreType()) - return m.adapter.BlockstoreMetadata(ctx, storageID) + return m.adapter.BlockstoreMetadata(ctx) } func (m *MetricsAdapter) GetStorageNamespaceInfo(storageID string) (StorageNamespaceInfo, error) { diff --git a/pkg/block/s3/adapter.go b/pkg/block/s3/adapter.go index 3cb1b70d291..c28c1322e46 100644 --- a/pkg/block/s3/adapter.go +++ b/pkg/block/s3/adapter.go @@ -855,7 +855,7 @@ func (a *Adapter) BlockstoreType() string { return block.BlockstoreTypeS3 } -func (a *Adapter) BlockstoreMetadata(ctx context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *Adapter) BlockstoreMetadata(ctx context.Context) (*block.BlockstoreMetadata, error) { region, err := a.clients.GetBucketRegionDefault(ctx, "") if err != nil { return nil, err diff --git a/pkg/block/transient/adapter.go b/pkg/block/transient/adapter.go index 99d870741c3..1b349dcf2d6 100644 --- a/pkg/block/transient/adapter.go +++ b/pkg/block/transient/adapter.go @@ -147,7 +147,7 @@ func (a *Adapter) BlockstoreType() string { return block.BlockstoreTypeTransient } -func (a *Adapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *Adapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { return nil, block.ErrOperationNotSupported } diff --git a/pkg/block/validations.go b/pkg/block/validations.go index a961447cc91..84f26c2d6a3 100644 --- a/pkg/block/validations.go +++ b/pkg/block/validations.go @@ -7,7 +7,7 @@ import ( ) func ValidateInterRegionStorage(ctx context.Context, adapter Adapter, storageID, storageNamespace string) error { - blockstoreMetadata, err := adapter.BlockstoreMetadata(ctx, storageID) + blockstoreMetadata, err := adapter.BlockstoreMetadata(ctx) if errors.Is(err, ErrOperationNotSupported) { // region detection not supported for the server's blockstore, skip validation return nil diff --git a/pkg/testutil/adapter.go b/pkg/testutil/adapter.go index 223df385578..ebd7b19eb69 100644 --- a/pkg/testutil/adapter.go +++ b/pkg/testutil/adapter.go @@ -133,7 +133,7 @@ func (a *MockAdapter) BlockstoreType() string { return "s3" } -func (a *MockAdapter) BlockstoreMetadata(_ context.Context, _ string) (*block.BlockstoreMetadata, error) { +func (a *MockAdapter) BlockstoreMetadata(_ context.Context) (*block.BlockstoreMetadata, error) { if a.blockstoreMetadata != nil { return a.blockstoreMetadata, nil } else {