Basic fixes for the update.

Signed-off-by: Johnathan Falk <johnathan.falk@gmail.com>

Author: jdfalk

backends/aws_s3_backend.go

@@ -174,9 +174,6 @@ func withRequestLimiter(buffer chan bool) request.Option {
 func withComputeMD5HashHandler(ro *request.Request) {
 	ro.Handlers.Build.PushBack(func(r *request.Request) {
 		reader := r.GetBody()
-		if reader == nil {
-			return
-		}
 
 		//nolint:gosec // MD5 not used cryptographically here
 		md5Raw := md5.New()

backends/azure_backend.go

@@ -189,7 +189,7 @@ func (a *AzureBackend) Upload(ctx context.Context, vol *files.VolumeInfo) error
 			case a.conf.MaxParallelUploadBuffer <- true:
 				errg.Go(func() error {
 					defer func() { <-a.conf.MaxParallelUploadBuffer }()
-					_, err := blobURL.StageBlock(ctx, blockID, bytes.NewReader(buf[:n]), azblob.LeaseAccessConditions{}, md5sum[:])
+					_, err := blobURL.StageBlock(ctx, blockID, bytes.NewReader(buf[:n]), azblob.LeaseAccessConditions{}, md5sum[:], azblob.ClientProvidedKeyOptions{})
 					return err
 				})
 			}
@@ -213,7 +213,15 @@ func (a *AzureBackend) Upload(ctx context.Context, vol *files.VolumeInfo) error
 
 	// Finally, finalize the storage blob by giving Azure the block list order
 	_, err = blobURL.CommitBlockList(
-		ctx, blockIDs, azblob.BlobHTTPHeaders{ContentMD5: md5Raw}, azblob.Metadata{}, azblob.BlobAccessConditions{}, azblob.DefaultAccessTier, azblob.BlobTagsMap{},
+		ctx,
+		blockIDs,
+		azblob.BlobHTTPHeaders{ContentMD5: md5Raw},
+		azblob.Metadata{},
+		azblob.BlobAccessConditions{},
+		azblob.DefaultAccessTier,
+		azblob.BlobTagsMap{},
+		azblob.ClientProvidedKeyOptions{},
+		azblob.ImmutabilityPolicyOptions{},
 	)
 	if err != nil {
 		log.AppLogger.Debugf("azure backend: Error while finalizing volume %s - %v", vol.ObjectName, err)
@@ -236,7 +244,7 @@ func (a *AzureBackend) PreDownload(ctx context.Context, keys []string) error {
 // Download will download the requseted object which can be read from the returned io.ReadCloser
 func (a *AzureBackend) Download(ctx context.Context, name string) (io.ReadCloser, error) {
 	blobURL := a.containerSvc.NewBlobURL(a.prefix + name)
-	resp, err := blobURL.Download(ctx, 0, 0, azblob.BlobAccessConditions{}, false)
+	resp, err := blobURL.Download(ctx, int64(0), int64(0), azblob.BlobAccessConditions{}, false, azblob.ClientProvidedKeyOptions{})
 	if err != nil {
 		return nil, err
 	}

backends/file_backend_test.go

@@ -22,7 +22,6 @@ package backends
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -78,7 +77,7 @@ func TestFileBackend(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	tempPath, err := ioutil.TempDir("", t.Name())
+	tempPath, err := os.MkdirTemp("", t.Name())
 	if err != nil {
 		t.Fatalf("could not create temp dir: %v", err)
 	}

go.mod

@@ -35,11 +35,9 @@ require (
 	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dnaeon/go-vcr v1.2.0 // indirect
-	github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
 	github.com/gofrs/uuid v4.3.1+incompatible // indirect
-	github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
@@ -50,7 +48,6 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.15.12 // indirect
 	github.com/mattn/go-ieproxy v0.0.9 // indirect
-	github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/net v0.2.0 // indirect