cleanup on staticcheck fixes

api/client/api.go

@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -75,6 +74,9 @@ func NewClientWithToken(baseURL, token string) *Client {
 func (c *Client) getRequest(relPath string, data interface{}, response interface{}) error {
 	vals := make(map[string][]string)
 	err := schema.NewEncoder().Encode(data, vals)
+	if err != nil {
+		return fmt.Errorf("error encoding data for GET request: %w", err)
+	}
 
 	urlVals := url.Values(vals)
 	encodedURLVals := urlVals.Encode()
@@ -100,7 +102,7 @@ func (c *Client) getRequest(relPath string, data interface{}, response interface
 
 	if httpErr, err := c.sendRequest(req, response, true); httpErr != nil || err != nil {
 		if httpErr != nil {
-			return fmt.Errorf("%v", httpErr.Error)
+			return fmt.Errorf("%s", httpErr.Error)
 		}
 
 		return err
@@ -156,7 +158,7 @@ func (c *Client) postRequest(relPath string, data interface{}, response interfac
 	}
 
 	if httpErr != nil {
-		return fmt.Errorf("%v", httpErr.Error)
+		return fmt.Errorf("%s", httpErr.Error)
 	}
 
 	return err
@@ -209,7 +211,7 @@ func (c *Client) patchRequest(relPath string, data interface{}, response interfa
 	}
 
 	if httpErr != nil {
-		return fmt.Errorf("%v", httpErr.Error)
+		return fmt.Errorf("%s", httpErr.Error)
 	}
 
 	return err
@@ -232,7 +234,7 @@ func (c *Client) deleteRequest(relPath string, data interface{}, response interf
 
 	if httpErr, err := c.sendRequest(req, response, true); httpErr != nil || err != nil {
 		if httpErr != nil {
-			return fmt.Errorf("%v", httpErr.Error)
+			return fmt.Errorf("%s", httpErr.Error)
 		}
 
 		return err
@@ -299,12 +301,12 @@ func (c *Client) saveCookie(cookie *http.Cookie) error {
 		return err
 	}
 
-	return ioutil.WriteFile(c.CookieFilePath, data, 0o644)
+	return os.WriteFile(c.CookieFilePath, data, 0o644)
 }
 
 // retrieves single cookie from file
 func (c *Client) getCookie() (*http.Cookie, error) {
-	data, err := ioutil.ReadFile(c.CookieFilePath)
+	data, err := os.ReadFile(c.CookieFilePath)
 	if err != nil {
 		return nil, err
 	}

api/client/project.go

@@ -72,13 +72,7 @@ func (c *Client) CreateProject(
 ) (*types.CreateProjectResponse, error) {
 	resp := &types.CreateProjectResponse{}
 
-	err := c.postRequest(
-		fmt.Sprintf(
-			"/projects",
-		),
-		req,
-		resp,
-	)
+	err := c.postRequest("/projects", req, resp)
 
 	return resp, err
 }

api/client/user.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/porter-dev/porter/api/types"
 )
@@ -11,13 +10,7 @@ import (
 func (c *Client) AuthCheck(ctx context.Context) (*types.GetAuthenticatedUserResponse, error) {
 	resp := &types.GetAuthenticatedUserResponse{}
 
-	err := c.getRequest(
-		fmt.Sprintf(
-			"/users/current",
-		),
-		nil,
-		resp,
-	)
+	err := c.getRequest("/users/current", nil, resp)
 
 	return resp, err
 }
@@ -26,26 +19,14 @@ func (c *Client) AuthCheck(ctx context.Context) (*types.GetAuthenticatedUserResp
 func (c *Client) Login(ctx context.Context, req *types.LoginUserRequest) (*types.GetAuthenticatedUserResponse, error) {
 	resp := &types.GetAuthenticatedUserResponse{}
 
-	err := c.postRequest(
-		fmt.Sprintf(
-			"/login",
-		),
-		req,
-		resp,
-	)
+	err := c.postRequest("/login", req, resp)
 
 	return resp, err
 }
 
 // Logout logs the user out and deauthorizes the cookie-based session
 func (c *Client) Logout(ctx context.Context) error {
-	err := c.postRequest(
-		fmt.Sprintf(
-			"/logout",
-		),
-		nil,
-		nil,
-	)
+	err := c.postRequest("/logout", nil, nil)
 	if err != nil {
 		return err
 	}
@@ -61,13 +42,7 @@ func (c *Client) CreateUser(
 ) (*types.CreateUserResponse, error) {
 	resp := &types.CreateUserResponse{}
 
-	err := c.postRequest(
-		fmt.Sprintf(
-			"/users",
-		),
-		req,
-		resp,
-	)
+	err := c.postRequest("/users", req, resp)
 
 	return resp, err
 }
@@ -76,13 +51,7 @@ func (c *Client) CreateUser(
 func (c *Client) ListUserProjects(ctx context.Context) (*types.ListUserProjectsResponse, error) {
 	resp := &types.ListUserProjectsResponse{}
 
-	err := c.getRequest(
-		fmt.Sprintf(
-			"/projects",
-		),
-		nil,
-		resp,
-	)
+	err := c.getRequest("/projects", nil, resp)
 
 	return resp, err
 }
@@ -91,11 +60,5 @@ func (c *Client) ListUserProjects(ctx context.Context) (*types.ListUserProjectsR
 func (c *Client) DeleteUser(
 	ctx context.Context,
 ) error {
-	return c.deleteRequest(
-		fmt.Sprintf(
-			"/users/current",
-		),
-		nil,
-		nil,
-	)
+	return c.deleteRequest("/users/current", nil, nil)
 }

provisioner/client/client.go

@@ -104,7 +104,7 @@ func (c *Client) getRequest(relPath string, data interface{}, response interface
 
 	if httpErr, err := c.sendRequest(req, response); httpErr != nil || err != nil {
 		if httpErr != nil {
-			return fmt.Errorf("%v", httpErr.Error)
+			return fmt.Errorf("%s", httpErr.Error)
 		}
 
 		return err
@@ -160,7 +160,7 @@ func (c *Client) postRequest(relPath string, data interface{}, response interfac
 	}
 
 	if httpErr != nil {
-		return fmt.Errorf("%v", httpErr.Error)
+		return fmt.Errorf("%s", httpErr.Error)
 	}
 
 	return err
@@ -183,7 +183,7 @@ func (c *Client) deleteRequest(relPath string, data interface{}, response interf
 
 	if httpErr, err := c.sendRequest(req, response); httpErr != nil || err != nil {
 		if httpErr != nil {
-			return fmt.Errorf("%v", httpErr.Error)
+			return fmt.Errorf("%s", httpErr.Error)
 		}
 
 		return err