Merge pull request #56 from opencredo/xml_to_json_conversion

XML-to-JSON conversion

Author: Trdls

.travis.yml

@@ -11,4 +11,8 @@ go:
 env:
   - CGO_ENABLED=0
 
-script: travis_wait 20 ./scripts/build.sh
+script: |
+  if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    export UPCLOUD_GO_SDK_TEST_NO_CREDENTIALS="yes"
+  fi
+  travis_wait 20 ./scripts/build.sh

upcloud/account.go

@@ -1,7 +1,27 @@
 package upcloud
 
+import "encoding/json"
+
 // Account represents an account
 type Account struct {
-	Credits  float64 `xml:"credits"`
-	UserName string  `xml:"username"`
+	Credits  float64 `json:"credits"`
+	UserName string  `json:"username"`
+}
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (s *Account) UnmarshalJSON(b []byte) error {
+	type localAccount Account
+
+	v := struct {
+		Account localAccount `json:"account"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	(*s) = Account(v.Account)
+
+	return nil
 }

upcloud/account_test.go

@@ -1,23 +1,26 @@
 package upcloud
 
 import (
-	"encoding/xml"
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 // TestUnmarshalAccount tests that Account objects unmarshal correctly
 func TestUnmarshalAccount(t *testing.T) {
-	originalXML := `<?xml version="1.0" encoding="utf-8"?>
-<account>
-    <credits>22465.536</credits>
-    <username>foobar</username>
-</account>`
+	originalJSON := `
+	{
+      "account": {
+        "credits": 9972.2324,
+        "username": "username"
+      }
+    }
+	`
 
 	account := Account{}
-	err := xml.Unmarshal([]byte(originalXML), &account)
-	assert.Nil(t, err)
-	assert.Equal(t, 22465.536, account.Credits)
-	assert.Equal(t, "foobar", account.UserName)
+	err := json.Unmarshal([]byte(originalJSON), &account)
+	assert.NoError(t, err)
+	assert.Equal(t, 9972.2324, account.Credits)
+	assert.Equal(t, "username", account.UserName)
 }

upcloud/client/client.go

@@ -68,17 +68,6 @@ func (c *Client) CreateRequestURL(location string) string {
 	return fmt.Sprintf("%s%s", c.getBaseURL(), location)
 }
 
-// PerformGetRequest performs a GET request to the specified URL and returns the response body and eventual errors
-func (c *Client) PerformGetRequest(url string) ([]byte, error) {
-	request, err := http.NewRequest(http.MethodGet, url, nil)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return c.performRequest(request)
-}
-
 // PerformJSONGetRequest performs a GET request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformJSONGetRequest(url string) ([]byte, error) {
 	request, err := http.NewRequest(http.MethodGet, url, nil)
@@ -90,23 +79,6 @@ func (c *Client) PerformJSONGetRequest(url string) ([]byte, error) {
 	return c.performJSONRequest(request)
 }
 
-// PerformPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
-func (c *Client) PerformPostRequest(url string, requestBody []byte) ([]byte, error) {
-	var bodyReader io.Reader
-
-	if requestBody != nil {
-		bodyReader = bytes.NewBuffer(requestBody)
-	}
-
-	request, err := http.NewRequest(http.MethodPost, url, bodyReader)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return c.performRequest(request)
-}
-
 // PerformJSONPostRequest performs a POST request to the specified URL and returns the response body and eventual errors
 func (c *Client) PerformJSONPostRequest(url string, requestBody []byte) ([]byte, error) {
 	var bodyReader io.Reader
@@ -124,33 +96,21 @@ func (c *Client) PerformJSONPostRequest(url string, requestBody []byte) ([]byte,
 	return c.performJSONRequest(request)
 }
 
-// PerformPutRequest performs a PUT request to the specified URL and returns the response body and eventual errors
-func (c *Client) PerformPutRequest(url string, requestBody []byte) ([]byte, error) {
+// PerformJSONPutRequest performs a PUT request to the specified URL and returns the response body and eventual errors
+func (c *Client) PerformJSONPutRequest(url string, requestBody []byte) ([]byte, error) {
 	var bodyReader io.Reader
 
 	if requestBody != nil {
 		bodyReader = bytes.NewBuffer(requestBody)
 	}
 
-	request, err := http.NewRequest("PUT", url, bodyReader)
+	request, err := http.NewRequest(http.MethodPut, url, bodyReader)
 
 	if err != nil {
 		return nil, err
 	}
 
-	return c.performRequest(request)
-}
-
-// PerformDeleteRequest performs a DELETE request to the specified URL and returns the response body and eventual errors
-func (c *Client) PerformDeleteRequest(url string) error {
-	request, err := http.NewRequest(http.MethodDelete, url, nil)
-
-	if err != nil {
-		return err
-	}
-
-	_, err = c.performRequest(request)
-	return err
+	return c.performJSONRequest(request)
 }
 
 // PerformJSONDeleteRequest performs a DELETE request to the specified URL and returns the response body and eventual errors
@@ -165,15 +125,6 @@ func (c *Client) PerformJSONDeleteRequest(url string) error {
 	return err
 }
 
-// Adds common headers to the specified request
-func (c *Client) addRequestHeaders(request *http.Request) *http.Request {
-	request.SetBasicAuth(c.userName, c.password)
-	request.Header.Add("Accept", "application/xml")
-	request.Header.Add("Content-Type", "application/xml")
-
-	return request
-}
-
 // Adds common headers to the specified request
 func (c *Client) addJSONRequestHeaders(request *http.Request) *http.Request {
 	request.SetBasicAuth(c.userName, c.password)
@@ -183,18 +134,6 @@ func (c *Client) addJSONRequestHeaders(request *http.Request) *http.Request {
 	return request
 }
 
-// Performs the specified HTTP request and returns the response through handleResponse()
-func (c *Client) performRequest(request *http.Request) ([]byte, error) {
-	c.addRequestHeaders(request)
-	response, err := c.httpClient.Do(request)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return handleResponse(response)
-}
-
 // Performs the specified HTTP request and returns the response through handleResponse()
 func (c *Client) performJSONRequest(request *http.Request) ([]byte, error) {
 	c.addJSONRequestHeaders(request)

upcloud/error.go

@@ -7,10 +7,12 @@ import (
 
 // Error represents an error
 type Error struct {
-	ErrorCode    string `xml:"error_code" json:"error_code"`
-	ErrorMessage string `xml:"error_message" json:"error_message"`
+	ErrorCode    string `json:"error_code"`
+	ErrorMessage string `json:"error_message"`
 }
 
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
 func (e *Error) UnmarshalJSON(b []byte) error {
 	type localError Error
 	v := struct {

upcloud/firewall.go

@@ -1,5 +1,7 @@
 package upcloud
 
+import "encoding/json"
+
 // Constants
 const (
 	FirewallRuleActionAccept = "accept"
@@ -16,24 +18,65 @@ const (
 
 // FirewallRules represents a list of firewall rules
 type FirewallRules struct {
-	FirewallRules []FirewallRule `xml:"firewall_rule"`
+	FirewallRules []FirewallRule `json:"firewall_rules"`
+}
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (s *FirewallRules) UnmarshalJSON(b []byte) error {
+	type localFirewallRule FirewallRule
+	type firewallRuleWrapper struct {
+		FirewallRules []localFirewallRule `json:"firewall_rule"`
+	}
+
+	v := struct {
+		FirewallRules firewallRuleWrapper `json:"firewall_rules"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	for _, f := range v.FirewallRules.FirewallRules {
+		s.FirewallRules = append(s.FirewallRules, FirewallRule(f))
+	}
+
+	return nil
 }
 
 // FirewallRule represents a single firewall rule. Note that most integer values are represented as strings
 type FirewallRule struct {
-	Action                  string `xml:"action"`
-	Comment                 string `xml:"comment,omitempty"`
-	DestinationAddressStart string `xml:"destination_address_start,omitempty"`
-	DestinationAddressEnd   string `xml:"destination_address_end,omitempty"`
-	DestinationPortStart    string `xml:"destination_port_start,omitempty"`
-	DestinationPortEnd      string `xml:"destination_port_end,omitempty"`
-	Direction               string `xml:"direction"`
-	Family                  string `xml:"family"`
-	ICMPType                string `xml:"icmp_type,omitempty"`
-	Position                int    `xml:"position"`
-	Protocol                string `xml:"protocol,omitempty"`
-	SourceAddressStart      string `xml:"source_address_start,omitempty"`
-	SourceAddressEnd        string `xml:"source_address_end,omitempty"`
-	SourcePortStart         string `xml:"source_port_start,omitempty"`
-	SourcePortEnd           string `xml:"source_port_end,omitempty"`
+	Action                  string `json:"action"`
+	Comment                 string `json:"comment,omitempty"`
+	DestinationAddressStart string `json:"destination_address_start,omitempty"`
+	DestinationAddressEnd   string `json:"destination_address_end,omitempty"`
+	DestinationPortStart    string `json:"destination_port_start,omitempty"`
+	DestinationPortEnd      string `json:"destination_port_end,omitempty"`
+	Direction               string `json:"direction"`
+	Family                  string `json:"family"`
+	ICMPType                string `json:"icmp_type,omitempty"`
+	Position                int    `json:"position,string"`
+	Protocol                string `json:"protocol,omitempty"`
+	SourceAddressStart      string `json:"source_address_start,omitempty"`
+	SourceAddressEnd        string `json:"source_address_end,omitempty"`
+	SourcePortStart         string `json:"source_port_start,omitempty"`
+	SourcePortEnd           string `json:"source_port_end,omitempty"`
+}
+
+// UnmarshalJSON is a custom unmarshaller that deals with
+// deeply embedded values.
+func (s *FirewallRule) UnmarshalJSON(b []byte) error {
+	type localFirewallRule FirewallRule
+
+	v := struct {
+		FirewallRule localFirewallRule `json:"firewall_rule"`
+	}{}
+	err := json.Unmarshal(b, &v)
+	if err != nil {
+		return err
+	}
+
+	(*s) = FirewallRule(v.FirewallRule)
+
+	return nil
 }