Replacing + with %20 in URL query strings

Author: edwardsp

cmd/lhsm-plugin-az-core/remove.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/url"
 	"path"
+	"strings"
 
 	"github.com/Azure/azure-pipeline-go/pipeline"
 	"github.com/Azure/azure-storage-blob-go/azblob"
@@ -24,7 +25,7 @@ type RemoveOptions struct {
 func Remove(o RemoveOptions) error {
 	ctx := context.TODO()
 	p := azblob.NewPipeline(o.Credential, azblob.PipelineOptions{})
-	blobPath := url.QueryEscape(path.Join(o.ContainerName, o.ExportPrefix, o.BlobName))
+	blobPath := strings.Replace(url.QueryEscape(path.Join(o.ContainerName, o.ExportPrefix, o.BlobName)), "+", "%20", -1)
 	u, _ := url.Parse(fmt.Sprintf("https://%s.%s/%s%s", o.AccountName, o.AccountSuffix, blobPath, o.ResourceSAS))
 
 	util.Log(pipeline.LogInfo, fmt.Sprintf("Removing %s.", u.String()))

cmd/lhsm-plugin-az-core/restore.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"path"
+	"strings"
 
 	"github.com/Azure/azure-pipeline-go/pipeline"
 	"github.com/Azure/azure-storage-blob-go/azblob"
@@ -39,7 +40,7 @@ func Restore(o RestoreOptions) (int64, error) {
 	defer cancel()
 
 	p := util.NewPipeline(ctx, o.Credential, o.Pacer, azblob.PipelineOptions{HTTPSender: util.HTTPClientFactory(o.HTTPClient)})
-	blobPath := url.QueryEscape(path.Join(o.ContainerName, o.ExportPrefix, o.BlobName))
+	blobPath := strings.Replace(url.QueryEscape(path.Join(o.ContainerName, o.ExportPrefix, o.BlobName)), "+", "%20", -1)
 
 	u, _ := url.Parse(fmt.Sprintf("https://%s.%s/%s%s", o.AccountName, o.AccountSuffix, blobPath, o.ResourceSAS))