Merge pull request #1 from ldez/fix/redundant-type-conv

fix: redundant type conversion

Author: caiges

client/client.go

@@ -64,25 +64,25 @@ type Client struct {
 
 // NewClient returns a prepared API client.
 func NewClient(config *Config) *Client {
-	httpClient := &http.Client{Timeout: time.Duration(time.Duration(config.Timeout) * time.Second)}
+	httpClient := &http.Client{Timeout: time.Duration(config.Timeout) * time.Second}
 
 	if !config.SecureTLS {
 		tr := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		}
 		httpClient.Transport = tr
 	}
-	client := &Client{
-		config:     config,
-		httpClient: httpClient}
 
-	return client
+	return &Client{
+		config:     config,
+		httpClient: httpClient,
+	}
 }
 
 // Call takes a path, such as "network/zone/details" and a params structure.
 // It is recommended that the params be a map[string]interface{}, but you can use
 // anything that serializes to the right json structure.
-// A `interface{}` and an error are returned, in typical go fasion.
+// A `interface{}` and an error are returned, in typical go fashion.
 //
 // Example:
 //	args := map[string]interface{}{
@@ -115,10 +115,7 @@ func (client *Client) Call(method string, params interface{}, into interface{})
 	}
 
 	// Response should be valid, decode it.
-	if err = json.Unmarshal(bsRb, &into); err != nil {
-		return err
-	}
-	return nil
+	return json.Unmarshal(bsRb, &into)
 }
 
 // CallRaw is just like Call, except it returns the raw json as a byte slice. However, in contrast to
@@ -137,36 +134,36 @@ func (client *Client) Call(method string, params interface{}, into interface{})
 //	// Check got now for LiquidWeb specific exceptions, as described above.
 func (client *Client) CallRaw(method string, params interface{}) ([]byte, error) {
 	//  api wants the "params" prefix key. Do it here so consumers dont have
-	// to do this everytime.
+	// to do this every time.
 	args := map[string]interface{}{
 		"params": params,
 	}
-	encodedArgs, encodeErr := json.Marshal(args)
-	if encodeErr != nil {
-		return nil, encodeErr
+	encodedArgs, err := json.Marshal(args)
+	if err != nil {
+		return nil, err
 	}
+
 	// formulate the HTTP POST request
-	url := fmt.Sprintf("%s/%s", client.config.URL, method)
-	req, reqErr := http.NewRequest("POST", url, bytes.NewReader(encodedArgs))
-	if reqErr != nil {
-		return nil, reqErr
+	uri := fmt.Sprintf("%s/%s", client.config.URL, method)
+	req, err := http.NewRequest(http.MethodPost, uri, bytes.NewReader(encodedArgs))
+	if err != nil {
+		return nil, err
 	}
+
 	// HTTP basic auth
 	req.SetBasicAuth(client.config.Username, client.config.Password)
+
 	// make the POST request
-	resp, doErr := client.httpClient.Do(req)
-	if doErr != nil {
-		return nil, doErr
+	resp, err := client.httpClient.Do(req)
+	if err != nil {
+		return nil, err
 	}
 	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("Bad HTTP response code [%d] from [%s]", resp.StatusCode, url)
-	}
-	// read the response body into a byte slice
-	bsRb, readErr := ioutil.ReadAll(resp.Body)
-	if readErr != nil {
-		return nil, readErr
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("bad HTTP response code [%d] from [%s]", resp.StatusCode, uri)
 	}
 
-	return bsRb, nil
+	// read the response body into a byte slice
+	return ioutil.ReadAll(resp.Body)
 }

storage/block_volume_client.go

@@ -50,7 +50,7 @@ func (c *BlockVolumeClient) List(params *BlockVolumeParams) (*BlockVolumeList, e
 	if err != nil {
 		return nil, err
 	}
-	return list, err
+	return list, nil
 }
 
 // Update will update a block volume.

storm/config_client.go

@@ -28,12 +28,12 @@ func (c *ConfigClient) Details(id string) (*Config, error) {
 
 // List fetches a list of storm configs.
 func (c *ConfigClient) List(params ConfigListParams) (*ConfigList, error) {
-	configList := &ConfigList{}
+	var configList ConfigList
 
 	err := c.Backend.Call("v1/Storm/Config/list", params, configList)
 	if err != nil {
 		return nil, err
 	}
 
-	return configList, nil
+	return &configList, nil
 }

types/types.go

@@ -39,10 +39,12 @@ func (fi *FlexInt) UnmarshalJSON(b []byte) error {
 	if b[0] != '"' {
 		return json.Unmarshal(b, (*int)(fi))
 	}
+
 	var s string
 	if err := json.Unmarshal(b, &s); err != nil {
 		return err
 	}
+
 	i, err := strconv.Atoi(s)
 	if err != nil {
 		return err