Fix tests

Signed-off-by: Filip Petkovski <[email protected]>

Author: fpetkovski

inmem.go

@@ -213,7 +213,7 @@ func (b *InMemBucket) Attributes(_ context.Context, name string) (ObjectAttribut
 }
 
 // Upload writes the file specified in src to into the memory.
-func (b *InMemBucket) Upload(_ context.Context, name string, r io.Reader) error {
+func (b *InMemBucket) Upload(_ context.Context, name string, r io.Reader, _ ...ObjectUploadOption) error {
 	b.mtx.Lock()
 	defer b.mtx.Unlock()
 	body, err := io.ReadAll(r)

objstore_test.go

@@ -124,7 +124,7 @@ func TestMetricBucket_UploadShouldPreserveReaderFeatures(t *testing.T) {
 
 			m := &mockBucket{
 				Bucket: WrapWithMetrics(NewInMemBucket(), nil, ""),
-				upload: func(ctx context.Context, name string, r io.Reader) error {
+				upload: func(ctx context.Context, name string, r io.Reader, opts ...ObjectUploadOption) error {
 					uploadReader = r
 					return nil
 				},
@@ -570,14 +570,14 @@ func (r *mockReader) Close() error {
 type mockBucket struct {
 	Bucket
 
-	upload   func(ctx context.Context, name string, r io.Reader) error
+	upload   func(ctx context.Context, name string, r io.Reader, opts ...ObjectUploadOption) error
 	get      func(ctx context.Context, name string) (io.ReadCloser, error)
 	getRange func(ctx context.Context, name string, off, length int64) (io.ReadCloser, error)
 }
 
-func (b *mockBucket) Upload(ctx context.Context, name string, r io.Reader) error {
+func (b *mockBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...ObjectUploadOption) error {
 	if b.upload != nil {
-		return b.upload(ctx, name, r)
+		return b.upload(ctx, name, r, opts...)
 	}
 	return errors.New("Upload has not been mocked")
 }

tracing/opentelemetry/opentelemetry.go

@@ -110,7 +110,7 @@ func (t TracingBucket) Attributes(ctx context.Context, name string) (_ objstore.
 	return t.bkt.Attributes(ctx, name)
 }
 
-func (t TracingBucket) Upload(ctx context.Context, name string, r io.Reader) (err error) {
+func (t TracingBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) (err error) {
 	ctx, span := t.tracer.Start(ctx, "bucket_upload")
 	defer span.End()
 	span.SetAttributes(attribute.String("name", name))
@@ -120,7 +120,7 @@ func (t TracingBucket) Upload(ctx context.Context, name string, r io.Reader) (er
 			span.RecordError(err)
 		}
 	}()
-	return t.bkt.Upload(ctx, name, r)
+	return t.bkt.Upload(ctx, name, r, opts...)
 }
 
 func (t TracingBucket) Delete(ctx context.Context, name string) (err error) {

tracing/opentracing/opentracing.go

@@ -110,10 +110,10 @@ func (t TracingBucket) Attributes(ctx context.Context, name string) (attrs objst
 	return
 }
 
-func (t TracingBucket) Upload(ctx context.Context, name string, r io.Reader) (err error) {
+func (t TracingBucket) Upload(ctx context.Context, name string, r io.Reader, opts ...objstore.ObjectUploadOption) (err error) {
 	doWithSpan(ctx, "bucket_upload", func(spanCtx context.Context, span opentracing.Span) {
 		span.LogKV("name", name)
-		err = t.bkt.Upload(spanCtx, name, r)
+		err = t.bkt.Upload(spanCtx, name, r, opts...)
 	})
 	return
 }