Merge lp:~julian-edwards/gwacl/deletedisk into lp:gwacl

[Julian Edwards]

Ensures each api call specifies its own x-ms-version and add Azure url links to relevant docs for each api call

I was intending this to be a fix for the disk deletion problem (http://paste.ubuntu.com/5864779/) but it doesn't work. However this branch still sorts out a few things:

 1. Adds Azure url links to relevant docs for each api call
 2. Ensures each api call specifies its own x-ms-version. This is critical to prevent future cock ups and also because the deletedisk call requires a version other than the old base version.
 3. Adds extra test coverage that was missing which ensures x-ms-header is set for all the session op methods.

[Julian Edwards (julian-edwards)]

Well I tell a lie - disk deletion has worked, so this fixes that too.

However the example program is still not cleaning up the storage, that needs looking at still.

[Jeroen T. Vermeulen (jtv)]

Good stuff. Consistent function documentation is lagniappe, but particularly appreciated. Sometimes a top comment for a function doesn't help understanding per se, but I still find that applying them inconsistently can frustrate the scanning of code. It's as if it makes my eyes recover from an exception rather than processing the text in a straight loop.

review: Approve

=== modified file 'deletedisk_test.go'
--- deletedisk_test.go	2013-06-27 10:55:35 +0000
+++ deletedisk_test.go	2013-07-12 05:06:27 +0000
@@ -73,7 +73,7 @@
     c.Assert(response, IsNil)
     c.Assert(err, IsNil)
     expectedURL := api.session.composeURL("services/disks/" + diskName)
-    checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "DELETE")
+    checkOneRequest(c, recordedRequests, expectedURL, "2012-08-01", nil, "DELETE")
 }
 
 func (suite *deleteDiskSuite) TestManagementAPIDeleteDiskPolls(c *C) {
@@ -98,6 +98,6 @@
     c.Assert(err, IsNil)
     expectedURL := api.session.composeURL("services/disks/" + diskName)
     c.Check(len(recordedRequests), Equals, 2)
-    checkRequest(c, recordedRequests[0], expectedURL, []byte{}, "DELETE")
-    checkRequest(c, recordedRequests[1], expectedURL, []byte{}, "DELETE")
+    checkRequest(c, recordedRequests[0], expectedURL, "2012-08-01", nil, "DELETE")
+    checkRequest(c, recordedRequests[1], expectedURL, "2012-08-01", nil, "DELETE")
 }

