Merge pull request #1 from bfirsh/gofmt

Tidy up with gofmt
Azure · Oct 8, 2014 · 7daeb26 · 7daeb26
2 parents 9907835 + 1aa8e81
commit 7daeb26
Show file tree

Hide file tree

Showing 14 changed files with 270 additions and 272 deletions.
diff --git a/clients/imageClient/entities.go b/clients/imageClient/entities.go
@@ -5,18 +5,18 @@ import (
 )
 
 type ImageList struct {
-	XMLName   	xml.Name `xml:"Images"`
-	Xmlns	  	string `xml:"xmlns,attr"`
-	OSImages 	[]OSImage `xml:"OSImage"`
+	XMLName  xml.Name  `xml:"Images"`
+	Xmlns    string    `xml:"xmlns,attr"`
+	OSImages []OSImage `xml:"OSImage"`
 }
 
 type OSImage struct {
-	Category		string
-	Label			string
-	LogicalSizeInGB	string
-	Name			string
-	OS				string
-	Eula			string
-	Description		string
-	Location		string
+	Category        string
+	Label           string
+	LogicalSizeInGB string
+	Name            string
+	OS              string
+	Eula            string
+	Description     string
+	Location        string
 }
diff --git a/clients/imageClient/imageClient.go b/clients/imageClient/imageClient.go
@@ -1,18 +1,18 @@
 package imageClient
 
 import (
-	"fmt"
 	"encoding/xml"
 	"errors"
+	"fmt"
 	azure "github.com/MSOpenTech/azure-sdk-for-go"
 )
 
 const (
-	azureImageListURL = "services/images"
+	azureImageListURL    = "services/images"
 	invalidLocationError = "Error: Can not find image %s in specified subscription, please specify another image name \n"
 )
 
