Merge lp:~rvb/gwacl/export-file-url into lp:gwacl

[Raphaël Badin]

Export GetFileURL().

Export context.GetFileURL(). I need this to test that the call to gwacl in the provider is using the proper URL. Also (but that's still a hypothesis right now) we might need it to implement storage.URL(filename string).

[Gavin Panella (allenap)]

review: Approve

=== modified file 'storage_base.go'
--- storage_base.go	2013-06-19 06:56:46 +0000
+++ storage_base.go	2013-06-19 14:12:29 +0000
@@ -327,9 +327,9 @@
     return context.getAccountURL() + url.QueryEscape(container)
 }
 
-// getFileURL returns the URL for a given file in the given container.
+// GetFileURL returns the URL for a given file in the given container.
 // (The result does not end in a slash.)
-func (context *StorageContext) getFileURL(container, filename string) string {
+func (context *StorageContext) GetFileURL(container, filename string) string {
     return context.getContainerURL(container) + "/" + url.QueryEscape(filename)
 }
 
@@ -439,7 +439,7 @@
 
     _, err := context.performRequest(requestParams{
         Method:         "PUT",
-        URL:            context.getFileURL(req.Container, req.Filename),
+        URL:            context.GetFileURL(req.Container, req.Filename),
         APIVersion:     "2012-02-12",
         ExtraHeaders:   extraHeaders,
         ExpectedStatus: http.StatusCreated,
@@ -462,7 +462,7 @@
 // See http://msdn.microsoft.com/en-us/library/windowsazure/ee691975.aspx
 func (context *StorageContext) PutPage(req *PutPageRequest) error {
     uri := addURLQueryParams(
-        context.getFileURL(req.Container, req.Filename),
+        context.GetFileURL(req.Container, req.Filename),
         "comp", "page")
 
     extraHeaders := http.Header{}
@@ -489,7 +489,7 @@
 // of a block blob.
 func (context *StorageContext) GetBlockList(container, filename string) (*GetBlockList, error) {
     uri := addURLQueryParams(
-        context.getFileURL(container, filename),
+        context.GetFileURL(container, filename),
         "comp", "blocklist",
         "blocklisttype", "all")
     bl := GetBlockList{}
@@ -511,7 +511,7 @@
 func (context *StorageContext) PutBlock(container, filename, id string, data io.Reader) error {
     base64_id := base64.StdEncoding.EncodeToString([]byte(id))
     uri := addURLQueryParams(
-        context.getFileURL(container, filename),
+        context.GetFileURL(container, filename),
         "comp", "block",
         "blockid", base64_id)
     _, err := context.performRequest(requestParams{
@@ -530,7 +530,7 @@
 // Send a request to piece together blocks into a list that specifies a blob.
 func (context *StorageContext) PutBlockList(container, filename string, blocklist *BlockList) error {
     uri := addURLQueryParams(
-        context.getFileURL(container, filename),
+        context.GetFileURL(container, filename),
         "comp", "blocklist")
     data, err := blocklist.Serialize()
     if err != nil {
@@ -555,7 +555,7 @@
 func (context *StorageContext) DeleteBlob(container, filename string) error {
     _, err := context.performRequest(requestParams{
         Method:         "DELETE",
-        URL:            context.getFileURL(container, filename),
+        URL:            context.GetFileURL(container, filename),
         APIVersion:     "2012-02-12",
         ExpectedStatus: http.StatusAccepted,
     })
@@ -570,7 +570,7 @@
 func (context *StorageContext) GetBlob(container, filename string) (io.ReadCloser, error) {
     response, err := context.performRequest(requestParams{
         Method:         "GET",
-        URL:            context.getFileURL(container, filename),
+        URL:            context.GetFileURL(container, filename),
         APIVersion:     "2012-02-12",
         ExpectedStatus: http.StatusOK,
     })

=== modified file 'storage_base_test.go'
--- storage_base_test.go	2013-06-19 06:41:44 +0000
+++ storage_base_test.go	2013-06-19 14:12:29 +0000
@@ -278,7 +278,7 @@
     file := makeNastyURLUnfriendlyString()
     context := StorageContext{Account: account}
     c.Check(
-        context.getFileURL(container, file),
+        context.GetFileURL(container, file),
         Equals,
         "http://"+url.QueryEscape(account)+".blob.core.windows.net/"+url.QueryEscape(container)+"/"+url.QueryEscape(file))
 }
@@ -689,7 +689,7 @@
     c.Assert(err, IsNil)
 
     // Ensure that container was set right.
-    c.Check(transport.Request.URL.String(), Matches, context.getFileURL("container", "filename")+"?.*")
+    c.Check(transport.Request.URL.String(), Matches, context.GetFileURL("container", "filename")+"?.*")
     // Ensure that the Authorization header is set.
     c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
     // Check the range is set.
@@ -754,7 +754,7 @@
         Container: "container", BlobType: "block", Filename: "blobname"})
     c.Assert(err, IsNil)
     // Ensure that container was set right.
-    c.Check(transport.Request.URL.String(), Equals, context.getFileURL("container", "blobname"))
+    c.Check(transport.Request.URL.String(), Equals, context.GetFileURL("container", "blobname"))
     // Ensure that the Authorization header is set.
     c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
     // The blob type should be a block.
@@ -838,7 +838,7 @@
 
     // The blockid should have been base64 encoded and url escaped.
     base64_id := base64.StdEncoding.EncodeToString([]byte(blockid))
-    c.Check(transport.Request.URL.String(), Matches, context.getFileURL("container", "blobname")+"?.*")
+    c.Check(transport.Request.URL.String(), Matches, context.GetFileURL("container", "blobname")+"?.*")
     c.Check(transport.Request.URL.Query(), DeepEquals, url.Values{
         "comp":    {"block"},
         "blockid": {base64_id},
@@ -976,7 +976,7 @@
     context.client = &http.Client{Transport: transport}
     results, err := context.GetBlockList("container", "myfilename")
     c.Assert(err, IsNil)
-    c.Check(transport.Request.URL.String(), Matches, context.getFileURL("container", "myfilename")+"?.*")
+    c.Check(transport.Request.URL.String(), Matches, context.GetFileURL("container", "myfilename")+"?.*")
     c.Check(transport.Request.URL.Query(), DeepEquals, url.Values{
         "comp":          {"blocklist"},
         "blocklisttype": {"all"},
@@ -1024,7 +1024,7 @@
     c.Assert(err, IsNil)
 
     c.Check(transport.Request.Method, Equals, "DELETE")
-    c.Check(transport.Request.URL.String(), Equals, context.getFileURL("container", "blobname"))
+    c.Check(transport.Request.URL.String(), Equals, context.GetFileURL("container", "blobname"))
     c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
     c.Check(transport.Request.Body, IsNil)
 }
@@ -1076,7 +1076,7 @@
     defer reader.Close()
 
     c.Check(transport.Request.Method, Equals, "GET")
-    c.Check(transport.Request.URL.String(), Equals, context.getFileURL("container", "blobname"))
+    c.Check(transport.Request.URL.String(), Equals, context.GetFileURL("container", "blobname"))
     c.Check(transport.Request.Header.Get("Authorization"), Not(Equals), "")
 
     data, err := ioutil.ReadAll(reader)

=== modified file 'storage_test.go'
--- storage_test.go	2013-06-11 16:31:49 +0000
+++ storage_test.go	2013-06-19 14:12:29 +0000
@@ -67,7 +67,7 @@
 
 func assertBlockSent(
     c *C, context *StorageContext, data []byte, blockID string, exchange *TestTransport2Exchange) {
-    c.Check(exchange.Request.URL.String(), Matches, context.getFileURL("MyContainer", "MyFile")+"?.*")
+    c.Check(exchange.Request.URL.String(), Matches, context.GetFileURL("MyContainer", "MyFile")+"?.*")
     c.Check(exchange.Request.URL.Query(), DeepEquals, url.Values{
         "comp":    {"block"},
         "blockid": {blockID},