Merge pull request #110 from tombuildsstuff/bugfix/encoding-storage-blob-from-content

bugfix: don't use req.Marshal to encode a binary payload…

Author: manicminer

storage/2023-11-03/blob/blobs/get.go

@@ -3,6 +3,7 @@ package blobs
 import (
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"strings"
 
@@ -65,13 +66,16 @@ func (c Client) Get(ctx context.Context, containerName, blobName string, input G
 	var resp *client.Response
 	resp, err = req.Execute(ctx)
 	if resp != nil {
-		result.Contents = &[]byte{}
 		result.HttpResponse = resp.Response
 
-		err = resp.Unmarshal(result.Contents)
-		if err != nil {
-			err = fmt.Errorf("unmarshalling response: %+v", err)
-			return
+		if resp.Body != nil {
+			defer resp.Body.Close()
+			respBody, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return result, fmt.Errorf("could not parse response body")
+			}
+
+			result.Contents = &respBody
 		}
 	}
 	if err != nil {

storage/2023-11-03/blob/blobs/put_block_blob.go

@@ -1,8 +1,10 @@
 package blobs
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
@@ -78,10 +80,9 @@ func (c Client) PutBlockBlob(ctx context.Context, containerName, blobName string
 		return
 	}
 
-	err = req.Marshal(input.Content)
-	if err != nil {
-		err = fmt.Errorf("marshalling request: %+v", err)
-		return
+	if input.Content != nil {
+		req.ContentLength = int64(len(*input.Content))
+		req.Body = io.NopCloser(bytes.NewReader(*input.Content))
 	}
 
 	var resp *client.Response