Format codebase with gofumpt

cmd/eksctl-anywhere/cmd/deprecated_importimages.go

@@ -112,7 +112,7 @@ func importImages(ctx context.Context, clusterSpecPath string) error {
 	return importCharts(ctx, helmExecutable, bundle.Charts(), endpoint, registryUsername, registryPassword)
 }
 
-func importImage(ctx context.Context, docker *executables.Docker, image string, endpoint string) error {
+func importImage(ctx context.Context, docker *executables.Docker, image, endpoint string) error {
 	if err := docker.PullImage(ctx, image); err != nil {
 		return err
 	}

cmd/eksctl-anywhere/cmd/internal/commands/artifacts/download.go

@@ -31,7 +31,7 @@ type ManifestDownloader interface {
 }
 
 type Packager interface {
-	Package(folder string, dstFile string) error
+	Package(folder, dstFile string) error
 }
 
 type Download struct {

internal/pkg/api/cluster.go

@@ -40,7 +40,7 @@ func WithKubernetesVersion(v anywherev1.KubernetesVersion) ClusterFiller {
 }
 
 // WithBundlesRef sets BundlesRef with the provided name to use.
-func WithBundlesRef(name string, namespace string, apiVersion string) ClusterFiller {
+func WithBundlesRef(name, namespace, apiVersion string) ClusterFiller {
 	return func(c *anywherev1.Cluster) {
 		c.Spec.BundlesRef = &anywherev1.BundlesRef{Name: name, Namespace: namespace, APIVersion: apiVersion}
 	}
@@ -117,7 +117,7 @@ func WithControlPlaneTaints(taints []corev1.Taint) ClusterFiller {
 	}
 }
 
-func WithControlPlaneLabel(key string, val string) ClusterFiller {
+func WithControlPlaneLabel(key, val string) ClusterFiller {
 	return func(c *anywherev1.Cluster) {
 		if c.Spec.ControlPlaneConfiguration.Labels == nil {
 			c.Spec.ControlPlaneConfiguration.Labels = map[string]string{}
@@ -176,7 +176,7 @@ func WithWorkerNodeCount(r int) ClusterFiller {
 }
 
 // WithWorkerNodeAutoScalingConfig adds an autoscaling configuration with a given min and max count.
-func WithWorkerNodeAutoScalingConfig(min int, max int) ClusterFiller {
+func WithWorkerNodeAutoScalingConfig(min, max int) ClusterFiller {
 	return func(c *anywherev1.Cluster) {
 		if len(c.Spec.WorkerNodeGroupConfigurations) == 0 {
 			c.Spec.WorkerNodeGroupConfigurations = []anywherev1.WorkerNodeGroupConfiguration{{Count: ptr.Int(min)}}
@@ -251,7 +251,7 @@ func WithProxyConfig(httpProxy, httpsProxy string, noProxy []string) ClusterFill
 }
 
 // WithRegistryMirror adds a registry mirror configuration.
-func WithRegistryMirror(endpoint, port string, caCert string, authenticate bool, insecureSkipVerify bool) ClusterFiller {
+func WithRegistryMirror(endpoint, port, caCert string, authenticate, insecureSkipVerify bool) ClusterFiller {
 	return func(c *anywherev1.Cluster) {
 		if c.Spec.RegistryMirrorConfiguration == nil {
 			c.Spec.RegistryMirrorConfiguration = &anywherev1.RegistryMirrorConfiguration{}

internal/pkg/api/vsphere.go

@@ -99,7 +99,7 @@ func WithTemplateForAllMachines(value string) VSphereFiller {
 }
 
 // WithMachineTemplate configs template in machine config.
-func WithMachineTemplate(machineConfigName string, template string) VSphereFiller {
+func WithMachineTemplate(machineConfigName, template string) VSphereFiller {
 	return func(config VSphereConfig) {
 		config.machineConfigs[machineConfigName].Spec.Template = template
 	}

internal/pkg/ec2/list.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/logger"
 )
 
-func ListInstances(session *session.Session, key string, value string, maxAge float64) ([]*string, error) {
+func ListInstances(session *session.Session, key, value string, maxAge float64) ([]*string, error) {
 	service := ec2.New(session)
 	var instanceList []*string
 

internal/test/cleanup/cleanup.go

@@ -26,7 +26,7 @@ const (
 	retryBackoff   = 10 * time.Second
 )
 
-func CleanUpAwsTestResources(storageBucket string, maxAge string, tag string) error {
+func CleanUpAwsTestResources(storageBucket, maxAge, tag string) error {
 	session, err := session.NewSession()
 	if err != nil {
 		return fmt.Errorf("creating session: %v", err)

internal/test/e2e/github.go

@@ -10,7 +10,7 @@ import (
 	"github.com/aws/eks-anywhere/pkg/git/providers/github"
 )
 
-func (e *E2ESession) TestGithubClient(ctx context.Context, githubToken string, owner string, repository string, personal bool) (git.ProviderClient, error) {
+func (e *E2ESession) TestGithubClient(ctx context.Context, githubToken, owner, repository string, personal bool) (git.ProviderClient, error) {
 	auth := git.TokenAuth{Token: githubToken, Username: owner}
 	gogithubOpts := gogithub.Options{Auth: auth}
 	githubProviderClient := gogithub.New(ctx, gogithubOpts)

internal/test/e2e/registryMirror.go

@@ -74,7 +74,7 @@ func (e *E2ESession) setupRegistryMirrorEnv(testRegex string) error {
 	return nil
 }
 
-func (e *E2ESession) mountRegistryCert(cert string, endpoint string) error {
+func (e *E2ESession) mountRegistryCert(cert, endpoint string) error {
 	command := fmt.Sprintf("sudo mkdir -p /etc/docker/certs.d/%s", endpoint)
 
 	if err := ssm.Run(e.session, logr.Discard(), e.instanceId, command, ssmTimeout); err != nil {

internal/test/e2e/snow.go

@@ -72,7 +72,7 @@ func (e *E2ESession) setupSnowEnv(testRegex string) error {
 	return nil
 }
 
-func sendFileViaS3(e *E2ESession, s3Path string, filename string) error {
+func sendFileViaS3(e *E2ESession, s3Path, filename string) error {
 	if err := s3.DownloadToDisk(e.session, s3Path, e.storageBucket, "bin/"+filename); err != nil {
 		return err
 	}

pkg/api/v1alpha1/awsiamconfig.go

@@ -14,7 +14,7 @@ const (
 	DefaultAWSIamConfigPartition = "aws"
 )
 
-func GetAndValidateAWSIamConfig(fileName string, refName string, clusterConfig *Cluster) (*AWSIamConfig, error) {
+func GetAndValidateAWSIamConfig(fileName, refName string, clusterConfig *Cluster) (*AWSIamConfig, error) {
 	config, err := getAWSIamConfig(fileName)
 	if err != nil {
 		return nil, err

pkg/api/v1alpha1/cloudstackmachineconfig_types.go

@@ -115,7 +115,7 @@ func (r *CloudStackResourceDiskOffering) IsEmpty() bool {
 		r.Filesystem == "" && r.MountPath == "" && r.CustomSize == 0
 }
 
-func (r *CloudStackResourceDiskOffering) Validate() (err error, field string, value string) {
+func (r *CloudStackResourceDiskOffering) Validate() (err error, field, value string) {
 	if r != nil && (len(r.Id) > 0 || len(r.Name) > 0) {
 		if len(r.MountPath) < 2 || !strings.HasPrefix(r.MountPath, "/") {
 			return errors.New("must be non-empty and start with /"), "mountPath", r.MountPath
@@ -137,7 +137,7 @@ func (r *CloudStackResourceDiskOffering) Validate() (err error, field string, va
 	return nil, "", ""
 }
 
-func (r SymlinkMaps) Validate() (err error, field string, value string) {
+func (r SymlinkMaps) Validate() (err error, field, value string) {
 	isPortableFileNameSet := regexp.MustCompile(`^[a-zA-Z0-9\.\-\_\/]+$`)
 	for key, value := range r {
 		if !strings.HasPrefix(key, "/") || strings.HasSuffix(key, "/") {

pkg/api/v1alpha1/cluster.go

@@ -103,7 +103,7 @@ func WithClusterEndpoint() ClusterGenerateOpt {
 }
 
 // WithCPUpgradeRolloutStrategy allows add UpgradeRolloutStrategy option to cluster config under ControlPlaneConfiguration.
-func WithCPUpgradeRolloutStrategy(maxSurge int, maxUnavailable int) ClusterGenerateOpt {
+func WithCPUpgradeRolloutStrategy(maxSurge, maxUnavailable int) ClusterGenerateOpt {
 	return func(c *ClusterGenerate) {
 		c.Spec.ControlPlaneConfiguration.UpgradeRolloutStrategy = &ControlPlaneUpgradeRolloutStrategy{Type: "RollingUpdate", RollingUpdate: ControlPlaneRollingUpdateParams{MaxSurge: maxSurge}}
 	}
@@ -150,7 +150,7 @@ func WithWorkerMachineGroupRef(ref ProviderRefAccessor) ClusterGenerateOpt {
 }
 
 // WithWorkerMachineUpgradeRolloutStrategy allows add UpgradeRolloutStrategy option to cluster config under WorkerNodeGroupConfiguration.
-func WithWorkerMachineUpgradeRolloutStrategy(maxSurge int, maxUnavailable int) ClusterGenerateOpt {
+func WithWorkerMachineUpgradeRolloutStrategy(maxSurge, maxUnavailable int) ClusterGenerateOpt {
 	return func(c *ClusterGenerate) {
 		c.Spec.WorkerNodeGroupConfigurations[0].UpgradeRolloutStrategy = &WorkerNodesUpgradeRolloutStrategy{
 			Type:          "RollingUpdate",

pkg/api/v1alpha1/cluster_types.go

@@ -397,7 +397,7 @@ func (n *Endpoint) CloudStackEqual(o *Endpoint) bool {
 }
 
 // GetControlPlaneHostPort retrieves the ControlPlaneConfiguration host and port split defined in the cluster.Spec.
-func GetControlPlaneHostPort(pHost string, defaultPort string) (string, string, error) {
+func GetControlPlaneHostPort(pHost, defaultPort string) (string, string, error) {
 	host, port, err := net.SplitHostPort(pHost)
 	if err != nil {
 		if strings.Contains(err.Error(), "missing port") {
@@ -650,7 +650,7 @@ func UsersSliceEqual(a, b []UserConfiguration) bool {
 	return true
 }
 
-func CNIPluginSame(n ClusterNetwork, o ClusterNetwork) bool {
+func CNIPluginSame(n, o ClusterNetwork) bool {
 	if n.CNI != "" {
 		/*This shouldn't be required since we set CNIConfig and unset CNI as part of cluster_defaults. However, while upgrading an existing cluster, the eks-a controller
 		does not set any defaults (no mutating webhook), so it gets stuck in an error loop. Adding these checks to avoid that. We can remove it when removing the CNI field

pkg/api/v1alpha1/machine_types.go

@@ -30,7 +30,7 @@ func defaultMachineConfigUsers(defaultUsername string, users []UserConfiguration
 	return users
 }
 
-func validateMachineConfigUsers(machineConfigName string, machineConfigKind string, users []UserConfiguration) error {
+func validateMachineConfigUsers(machineConfigName, machineConfigKind string, users []UserConfiguration) error {
 	if len(users) == 0 {
 		return fmt.Errorf("users is not set for %s %s, please provide a user", machineConfigKind, machineConfigName)
 	}

pkg/api/v1alpha1/nutanixmachineconfig.go

@@ -217,7 +217,7 @@ func validateNutanixReferences(c *NutanixMachineConfig) error {
 	return nil
 }
 
-func validateNutanixResourceReference(i *NutanixResourceIdentifier, resource string, mcName string) error {
+func validateNutanixResourceReference(i *NutanixResourceIdentifier, resource, mcName string) error {
 	if i.Type != NutanixIdentifierName && i.Type != NutanixIdentifierUUID {
 		return fmt.Errorf("NutanixMachineConfig: invalid identifier type for %s: %s", resource, i.Type)
 	}

pkg/api/v1alpha1/nutanixmachineconfig_webhook_test.go

@@ -222,17 +222,17 @@ func TestValidateUpdate_Invalid(t *testing.T) {
 	g := NewWithT(t)
 	tests := []struct {
 		name string
-		fn   func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig)
+		fn   func(new, old *v1alpha1.NutanixMachineConfig)
 	}{
 		{
 			name: "different os family",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				new.Spec.OSFamily = v1alpha1.Bottlerocket
 			},
 		},
 		{
 			name: "different cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				new.Spec.Cluster = v1alpha1.NutanixResourceIdentifier{
 					Type: v1alpha1.NutanixIdentifierName,
 					Name: ptr.String("cluster-2"),
@@ -241,7 +241,7 @@ func TestValidateUpdate_Invalid(t *testing.T) {
 		},
 		{
 			name: "different subnet",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				new.Spec.Subnet = v1alpha1.NutanixResourceIdentifier{
 					Type: v1alpha1.NutanixIdentifierName,
 					Name: ptr.String("subnet-2"),
@@ -250,42 +250,42 @@ func TestValidateUpdate_Invalid(t *testing.T) {
 		},
 		{
 			name: "old cluster is managed",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				new.Spec.OSFamily = v1alpha1.Bottlerocket
 				old.SetManagedBy("test")
 			},
 		},
 		{
 			name: "mismatch vcpu sockets on control plane cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				old.SetControlPlane()
 				new.Spec.VCPUSockets++
 			},
 		},
 		{
 			name: "mismatch vcpu per socket on control plane cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				old.SetControlPlane()
 				new.Spec.VCPUsPerSocket++
 			},
 		},
 		{
 			name: "mismatch memory size on control plane cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				old.SetControlPlane()
 				new.Spec.MemorySize.Add(resource.MustParse("1Gi"))
 			},
 		},
 		{
 			name: "mismatch system disk size on control plane cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				old.SetControlPlane()
 				new.Spec.SystemDiskSize.Add(resource.MustParse("1Gi"))
 			},
 		},
 		{
 			name: "mismatch users on control plane cluster",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				old.SetControlPlane()
 				new.Spec.Users = append(new.Spec.Users, v1alpha1.UserConfiguration{
 					Name: "another-user",
@@ -294,7 +294,7 @@ func TestValidateUpdate_Invalid(t *testing.T) {
 		},
 		{
 			name: "invalid vcpus per socket",
-			fn: func(new *v1alpha1.NutanixMachineConfig, old *v1alpha1.NutanixMachineConfig) {
+			fn: func(new, old *v1alpha1.NutanixMachineConfig) {
 				new.Spec.VCPUsPerSocket = 0
 			},
 		},

pkg/api/v1alpha1/oidcconfig.go

@@ -10,7 +10,7 @@ import (
 
 const OIDCConfigKind = "OIDCConfig"
 
-func GetAndValidateOIDCConfig(fileName string, refName string, clusterConfig *Cluster) (*OIDCConfig, error) {
+func GetAndValidateOIDCConfig(fileName, refName string, clusterConfig *Cluster) (*OIDCConfig, error) {
 	config, err := getOIDCConfig(fileName)
 	if err != nil {
 		return nil, err

pkg/api/v1alpha1/tinkerbelltemplateconfig_defaults.go

@@ -171,7 +171,7 @@ func withDisableCloudInitNetworkCapabilities(b v1alpha1.VersionsBundle, disk str
 	}
 }
 
-func withTinkCloudInitAction(b v1alpha1.VersionsBundle, disk string, metadataURLs string) ActionOpt {
+func withTinkCloudInitAction(b v1alpha1.VersionsBundle, disk, metadataURLs string) ActionOpt {
 	return func(a *[]tinkerbell.Action) {
 		*a = append(*a, tinkerbell.Action{
 			Name:    "add-tink-cloud-init-config",
@@ -244,7 +244,7 @@ func withBottlerocketBootconfigAction(b v1alpha1.VersionsBundle, disk string) Ac
 	}
 }
 
-func withBottlerocketUserDataAction(b v1alpha1.VersionsBundle, disk string, metadataURLs string) ActionOpt {
+func withBottlerocketUserDataAction(b v1alpha1.VersionsBundle, disk, metadataURLs string) ActionOpt {
 	return func(a *[]tinkerbell.Action) {
 		*a = append(*a, tinkerbell.Action{
 			Name:    "write-user-data",

pkg/api/v1alpha1/vspheredatacenterconfig.go

@@ -53,7 +53,7 @@ func GetVSphereDatacenterConfig(fileName string) (*VSphereDatacenterConfig, erro
 	return &clusterConfig, nil
 }
 
-func generateFullVCenterPath(foldType folderType, folderPath string, datacenter string) string {
+func generateFullVCenterPath(foldType folderType, folderPath, datacenter string) string {
 	if folderPath == "" {
 		return folderPath
 	}
@@ -69,7 +69,7 @@ func generateFullVCenterPath(foldType folderType, folderPath string, datacenter
 	return modPath
 }
 
-func validatePath(foldType folderType, folderPath string, datacenter string) error {
+func validatePath(foldType folderType, folderPath, datacenter string) error {
 	prefix := filepath.Join(fmt.Sprintf("/%s", datacenter), string(foldType))
 	if !strings.HasPrefix(folderPath, prefix) {
 		return fmt.Errorf("invalid path, expected path [%s] to be under [%s]", folderPath, prefix)

pkg/aws/snow.go

@@ -78,7 +78,7 @@ func WithCustomCABundleFile(certsFile string) AwsConfigOpt {
 // WithSnowEndpointAccess gathers all the config's LoadOptions for snow,
 // which includes snowball ec2 endpoint, snow credentials for a specific profile,
 // and CA bundles for accessing the https endpoint.
-func WithSnowEndpointAccess(deviceIP string, certsFile, credsFile string) AwsConfigOpt {
+func WithSnowEndpointAccess(deviceIP, certsFile, credsFile string) AwsConfigOpt {
 	return AwsConfigOptSet(
 		WithCustomCABundleFile(certsFile),
 		config.WithSharedCredentialsFiles([]string{credsFile}),

pkg/awsiamauth/client.go

@@ -18,7 +18,7 @@ import (
 type Client interface {
 	ApplyKubeSpecFromBytes(ctx context.Context, cluster *types.Cluster, data []byte) error
 	GetApiServerUrl(ctx context.Context, cluster *types.Cluster) (string, error)
-	GetObject(ctx context.Context, resourceType string, name string, namespace string, kubeconfig string, obj runtime.Object) error
+	GetObject(ctx context.Context, resourceType, name, namespace, kubeconfig string, obj runtime.Object) error
 }
 
 // RetrierClient wraps basic kubernetes API operations around a retrier.

pkg/bootstrapper/client.go

@@ -25,7 +25,7 @@ type KubernetesClient interface {
 	ApplyKubeSpecFromBytes(ctx context.Context, cluster *types.Cluster, data []byte) error
 	GetClusters(ctx context.Context, cluster *types.Cluster) ([]types.CAPICluster, error)
 	ValidateClustersCRD(ctx context.Context, cluster *types.Cluster) error
-	CreateNamespaceIfNotPresent(ctx context.Context, kubeconfig string, namespace string) error
+	CreateNamespaceIfNotPresent(ctx context.Context, kubeconfig, namespace string) error
 }
 
 // RetrierClientOpt allows to customize a RetrierClient

pkg/clustermanager/client.go

@@ -16,7 +16,7 @@ type KubernetesClient interface {
 	ApplyKubeSpecFromBytes(ctx context.Context, cluster *types.Cluster, data []byte) error
 	ApplyKubeSpecFromBytesWithNamespace(ctx context.Context, cluster *types.Cluster, data []byte, namespace string) error
 	ApplyKubeSpecFromBytesForce(ctx context.Context, cluster *types.Cluster, data []byte) error
-	WaitForDeployment(ctx context.Context, cluster *types.Cluster, timeout string, condition string, target string, namespace string) error
+	WaitForDeployment(ctx context.Context, cluster *types.Cluster, timeout, condition, target, namespace string) error
 	UpdateAnnotationInNamespace(ctx context.Context, resourceType, objectName string, annotations map[string]string, cluster *types.Cluster, namespace string) error
 	RemoveAnnotationInNamespace(ctx context.Context, resourceType, objectName, key string, cluster *types.Cluster, namespace string) error
 }