feat: Add http.Header to CreateSignedURL method in ObjectStore interface

Signed-off-by: Itamar Perez <[email protected]>

pkg/controller/download_request_controller.go

@@ -203,7 +203,7 @@ func (r *downloadRequestReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 			_ = r.restoreItemOperationsMap.UpdateForRestore(backupStore, downloadRequest.Spec.Target.Name)
 		}
 
-		if downloadRequest.Status.DownloadURL, err = backupStore.GetDownloadURL(downloadRequest.Spec.Target); err != nil {
+		if downloadRequest.Status.DownloadURL, _, err = backupStore.GetDownloadURL(downloadRequest.Spec.Target); err != nil {
 			log.Warnf("fail to get Backup metadata file's download URL %s, retry later: %s", downloadRequest.Spec.Target, err)
 			return ctrl.Result{}, errors.WithStack(err)
 		}

pkg/persistence/in_memory_object_store.go

@@ -20,6 +20,7 @@ import (
 	"bytes"
 	"errors"
 	"io"
+	"net/http"
 	"strings"
 	"time"
 )
@@ -152,18 +153,18 @@ func (o *inMemoryObjectStore) DeleteObject(bucket, key string) error {
 	return nil
 }
 
-func (o *inMemoryObjectStore) CreateSignedURL(bucket, key string, ttl time.Duration) (string, error) {
+func (o *inMemoryObjectStore) CreateSignedURL(bucket, key string, ttl time.Duration) (string, http.Header, error) {
 	bucketData, ok := o.Data[bucket]
 	if !ok {
-		return "", errors.New("bucket not found")
+		return "", http.Header{}, errors.New("bucket not found")
 	}
 
 	_, ok = bucketData[key]
 	if !ok {
-		return "", errors.New("key not found")
+		return "", http.Header{}, errors.New("key not found")
 	}
 
-	return "a-url", nil
+	return "a-url", http.Header{}, nil
 }
 
 //

pkg/persistence/object_store.go

@@ -20,6 +20,7 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"io"
+	"net/http"
 	"strings"
 	"time"
 
@@ -92,7 +93,7 @@ type BackupStore interface {
 	DeleteRestore(name string) error
 	GetRestoredResourceList(name string) (map[string][]string, error)
 
-	GetDownloadURL(target velerov1api.DownloadTarget) (string, error)
+	GetDownloadURL(target velerov1api.DownloadTarget) (string, http.Header, error)
 }
 
 // DownloadURLTTL is how long a download URL is valid for.
@@ -615,7 +616,7 @@ func (s *objectBackupStore) PutBackupContents(backup string, backupContents io.R
 	return seekAndPutObject(s.objectStore, s.bucket, s.layout.getBackupContentsKey(backup), backupContents)
 }
 
-func (s *objectBackupStore) GetDownloadURL(target velerov1api.DownloadTarget) (string, error) {
+func (s *objectBackupStore) GetDownloadURL(target velerov1api.DownloadTarget) (string, http.Header, error) {
 	switch target.Kind {
 	case velerov1api.DownloadTargetKindBackupContents:
 		return s.objectStore.CreateSignedURL(s.bucket, s.layout.getBackupContentsKey(target.Name), DownloadURLTTL)
@@ -646,7 +647,7 @@ func (s *objectBackupStore) GetDownloadURL(target velerov1api.DownloadTarget) (s
 	case velerov1api.DownloadTargetKindRestoreVolumeInfo:
 		return s.objectStore.CreateSignedURL(s.bucket, s.layout.getRestoreVolumeInfoKey(target.Name), DownloadURLTTL)
 	default:
-		return "", errors.Errorf("unsupported download target kind %q", target.Kind)
+		return "", http.Header{}, errors.Errorf("unsupported download target kind %q", target.Kind)
 	}
 }
 

pkg/persistence/object_store_test.go

@@ -786,7 +786,7 @@ func TestGetDownloadURL(t *testing.T) {
 				t.Run(string(kind), func(t *testing.T) {
 					require.NoError(t, harness.objectStore.PutObject("test-bucket", expectedKey, newStringReadSeeker("foo")))
 
-					url, err := harness.GetDownloadURL(velerov1api.DownloadTarget{Kind: kind, Name: test.targetName})
+					url, _, err := harness.GetDownloadURL(velerov1api.DownloadTarget{Kind: kind, Name: test.targetName})
 					require.NoError(t, err)
 					assert.Equal(t, "a-url", url)
 				})

pkg/plugin/clientmgmt/restartable_object_store.go

@@ -18,6 +18,7 @@ package clientmgmt
 
 import (
 	"io"
+	"net/http"
 	"time"
 
 	"github.com/pkg/errors"
@@ -167,10 +168,10 @@ func (r *restartableObjectStore) DeleteObject(bucket string, key string) error {
 }
 
 // CreateSignedURL restarts the plugin's process if needed, then delegates the call.
-func (r *restartableObjectStore) CreateSignedURL(bucket string, key string, ttl time.Duration) (string, error) {
+func (r *restartableObjectStore) CreateSignedURL(bucket string, key string, ttl time.Duration) (string, http.Header, error) {
 	delegate, err := r.getDelegate()
 	if err != nil {
-		return "", err
+		return "", http.Header{}, err
 	}
 	return delegate.CreateSignedURL(bucket, key, ttl)
 }

pkg/plugin/clientmgmt/restartable_object_store_test.go

@@ -18,6 +18,7 @@ package clientmgmt
 
 import (
 	"io"
+	"net/http"
 	"strings"
 	"testing"
 	"time"
@@ -231,8 +232,8 @@ func TestRestartableObjectStoreDelegatedFunctions(t *testing.T) {
 		restartabletest.RestartableDelegateTest{
 			Function:                "CreateSignedURL",
 			Inputs:                  []interface{}{"bucket", "key", 30 * time.Minute},
-			ExpectedErrorOutputs:    []interface{}{"", errors.Errorf("reset error")},
-			ExpectedDelegateOutputs: []interface{}{"signedURL", errors.Errorf("delegate error")},
+			ExpectedErrorOutputs:    []interface{}{"", http.Header{}, errors.Errorf("reset error")},
+			ExpectedDelegateOutputs: []interface{}{"signedURL", http.Header{}, errors.Errorf("delegate error")},
 		},
 	)
 }

pkg/plugin/framework/object_store_client.go

@@ -18,6 +18,7 @@ package framework
 
 import (
 	"io"
+	"net/http"
 	"time"
 
 	"github.com/pkg/errors"
@@ -206,7 +207,7 @@ func (c *ObjectStoreGRPCClient) DeleteObject(bucket, key string) error {
 }
 
 // CreateSignedURL creates a pre-signed URL for the given bucket and key that expires after ttl.
-func (c *ObjectStoreGRPCClient) CreateSignedURL(bucket, key string, ttl time.Duration) (string, error) {
+func (c *ObjectStoreGRPCClient) CreateSignedURL(bucket, key string, ttl time.Duration) (string, http.Header, error) {
 	req := &proto.CreateSignedURLRequest{
 		Plugin: c.Plugin,
 		Bucket: bucket,
@@ -216,8 +217,8 @@ func (c *ObjectStoreGRPCClient) CreateSignedURL(bucket, key string, ttl time.Dur
 
 	res, err := c.grpcClient.CreateSignedURL(context.Background(), req)
 	if err != nil {
-		return "", common.FromGRPCError(err)
+		return "", http.Header{}, common.FromGRPCError(err)
 	}
 
-	return res.Url, nil
+	return res.Url, res.Headers, nil
 }

pkg/plugin/framework/object_store_server.go

@@ -264,10 +264,10 @@ func (s *ObjectStoreGRPCServer) CreateSignedURL(ctx context.Context, req *proto.
 		return nil, common.NewGRPCError(err)
 	}
 
-	url, err := impl.CreateSignedURL(req.Bucket, req.Key, time.Duration(req.Ttl))
+	url, headers, err := impl.CreateSignedURL(req.Bucket, req.Key, time.Duration(req.Ttl))
 	if err != nil {
 		return nil, common.NewGRPCError(err)
 	}
 
-	return &proto.CreateSignedURLResponse{Url: url}, nil
+	return &proto.CreateSignedURLResponse{Url: url, Headers: headers}, nil
 }

pkg/plugin/proto/ObjectStore.proto

@@ -54,7 +54,7 @@ message ListObjectsResponse {
 
 message DeleteObjectRequest {
     string plugin = 1;
-    string bucket = 2;  
+    string bucket = 2;
     string key = 3;
 }
 
@@ -66,8 +66,13 @@ message CreateSignedURLRequest {
     int64 ttl = 4;
 }
 
+message HeaderValues {
+    repeated string values = 1;
+}
+
 message CreateSignedURLResponse {
     string url = 1;
+    map<string, HeaderValues> headers = 2;
 }
 
 message ObjectStoreInitRequest {

pkg/plugin/velero/object_store.go

@@ -18,6 +18,7 @@ package velero
 
 import (
 	"io"
+	"net/http"
 	"time"
 )
 
@@ -61,5 +62,5 @@ type ObjectStore interface {
 	DeleteObject(bucket, key string) error
 
 	// CreateSignedURL creates a pre-signed URL for the given bucket and key that expires after ttl.
-	CreateSignedURL(bucket, key string, ttl time.Duration) (string, error)
+	CreateSignedURL(bucket, key string, ttl time.Duration) (string, http.Header, error)
 }