From f4e51493f33fad2f86ae48393188243155ded715 Mon Sep 17 00:00:00 2001
From: Mario Constanti <mario.constanti@mercedes-benz.com>
Date: Thu, 22 Feb 2024 14:43:15 +0100
Subject: [PATCH] fix: var-naming linter findings

Signed-off-by: Mario Constanti <mario.constanti@mercedes-benz.com>
---
 cmd/garm-cli/cmd/init.go    |  2 +-
 cmd/garm-cli/cmd/pool.go    |  6 +++---
 cmd/garm-cli/cmd/profile.go |  2 +-
 cmd/garm-cli/cmd/root.go    | 19 ++++++++-----------
 cmd/garm-cli/cmd/runner.go  |  3 ---
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/cmd/garm-cli/cmd/init.go b/cmd/garm-cli/cmd/init.go
index 608d0e1f..c3c00997 100644
--- a/cmd/garm-cli/cmd/init.go
+++ b/cmd/garm-cli/cmd/init.go
@@ -66,7 +66,7 @@ garm-cli init --name=dev --url=https://runner.example.com --username=admin --pas
 
 		url := strings.TrimSuffix(loginURL, "/")
 
-		initApiClient(url, "")
+		initAPIClient(url, "")
 
 		response, err := apiCli.FirstRun.FirstRun(newUserReq, authToken)
 		if err != nil {
diff --git a/cmd/garm-cli/cmd/pool.go b/cmd/garm-cli/cmd/pool.go
index b304b587..47cd821e 100644
--- a/cmd/garm-cli/cmd/pool.go
+++ b/cmd/garm-cli/cmd/pool.go
@@ -451,13 +451,13 @@ func asRawMessage(data []byte) (json.RawMessage, error) {
 		return nil, errors.Wrap(err, "decoding extra specs")
 	}
 
-	var asRawJson json.RawMessage
+	var asRawJSON json.RawMessage
 	var err error
-	asRawJson, err = json.Marshal(unmarshaled)
+	asRawJSON, err = json.Marshal(unmarshaled)
 	if err != nil {
 		return nil, errors.Wrap(err, "marshaling json")
 	}
-	return asRawJson, nil
+	return asRawJSON, nil
 }
 
 func formatPools(pools []params.Pool) {
diff --git a/cmd/garm-cli/cmd/profile.go b/cmd/garm-cli/cmd/profile.go
index 551cb4ad..fe7e36e6 100644
--- a/cmd/garm-cli/cmd/profile.go
+++ b/cmd/garm-cli/cmd/profile.go
@@ -145,7 +145,7 @@ var profileAddCmd = &cobra.Command{
 
 		url := strings.TrimSuffix(loginURL, "/")
 
-		initApiClient(url, "")
+		initAPIClient(url, "")
 
 		newLoginParamsReq := apiClientLogin.NewLoginParams()
 		newLoginParamsReq.Body = params.PasswordLoginParams{
diff --git a/cmd/garm-cli/cmd/root.go b/cmd/garm-cli/cmd/root.go
index ef63ecff..86bd47ac 100644
--- a/cmd/garm-cli/cmd/root.go
+++ b/cmd/garm-cli/cmd/root.go
@@ -20,9 +20,6 @@ import (
 	"os"
 
 	"github.com/go-openapi/runtime"
-	"github.com/jedib0t/go-pretty/v6/table"
-
-
 	openapiRuntimeClient "github.com/go-openapi/runtime/client"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
@@ -63,24 +60,24 @@ func Execute() {
 	}
 }
 
-func initApiClient(baseUrl, token string) {
-	baseUrlParsed, err := url.Parse(baseUrl)
+func initAPIClient(baseURL, token string) {
+	baseURLParsed, err := url.Parse(baseURL)
 	if err != nil {
-		fmt.Printf("Failed to parse base url %s: %s", baseUrl, err)
+		fmt.Printf("Failed to parse base url %s: %s", baseURL, err)
 		os.Exit(1)
 	}
-	apiPath, err := url.JoinPath(baseUrlParsed.Path, apiClient.DefaultBasePath)
+	apiPath, err := url.JoinPath(baseURLParsed.Path, apiClient.DefaultBasePath)
 	if err != nil {
-		fmt.Printf("Failed to join base url path %s with %s: %s", baseUrlParsed.Path, apiClient.DefaultBasePath, err)
+		fmt.Printf("Failed to join base url path %s with %s: %s", baseURLParsed.Path, apiClient.DefaultBasePath, err)
 		os.Exit(1)
 	}
 	if debug {
 		os.Setenv("SWAGGER_DEBUG", "true")
 	}
 	transportCfg := apiClient.DefaultTransportConfig().
-		WithHost(baseUrlParsed.Host).
+		WithHost(baseURLParsed.Host).
 		WithBasePath(apiPath).
-		WithSchemes([]string{baseUrlParsed.Scheme})
+		WithSchemes([]string{baseURLParsed.Scheme})
 	apiCli = apiClient.NewHTTPClientWithConfig(nil, transportCfg)
 	authToken = openapiRuntimeClient.BearerToken(token)
 }
@@ -101,7 +98,7 @@ func initConfig() {
 			mgr = cfg.Managers[0]
 		}
 	}
-	initApiClient(mgr.BaseURL, mgr.Token)
+	initAPIClient(mgr.BaseURL, mgr.Token)
 }
 
 func formatOneHookInfo(hook params.HookInfo) {
diff --git a/cmd/garm-cli/cmd/runner.go b/cmd/garm-cli/cmd/runner.go
index 4613c669..730e0625 100644
--- a/cmd/garm-cli/cmd/runner.go
+++ b/cmd/garm-cli/cmd/runner.go
@@ -21,9 +21,6 @@ import (
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 
-	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/spf13/cobra"
-
 	apiClientEnterprises "github.com/cloudbase/garm/client/enterprises"
 	apiClientInstances "github.com/cloudbase/garm/client/instances"
 	apiClientOrgs "github.com/cloudbase/garm/client/organizations"