Remove the ability to override the API base URL and version (closes #29)

Author: Sam Stenvall

upcloud/client/client.go

@@ -38,8 +38,9 @@ func New(userName, password string) *Client {
 	client.password = password
 	client.httpClient = cleanhttp.DefaultClient()
 	client.SetTimeout(time.Second * DEFAULT_TIMEOUT)
-	client.SetAPIVersion(DEFAULT_API_VERSION)
-	client.SetAPIBaseUrl(DEFAULT_API_BASEURL)
+
+	client.apiVersion = DEFAULT_API_VERSION
+	client.apiBaseUrl = DEFAULT_API_BASEURL
 
 	return &client
 }
@@ -49,16 +50,6 @@ func (c *Client) SetTimeout(timeout time.Duration) {
 	c.httpClient.Timeout = timeout
 }
 
-// SetAPIVersion tells the client which API version to use
-func (c *Client) SetAPIVersion(version string) {
-	c.apiVersion = version
-}
-
-// SetAPIBaseUrl tells the client which API URL to use
-func (c *Client) SetAPIBaseUrl(url string) {
-	c.apiBaseUrl = url
-}
-
 // CreateRequestUrl creates and returns a complete request URL for the specified API location
 func (c *Client) CreateRequestUrl(location string) string {
 	return fmt.Sprintf("%s%s", c.getBaseUrl(), location)

upcloud/service/service_test.go

@@ -105,7 +105,7 @@ func TestGetAccount(t *testing.T) {
 	}
 }
 
-// TestErrorHandling performs various type checking on errors returned from the service and the underlying client
+// TestErrorHandling checks that the correct error type is returned from service methods
 func TestErrorHandling(t *testing.T) {
 	// Perform a bogus request that will certainly fail
 	_, err := svc.StartServer(&request.StartServerRequest{
@@ -119,19 +119,6 @@ func TestErrorHandling(t *testing.T) {
 	if actualErrorType != expectedErrorType {
 		t.Errorf("TestErrorHandling expected %s, got %s", expectedErrorType, actualErrorType)
 	}
-
-	// Create a service where the client is misconfigured
-	brokenClient := client.New("foo", "bar")
-	brokenClient.SetAPIBaseUrl("???¤#Whttp://example.com")
-	brokenSvc := New(brokenClient)
-
-	_, err = brokenSvc.GetAccount()
-	expectedErrorType = "*url.Error"
-	actualErrorType = reflect.TypeOf(err).String()
-
-	if actualErrorType != expectedErrorType {
-		t.Errorf("TestErrorHandling expected %s, got %s", expectedErrorType, actualErrorType)
-	}
 }
 
 // TestCreateModifyDeleteServer performs the following actions: