Merge lp:~jtv/gwacl/bug-1213059 into lp:gwacl

[Jeroen T. Vermeulen]

Add, and use, -location option in storage example/tool.

The -location option is mandatory, because it selects the API endpoint that the program will make its requests to in the first place. (In practice there only seem to be two zones: mainland China and the rest of the world. A storage account in one won't necessarily exist in the other, although a storage account in one location will also be available for other locations in the same zone.)

I also corrected a silly mistake in my previous branch: the "list" operation listed "list" as one of its required arguments. That should have been "container".

Jeroen

[Julian Edwards (julian-edwards)]

Perhaps only insist on location for things that need it?

review: Approve

=== modified file 'example/storage/run.go'
--- example/storage/run.go	2013-08-19 05:20:08 +0000
+++ example/storage/run.go	2013-08-19 06:09:09 +0000
@@ -55,7 +55,7 @@
         name:           "list",
         description:    "List files in a container",
         example:        "-container=<container> list",
-        requiredArgs:   []string{"list"},
+        requiredArgs:   []string{"container"},
         implementation: list,
     },
     {
@@ -65,7 +65,8 @@
         requiredArgs: []string{"container", "key", "acl"},
         validate: func() error {
             if acl != "container" && acl != "blob" && acl != "private" {
-                return fmt.Errorf("Usage: containeracl -container=<container> <container|blob|private>")
+                return fmt.Errorf(
+                    "Usage: containeracl -container=<container> <container|blob|private>")
             }
             return nil
         },
@@ -154,6 +155,8 @@
     switch name {
     case "account":
         return account != ""
+    case "location":
+        return location != ""
     case "key":
         return key != ""
     case "container":
@@ -180,6 +183,7 @@
     flag.BoolVar(&help, "h", false, "Show usage and exit")
 
     flag.StringVar(&account, "account", "", "Storage account name")
+    flag.StringVar(&location, "location", "", "Azure location, e.g. \"West US\", \"China East\", or \"North Europe\"")
     flag.StringVar(&key, "key", "", "A valid storage account key (base64 encoded), defaults to the empty string (i.e. anonymous access)")
     flag.StringVar(&container, "container", "", "Name of the container to use")
     flag.StringVar(&filename, "filename", "", "File containing blob/page to upload/download")
@@ -200,8 +204,11 @@
         return "", fmt.Errorf("No operation specified")
     }
 
-    if account == "" {
-        return "", fmt.Errorf("Must supply account parameter")
+    requiredArgs := []string{"account", "location"}
+    for _, arg := range requiredArgs {
+        if !argumentGiven(arg) {
+            return "", fmt.Errorf("Must supply %q parameter.", arg)
+        }
     }
 
     if len(flag.Args()) != 1 {
@@ -379,8 +386,9 @@
     }
 
     storage := gwacl.StorageContext{
-        Account: account,
-        Key:     key,
+        Account:       account,
+        Key:           key,
+        AzureEndpoint: gwacl.GetEndpoint(location),
     }
 
     perform := operationsByName[op].implementation