Change Cartel client method visibility

Author: loafoe

cartel/add_security_groups.go

@@ -21,12 +21,12 @@ func (c *Client) AddSecurityGroups(instances []string, groups []string) (*Securi
 	body.NameTag = instances
 	body.SecurityGroup = groups
 
-	req, err := c.NewRequest("POST", "v3/api/add_security_groups", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/add_security_groups", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 	var responseBody SecurityGroupsResponse
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 
 	return &responseBody, resp, err
 }

cartel/add_tags.go

@@ -15,12 +15,12 @@ func (c *Client) AddTags(instances []string, tags map[string]string) (*AddTagRes
 	body.NameTag = instances
 	body.Tags = tags
 
-	req, err := c.NewRequest("POST", "v3/api/add_tags", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/add_tags", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 	var responseBody AddTagResponse
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 
 	return &responseBody, resp, err
 

cartel/add_user_groups.go

@@ -18,12 +18,12 @@ func (c *Client) AddUserGroups(instances []string, groups []string) (*UserGroups
 	body.NameTag = instances
 	body.LDAPGroups = groups
 
-	req, err := c.NewRequest("POST", "v3/api/add_ldap_group", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/add_ldap_group", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 	var responseBody UserGroupsResponse
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 
 	return &responseBody, resp, err
 }

cartel/all_instances.go

@@ -3,14 +3,14 @@ package cartel
 func (c *Client) GetAllInstances() (*[]InstanceDetails, *Response, error) {
 	var body RequestBody
 
-	req, err := c.NewRequest("POST", "v3/api/get_all_instances", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/get_all_instances", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	var responseBody []InstanceDetails
 
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 
 	return &responseBody, resp, err
 }

cartel/client.go

@@ -143,12 +143,12 @@ func configDebug(cartel *Client) {
 	}
 }
 
-// Do sends an API request and returns the API response. The API response is
+// do sends an API request and returns the API response. The API response is
 // JSON decoded and stored in the value pointed to by v, or returned as an
 // error if an API error has occurred. If v implements the io.Writer
 // interface, the raw response body will be written to v, without attempting to
 // first decode it.
-func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
+func (c *Client) do(req *http.Request, v interface{}) (*Response, error) {
 	if c.debugFile != nil {
 		dumped, _ := httputil.DumpRequest(req, true)
 		fmt.Fprintf(c.debugFile, "REQUEST: %s\n", string(dumped))
@@ -179,25 +179,25 @@ func (c *Client) Do(req *http.Request, v interface{}) (*Response, error) {
 	if err != nil {
 		return response, err
 	}
-	err = CheckResponse(resp)
+	err = checkResponse(resp)
 	return response, err
 }
 
-// CheckResponse checks the API response for errors, and returns them if present.
-func CheckResponse(r *http.Response) error {
+// checkResponse checks the API response for errors, and returns them if present.
+func checkResponse(r *http.Response) error {
 	switch r.StatusCode {
 	case 200, 201, 202, 204, 304:
 		return nil
 	}
 	return ErrNonHttp20xResponse
 }
 
-// NewRequest creates an API request. A relative URL path can be provided in
+// newRequest creates an API request. A relative URL path can be provided in
 // urlStr, in which case it is resolved relative to the base URL of the Client.
 // Relative URL paths should always be specified without a preceding slash. If
 // specified, the value pointed to by body is JSON encoded and included as the
 // request body.
-func (c *Client) NewRequest(method, path string, opt *RequestBody, options []OptionFunc) (*http.Request, error) {
+func (c *Client) newRequest(method, path string, opt *RequestBody, options []OptionFunc) (*http.Request, error) {
 	u := *c.baseURL
 	u.Opaque = c.baseURL.Path + path
 

cartel/create.go

@@ -47,10 +47,10 @@ func (c *Client) Create(tagName string, opts ...RequestOptionFunc) (*CreateRespo
 	}
 	var responseBody CreateResponse
 
-	req, err := c.NewRequest("POST", "v3/api/create", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/create", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 	return &responseBody, resp, err
 }

cartel/deployment_state.go

@@ -4,12 +4,12 @@ func (c *Client) GetDeploymentState(nameTag string) (string, *Response, error) {
 	var body RequestBody
 	body.NameTag = []string{nameTag}
 
-	req, err := c.NewRequest("POST", "v3/api/deployment_status", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/deployment_status", &body, nil)
 	if err != nil {
 		return "fatal_error", nil, err
 	}
 	var responseBody map[string]interface{}
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 	if err != nil {
 		return "unknown_instance", resp, err
 	}

cartel/destroy.go

@@ -19,13 +19,13 @@ func (c *Client) Destroy(tagName string) (*DestroyResponse, *Response, error) {
 	var body RequestBody
 	body.NameTag = []string{tagName}
 
-	req, err := c.NewRequest("POST", "v3/api/destroy", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/destroy", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 	var responseBody DestroyResponse
 
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 	if err != nil {
 		return nil, resp, err
 	}

cartel/details.go

@@ -50,14 +50,14 @@ func (c *Client) GetDetailsMulti(tags ...string) (*DetailsResponse, *Response, e
 	var body RequestBody
 	body.NameTag = tags
 
-	req, err := c.NewRequest("POST", "v3/api/instance_details", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/instance_details", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	var detailResponse []map[string]InstanceDetails
 
-	resp, err := c.Do(req, &detailResponse)
+	resp, err := c.do(req, &detailResponse)
 	response := make(DetailsResponse, len(detailResponse))
 	for _, r := range detailResponse {
 		for k, v := range r {

cartel/remove_security_groups.go

@@ -5,12 +5,12 @@ func (c *Client) RemoveSecurityGroups(instances []string, groups []string) (*Sec
 	body.NameTag = instances
 	body.SecurityGroup = groups
 
-	req, err := c.NewRequest("POST", "v3/api/remove_security_groups", &body, nil)
+	req, err := c.newRequest("POST", "v3/api/remove_security_groups", &body, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 	var responseBody SecurityGroupsResponse
-	resp, err := c.Do(req, &responseBody)
+	resp, err := c.do(req, &responseBody)
 
 	return &responseBody, resp, err
 }