Merge lp:~rvb/gwacl/media-link into lp:gwacl

[Raphaël Badin]

Add CreateVirtualHardDiskMediaLink utility.

The main reason for this new utility is to avoid having to hardcode the Azure hostname in client applications like the Azure provider in Juju.

Drive-by fix: fix message displayed in example/management/run.go

[Gavin Panella (allenap)]

Looks good.

[1]

+func CreateVirtualHardDiskMediaLink(StorageName, StoragePath string) string {
+    pathComponents := strings.Split(StoragePath, "/")

I think you ought to strip leading and trailing forward-slashes first:

  len(strings.Split("/fred/", "/")) -> 3

review: Approve

[Gavin Panella (allenap)]

> [1]
>
> +func CreateVirtualHardDiskMediaLink(StorageName, StoragePath string) string {
> +    pathComponents := strings.Split(StoragePath, "/")
>
> I think you ought to strip leading and trailing forward-slashes first:
>
>  len(strings.Split("/fred/", "/")) -> 3

I don't this matters much actually; I didn't read ahead (i.e. this is only used for validation).

[lp:~rvb/gwacl/media-link]

174. By Raphaël Badin on 2013-07-10

Fix run.go.

[Raphaël Badin (rvb)]

Thanks for the review!

=== modified file 'example/management/run.go'
--- example/management/run.go	2013-07-10 09:12:01 +0000
+++ example/management/run.go	2013-07-10 10:28:25 +0000
@@ -102,12 +102,12 @@
     release := "13.04"
 
     affinityGroupName := gwacl.MakeRandomHostname("affinitygroup")
-    fmt.Printf("Creating an affinity group...")
+    fmt.Println("Creating an affinity group...")
     cag := gwacl.NewCreateAffinityGroup(affinityGroupName, "affinity-label", "affinity-description", location)
     err = api.CreateAffinityGroup(&gwacl.CreateAffinityGroupRequest{
         CreateAffinityGroup: cag})
     checkError(err)
-    fmt.Println("created %s", affinityGroupName)
+    fmt.Printf("Created affinity group %s\n", affinityGroupName)
 
     defer func() {
         fmt.Println("Deleting affinity group %s", affinityGroupName)
@@ -185,7 +185,7 @@
         fmt.Println("Done deleting storage account\n")
     }()
 
-    mediaLink := fmt.Sprintf("http://%s.blob.core.windows.net/vhds/%s.vhd", storageAccount, vhdName)
+    mediaLink := gwacl.CreateVirtualHardDiskMediaLink(storageAccount, fmt.Sprintf("vhds/%s.vhd", vhdName))
     diskName := makeRandomIdentifier("gwacldisk", 16)
     diskLabel := makeRandomIdentifier("gwacl", 64)
     vhd := gwacl.NewOSVirtualHardDisk("", diskLabel, diskName, mediaLink, sourceImageName, "Linux")

=== modified file 'management_base_test.go'
--- management_base_test.go	2013-07-10 09:12:01 +0000
+++ management_base_test.go	2013-07-10 10:28:25 +0000
@@ -1017,4 +1017,3 @@
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/networking/media"
     checkOneRequest(c, &recordedRequests, expectedURL, requestPayload, "PUT")
 }
-

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-10 09:12:01 +0000
+++ xmlobjects.go	2013-07-10 10:28:25 +0000
@@ -271,6 +271,16 @@
     }
 }
 
+// CreateVirtualHardDiskMediaLink creates a media link string used to specify
+// the location of a physical blob in the given Windows Azure storage account.
+// Example: http://example.blob.core.windows.net/disks/mydatadisk.vhd
+func CreateVirtualHardDiskMediaLink(StorageName, StoragePath string) string {
+    pathComponents := strings.Split(StoragePath, "/")
+    components := append(pathComponents, StorageName)
+    checkPathComponents(components...)
+    return fmt.Sprintf("http://%s.blob.core.windows.net/%s", StorageName, StoragePath)
+}
+
 type Role struct {
     RoleName          string              `xml:"RoleName"`
     RoleType          string              `xml:"RoleType"` // Always "PersistentVMRole"

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-10 09:12:01 +0000
+++ xmlobjects_test.go	2013-07-10 10:28:25 +0000
@@ -888,6 +888,20 @@
     c.Check(deployment.VirtualNetworkName, Equals, virtualNetworkName)
 }
 
+func (suite *xmlSuite) TestCreateVirtualHardDiskMediaLinkHappyPath(c *C) {
+    mediaLink := CreateVirtualHardDiskMediaLink("storage-name", "storage/path")
+    c.Check(mediaLink, Equals, "http://storage-name.blob.core.windows.net/storage/path")
+}
+
+func (suite *xmlSuite) TestCreateVirtualHardDiskMediaLinkChecksParams(c *C) {
+    c.Check(
+        func() { CreateVirtualHardDiskMediaLink("foo^bar", "valid") },
+        PanicMatches, "'foo\\^bar' contains URI special characters")
+    c.Check(
+        func() { CreateVirtualHardDiskMediaLink("valid", "a/foo^bar/test") },
+        PanicMatches, "'foo\\^bar' contains URI special characters")
+}
+
 func (suite *xmlSuite) TestCreateStorageServiceInput(c *C) {
     s := makeCreateStorageServiceInput()
     extProperty := s.ExtendedProperties[0]