-func GetImageList() (ImageList, error){
+func GetImageList() (ImageList, error) {
 	imageList := ImageList{}
 
 	response, err := azure.SendAzureGetRequest(azureImageListURL)
@@ -24,11 +24,11 @@ func GetImageList() (ImageList, error){
 	return imageList, err
 }
 
-func ResolveImageName(imageName string) (error) {
+func ResolveImageName(imageName string) error {
 	if len(imageName) == 0 {
 		return fmt.Errorf(azure.ParamNotSpecifiedError, "imageName")
 	}
-	
+
 	imageList, err := GetImageList()
 	if err != nil {
 		return err

diff --git a/clients/locationClient/entities.go b/clients/locationClient/entities.go
@@ -5,13 +5,13 @@ import (
 )
 
 type LocationList struct {
-	XMLName   	xml.Name `xml:"Locations"`
-	Xmlns	  	string `xml:"xmlns,attr"`
-	Locations 	[]Location `xml:"Location"`
+	XMLName   xml.Name   `xml:"Locations"`
+	Xmlns     string     `xml:"xmlns,attr"`
+	Locations []Location `xml:"Location"`
 }
 
 type Location struct {
-	Name				string
-	DisplayName			string
-	AvailableServices 	[]string `xml:"AvailableServices>AvailableService"`
+	Name              string
+	DisplayName       string
+	AvailableServices []string `xml:"AvailableServices>AvailableService"`
 }
diff --git a/clients/locationClient/locationClient.go b/clients/locationClient/locationClient.go
@@ -1,24 +1,24 @@
 package locationClient
 
 import (
-	"fmt"
-	"strings"
+	"bytes"
 	"encoding/xml"
 	"errors"
-	"bytes"
+	"fmt"
 	azure "github.com/MSOpenTech/azure-sdk-for-go"
+	"strings"
 )
 
 const (
 	azureLocationListURL = "locations"
 	invalidLocationError = "Invalid location. Available locations: %s"
 )
 
-func ResolveLocation(location string) (error) {
+func ResolveLocation(location string) error {
 	if len(location) == 0 {
 		return fmt.Errorf(azure.ParamNotSpecifiedError, "location")
 	}
-	
+
 	locations, err := GetLocationList()
 	if err != nil {
 		return err

diff --git a/clients/storageServiceClient/entities.go b/clients/storageServiceClient/entities.go
@@ -5,45 +5,45 @@ import (
 )
 
 type StorageServiceList struct {
-	XMLName   		xml.Name `xml:"StorageServices"`
-	Xmlns	  		string `xml:"xmlns,attr"`
+	XMLName         xml.Name         `xml:"StorageServices"`
+	Xmlns           string           `xml:"xmlns,attr"`
 	StorageServices []StorageService `xml:"StorageService"`
 }
 
 type StorageService struct {
-	Url							string
-	ServiceName					string
-	StorageServiceProperties	StorageServiceProperties
+	Url                      string
+	ServiceName              string
+	StorageServiceProperties StorageServiceProperties
 }
 
 type StorageServiceProperties struct {
-	Description				string
-	Location				string
-	Label					string
-	Status					string
-	Endpoints 				[]string `xml:"Endpoints>Endpoint"`
-	GeoReplicationEnabled	string
-	GeoPrimaryRegion		string
+	Description           string
+	Location              string
+	Label                 string
+	Status                string
+	Endpoints             []string `xml:"Endpoints>Endpoint"`
+	GeoReplicationEnabled string
+	GeoPrimaryRegion      string
 }
 
 type StorageServiceDeployment struct {
-	XMLName   				xml.Name `xml:"CreateStorageServiceInput"`
-	Xmlns	  				string `xml:"xmlns,attr"`
-	ServiceName				string
-	Description				string
-	Label					string
-	AffinityGroup			string	`xml:",omitempty"`
-	Location				string	`xml:",omitempty"`
-	GeoReplicationEnabled	bool
-	ExtendedProperties 		ExtendedPropertyList
-	SecondaryReadEnabled 	bool
+	XMLName               xml.Name `xml:"CreateStorageServiceInput"`
+	Xmlns                 string   `xml:"xmlns,attr"`
+	ServiceName           string
+	Description           string
+	Label                 string
+	AffinityGroup         string `xml:",omitempty"`
+	Location              string `xml:",omitempty"`
+	GeoReplicationEnabled bool
+	ExtendedProperties    ExtendedPropertyList
+	SecondaryReadEnabled  bool
 }
 
 type ExtendedPropertyList struct {
-	ExtendedProperty	[]ExtendedProperty
+	ExtendedProperty []ExtendedProperty
 }
 
 type ExtendedProperty struct {
-	Name	string
-	Value	string
+	Name  string
+	Value string
 }
diff --git a/clients/storageServiceClient/storageServiceClient.go b/clients/storageServiceClient/storageServiceClient.go
@@ -1,23 +1,23 @@
 package storageServiceClient
 
 import (
-	"fmt"
-	"strings"
-	"errors"
-	"encoding/xml"
 	"encoding/base64"
+	"encoding/xml"
+	"errors"
+	"fmt"
 	azure "github.com/MSOpenTech/azure-sdk-for-go"
+	"strings"
 )
 
 const (
-	azureXmlns = "http://schemas.microsoft.com/windowsazure"
+	azureXmlns                 = "http://schemas.microsoft.com/windowsazure"
 	azureStorageServiceListURL = "services/storageservices"
-	azureStorageServiceURL = "services/storageservices/%s"
+	azureStorageServiceURL     = "services/storageservices/%s"
 
 	blobEndpointNotFoundError = "Blob endpoint was not found in storage serice %s"
 )
 
-func GetStorageServiceList() (*StorageServiceList, error){
+func GetStorageServiceList() (*StorageServiceList, error) {
 	storageServiceList := new(StorageServiceList)
 
 	response, err := azure.SendAzureGetRequest(azureStorageServiceListURL)
@@ -33,11 +33,11 @@ func GetStorageServiceList() (*StorageServiceList, error){
 	return storageServiceList, nil
 }
 
-func GetStorageServiceByName(serviceName string) (*StorageService, error){
+func GetStorageServiceByName(serviceName string) (*StorageService, error) {
 	if len(serviceName) == 0 {
 		return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "serviceName")
 	}
-	
+
 	storageService := new(StorageService)
 	requestURL := fmt.Sprintf(azureStorageServiceURL, serviceName)
 	response, err := azure.SendAzureGetRequest(requestURL)
@@ -57,7 +57,7 @@ func GetStorageServiceByLocation(location string) (*StorageService, error) {
 	if len(location) == 0 {
 		return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "location")
 	}
-	
+
 	storageService := new(StorageService)
 	storageServiceList, err := GetStorageServiceList()
 	if err != nil {
@@ -75,14 +75,14 @@ func GetStorageServiceByLocation(location string) (*StorageService, error) {
 	return nil, nil
 }
 
-func CreateStorageService(name, location string) (*StorageService, error){
+func CreateStorageService(name, location string) (*StorageService, error) {
 	if len(name) == 0 {
 		return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "name")
 	}
 	if len(location) == 0 {
 		return nil, fmt.Errorf(azure.ParamNotSpecifiedError, "location")
 	}
-	
+
 	storageDeploymentConfig := createStorageServiceDeploymentConf(name, location)
 	deploymentBytes, err := xml.Marshal(storageDeploymentConfig)
 	if err != nil {
@@ -115,7 +115,7 @@ func GetBlobEndpoint(storageService *StorageService) (string, error) {
 	return "", errors.New(fmt.Sprintf(blobEndpointNotFoundError, storageService.ServiceName))
 }
 
-func createStorageServiceDeploymentConf(name, location string) (StorageServiceDeployment){
+func createStorageServiceDeploymentConf(name, location string) StorageServiceDeployment {
 	storageServiceDeployment := StorageServiceDeployment{}
 
 	storageServiceDeployment.ServiceName = name