Apply gofmt, golangci-lint.

cmd/akamai/command.go

@@ -98,7 +98,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 
 	return createCmd

cmd/akamai/create.go

@@ -50,7 +50,6 @@ func createAkamai(cmd *cobra.Command, args []string) error {
 	utilities.CreateK1ClusterDirectory(clusterNameFlag)
 
 	gitAuth, err := gitShim.ValidateGitCredentials(cliFlags.GitProvider, cliFlags.GithubOrg, cliFlags.GitlabGroup)
-
 	if err != nil {
 		progress.Error(err.Error())
 		return nil

cmd/aws/command.go

@@ -38,11 +38,6 @@ var (
 	installCatalogApps       string
 	installKubefirstProFlag  bool
 
-	// RootCredentials
-	copyArgoCDPasswordToClipboardFlag bool
-	copyKbotPasswordToClipboardFlag   bool
-	copyVaultPasswordToClipboardFlag  bool
-
 	// Supported argument arrays
 	supportedDNSProviders        = []string{"aws", "cloudflare"}
 	supportedGitProviders        = []string{"github", "gitlab"}
@@ -100,7 +95,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 	createCmd.Flags().BoolVar(&ecrFlag, "ecr", false, "whether or not to use ecr vs the git provider")
 	createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")
@@ -118,7 +113,6 @@ func Destroy() *cobra.Command {
 	}
 
 	return destroyCmd
-
 }
 
 func Quota() *cobra.Command {

cmd/aws/create.go

@@ -62,7 +62,6 @@ func createAws(cmd *cobra.Command, args []string) error {
 		Config: awsinternal.NewAwsV2(cloudRegionFlag),
 	}
 	creds, err := awsClient.Config.Credentials.Retrieve(aws.BackgroundContext())
-
 	if err != nil {
 		progress.Error(err.Error())
 		return nil
@@ -80,7 +79,6 @@ func createAws(cmd *cobra.Command, args []string) error {
 	}
 
 	gitAuth, err := gitShim.ValidateGitCredentials(cliFlags.GitProvider, cliFlags.GithubOrg, cliFlags.GitlabGroup)
-
 	if err != nil {
 		progress.Error(err.Error())
 		return nil

cmd/aws/quota.go

@@ -35,7 +35,6 @@ func printAwsQuotaWarning(messageHeader string, output map[string][]awsinternal.
 
 	// Write to logs, but also output to stdout
 	return createAwsQuotaWarning.String()
-
 }
 
 // evalAwsQuota provides an interface to the command-line
@@ -53,7 +52,7 @@ func evalAwsQuota(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	var messageHeader = fmt.Sprintf(
+	messageHeader := fmt.Sprintf(
 		"AWS Quota Health\nRegion: %s\n\nIf you encounter issues deploying your kubefirst cluster, check these quotas and determine if you need to request a limit increase.",
 		cloudRegionFlag,
 	)

cmd/civo/command.go

@@ -111,7 +111,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 	createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")
 

cmd/civo/create.go

@@ -50,7 +50,6 @@ func createCivo(cmd *cobra.Command, args []string) error {
 	utilities.CreateK1ClusterDirectory(clusterNameFlag)
 
 	gitAuth, err := gitShim.ValidateGitCredentials(cliFlags.GitProvider, cliFlags.GithubOrg, cliFlags.GitlabGroup)
-
 	if err != nil {
 		progress.Error(err.Error())
 		return nil

cmd/civo/quota.go

@@ -132,7 +132,7 @@ func returnCivoQuotaEvaluation(cloudRegion string) (string, int, int, error) {
 	}
 
 	// Parse the entire message
-	var messageHeader = fmt.Sprintf("Civo Quota Health\nRegion: %s\n\nNote that if any of these are approaching their limits, you may want to increase them.", cloudRegion)
+	messageHeader := fmt.Sprintf("Civo Quota Health\nRegion: %s\n\nNote that if any of these are approaching their limits, you may want to increase them.", cloudRegion)
 	sort.Strings(output)
 	result := printCivoQuotaWarning(messageHeader, output)
 
@@ -164,7 +164,6 @@ func printCivoQuotaWarning(messageHeader string, output []string) string {
 
 	// Write to logs, but also output to stdout
 	return createCivoQuotaWarning.String()
-
 }
 
 // evalCivoQuota provides an interface to the command-line

cmd/digitalocean/command.go

@@ -104,7 +104,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 	createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")
 

cmd/digitalocean/create.go

@@ -56,7 +56,6 @@ func createDigitalocean(cmd *cobra.Command, args []string) error {
 	utilities.CreateK1ClusterDirectory(clusterNameFlag)
 
 	gitAuth, err := gitShim.ValidateGitCredentials(cliFlags.GitProvider, cliFlags.GithubOrg, cliFlags.GitlabGroup)
-
 	if err != nil {
 		progress.Error(err.Error())
 		return nil

cmd/google/command.go

@@ -108,7 +108,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 	createCmd.Flags().BoolVar(&forceDestroyFlag, "force-destroy", false, "allows force destruction on objects (helpful for test environments, defaults to false)")
 	createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")

cmd/info.go

@@ -20,7 +20,6 @@ var infoCmd = &cobra.Command{
 	Short: "provides general Kubefirst setup data",
 	Long:  `Provides machine data, files and folders paths`,
 	Run: func(cmd *cobra.Command, args []string) {
-
 		config := configs.ReadConfig()
 
 		content := `

cmd/k3d/command.go

@@ -96,7 +96,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values of catalog apps to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values of catalog apps to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 
 	return createCmd

cmd/k3d/create.go

@@ -9,6 +9,7 @@ package k3d
 import (
 	"context"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"net/http"
 	"os"
@@ -54,10 +55,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	cancelContext context.CancelFunc
-)
-
 func runK3d(cmd *cobra.Command, args []string) error {
 	ciFlag, err := cmd.Flags().GetBool("ci")
 	if err != nil {
@@ -137,22 +134,22 @@ func runK3d(cmd *cobra.Command, args []string) error {
 	case "github":
 		key, err := internalssh.GetHostKey("github.com")
 		if err != nil {
-			return fmt.Errorf("known_hosts file does not exist - please run `ssh-keyscan github.com >> ~/.ssh/known_hosts` to remedy")
+			return errors.New("known_hosts file does not exist - please run `ssh-keyscan github.com >> ~/.ssh/known_hosts` to remedy")
 		} else {
 			log.Info().Msgf("%s %s\n", "github.com", key.Type())
 		}
 	case "gitlab":
 		key, err := internalssh.GetHostKey("gitlab.com")
 		if err != nil {
-			return fmt.Errorf("known_hosts file does not exist - please run `ssh-keyscan gitlab.com >> ~/.ssh/known_hosts` to remedy")
+			return errors.New("known_hosts file does not exist - please run `ssh-keyscan gitlab.com >> ~/.ssh/known_hosts` to remedy")
 		} else {
 			log.Info().Msgf("%s %s\n", "gitlab.com", key.Type())
 		}
 	}
 
 	// Either user or org can be specified for github, not both
 	if githubOrgFlag != "" && githubUserFlag != "" {
-		return fmt.Errorf("only one of --github-user or --github-org can be supplied")
+		return errors.New("only one of --github-user or --github-org can be supplied")
 	}
 
 	// Check for existing port forwards before continuing
@@ -171,8 +168,8 @@ func runK3d(cmd *cobra.Command, args []string) error {
 	// }
 
 	// Global context
-	var ctx context.Context
-	ctx, cancelContext = context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 
 	// Clients
 	httpClient := http.DefaultClient
@@ -357,7 +354,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 		}
 	default:
 		switch gitopsTemplateURLFlag {
-		case "https://github.com/kubefirst/gitops-template.git": //default value
+		case "https://github.com/kubefirst/gitops-template.git": // default value
 			if gitopsTemplateBranchFlag == "" {
 				gitopsTemplateBranchFlag = configs.K1Version
 			}
@@ -366,7 +363,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 				gitopsTemplateBranchFlag = configs.K1Version
 			}
 		default: // not equal to our defaults
-			if gitopsTemplateBranchFlag == "" { //didn't supply the branch flag but they did supply the  repo flag
+			if gitopsTemplateBranchFlag == "" { // didn't supply the branch flag but they did supply the  repo flag
 				return fmt.Errorf("must supply gitops-template-branch flag when gitops-template-url is overridden")
 			}
 		}
@@ -575,11 +572,11 @@ func runK3d(cmd *cobra.Command, args []string) error {
 			config.GitProvider,
 			clusterNameFlag,
 			clusterTypeFlag,
-			config.DestinationGitopsRepoURL, //default to https for git interactions when creating remotes
+			config.DestinationGitopsRepoURL, // default to https for git interactions when creating remotes
 			config.GitopsDir,
 			gitopsTemplateBranchFlag,
 			gitopsTemplateURLFlag,
-			config.DestinationMetaphorRepoURL, //default to https for git interactions when creating remotes
+			config.DestinationMetaphorRepoURL, // default to https for git interactions when creating remotes
 			config.K1Dir,
 			&gitopsDirectoryTokens,
 			config.MetaphorDir,
@@ -714,7 +711,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		//Push to remotes and use https
+		// Push to remotes and use https
 		// Push gitops repo to remote
 		err = gitopsRepo.Push(
 			&git.PushOptions{
@@ -1142,7 +1139,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 		log.Info().Msgf("Error creating Minio client: %s", err)
 	}
 
-	//define upload object
+	// define upload object
 	objectName := fmt.Sprintf("terraform/%s/terraform.tfstate", config.GitProvider)
 	filePath := config.K1Dir + fmt.Sprintf("/gitops/%s", objectName)
 	contentType := "xl.meta"
@@ -1301,7 +1298,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 		progressPrinter.IncrementTracker("creating-users", 1)
 	}
 
-	//PostRun string replacement
+	// PostRun string replacement
 	progressPrinter.AddTracker("wrapping-up", "Wrapping up", 2)
 	progressPrinter.SetupProgress(progressPrinter.TotalOfTrackers(), false)
 
@@ -1316,7 +1313,7 @@ func runK3d(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		log.Info().Msgf("error opening repo at: %s", config.GitopsDir)
 	}
-	//check if file exists before rename
+	// check if file exists before rename
 	_, err = os.Stat(fmt.Sprintf("%s/terraform/%s/remote-backend.md", config.GitopsDir, config.GitProvider))
 	if err == nil {
 		err = os.Rename(fmt.Sprintf("%s/terraform/%s/remote-backend.md", config.GitopsDir, config.GitProvider), fmt.Sprintf("%s/terraform/%s/remote-backend.tf", config.GitopsDir, config.GitProvider))

cmd/k3d/destroy.go

@@ -151,7 +151,7 @@ func destroyK3d(cmd *cobra.Command, args []string) error {
 
 			// Before removing Terraform resources, remove any container registry repositories
 			// since failing to remove them beforehand will result in an apply failure
-			var projectsForDeletion = []string{"gitops", "metaphor"}
+			projectsForDeletion := []string{"gitops", "metaphor"}
 			for _, project := range projectsForDeletion {
 				projectExists, err := gitlabClient.CheckProjectExists(project)
 				if err != nil {
@@ -250,7 +250,7 @@ func destroyK3d(cmd *cobra.Command, args []string) error {
 	if _, err := os.Stat(config.K1Dir + "/kubeconfig"); !os.IsNotExist(err) {
 		err = os.Remove(config.K1Dir + "/kubeconfig")
 		if err != nil {
-			return fmt.Errorf("unable to delete %q folder, error: %s", config.K1Dir+"/kubeconfig", err)
+			return fmt.Errorf("unable to delete %q folder, error: %w", config.K1Dir+"/kubeconfig", err)
 		}
 	}
 	time.Sleep(time.Millisecond * 200) // allows progress bars to finish

cmd/k3d/mkcert.go

@@ -48,7 +48,7 @@ func mkCert(cmd *cobra.Command, args []string) error {
 
 	err = k3d.GenerateSingleTLSSecret(kcfg.Clientset, *config, appNameFlag, appNamespaceFlag)
 	if err != nil {
-		return fmt.Errorf("error generating certificate for %s/%s: %s", appNameFlag, appNamespaceFlag, err)
+		return fmt.Errorf("error generating certificate for %s/%s: %w", appNameFlag, appNamespaceFlag, err)
 	}
 
 	log.Infof("Certificate generated. You can use it with an app by setting `tls.secretName: %s-tls` on a Traefik IngressRoute.", appNameFlag)

cmd/k3d/vault.go

@@ -88,7 +88,7 @@ func unsealVault(cmd *cobra.Command, args []string) error {
 						}
 					}
 					if i == 5 {
-						return fmt.Errorf("error passing unseal shard %v to %s: %s", i+1, node, err)
+						return fmt.Errorf("error passing unseal shard %v to %s: %w", i+1, node, err)
 					}
 				}
 				// Wait for key acceptance
@@ -99,7 +99,7 @@ func unsealVault(cmd *cobra.Command, args []string) error {
 					}
 					if sealStatus.Progress > sealStatusTracking || !sealStatus.Sealed {
 						log.Info().Msgf("shard accepted")
-						sealStatusTracking += 1
+						sealStatusTracking++
 						break
 					}
 					log.Info().Msgf("waiting for node %s to accept unseal shard", node)

cmd/k3s/command.go

@@ -105,7 +105,7 @@ func Create() *cobra.Command {
 	createCmd.Flags().StringVar(&gitlabGroupFlag, "gitlab-group", "", "the GitLab group for the new gitops and metaphor projects - required if using gitlab")
 	createCmd.Flags().StringVar(&gitopsTemplateBranchFlag, "gitops-template-branch", "", "the branch to clone for the gitops-template repository")
 	createCmd.Flags().StringVar(&gitopsTemplateURLFlag, "gitops-template-url", "https://github.com/kubefirst/gitops-template.git", "the fully qualified url to the gitops-template repository to clone")
-	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma seperated values to install after provision")
+	createCmd.Flags().StringVar(&installCatalogApps, "install-catalog-apps", "", "comma separated values to install after provision")
 	createCmd.Flags().BoolVar(&useTelemetryFlag, "use-telemetry", true, "whether to emit telemetry")
 	createCmd.Flags().BoolVar(&forceDestroyFlag, "force-destroy", false, "allows force destruction on objects (helpful for test environments, defaults to false)")
 	createCmd.Flags().BoolVar(&installKubefirstProFlag, "install-kubefirst-pro", true, "whether or not to install kubefirst pro")

cmd/launch.go

@@ -13,10 +13,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	// additionalHelmFlags can optionally pass user-supplied flags to helm
-	additionalHelmFlags []string
-)
+// additionalHelmFlags can optionally pass user-supplied flags to helm
+var additionalHelmFlags []string
 
 func LaunchCommand() *cobra.Command {
 	launchCommand := &cobra.Command{

cmd/letsencrypt.go

@@ -14,10 +14,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var (
-	// Certificate check
-	domainNameFlag string
-)
+// Certificate check
+var domainNameFlag string
 
 func LetsEncryptCommand() *cobra.Command {
 	letsEncryptCommand := &cobra.Command{