=== modified file 'management_base.go'
--- management_base.go	2013-07-10 15:42:42 +0000
+++ management_base.go	2013-07-12 05:06:27 +0000
@@ -97,7 +97,7 @@
 // Images are returned in the order in which Azure lists them.
 // http://msdn.microsoft.com/en-us/library/windowsazure/jj157191.aspx
 func (api *ManagementAPI) ListOSImages() (*Images, error) {
-    response, err := api.session.get("services/images")
+    response, err := api.session.get("services/images", "2013-03-01")
     if err != nil {
         return nil, err
     }
@@ -110,9 +110,9 @@
 // Azure management API. 
 // HostedServiceDescriptor objects contains a small subset of the fields present in
 // HostedService objects.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460781.aspx
 func (api *ManagementAPI) ListHostedServices() ([]HostedServiceDescriptor, error) {
-    URI := "services/hostedservices"
-    res, err := api.session.get(URI)
+    res, err := api.session.get("services/hostedservices", "2012-03-01")
     if err != nil {
         return nil, err
     }
@@ -123,6 +123,7 @@
 
 // UpdateHostedService updates the provided values on the named service.
 // Use NewUpdateHostedService() to create an UpdateHostedService params object.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg441303.aspx
 func (api *ManagementAPI) UpdateHostedService(serviceName string, params *UpdateHostedService) error {
     var err error
     checkPathComponents(serviceName)
@@ -131,7 +132,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put(URI, []byte(body), "application/xml")
+    response, err := api.session.put(URI, "2012-03-01", []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -140,6 +141,7 @@
 
 // GetHostedServiceProperties loads a HostedService object from the Azure
 // management API.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460806.aspx
 func (api *ManagementAPI) GetHostedServiceProperties(
     serviceName string, embedDetail bool) (*HostedService, error) {
     checkPathComponents(serviceName)
@@ -150,7 +152,7 @@
     case false:
         URI += "false"
     }
-    res, err := api.session.get(URI)
+    res, err := api.session.get(URI, "2012-03-01")
     if err != nil {
         return nil, err
     }
@@ -162,21 +164,25 @@
 // AddHostedService adds a hosted service.
 // This is an asynchronous operation on Azure, but this call blocks until the
 // operation is completed.
+// This is actually called CreateHostedService in the Azure documentation.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
 func (api *ManagementAPI) AddHostedService(definition *CreateHostedService) error {
     URI := "services/hostedservices"
     body, err := marshalXML(definition)
     if err != nil {
         return err
     }
-    response, err := api.session.post(URI, []byte(body), "application/xml")
+    response, err := api.session.post(URI, "2012-03-01", []byte(body), "application/xml")
     if err != nil {
         return err
     }
     return api.blockUntilCompleted(response)
 }
 
+// DeleteHostedService deletes the named hosted service.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx
 func (api *ManagementAPI) DeleteHostedService(serviceName string) error {
-    response, err := api.session.delete("services/hostedservices/" + serviceName)
+    response, err := api.session.delete("services/hostedservices/" + serviceName, "2010-10-28")
     if err != nil {
         return err
     }
@@ -184,7 +190,10 @@
 }
 
 // AddDeployment adds a virtual machine deployment.
-// This is an asynchronous operation, it blocks until the operation is completed.
+// This is an asynchronous operation on Azure, but this call blocks until the
+// operation is completed.
+// This is actually called CreateDeployment in the Azure documentation.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460813.aspx
 func (api *ManagementAPI) AddDeployment(definition *Deployment, serviceName string) error {
     checkPathComponents(serviceName)
     URI := "services/hostedservices/" + serviceName + "/deployments"
@@ -192,16 +201,18 @@
     if err != nil {
         return err
     }
-    response, err := api.session.post(URI, []byte(body), "application/xml")
+    response, err := api.session.post(URI, "2012-03-01", []byte(body), "application/xml")
     if err != nil {
         return err
     }
     return api.blockUntilCompleted(response)
 }
 
+// DeleteDeployment deletes the named deployment from the named hosted service.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460815.aspx
 func (api *ManagementAPI) DeleteDeployment(serviceName string, deploymentName string) error {
     path := "services/hostedservices/" + serviceName + "/deployments/" + deploymentName
-    response, err := api.session.delete(path)
+    response, err := api.session.delete(path, "2012-03-01")
     if err != nil {
         return err
     }
@@ -213,11 +224,14 @@
     DeploymentName string
 }
 
+// GetDeployment returns a Deployment object for the named hosted service and
+// deployment name.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460804.aspx
 func (api *ManagementAPI) GetDeployment(request *GetDeploymentRequest) (*Deployment, error) {
     checkPathComponents(request.ServiceName)
     checkPathComponents(request.DeploymentName)
     path := "services/hostedservices/" + request.ServiceName + "/deployments/" + request.DeploymentName
-    response, err := api.session.get(path)
+    response, err := api.session.get(path, "2012-03-01")
     if err != nil {
         return nil, err
     }
@@ -232,14 +246,17 @@
 // AddStorageAccount starts the creation of a storage account.  This is
 // called a storage service in the Azure API, but nomenclature seems to
 // have changed.
-// This is an asynchronous operation, it blocks until the operation is completed.
+// This is an asynchronous operation on Azure, but the call blocks until the
+// operation is completed.
+// This is actually called CreateStorageAccount in the Azure documentation.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/hh264518.aspx
 func (api *ManagementAPI) AddStorageAccount(definition *CreateStorageServiceInput) error {
     uri := "services/storageservices"
     body, err := marshalXML(definition)
     if err != nil {
         return err
     }
-    response, err := api.session.post(uri, []byte(body), "application/xml")
+    response, err := api.session.post(uri, "2012-03-01", []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -247,8 +264,9 @@
 }
 
 // DeleteStorageAccount deletes a storage account.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/hh264517.aspx
 func (api *ManagementAPI) DeleteStorageAccount(storageAccountName string) error {
-    response, err := api.session.delete("services/storageservices/" + storageAccountName)
+    response, err := api.session.delete("services/storageservices/" + storageAccountName, "2011-06-01")
     if err != nil {
         return err
     }
@@ -257,9 +275,10 @@
 
 // GetStorageAccountKeys retrieves a storage account's primary and secondary
 // access keys from the Azure service.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460785.aspx
 func (api *ManagementAPI) GetStorageAccountKeys(accountName string) (*StorageAccountKeys, error) {
     url := "services/storageservices/" + accountName + "/keys"
-    res, err := api.session.get(url)
+    res, err := api.session.get(url, "2009-10-01")
     if err != nil {
         return nil, err
     }
@@ -271,6 +290,9 @@
     return &keys, nil
 }
 
+// DeleteDisk deletes the named OS/data disk.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157200.aspx
+// TODO: set comp=media to optionally delete associated blob.
 func (api *ManagementAPI) DeleteDisk(diskName string) error {
     // Use the disk deletion poller to work around a bug in Windows Azure.
     // See the documentation in the file deletedisk.go for details.
@@ -280,24 +302,25 @@
 }
 
 func (api *ManagementAPI) _DeleteDisk(diskName string) error {
-    response, err := api.session.delete("services/disks/" + diskName)
+    response, err := api.session.delete(
+        "services/disks/" + diskName, "2012-08-01")
     if err != nil {
         return err
     }
     return api.blockUntilCompleted(response)
 }
 
-// Perform an operation on the specified role (as defined by serviceName, deploymentName and
-// roleName)
-// This is an asynchronous operation, it blocks until the operation is completed.
-func (api *ManagementAPI) performRoleOperation(serviceName string, deploymentName string, roleName string, operation *RoleOperation) error {
+// Perform an operation on the specified role (as defined by serviceName,
+// deploymentName and roleName) This is an asynchronous operation on Azure, but
+// the call blocks until the operation is completed.
+func (api *ManagementAPI) performRoleOperation(serviceName, deploymentName, roleName, apiVersion string, operation *RoleOperation) error {
     checkPathComponents(serviceName, deploymentName, roleName)
     URI := "services/hostedservices/" + serviceName + "/deployments/" + deploymentName + "/roleinstances/" + roleName + "/Operations"
     body, err := marshalXML(operation)
     if err != nil {
         return err
     }
-    response, err := api.session.post(URI, []byte(body), "application/xml")
+    response, err := api.session.post(URI, apiVersion, []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -313,40 +336,44 @@
 type StartRoleRequest performRoleOperationRequest
 
 // StartRole starts the named Role.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx
 func (api *ManagementAPI) StartRole(request *StartRoleRequest) error {
     return api.performRoleOperation(
         request.ServiceName, request.DeploymentName, request.RoleName,
-        startRoleOperation)
+        "2012-03-01", startRoleOperation)
 }
 
 type RestartRoleRequest performRoleOperationRequest
 
 // RestartRole restarts the named Role.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157197.aspx
 func (api *ManagementAPI) RestartRole(request *RestartRoleRequest) error {
     return api.performRoleOperation(
         request.ServiceName, request.DeploymentName, request.RoleName,
-        restartRoleOperation)
+        "2012-03-01", restartRoleOperation)
 }
 
 type ShutdownRoleRequest performRoleOperationRequest
 
 // ShutdownRole shuts down the named Role.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157195.aspx
 func (api *ManagementAPI) ShutdownRole(request *ShutdownRoleRequest) error {
     return api.performRoleOperation(
         request.ServiceName, request.DeploymentName, request.RoleName,
-        shutdownRoleOperation)
+        "2012-03-01", shutdownRoleOperation)
 }
 
 type GetRoleRequest performRoleOperationRequest
 
 // GetRole requests the role data for the specified role.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157193.aspx
 func (api *ManagementAPI) GetRole(request *GetRoleRequest) (*GetRole, error) {
     checkPathComponents(
         request.ServiceName, request.DeploymentName, request.RoleName)
     url := ("services/hostedservices/" + request.ServiceName +
         "/deployments/" + request.DeploymentName + "/roles/" +
         request.RoleName)
-    response, err := api.session.get(url)
+    response, err := api.session.get(url, "2012-03-01")
     if err != nil {
         return nil, err
     }
@@ -363,6 +390,7 @@
 }
 
 // CreateAffinityGroup sends a request to make a new affinity group.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg715317.aspx
 func (api *ManagementAPI) CreateAffinityGroup(request *CreateAffinityGroupRequest) error {
     var err error
     url := "affinitygroups"
@@ -370,7 +398,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.post(url, []byte(body), "application/xml")
+    response, err := api.session.post(url, "2012-03-01", []byte(body), "application/xml")
     return api.blockUntilCompleted(response)
 }
 
@@ -380,6 +408,7 @@
 }
 
 // UpdateAffinityGroup sends a request to update the named affinity group.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg715316.aspx
 func (api *ManagementAPI) UpdateAffinityGroup(request *UpdateAffinityGroupRequest) error {
     var err error
     checkPathComponents(request.Name)
@@ -388,7 +417,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put(url, []byte(body), "application/xml")
+    response, err := api.session.put(url, "2011-02-25", []byte(body), "application/xml")
     if err != nil {
         return err
     }
@@ -400,6 +429,7 @@
 }
 
 // DeleteAffinityGroup requests a deletion of the named affinity group.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/gg715314.aspx
 func (api *ManagementAPI) DeleteAffinityGroup(request *DeleteAffinityGroupRequest) error {
     var err error
     checkPathComponents(request.Name)
@@ -407,7 +437,7 @@
     if err != nil {
         return err
     }
-    response, err := api.session.delete(url)
+    response, err := api.session.delete(url, "2011-02-25")
     if err != nil {
         return err
     }
@@ -417,8 +447,9 @@
 // GetNetworkConfiguration gets the network configuration for this
 // subscription. If there is no network configuration the configuration will
 // be nil.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/jj157196.aspx
 func (api *ManagementAPI) GetNetworkConfiguration() (*NetworkConfiguration, error) {
-    response, err := api.session.get("services/networking/media")
+    response, err := api.session.get("services/networking/media", "2012-03-01")
     if err != nil {
         if IsNotFoundError(err) {
             return nil, nil
@@ -442,7 +473,9 @@
     if err != nil {
         return err
     }
-    response, err := api.session.put("services/networking/media", []byte(body), "application/octet-stream")
+    response, err := api.session.put(
+        "services/networking/media", "2012-03-01", []byte(body),
+        "application/octet-stream")
     if err != nil {
         return err
     }

=== modified file 'management_base_test.go'
--- management_base_test.go	2013-07-10 16:02:17 +0000
+++ management_base_test.go	2013-07-12 05:06:27 +0000
@@ -246,17 +246,18 @@
 
 // checkOneRequest asserts that the given slice contains one request, with the
 // given characteristics.
-func checkOneRequest(c *C, recordedRequests *[]*X509Request, URL string, payload []byte, Method string) {
+func checkOneRequest(c *C, recordedRequests *[]*X509Request, URL, version string, payload []byte, Method string) {
     requests := *recordedRequests
     c.Assert(len(requests), Equals, 1)
     request := requests[0]
-    checkRequest(c, request, URL, payload, Method)
+    checkRequest(c, request, URL, version, payload, Method)
 }
 
-func checkRequest(c *C, request *X509Request, URL string, payload []byte, Method string) {
-    c.Assert(request.URL, Equals, URL)
-    c.Assert(string(request.Payload), Equals, string(payload))
-    c.Assert(request.Method, Equals, Method)
+func checkRequest(c *C, request *X509Request, URL, version string, payload []byte, Method string) {
+    c.Check(request.URL, Equals, URL)
+    c.Check(string(request.Payload), Equals, string(payload))
+    c.Check(request.Method, Equals, Method)
+    c.Check(request.APIVersion, Equals, version)
 }
 
 func (suite *managementBaseAPISuite) TestGetOperationFailsIfNoHeader(c *C) {
@@ -366,7 +367,7 @@
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices"
-    checkOneRequest(c, &recordedRequests, expectedURL, nil, "GET")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", nil, "GET")
     c.Assert(descriptors[0].URL, Equals, url)
 }
 
@@ -396,7 +397,7 @@
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices/" + serviceName
-    checkOneRequest(c, &recordedRequests, expectedURL, requestPayload, "PUT")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", requestPayload, "PUT")
 }
 
 func assertGetHostedServicePropertiesRequest(c *C, api *ManagementAPI, serviceName string, embedDetail bool, httpRequest *X509Request) {
@@ -408,7 +409,7 @@
     }
     expectedURL := fmt.Sprintf("%s%s/services/hostedservices/%s?%s", AZURE_URL,
         api.session.subscriptionId, serviceName, query)
-    checkRequest(c, httpRequest, expectedURL, nil, "GET")
+    checkRequest(c, httpRequest, expectedURL, "2012-03-01", nil, "GET")
 }
 
 func (suite *managementBaseAPISuite) TestGetHostedServiceProperties_withoutDetails(c *C) {
@@ -517,13 +518,13 @@
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices"
     expectedPayload, err := marshalXML(createHostedService)
     c.Assert(err, IsNil)
-    checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, recordedRequests, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func assertDeleteHostedServiceRequest(c *C, api *ManagementAPI, serviceName string, httpRequest *X509Request) {
     expectedURL := fmt.Sprintf("%s%s/services/hostedservices/%s", AZURE_URL,
         api.session.subscriptionId, serviceName)
-    checkRequest(c, httpRequest, expectedURL, nil, "DELETE")
+    checkRequest(c, httpRequest, expectedURL, "2010-10-28", nil, "DELETE")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteHostedService(c *C) {
@@ -550,14 +551,14 @@
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices/" + serviceName + "/deployments"
     expectedPayload, err := marshalXML(deployment)
     c.Assert(err, IsNil)
-    checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, recordedRequests, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func assertDeleteDeploymentRequest(c *C, api *ManagementAPI, hostedServiceName, deploymentName string, httpRequest *X509Request) {
     expectedURL := fmt.Sprintf(
         "%s%s/services/hostedservices/%s/deployments/%s", AZURE_URL,
         api.session.subscriptionId, hostedServiceName, deploymentName)
-    checkRequest(c, httpRequest, expectedURL, nil, "DELETE")
+    checkRequest(c, httpRequest, expectedURL, "2012-03-01", nil, "DELETE")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteDeployment(c *C) {
@@ -650,7 +651,7 @@
     expectedURL := fmt.Sprintf(
         "%s%s/services/hostedservices/%s/deployments/%s", AZURE_URL,
         api.session.subscriptionId, request.ServiceName, request.DeploymentName)
-    checkRequest(c, httpRequest, expectedURL, nil, "GET")
+    checkRequest(c, httpRequest, expectedURL, "2012-03-01", nil, "GET")
 }
 
 func (suite *managementBaseAPISuite) TestGetDeployment(c *C) {
@@ -693,7 +694,7 @@
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/storageservices"
     expectedPayload, err := marshalXML(cssi)
     c.Assert(err, IsNil)
-    checkOneRequest(c, &recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteStorageAccount(c *C) {
@@ -705,7 +706,7 @@
     err := api.DeleteStorageAccount(accountName)
     c.Assert(err, IsNil)
 
-    checkOneRequest(c, recordedRequests, accountURL, nil, "DELETE")
+    checkOneRequest(c, recordedRequests, accountURL, "2011-06-01", nil, "DELETE")
 }
 
 func (suite *managementBaseAPISuite) TestGetStorageAccountKeys(c *C) {
@@ -741,7 +742,7 @@
 func assertDeleteDiskRequest(c *C, api *ManagementAPI, diskName string, httpRequest *X509Request) {
     expectedURL := fmt.Sprintf("%s%s/services/disks/%s", AZURE_URL,
         api.session.subscriptionId, diskName)
-    checkRequest(c, httpRequest, expectedURL, nil, "DELETE")
+    checkRequest(c, httpRequest, expectedURL, "2012-08-01", nil, "DELETE")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteDisk(c *C) {
@@ -767,13 +768,14 @@
     deploymentName := "deploymentName"
     roleName := "roleName"
     operation := newRoleOperation("RandomOperation")
-    err := api.performRoleOperation(serviceName, deploymentName, roleName, operation)
+    version := "test-version"
+    err := api.performRoleOperation(serviceName, deploymentName, roleName, version, operation)
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/hostedservices/" + serviceName + "/deployments/" + deploymentName + "/roleinstances/" + roleName + "/Operations"
     expectedPayload, err := marshalXML(operation)
     c.Assert(err, IsNil)
-    checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, recordedRequests, expectedURL, version, expectedPayload, "POST")
 }
 
 func (suite *managementBaseAPISuite) TestStartRole(c *C) {
@@ -787,7 +789,7 @@
         request.RoleName + "/Operations")
     expectedPayload, err := marshalXML(startRoleOperation)
     c.Assert(err, IsNil)
-    checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, recordedRequests, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func (suite *managementBaseAPISuite) TestRestartRole(c *C) {
@@ -801,7 +803,7 @@
         request.RoleName + "/Operations")
     expectedPayload, err := marshalXML(restartRoleOperation)
     c.Assert(err, IsNil)
-    checkOneRequest(c, recordedRequests, expectedURL, expectedPayload, "POST")
+    checkOneRequest(c, recordedRequests, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func assertShutdownRoleRequest(c *C, api *ManagementAPI, request *ShutdownRoleRequest, httpRequest *X509Request) {
@@ -811,7 +813,7 @@
         request.DeploymentName, request.RoleName)
     expectedPayload, err := marshalXML(shutdownRoleOperation)
     c.Assert(err, IsNil)
-    checkRequest(c, httpRequest, expectedURL, expectedPayload, "POST")
+    checkRequest(c, httpRequest, expectedURL, "2012-03-01", expectedPayload, "POST")
 }
 
 func (suite *managementBaseAPISuite) TestShutdownRole(c *C) {
@@ -843,7 +845,7 @@
         "/services/hostedservices/" +
         request.ServiceName + "/deployments/" + request.DeploymentName +
         "/roles/" + request.RoleName)
-    checkOneRequest(c, &recordedRequests, expectedURL, nil, "GET")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", nil, "GET")
 
     c.Check(role.RoleName, Equals, "rolename")
 }
@@ -865,7 +867,7 @@
 
     expectedURL := AZURE_URL + api.session.subscriptionId + "/affinitygroups"
     expectedBody, _ := cag.Serialize()
-    checkOneRequest(c, &recordedRequests, expectedURL, []byte(expectedBody), "POST")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", []byte(expectedBody), "POST")
 }
 
 func (suite *managementBaseAPISuite) TestUpdateAffinityGroup(c *C) {
@@ -886,7 +888,7 @@
     expectedURL := (AZURE_URL + api.session.subscriptionId +
         "/affinitygroups/" + request.Name)
     expectedBody, _ := uag.Serialize()
-    checkOneRequest(c, &recordedRequests, expectedURL, []byte(expectedBody), "PUT")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2011-02-25", []byte(expectedBody), "PUT")
 }
 
 func (suite *managementBaseAPISuite) TestDeleteAffinityGroup(c *C) {
@@ -904,7 +906,7 @@
 
     expectedURL := (AZURE_URL + api.session.subscriptionId +
         "/affinitygroups/" + request.Name)
-    checkOneRequest(c, &recordedRequests, expectedURL, nil, "DELETE")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2011-02-25", nil, "DELETE")
 }
 
 func makeNetworkConfiguration() *NetworkConfiguration {
@@ -964,7 +966,7 @@
     expectedURL := fmt.Sprintf(
         "%s%s/services/networking/media", AZURE_URL,
         api.session.subscriptionId)
-    checkRequest(c, httpRequest, expectedURL, nil, "GET")
+    checkRequest(c, httpRequest, expectedURL, "2012-03-01", nil, "GET")
 }
 
 func (suite *managementBaseAPISuite) TestGetNetworkConfiguration(c *C) {
@@ -1014,5 +1016,5 @@
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/services/networking/media"
-    checkOneRequest(c, &recordedRequests, expectedURL, requestPayload, "PUT")
+    checkOneRequest(c, &recordedRequests, expectedURL, "2012-03-01", requestPayload, "PUT")
 }

=== modified file 'management_test.go'
--- management_test.go	2013-07-10 15:37:52 +0000
+++ management_test.go	2013-07-12 05:06:27 +0000
@@ -88,11 +88,8 @@
     expectedURL := fmt.Sprintf(
         "%ssubscriptionId/services/hostedservices/%s?embed-detail=true",
         AZURE_URL, service.ServiceName)
-    c.Check(record[0], DeepEquals, &X509Request{
-        APIVersion: baseAPIVersion,
-        URL:        expectedURL,
-        Method:     "GET",
-    })
+    c.Check(record[0].URL, Equals, expectedURL)
+    c.Check(record[0].Method, Equals, "GET")
 }
 
 func (suite *managementAPISuite) TestListInstancesFailsGettingDetails(c *C) {

=== modified file 'poller.go'
--- poller.go	2013-07-02 14:22:42 +0000
+++ poller.go	2013-07-12 05:06:27 +0000
@@ -93,9 +93,10 @@
 
 // Poll issues a blocking request to microsoft Azure to fetch the information
 // related to the operation associated with the poller.
+// See http://msdn.microsoft.com/en-us/library/windowsazure/ee460783.aspx
 func (poller operationPoller) poll() (*x509Response, error) {
     URI := "operations/" + poller.operationID
-    return poller.api.session.get(URI)
+    return poller.api.session.get(URI, "2009-10-01")
 }
 
 // IsDone returns true if the given response has a status code indicating

=== modified file 'poller_test.go'
--- poller_test.go	2013-07-02 13:51:00 +0000
+++ poller_test.go	2013-07-12 05:06:27 +0000
@@ -120,7 +120,7 @@
 
     c.Assert(err, IsNil)
     expectedURL := AZURE_URL + api.session.subscriptionId + "/operations/" + operationID
-    checkOneRequest(c, recordedRequests, expectedURL, []byte{}, "GET")
+    checkOneRequest(c, recordedRequests, expectedURL, "2009-10-01", nil, "GET")
 }
 
 var operationXMLTemplate = dedent.Dedent(`
@@ -212,6 +212,6 @@
     operationPollerInstance := poller.(operationPoller)
     expectedURL := AZURE_URL + operationPollerInstance.api.session.subscriptionId + "/operations/" + operationID
     c.Assert(len(recordedRequests), Equals, 2)
-    checkRequest(c, recordedRequests[0], expectedURL, []byte{}, "GET")
-    checkRequest(c, recordedRequests[1], expectedURL, []byte{}, "GET")
+    checkRequest(c, recordedRequests[0], expectedURL, "2009-10-01", nil, "GET")
+    checkRequest(c, recordedRequests[1], expectedURL, "2009-10-01", nil, "GET")
 }

=== modified file 'x509dispatcher.go'
--- x509dispatcher.go	2013-07-10 15:42:42 +0000
+++ x509dispatcher.go	2013-07-12 05:06:27 +0000
@@ -25,47 +25,44 @@
     verbose = newVerbose
 }
 
-// baseAPIVersion is the default Azure API version to use.
-const baseAPIVersion = "2013-03-01"
-
 // newX509RequestGET initializes an X509Request for a GET.  You may still need
 // to set further values.
-func newX509RequestGET(url string) *X509Request {
+func newX509RequestGET(url, apiVersion string) *X509Request {
     return &X509Request{
         Method:     "GET",
         URL:        url,
-        APIVersion: baseAPIVersion,
+        APIVersion: apiVersion,
     }
 }
 
 // newX509RequestPOST initializes an X509Request for a POST.  You may still
 // need to set further values.
-func newX509RequestPOST(url string, payload []byte, contentType string) *X509Request {
+func newX509RequestPOST(url, apiVersion string, payload []byte, contentType string) *X509Request {
     return &X509Request{
         Method:      "POST",
         URL:         url,
-        APIVersion:  baseAPIVersion,
+        APIVersion:  apiVersion,
         Payload:     payload,
         ContentType: contentType,
     }
 }
 
 // newX509RequestDELETE initializes an X509Request for a DELETE.
-func newX509RequestDELETE(url string) *X509Request {
+func newX509RequestDELETE(url, apiVersion string) *X509Request {
     return &X509Request{
         Method:     "DELETE",
         URL:        url,
-        APIVersion: baseAPIVersion,
+        APIVersion: apiVersion,
     }
 }
 
 // newX509RequestPUT initializes an X509Request for a PUT.  You may still
 // need to set further values.
-func newX509RequestPUT(url string, payload []byte, contentType string) *X509Request {
+func newX509RequestPUT(url, apiVersion string, payload []byte, contentType string) *X509Request {
     return &X509Request{
         Method:      "PUT",
         URL:         url,
-        APIVersion:  baseAPIVersion,
+        APIVersion:  apiVersion,
         Payload:     payload,
         ContentType: contentType,
     }

=== modified file 'x509dispatcher_test.go'
--- x509dispatcher_test.go	2013-07-10 15:42:42 +0000
+++ x509dispatcher_test.go	2013-07-12 05:06:27 +0000
@@ -78,7 +78,8 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestGET(server.URL + path)
+    version := "test-version"
+    request := newX509RequestGET(server.URL + path, version)
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -86,6 +87,7 @@
 
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "GET")
+    c.Check(httpRequest.Header[http.CanonicalHeaderKey("X-Ms-Version")], DeepEquals, []string{version})
     c.Check(httpRequest.URL.String(), Equals, path)
     c.Check(httpRequest.BodyContent, HasLen, 0)
 }
@@ -101,7 +103,8 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestGET(server.URL + path)
+    version := "test-version"
+    request := newX509RequestGET(server.URL + path, version)
 
     _, err = performX509CurlRequest(session, request)
     c.Check(err, ErrorMatches, ".*Number of redirects hit maximum amount.*")
@@ -114,6 +117,7 @@
         c.Error("The original request has not been performed.")
     }
     c.Check(httpRequest.Method, Equals, "GET")
+    c.Check(httpRequest.Header[http.CanonicalHeaderKey("X-Ms-Version")], DeepEquals, []string{version})
     c.Check(httpRequest.URL.String(), Equals, path)
 
     // _CURL_MAX_REDIRECTS redirected requests have been performed.
@@ -139,7 +143,8 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestPOST(server.URL+path, requestBody, requestContentType)
+    version := "test-version"
+    request := newX509RequestPOST(server.URL+path, version, requestBody, requestContentType)
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -162,7 +167,8 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestDELETE(server.URL + path)
+    version := "test-version"
+    request := newX509RequestDELETE(server.URL + path, version)
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -170,6 +176,7 @@
 
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "DELETE")
+    c.Check(httpRequest.Header[http.CanonicalHeaderKey("X-Ms-Version")], DeepEquals, []string{version})
     c.Check(httpRequest.URL.String(), Equals, path)
     c.Check(httpRequest.BodyContent, HasLen, 0)
 }
@@ -184,7 +191,8 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestPUT(server.URL+path, requestBody, "application/octet-stream")
+    version := "test-version"
+    request := newX509RequestPUT(server.URL+path, version, requestBody, "application/octet-stream")
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -193,6 +201,7 @@
 
     httpRequest := <-httpRequests
     c.Check(httpRequest.Method, Equals, "PUT")
+    c.Check(httpRequest.Header[http.CanonicalHeaderKey("X-Ms-Version")], DeepEquals, []string{version})
     c.Check(httpRequest.URL.String(), Equals, path)
     c.Check(httpRequest.BodyContent, DeepEquals, requestBody)
 }
@@ -211,7 +220,7 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestGET(server.URL + path)
+    request := newX509RequestGET(server.URL + path, "testversion")
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)

=== modified file 'x509session.go'
--- x509session.go	2013-07-10 15:42:42 +0000
+++ x509session.go	2013-07-12 05:06:27 +0000
@@ -60,8 +60,8 @@
 // It returns the response body and/or an error.  If the error is a
 // ServerError, the returned body will be the one received from the server.
 // For any other kind of error, the returned body will be nil.
-func (session *x509Session) get(path string) (*x509Response, error) {
-    request := newX509RequestGET(session.composeURL(path))
+func (session *x509Session) get(path, apiVersion string) (*x509Response, error) {
+    request := newX509RequestGET(session.composeURL(path), apiVersion)
     response, err := _X509Dispatcher(session, request)
     if err != nil {
         return nil, err
@@ -76,8 +76,8 @@
 // For any other kind of error, the returned body will be nil.
 // Be aware that Azure may perform POST operations asynchronously.  If you are
 // not sure, call blockUntilCompleted() on the response.
-func (session *x509Session) post(path string, body []byte, contentType string) (*x509Response, error) {
-    request := newX509RequestPOST(session.composeURL(path), body, contentType)
+func (session *x509Session) post(path, apiVersion string, body []byte, contentType string) (*x509Response, error) {
+    request := newX509RequestPOST(session.composeURL(path), apiVersion, body, contentType)
     response, err := _X509Dispatcher(session, request)
     if err != nil {
         return nil, err
@@ -89,8 +89,8 @@
 // delete performs a DELETE request to the Azure management API.
 // Be aware that Azure may perform DELETE operations asynchronously.  If you
 // are not sure, call blockUntilCompleted() on the response.
-func (session *x509Session) delete(path string) (*x509Response, error) {
-    request := newX509RequestDELETE(session.composeURL(path))
+func (session *x509Session) delete(path, apiVersion string) (*x509Response, error) {
+    request := newX509RequestDELETE(session.composeURL(path), apiVersion)
     response, err := _X509Dispatcher(session, request)
     if err != nil {
         return response, err
@@ -102,8 +102,8 @@
 // put performs a PUT request to the Azure management API.
 // Be aware that Azure may perform PUT operations asynchronously.  If you are
 // not sure, call blockUntilCompleted() on the response.
-func (session *x509Session) put(path string, body []byte, contentType string) (*x509Response, error) {
-    request := newX509RequestPUT(session.composeURL(path), body, contentType)
+func (session *x509Session) put(path, apiVersion string, body []byte, contentType string) (*x509Response, error) {
+    request := newX509RequestPUT(session.composeURL(path), apiVersion, body, contentType)
     response, err := _X509Dispatcher(session, request)
     if err != nil {
         return nil, err

=== modified file 'x509session_test.go'
--- x509session_test.go	2013-07-10 15:42:42 +0000
+++ x509session_test.go	2013-07-12 05:06:27 +0000
@@ -192,13 +192,15 @@
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    receivedResponse, err := session.get(uri)
+    version := "test-version"
+    receivedResponse, err := session.get(uri,version)
     c.Assert(err, IsNil)
 
     c.Assert(len(recordedRequests), Equals, 1)
     request := recordedRequests[0]
     c.Check(request.URL, Equals, AZURE_URL+subscriptionID+"/"+uri)
     c.Check(request.Method, Equals, "GET")
+    c.Check(request.APIVersion, Equals, version)
     c.Check(*receivedResponse, DeepEquals, fixedResponse)
 }
 
@@ -207,7 +209,7 @@
     msg := "could not dispatch request"
     rigFailingDispatcher(fmt.Errorf(msg))
 
-    body, err := session.get("flop")
+    body, err := session.get("flop", "version")
     c.Assert(err, NotNil)
 
     c.Check(body, IsNil)
@@ -222,7 +224,7 @@
     }
     rigFixedResponseDispatcher(&fixedResponse)
 
-    response, err := session.get("fail")
+    response, err := session.get("fail", "version")
     c.Assert(err, NotNil)
 
     serverError := err.(*ServerError)
@@ -233,6 +235,7 @@
 func (suite *x509SessionSuite) TestPostIssuesRequest(c *C) {
     subscriptionID := "subscriptionID"
     uri := "resource"
+    version := "test-version"
     requestBody := []byte("Request body")
     requestContentType := "bogusContentType"
     session, err := newX509Session(subscriptionID, "cert.pem")
@@ -246,13 +249,14 @@
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    receivedResponse, err := session.post(uri, requestBody, requestContentType)
+    receivedResponse, err := session.post(uri, version, requestBody, requestContentType)
     c.Assert(err, IsNil)
 
     c.Assert(len(recordedRequests), Equals, 1)
     request := recordedRequests[0]
     c.Check(request.URL, Equals, AZURE_URL+subscriptionID+"/"+uri)
     c.Check(request.Method, Equals, "POST")
+    c.Check(request.APIVersion, Equals, version)
     c.Check(request.ContentType, Equals, requestContentType)
     c.Check(request.Payload, DeepEquals, requestBody)
     c.Check(*receivedResponse, DeepEquals, fixedResponse)
@@ -263,7 +267,7 @@
     msg := "could not dispatch request"
     rigFailingDispatcher(fmt.Errorf(msg))
 
-    body, err := session.post("flop", []byte("body"), "contentType")
+    body, err := session.post("flop", "version", []byte("body"), "contentType")
     c.Assert(err, NotNil)
 
     c.Check(body, IsNil)
@@ -278,7 +282,7 @@
     }
     rigFixedResponseDispatcher(&fixedResponse)
 
-    reponse, err := session.post("fail", []byte("request body"), "contentType")
+    reponse, err := session.post("fail", "version", []byte("request body"), "contentType")
     c.Assert(err, NotNil)
 
     serverError := err.(*ServerError)
@@ -289,6 +293,7 @@
 func (suite *x509SessionSuite) TestDeleteIssuesRequest(c *C) {
     subscriptionID := "subscriptionID"
     uri := "resource"
+    version := "test-version"
     session, err := newX509Session(subscriptionID, "cert.pem")
     c.Assert(err, IsNil)
     // Record incoming requests, and have them return a given reply.
@@ -297,7 +302,7 @@
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    response, err := session.delete(uri)
+    response, err := session.delete(uri, version)
     c.Assert(err, IsNil)
 
     c.Check(*response, DeepEquals, fixedResponse)
@@ -305,11 +310,13 @@
     request := recordedRequests[0]
     c.Check(request.URL, Equals, AZURE_URL+subscriptionID+"/"+uri)
     c.Check(request.Method, Equals, "DELETE")
+    c.Check(request.APIVersion, Equals, version)
 }
 
 func (suite *x509SessionSuite) TestPutIssuesRequest(c *C) {
     subscriptionID := "subscriptionID"
     uri := "resource"
+    version := "test-version"
     requestBody := []byte("Request body")
     session, err := newX509Session(subscriptionID, "cert.pem")
     c.Assert(err, IsNil)
@@ -321,12 +328,13 @@
     recordedRequests := make([]*X509Request, 0)
     rigRecordingDispatcher(&recordedRequests)
 
-    _, err = session.put(uri, requestBody, "text/plain")
+    _, err = session.put(uri, version, requestBody, "text/plain")
     c.Assert(err, IsNil)
 
     c.Assert(len(recordedRequests), Equals, 1)
     request := recordedRequests[0]
     c.Check(request.URL, Equals, AZURE_URL+subscriptionID+"/"+uri)
     c.Check(request.Method, Equals, "PUT")
+    c.Check(request.APIVersion, Equals, version)
     c.Check(request.Payload, DeepEquals, requestBody)
 }