From 74f3ec454a88fd546b18709f8c555236f8c7bcaf Mon Sep 17 00:00:00 2001 From: Limbo Peng Date: Sun, 18 Nov 2018 17:33:35 +0800 Subject: [PATCH] Add option `--baseurl` to override default endpoint --- vhdUploadCmdHandler.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/vhdUploadCmdHandler.go b/vhdUploadCmdHandler.go index fec3df9e..869ff751 100644 --- a/vhdUploadCmdHandler.go +++ b/vhdUploadCmdHandler.go @@ -15,7 +15,7 @@ import ( "github.com/Microsoft/azure-vhd-utils/vhdcore/common" "github.com/Microsoft/azure-vhd-utils/vhdcore/diskstream" "github.com/Microsoft/azure-vhd-utils/vhdcore/validator" - "gopkg.in/urfave/cli.v1" + cli "gopkg.in/urfave/cli.v1" ) func vhdUploadCmdHandler() cli.Command { @@ -23,6 +23,10 @@ func vhdUploadCmdHandler() cli.Command { Name: "upload", Usage: "Upload a local VHD to Azure storage as page blob", Flags: []cli.Flag{ + cli.StringFlag{ + Name: "baseurl", + Usage: "Base URL for storage endpoint", + }, cli.StringFlag{ Name: "localvhdpath", Usage: "Path to source VHD in the local machine.", @@ -55,6 +59,11 @@ func vhdUploadCmdHandler() cli.Command { Action: func(c *cli.Context) error { const PageBlobPageSize int64 = 2 * 1024 * 1024 + baseURL := c.String("baseurl") + if baseURL == "" { + baseURL = storage.DefaultBaseURL + } + localVHDPath := c.String("localvhdpath") if localVHDPath == "" { return errors.New("Missing required argument --localvhdpath") @@ -106,7 +115,7 @@ func vhdUploadCmdHandler() cli.Command { } defer diskStream.Close() - storageClient, err := storage.NewBasicClient(stgAccountName, stgAccountKey) + storageClient, err := storage.NewClient(stgAccountName, stgAccountKey, baseURL, storage.DefaultAPIVersion, true) if err != nil { return err }