Merge lp:~allenap/gwacl/lint into lp:gwacl

[Gavin Panella]

Reformat code and remove trailing white-space.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'example/storage/run.go'
--- example/storage/run.go	2013-06-25 05:55:14 +0000
+++ example/storage/run.go	2013-07-12 14:49:28 +0000
@@ -140,31 +140,31 @@
     invocation parameters:
 
     Show existing storage containers:
-        listcontainers 
+        listcontainers
 
     List files in a container:
         -container=<container> list
 
     Set access on a container:
-        -container=<container> -acl <container|blob|private> containeracl 
+        -container=<container> -acl <container|blob|private> containeracl
 
     Get a file from a container (it's returned on stdout):
-        -container=<container> -filename=<filename> getblob 
-    
+        -container=<container> -filename=<filename> getblob
+
     Upload a file to a block blob:
-        -container=<container> -filename=<filename> addblock 
+        -container=<container> -filename=<filename> addblock
 
     Delete a blob:
-        -container=<container> -filename=<filename> deleteblob 
+        -container=<container> -filename=<filename> deleteblob
 
     Create an empty page blob:
         -container=<container> -blobname=<blobname> -size=<bytes>
-                -blobtype="page" putblob 
+                -blobtype="page" putblob
 
     Upload a file to a page blob's page.  The range parameters must be
     (modulo 512)-(modulo 512 -1), eg: -pagerange=0-511
         -container=<container> -blobname=<blobname> -pagerange=<N-N>
-        -filename=<local file> putpage 
+        -filename=<local file> putpage
     `)
 }
 

=== modified file 'httperror.go'
--- httperror.go	2013-07-11 10:48:03 +0000
+++ httperror.go	2013-07-12 14:49:28 +0000
@@ -95,7 +95,7 @@
 // the given message plus the error string from the original error.
 // It preserves the value of the error types it knows about (currently only
 // ServerError).
-// 
+//
 // The main purpose of this method is to offer a unified way to
 // extend the information present in errors while still not losing the
 // additioning information present on specific errors gwacl knows out to extend

=== modified file 'management_base.go'
--- management_base.go	2013-07-12 04:45:34 +0000
+++ management_base.go	2013-07-12 14:49:28 +0000
@@ -107,7 +107,7 @@
 }
 
 // ListHostedServices loads a list of HostedServiceDescriptor objects from the
-// Azure management API. 
+// 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
@@ -182,7 +182,7 @@
 // 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, "2010-10-28")
+    response, err := api.session.delete("services/hostedservices/"+serviceName, "2010-10-28")
     if err != nil {
         return err
     }
@@ -266,7 +266,7 @@
 // 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, "2011-06-01")
+    response, err := api.session.delete("services/storageservices/"+storageAccountName, "2011-06-01")
     if err != nil {
         return err
     }
@@ -303,7 +303,7 @@
 
 func (api *ManagementAPI) _DeleteDisk(diskName string) error {
     response, err := api.session.delete(
-        "services/disks/" + diskName, "2012-08-01")
+        "services/disks/"+diskName, "2012-08-01")
     if err != nil {
         return err
     }

=== modified file 'names.go'
--- names.go	2013-07-11 14:06:24 +0000
+++ names.go	2013-07-12 14:49:28 +0000
@@ -95,7 +95,7 @@
 // the same sequence!
 func MakeRandomDiskName(prefix string) string {
     // Azure documentation does not say what the maximum size of a disk name
-    // is.  Testing indicate that 50 works.  
+    // is.  Testing indicate that 50 works.
     return makeRandomIdentifier(prefix, 50)
 }
 
@@ -110,7 +110,7 @@
 // the same sequence!
 func MakeRandomRoleName(prefix string) string {
     // Azure documentation does not say what the maximum size of a role name
-    // is.  Testing indicate that 50 works.  
+    // is.  Testing indicate that 50 works.
     return makeRandomIdentifier(prefix, 50)
 }
 

=== modified file 'poller.go'
--- poller.go	2013-07-12 03:23:57 +0000
+++ poller.go	2013-07-12 14:49:28 +0000
@@ -11,7 +11,7 @@
 // Generic poller interface/methods.
 
 // A poller exposes two methods to query a remote server and decide when
-// the response given by the server means that the polling is finished. 
+// the response given by the server means that the polling is finished.
 type poller interface {
     poll() (*x509Response, error)
     isDone(*x509Response, error) (bool, error)

=== modified file 'poller_test.go'
--- poller_test.go	2013-07-12 04:22:16 +0000
+++ poller_test.go	2013-07-12 14:49:28 +0000
@@ -184,7 +184,7 @@
     // it's probably worth it to thoroughly test performOperationPolling().
 
     // Fake 2 responses in sequence: a 'InProgress' response and then a
-    // 'Succeeded' response. 
+    // 'Succeeded' response.
     firstResponse := DispatcherResponse{
         response: &x509Response{
             Body:       []byte(fmt.Sprintf(operationXMLTemplate, "InProgress")),

=== modified file 'x509dispatcher.go'
--- x509dispatcher.go	2013-07-12 02:52:34 +0000
+++ x509dispatcher.go	2013-07-12 14:49:28 +0000
@@ -176,7 +176,7 @@
     return response, nil
 }
 
-// The maximum number of redirection-followings allowed. 
+// The maximum number of redirection-followings allowed.
 var _CURL_MAX_REDIRECTS = 10
 
 // makeCurlRequest produces a curl.CURL representing the request.

=== modified file 'x509dispatcher_test.go'
--- x509dispatcher_test.go	2013-07-12 04:25:31 +0000
+++ x509dispatcher_test.go	2013-07-12 14:49:28 +0000
@@ -79,7 +79,7 @@
     c.Assert(err, IsNil)
     path := "/foo/bar"
     version := "test-version"
-    request := newX509RequestGET(server.URL + path, version)
+    request := newX509RequestGET(server.URL+path, version)
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -104,7 +104,7 @@
     c.Assert(err, IsNil)
     path := "/foo/bar"
     version := "test-version"
-    request := newX509RequestGET(server.URL + path, version)
+    request := newX509RequestGET(server.URL+path, version)
 
     _, err = performX509CurlRequest(session, request)
     c.Check(err, ErrorMatches, ".*Number of redirects hit maximum amount.*")
@@ -168,7 +168,7 @@
     c.Assert(err, IsNil)
     path := "/foo/bar"
     version := "test-version"
-    request := newX509RequestDELETE(server.URL + path, version)
+    request := newX509RequestDELETE(server.URL+path, version)
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)
@@ -220,7 +220,7 @@
     session, err := newX509Session("subscriptionid", "cert.pem")
     c.Assert(err, IsNil)
     path := "/foo/bar"
-    request := newX509RequestGET(server.URL + path, "testversion")
+    request := newX509RequestGET(server.URL+path, "testversion")
 
     response, err := performX509CurlRequest(session, request)
     c.Assert(err, IsNil)

=== modified file 'x509session_test.go'
--- x509session_test.go	2013-07-12 04:22:16 +0000
+++ x509session_test.go	2013-07-12 14:49:28 +0000
@@ -193,7 +193,7 @@
     rigRecordingDispatcher(&recordedRequests)
 
     version := "test-version"
-    receivedResponse, err := session.get(uri,version)
+    receivedResponse, err := session.get(uri, version)
     c.Assert(err, IsNil)
 
     c.Assert(len(recordedRequests), Equals, 1)

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-07-12 12:58:03 +0000
+++ xmlobjects.go	2013-07-12 14:49:28 +0000
@@ -157,7 +157,7 @@
 
 // GetLatestUbuntuImage returns the most recent released available OSImage,
 // for the given release name and location.  The 'releaseName' parameter is
-// the Ubuntu version number present in the 'ImageFamily' tag present in 
+// the Ubuntu version number present in the 'ImageFamily' tag present in
 // Azure's representation of an OS Image (e.g. '12.04', '12.10').
 func (images *Images) GetLatestUbuntuImage(releaseName string, location string) (image *OSImage, err error) {
     // The Less method defined above can panic if one of the published dates cannot be parsed,
@@ -545,7 +545,7 @@
     return &operation
 }
 
-// The Start Role operation starts a virtual machine. 
+// The Start Role operation starts a virtual machine.
 // http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx
 var startRoleOperation = newRoleOperation("StartRoleOperation")
 

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-07-11 03:41:33 +0000
+++ xmlobjects_test.go	2013-07-12 14:49:28 +0000
@@ -147,12 +147,12 @@
         <PersistentVMRole xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
           <RoleName>%s</RoleName>
           <OsVersion>operating-system-version</OsVersion>
-          <RoleType>PersistentVMRole</RoleType>      
+          <RoleType>PersistentVMRole</RoleType>
           <ConfigurationSets>
             <ConfigurationSet>
-              <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>          
+              <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>
               <InputEndpoints>
-                <InputEndpoint>                
+                <InputEndpoint>
                   <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName>
                   <LocalPort>1</LocalPort>
                   <Name>name-of-input-endpoint</Name>
@@ -160,12 +160,12 @@
                   <LoadBalancerProbe>
                     <Path>path-of-probe</Path>
                     <Port>port-assigned-to-probe</Port>
-                    <Protocol>protocol-of-input-endpoint</Protocol>                    
+                    <Protocol>protocol-of-input-endpoint</Protocol>
                   </LoadBalancerProbe>
-                  <Protocol>TCP|UDP</Protocol>                    
+                  <Protocol>TCP|UDP</Protocol>
                   <Vip>virtual-ip-address-of-input-endpoint</Vip>
                 </InputEndpoint>
-                <InputEndpoint>                
+                <InputEndpoint>
                   <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName>
                   <LocalPort>2</LocalPort>
                   <Name>name-of-input-endpoint</Name>
@@ -173,9 +173,9 @@
                   <LoadBalancerProbe>
                     <Path>path-of-probe</Path>
                     <Port>port-assigned-to-probe</Port>
-                    <Protocol>protocol-of-input-endpoint</Protocol>                    
+                    <Protocol>protocol-of-input-endpoint</Protocol>
                   </LoadBalancerProbe>
-                  <Protocol>TCP|UDP</Protocol>                    
+                  <Protocol>TCP|UDP</Protocol>
                   <Vip>virtual-ip-address-of-input-endpoint</Vip>
                 </InputEndpoint>
               </InputEndpoints>
@@ -187,22 +187,22 @@
           <AvailabilitySetName>name-of-availability-set</AvailabilitySetName>
           <DataVirtualHardDisks>
             <DataVirtualHardDisk>
-              <HostCaching>host-caching-mode-of-data-disk</HostCaching> 
+              <HostCaching>host-caching-mode-of-data-disk</HostCaching>
               <DiskName>new-or-existing-disk-name</DiskName>
               <Lun>logical-unit-number-of-data-disk</Lun>
-              <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB>            
+              <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB>
               <MediaLink>path-to-vhd</MediaLink>
             </DataVirtualHardDisk>
           </DataVirtualHardDisks>
           <OSVirtualHardDisk>
-            <HostCaching>host-caching-mode-of-os-disk</HostCaching>    
-            <DiskName>name-of-os-disk</DiskName>                    
+            <HostCaching>host-caching-mode-of-os-disk</HostCaching>
+            <DiskName>name-of-os-disk</DiskName>
             <MediaLink>path-to-vhd</MediaLink>
             <SourceImageName>image-used-to-create-os-disk</SourceImageName>
             <OS>operating-system-on-os-disk</OS>
-          </OSVirtualHardDisk>      
+          </OSVirtualHardDisk>
           <RoleSize>size-of-instance</RoleSize>
-          <DefaultWinRmCertificateThumbprint>winrm-cert-thumbprint</DefaultWinRmCertificateThumbprint>      
+          <DefaultWinRmCertificateThumbprint>winrm-cert-thumbprint</DefaultWinRmCertificateThumbprint>
         </PersistentVMRole>
         `, rolename)
     return template
@@ -1099,7 +1099,7 @@
                 <CopyCompletionTime>copycompletiontime</CopyCompletionTime>
                 <CopyStatusDescription>copydesc</CopyStatusDescription>
               </Properties>
-              <Metadata>   
+              <Metadata>
                 <MetaName1>metadataname1</MetaName1>
                 <MetaName2>metadataname2</MetaName2>
               </Metadata>