Don't expose the client's username and password (mentioned in #25)

The setters were never used and the getter was only used in an integration test, which could be modified to not require it.

Author: Sam Stenvall

upcloud/client/client.go

@@ -34,32 +34,16 @@ type Client struct {
 func New(userName, password string) *Client {
 	client := Client{}
 
-	client.SetUserName(userName)
-	client.SetPassword(password)
+	client.userName = userName
+	client.password = password
 	client.httpClient = cleanhttp.DefaultClient()
 	client.SetTimeout(time.Second * DEFAULT_TIMEOUT)
-
 	client.SetAPIVersion(DEFAULT_API_VERSION)
 	client.SetAPIBaseUrl(DEFAULT_API_BASEURL)
 
 	return &client
 }
 
-// GetUserName returns the user name the client uses
-func (c *Client) GetUserName() string {
-	return c.userName
-}
-
-// SetUserName sets the client user to the specified user
-func (c *Client) SetUserName(userName string) {
-	c.userName = userName
-}
-
-// SetPassword sets the client password to the specified password
-func (c *Client) SetPassword(password string) {
-	c.password = password
-}
-
 // SetTimeout sets the client timeout to the specified amount of seconds
 func (c *Client) SetTimeout(timeout time.Duration) {
 	c.httpClient.Timeout = timeout

upcloud/service/service_test.go

@@ -97,10 +97,11 @@ func teardown() {
 // TestGetAccount tests that the GetAccount() method returns proper data
 func TestGetAccount(t *testing.T) {
 	account, err := svc.GetAccount()
+	username, _ := getCredentials()
 	handleError(err)
 
-	if account.UserName != svc.client.GetUserName() {
-		t.Errorf("TestGetAccoun expected %s, got %s", svc.client.GetUserName(), account.UserName)
+	if account.UserName != username {
+		t.Errorf("TestGetAccount expected %s, got %s", username, account.UserName)
 	}
 }