fix: apply fixes found by linter (#43)

Author: leafty

pkg/cmd/cleanupdeployment.go

@@ -144,5 +144,5 @@ func askForConfirmation(question string) (response bool, err error) {
 	case "no":
 		return false, nil
 	}
-	return false, fmt.Errorf("Invalid answer, aborting.")
+	return false, fmt.Errorf("invalid answer, aborting")
 }

pkg/helm/release.go

@@ -30,9 +30,7 @@ type helmListOutput struct {
 
 func (cli *HelmCLI) UninstallReleases(ctx context.Context, namespace string, releases []string) error {
 	args := []string{"uninstall", "--wait", "--namespace", namespace}
-	for _, release := range releases {
-		args = append(args, release)
-	}
+	args = append(args, releases...)
 
 	out, err := cli.RunCmd(ctx, args...)
 	if err != nil {

pkg/k8s/client.go

@@ -13,7 +13,7 @@ import (
 func GetClientset() (*kubernetes.Clientset, error) {
 	home := homedir.HomeDir()
 	if home == "" {
-		return nil, fmt.Errorf("Could not determine home directory")
+		return nil, fmt.Errorf("could not determine home directory")
 	}
 
 	kubeconfig := filepath.Join(home, ".kube", "config")
@@ -28,7 +28,7 @@ func GetClientset() (*kubernetes.Clientset, error) {
 func GetDynamicClient() (client *dynamic.DynamicClient, err error) {
 	home := homedir.HomeDir()
 	if home == "" {
-		return nil, fmt.Errorf("Could not determine home directory")
+		return nil, fmt.Errorf("could not determine home directory")
 	}
 
 	kubeconfig := filepath.Join(home, ".kube", "config")

pkg/keycloak/admin.go

@@ -30,7 +30,7 @@ func (client *KeycloakClient) FindUser(ctx context.Context, realm string, email
 		}
 	}
 
-	return "", fmt.Errorf("Could not find user '%s' in Keycloak", email)
+	return "", fmt.Errorf("could not find user '%s' in Keycloak", email)
 }
 
 func (client *KeycloakClient) GetAdminUsersURL(realm string) *url.URL {
@@ -75,11 +75,14 @@ func (client *KeycloakClient) findRenkuAdminRole(ctx context.Context, realm stri
 			return role, err
 		}
 	}
-	return roleMapping{}, fmt.Errorf("Could not find role '%s' in Keycloak", renkuAdminRole)
+	return roleMapping{}, fmt.Errorf("could not find role '%s' in Keycloak", renkuAdminRole)
 }
 
 func (client *KeycloakClient) AddRenkuAdminRoleToUser(ctx context.Context, realm string, userID string) error {
 	role, err := client.findRenkuAdminRole(ctx, realm, userID)
+	if err != nil {
+		return err
+	}
 
 	postURL := client.GetAdminRolesURL(realm, userID)
 

pkg/keycloak/rest.go

@@ -30,7 +30,7 @@ func (client *KeycloakClient) GetJSON(ctx context.Context, url string, result an
 	if resp.Header.Get("Content-Type") == jsonContentType {
 		parseErr = tryParseResponse(resp, result)
 	} else {
-		return resp, fmt.Errorf("Expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
+		return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
 	}
 	if resp.StatusCode >= 200 && resp.StatusCode < 300 && parseErr != nil {
 		return resp, parseErr
@@ -67,7 +67,7 @@ func (client *KeycloakClient) PostJSON(ctx context.Context, url string, body any
 		// No content
 		return resp, nil
 	} else {
-		return resp, fmt.Errorf("Expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
+		return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
 	}
 	if resp.StatusCode >= 200 && resp.StatusCode < 300 && parseErr != nil {
 		return resp, parseErr
@@ -95,7 +95,7 @@ func (client *KeycloakClient) PostForm(ctx context.Context, url string, data url
 	if resp.Header.Get("Content-Type") == jsonContentType {
 		parseErr = tryParseResponse(resp, result)
 	} else {
-		return resp, fmt.Errorf("Expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
+		return resp, fmt.Errorf("expected '%s' but got response with content type '%s'", jsonContentType, resp.Header.Get("Content-Type"))
 	}
 	if resp.StatusCode >= 200 && resp.StatusCode < 300 && parseErr != nil {
 		return resp, parseErr
@@ -105,7 +105,11 @@ func (client *KeycloakClient) PostForm(ctx context.Context, url string, data url
 }
 
 func tryParseResponse(resp *http.Response, result any) error {
-	defer resp.Body.Close()
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			fmt.Printf("Warning, could not close HTTP response: %s", err.Error())
+		}
+	}()
 
 	outBuf := new(bytes.Buffer)
 	_, err := outBuf.ReadFrom(resp.Body)

pkg/renkuapi/auth.go

@@ -370,7 +370,11 @@ func (auth *RenkuApiAuth) postForm(ctx context.Context, url string, data url.Val
 }
 
 func tryParseResponse(resp *http.Response, result any) error {
-	defer resp.Body.Close()
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			fmt.Printf("Warning, could not close HTTP response: %s", err.Error())
+		}
+	}()
 
 	outBuf := new(bytes.Buffer)
 	_, err := outBuf.ReadFrom(resp.Body)