lint fixes

Author: andfasano

cmd/node-joiner/main.go

@@ -10,7 +10,6 @@ import (
 )
 
 func main() {
-
 	wd, err := os.Getwd()
 	if err != nil {
 		logrus.Fatal(err)

pkg/asset/agent/joiner/addnodesconfig.go

@@ -7,32 +7,33 @@ import (
 	"path/filepath"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/pkg/errors"
 )
 
 const (
 	addNodesParamsFile = ".addnodesparams"
 )
 
+// AddNodesConfig is used to store the current configuration
+// for the command.
 type AddNodesConfig struct {
 	File   *asset.File
 	Params Params
 }
 
-// Params is used to store the command line parameters
+// Params is used to store the command line parameters.
 type Params struct {
 	Kubeconfig string `json:"kubeconfig,omitempty"`
 }
 
-// Save stores the current parameters on disk
+// Save stores the current parameters on disk.
 func (p *Params) Save(assetsDir string) error {
 	data, err := json.Marshal(p)
 	if err != nil {
 		return err
 	}
 
 	fileName := filepath.Join(assetsDir, addNodesParamsFile)
-	return os.WriteFile(fileName, data, 0o644)
+	return os.WriteFile(fileName, data, 0o600)
 }
 
 // Name returns the human-friendly name of the asset.

pkg/asset/agent/joiner/clusterinfo.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"net/url"
 
-	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
+	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent/workflow"
 )
@@ -18,7 +18,7 @@ import (
 // from an already existing cluster.
 type ClusterInfo struct {
 	ClusterID  string
-	ApiDnsName string
+	APIDNSName string
 	PullSecret string
 }
 
@@ -58,7 +58,7 @@ func (ci *ClusterInfo) Generate(dependencies asset.Parents) error {
 		return err
 	}
 
-	err = ci.retrieveApiDnsName(config)
+	err = ci.retrieveAPIDNSName(config)
 	if err != nil {
 		return err
 	}
@@ -99,14 +99,13 @@ func (ci *ClusterInfo) retrieveClusterID(config *rest.Config) error {
 	return nil
 }
 
-func (ci *ClusterInfo) retrieveApiDnsName(config *rest.Config) error {
-
-	parsedUrl, err := url.Parse(config.Host)
+func (ci *ClusterInfo) retrieveAPIDNSName(config *rest.Config) error {
+	parsedURL, err := url.Parse(config.Host)
 	if err != nil {
 		return err
 	}
 
-	ci.ApiDnsName = parsedUrl.Hostname()
+	ci.APIDNSName = parsedURL.Hostname()
 	return nil
 }
 

pkg/asset/agent/workflow/agentworkflow.go

@@ -5,11 +5,10 @@ import (
 	"os"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/pkg/errors"
 )
 
 // AgentWorkflow allows other assets to check
-// which is the workflow currently active
+// which is the workflow currently active.
 type AgentWorkflow struct {
 	File     *asset.File
 	Workflow AgentWorkflowType
@@ -30,7 +29,6 @@ func (*AgentWorkflow) Dependencies() []asset.Asset {
 
 // Generate generates the AgentWorkflow asset.
 func (a *AgentWorkflow) Generate(dependencies asset.Parents) error {
-
 	// Set install workflow as a default
 	a.Workflow = AgentWorkflowTypeInstall
 	a.File = &asset.File{
@@ -56,7 +54,7 @@ func (a *AgentWorkflow) Load(f asset.FileFetcher) (bool, error) {
 		if os.IsNotExist(err) {
 			return false, nil
 		}
-		return false, errors.Wrap(err, fmt.Sprintf("failed to load %s file", agentWorkflowFilename))
+		return false, fmt.Errorf("failed to load %s file: %w", agentWorkflowFilename, err)
 	}
 
 	// Get the current workflow

pkg/asset/agent/workflow/agentworkflowaddnodes.go

@@ -3,7 +3,7 @@ package workflow
 import "github.com/openshift/installer/pkg/asset"
 
 // AgentWorkflowAddNodes is meant just to define
-// the add nodes workflow
+// the add nodes workflow.
 type AgentWorkflowAddNodes struct {
 	AgentWorkflow
 }
@@ -17,7 +17,6 @@ func (*AgentWorkflowAddNodes) Name() string {
 
 // Generate generates the AgentWorkflow asset.
 func (a *AgentWorkflowAddNodes) Generate(dependencies asset.Parents) error {
-
 	a.Workflow = AgentWorkflowTypeAddNodes
 	a.File = &asset.File{
 		Filename: agentWorkflowFilename,

pkg/asset/agent/workflow/commons.go

@@ -5,7 +5,9 @@ package workflow
 type AgentWorkflowType string
 
 const (
-	AgentWorkflowTypeInstall  AgentWorkflowType = "install"
+	// AgentWorkflowTypeInstall identifies the install workflow.
+	AgentWorkflowTypeInstall AgentWorkflowType = "install"
+	// AgentWorkflowTypeAddNodes identifies the add nodes workflow.
 	AgentWorkflowTypeAddNodes AgentWorkflowType = "addnodes"
 
 	agentWorkflowFilename = ".agentworkflow"

pkg/nodejoiner/addnodes.go

@@ -9,13 +9,15 @@ import (
 
 // NewAddNodesCommand creates a new command for add nodes.
 func NewAddNodesCommand(directory string, kubeConfig string) error {
-
 	// Store the current parameters into the assets folder, so
 	// that they could be retrieved later by the assets
 	params := joiner.Params{
 		Kubeconfig: kubeConfig,
 	}
-	params.Save(directory)
+	err := params.Save(directory)
+	if err != nil {
+		return err
+	}
 
 	fetcher := store.NewAssetsFetcher(directory)
 	return fetcher.FetchAndPersist([]asset.WritableAsset{