Merge pull request #7 from edwardsp/multi-cloud-bugfix

Fixing multicloud support for changelog-reader

Author: edwardsp

cmd/azure-import/main.go

@@ -75,8 +75,6 @@ func setDirStripe(dir_name string, stripe_count int, stripe_size int) error {
 	return err
 }
 
-const blobEndPoint string = "https://%s.blob.core.windows.net/"
-
 func main() {
 	sasKey := os.Getenv("STORAGE_SAS")
 

cmd/changelog-reader/main.go

@@ -22,8 +22,6 @@ import (
 	"github.com/edwardsp/go-lustre/llapi"
 )
 
-const blobEndPoint string = "https://%s.blob.core.windows.net/"
-
 var mountRoot string
 var rootFid string
 var containerURL azblob.ContainerURL
@@ -714,7 +712,7 @@ func main() {
 	}
 
 	p := azblob.NewPipeline(azblob.NewAnonymousCredential(), azblob.PipelineOptions{})
-	cu, _ := url.Parse(fmt.Sprintf(blobEndPoint+"%s%s", accountName, container, sasKey))
+	cu, _ := url.Parse(fmt.Sprintf("https://%s.%s/%s%s", accountName, accountSuffix, container, sasKey))
 	containerURL = azblob.NewContainerURL(*cu, p)
 
 	// set the global rootFid