lint: enable -nolintlint and fix findings

kubernetes-sigs · Aug 30, 2023 · 2d7c049 · 2d7c049
1 parent 61d0956
commit 2d7c049
Show file tree

Hide file tree

Showing 32 changed files with 38 additions and 62 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -37,7 +37,7 @@ linters:
   - nakedret
   - nilerr
   - noctx
-  # - nolintlint
+  - nolintlint
   - nosprintfhostport
   - prealloc
   - predeclared
@@ -55,7 +55,11 @@ linters:
 
 linters-settings:
   gci:
-    local-prefixes: "sigs.k8s.io/cluster-api-provider-vsphere"
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - prefix(sigs.k8s.io/cluster-api-provider-vsphere) # Custom section: groups all imports with the specified Prefix.
+    custom-order: true
   godot:
     #   declarations - for top level declaration comments (default);
     #   toplevel     - for top level comments;

diff --git a/apis/v1alpha3/conversion.go b/apis/v1alpha3/conversion.go
@@ -23,15 +23,11 @@ import (
 )
 
 // Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec is an autogenerated conversion function.
-//
-//nolint:golint,revive,stylecheck
 func Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec(in *v1beta1.VirtualMachineCloneSpec, out *VirtualMachineCloneSpec, s conversion.Scope) error {
 	return autoConvert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec(in, out, s)
 }
 
 // Convert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus is an autogenerated conversion function.
-//
-//nolint:golint,revive,stylecheck
 func Convert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus(in *v1beta1.VSphereVMStatus, out *VSphereVMStatus, s conversion.Scope) error {
 	return autoConvert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus(in, out, s)
 }

diff --git a/apis/v1alpha3/vspherecluster_conversion.go b/apis/v1alpha3/vspherecluster_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha3
 
 import (

diff --git a/apis/v1alpha3/vspheremachine_conversion.go b/apis/v1alpha3/vspheremachine_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha3
 
 import (

diff --git a/apis/v1alpha3/vspheremachinetemplate_conversion.go b/apis/v1alpha3/vspheremachinetemplate_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha3
 
 import (

diff --git a/apis/v1alpha3/vspherevm_conversion.go b/apis/v1alpha3/vspherevm_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha3
 
 import (

diff --git a/apis/v1alpha4/conversion.go b/apis/v1alpha4/conversion.go
@@ -23,8 +23,6 @@ import (
 )
 
 // Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec is an autogenerated conversion function.
-//
-//nolint:golint,revive,stylecheck
 func Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec(in *infrav1.VirtualMachineCloneSpec, out *VirtualMachineCloneSpec, s conversion.Scope) error {
 	return autoConvert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec(in, out, s)
 }

diff --git a/apis/v1alpha4/vspherecluster_conversion.go b/apis/v1alpha4/vspherecluster_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha4
 
 import (

diff --git a/apis/v1alpha4/vsphereclusteridentity_conversion.go b/apis/v1alpha4/vsphereclusteridentity_conversion.go
@@ -29,7 +29,7 @@ func (src *VSphereClusterIdentity) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts from the Hub version (v1beta1) to this VSphereClusterIdentity.
-func (dst *VSphereClusterIdentity) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereClusterIdentity) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereClusterIdentity)
 	return Convert_v1beta1_VSphereClusterIdentity_To_v1alpha4_VSphereClusterIdentity(src, dst, nil)
 }
@@ -41,7 +41,7 @@ func (src *VSphereClusterIdentityList) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts this VSphereClusterIdentityList to the Hub version (v1beta1).
-func (dst *VSphereClusterIdentityList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereClusterIdentityList) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereClusterIdentityList)
 	return Convert_v1beta1_VSphereClusterIdentityList_To_v1alpha4_VSphereClusterIdentityList(src, dst, nil)
 }
diff --git a/apis/v1alpha4/vsphereclusteridentity_types.go b/apis/v1alpha4/vsphereclusteridentity_types.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:godot
 package v1alpha4
 
 import (

diff --git a/apis/v1alpha4/vsphereclustertemplate_conversion.go b/apis/v1alpha4/vsphereclustertemplate_conversion.go
@@ -29,7 +29,7 @@ func (src *VSphereClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts from the Hub version (v1beta1) to this VSphereClusterTemplate.
-func (dst *VSphereClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereClusterTemplate)
 	return Convert_v1beta1_VSphereClusterTemplate_To_v1alpha4_VSphereClusterTemplate(src, dst, nil)
 }
@@ -41,7 +41,7 @@ func (src *VSphereClusterTemplateList) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts this VSphereClusterIdentityList to the Hub version (v1beta1).
-func (dst *VSphereClusterTemplateList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereClusterTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereClusterTemplateList)
 	return Convert_v1beta1_VSphereClusterTemplateList_To_v1alpha4_VSphereClusterTemplateList(src, dst, nil)
 }
diff --git a/apis/v1alpha4/vspheredeploymentzone_conversion.go b/apis/v1alpha4/vspheredeploymentzone_conversion.go
@@ -29,7 +29,7 @@ func (src *VSphereDeploymentZone) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts from the Hub version (v1beta1) to this VSphereDeploymentZone.
-func (dst *VSphereDeploymentZone) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereDeploymentZone) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereDeploymentZone)
 	return Convert_v1beta1_VSphereDeploymentZone_To_v1alpha4_VSphereDeploymentZone(src, dst, nil)
 }
@@ -41,7 +41,7 @@ func (src *VSphereDeploymentZoneList) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts this VSphereDeploymentZoneList to the Hub version (v1beta1).
-func (dst *VSphereDeploymentZoneList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereDeploymentZoneList) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereDeploymentZoneList)
 	return Convert_v1beta1_VSphereDeploymentZoneList_To_v1alpha4_VSphereDeploymentZoneList(src, dst, nil)
 }
diff --git a/apis/v1alpha4/vspherefailuredomain_conversion.go b/apis/v1alpha4/vspherefailuredomain_conversion.go
@@ -29,7 +29,7 @@ func (src *VSphereFailureDomain) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts from the Hub version (v1beta1) to this VSphereFailureDomain.
-func (dst *VSphereFailureDomain) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereFailureDomain) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereFailureDomain)
 	return Convert_v1beta1_VSphereFailureDomain_To_v1alpha4_VSphereFailureDomain(src, dst, nil)
 }
@@ -41,7 +41,7 @@ func (src *VSphereFailureDomainList) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 // ConvertFrom converts this VSphereFailureDomainList to the Hub version (v1beta1).
-func (dst *VSphereFailureDomainList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+func (dst *VSphereFailureDomainList) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1.VSphereFailureDomainList)
 	return Convert_v1beta1_VSphereFailureDomainList_To_v1alpha4_VSphereFailureDomainList(src, dst, nil)
 }
diff --git a/apis/v1alpha4/vspheremachine_conversion.go b/apis/v1alpha4/vspheremachine_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha4
 
 import (

diff --git a/apis/v1alpha4/vspheremachinetemplate_conversion.go b/apis/v1alpha4/vspheremachinetemplate_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:golint,revive,stylecheck
 package v1alpha4
 
 import (
@@ -29,7 +28,7 @@ import (
 
 // ConvertTo.
 func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*infrav1.VSphereMachineTemplate) //nolint:forcetypeassert
+	dst := dstRaw.(*infrav1.VSphereMachineTemplate)
 	if err := Convert_v1alpha4_VSphereMachineTemplate_To_v1beta1_VSphereMachineTemplate(src, dst, nil); err != nil {
 		return err
 	}
@@ -53,7 +52,7 @@ func (src *VSphereMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 }
 
 func (dst *VSphereMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*infrav1.VSphereMachineTemplate) //nolint:forcetypeassert
+	src := srcRaw.(*infrav1.VSphereMachineTemplate)
 	if err := Convert_v1beta1_VSphereMachineTemplate_To_v1alpha4_VSphereMachineTemplate(src, dst, nil); err != nil {
 		return err
 	}
@@ -67,23 +66,21 @@ func (dst *VSphereMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 }
 
 func (src *VSphereMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*infrav1.VSphereMachineTemplateList) //nolint:forcetypeassert
+	dst := dstRaw.(*infrav1.VSphereMachineTemplateList)
 	return Convert_v1alpha4_VSphereMachineTemplateList_To_v1beta1_VSphereMachineTemplateList(src, dst, nil)
 }
 
 func (dst *VSphereMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*infrav1.VSphereMachineTemplateList) //nolint:forcetypeassert
+	src := srcRaw.(*infrav1.VSphereMachineTemplateList)
 	return Convert_v1beta1_VSphereMachineTemplateList_To_v1alpha4_VSphereMachineTemplateList(src, dst, nil)
 }
 
-// nolint
 func Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(in *clusterv1alpha4.ObjectMeta, out *clusterv1.ObjectMeta, s apiconversion.Scope) error {
 	// wrapping the conversion func to avoid having compile errors due to compileErrorOnMissingConversion()
 	// more details at https://github.com/kubernetes/kubernetes/issues/98380
 	return clusterv1alpha4.Convert_v1alpha4_ObjectMeta_To_v1beta1_ObjectMeta(in, out, s)
 }
 
-// nolint
 func Convert_v1beta1_ObjectMeta_To_v1alpha4_ObjectMeta(in *clusterv1.ObjectMeta, out *clusterv1alpha4.ObjectMeta, s apiconversion.Scope) error {
 	// wrapping the conversion func to avoid having compile errors due to compileErrorOnMissingConversion()
 	// more details at https://github.com/kubernetes/kubernetes/issues/98380

diff --git a/apis/v1alpha4/vspherevm_conversion.go b/apis/v1alpha4/vspherevm_conversion.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//nolint:forcetypeassert,golint,revive,stylecheck
 package v1alpha4
 
 import (

diff --git a/apis/v1beta1/vsphereclustertemplate_webhook.go b/apis/v1beta1/vsphereclustertemplate_webhook.go
@@ -43,7 +43,7 @@ func (r *VSphereClusterTemplate) ValidateCreate() (admission.Warnings, error) {
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
 func (r *VSphereClusterTemplate) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
-	old := oldRaw.(*VSphereClusterTemplate) //nolint:forcetypeassert
+	old := oldRaw.(*VSphereClusterTemplate)
 	if !reflect.DeepEqual(r.Spec.Template.Spec, old.Spec.Template.Spec) {
 		return nil, field.Forbidden(field.NewPath("spec", "template", "spec"), "VSphereClusterTemplate spec is immutable")
 	}

diff --git a/apis/v1beta1/vspheremachine_webhook.go b/apis/v1beta1/vspheremachine_webhook.go
@@ -79,8 +79,6 @@ func (m *VSphereMachine) ValidateCreate() (admission.Warnings, error) {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-//
-//nolint:forcetypeassert
 func (m *VSphereMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	if m.Spec.GuestSoftPowerOffTimeout != nil {

diff --git a/apis/v1beta1/vspheremachine_webhook_test.go b/apis/v1beta1/vspheremachine_webhook_test.go
@@ -35,9 +35,7 @@ func TestVsphereMachine_Default(t *testing.T) {
 	g.Expect(m.Spec.Datacenter).To(Equal("*"))
 }
 
-//nolint:all
 func TestVSphereMachine_ValidateCreate(t *testing.T) {
-
 	g := NewWithT(t)
 	tests := []struct {
 		name           string
@@ -107,9 +105,7 @@ func TestVSphereMachine_ValidateCreate(t *testing.T) {
 	}
 }
 
-//nolint:all
 func TestVSphereMachine_ValidateUpdate(t *testing.T) {
-
 	g := NewWithT(t)
 
 	tests := []struct {

diff --git a/apis/v1beta1/vspherevm_webhook.go b/apis/v1beta1/vspherevm_webhook.go
@@ -78,8 +78,6 @@ func (r *VSphereVM) ValidateCreate() (admission.Warnings, error) {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-//
-//nolint:forcetypeassert
 func (r *VSphereVM) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
 	if r.Spec.GuestSoftPowerOffTimeout != nil {

diff --git a/controllers/vmware/test/controllers_suite_test.go b/controllers/vmware/test/controllers_suite_test.go
@@ -65,7 +65,8 @@ func getTestEnv() (*envtest.Environment, *rest.Config) {
 	utilruntime.Must(vmwarev1.AddToScheme(scheme.Scheme))
 
 	// Get the root of the current file to use in CRD paths.
-	_, filename, _, _ := goruntime.Caller(0) //nolint
+	_, filename, _, ok := goruntime.Caller(0)
+	Expect(ok).To(BeTrue(), "Failed to get information for current file from runtime")
 	root := path.Join(path.Dir(filename), "..", "..", "..")
 
 	localTestEnv := &envtest.Environment{

diff --git a/controllers/vmware/test/controllers_test.go b/controllers/vmware/test/controllers_test.go
@@ -355,7 +355,7 @@ var _ = Describe("Reconciliation tests", func() {
 			if err := k8sClient.Get(ctx, key, obj); err != nil {
 				return "", err
 			}
-			vSphereMachine := obj.(*vmwarev1.VSphereMachine) //nolint:forcetypeassert
+			vSphereMachine := obj.(*vmwarev1.VSphereMachine)
 			return vSphereMachine.Status.VMStatus, nil
 		}, time.Second*30).Should(Equal(expectedState))
 	}
@@ -365,7 +365,7 @@ var _ = Describe("Reconciliation tests", func() {
 			if err := k8sClient.Get(ctx, key, obj); err != nil {
 				return "", err
 			}
-			vsphereCluster := obj.(*vmwarev1.VSphereCluster) //nolint:forcetypeassert
+			vsphereCluster := obj.(*vmwarev1.VSphereCluster)
 			return vsphereCluster.Spec.ControlPlaneEndpoint.Host, nil
 		}, time.Second*30).Should(Equal(expectedIP))
 	}

diff --git a/controllers/vspherevm_controller.go b/controllers/vspherevm_controller.go
@@ -69,8 +69,6 @@ import (
 // +kubebuilder:rbac:groups=core,resources=nodes,verbs=get;list;delete
 
 // AddVMControllerToManager adds the VM controller to the provided manager.
-//
-//nolint:forcetypeassert
 func AddVMControllerToManager(ctx *context.ControllerManagerContext, mgr manager.Manager, tracker *remote.ClusterCacheTracker, options controller.Options) error {
 	var (
 		controlledType     = &infrav1.VSphereVM{}

diff --git a/packaging/flavorgen/flavors/util/helpers.go b/packaging/flavorgen/flavors/util/helpers.go
@@ -115,7 +115,7 @@ func deleteZeroValues(o map[string]interface{}) map[string]interface{} {
 			continue
 		}
 		if val.Kind() == reflect.Map {
-			newMap := v.(map[string]interface{}) //nolint:forcetypeassert
+			newMap := v.(map[string]interface{})
 			newMap = deleteZeroValues(newMap)
 			if isZeroValue(reflect.ValueOf(newMap)) {
 				delete(o, k)

diff --git a/pkg/identity/identity_suite_test.go b/pkg/identity/identity_suite_test.go
@@ -53,7 +53,8 @@ func init() {
 	utilruntime.Must(infrav1.AddToScheme(scheme))
 	utilruntime.Must(infrav1alpha3.AddToScheme(scheme))
 
-	_, filename, _, _ := goruntime.Caller(0) //nolint
+	_, filename, _, ok := goruntime.Caller(0)
+	Expect(ok).To(BeTrue(), "Failed to get information for current file from runtime")
 	root := path.Join(path.Dir(filename), "..", "..")
 
 	crdPaths := []string{

diff --git a/pkg/services/govmomi/create_test.go b/pkg/services/govmomi/create_test.go
@@ -29,7 +29,6 @@ import (
 	"sigs.k8s.io/cluster-api-provider-vsphere/test/helpers/vcsim"
 )
 
-//nolint:forcetypeassert
 func TestCreate(t *testing.T) {
 	model := simulator.VPX()
 	model.Host = 0 // ClusterHost only

diff --git a/pkg/services/govmomi/service.go b/pkg/services/govmomi/service.go
@@ -407,7 +407,7 @@ func (vms *VMService) reconcileStoragePolicy(ctx *virtualMachineContext) error {
 
 	disks := devices.SelectByType((*types.VirtualDisk)(nil))
 	for _, d := range disks {
-		disk := d.(*types.VirtualDisk) //nolint:forcetypeassert
+		disk := d.(*types.VirtualDisk)
 		found := false
 		// entities associated with storage policy has key in the form <vm-ID>:<disk>
 		diskID := fmt.Sprintf("%s:%d", ctx.Obj.Reference().Value, disk.Key)

diff --git a/pkg/services/govmomi/vcenter/clone.go b/pkg/services/govmomi/vcenter/clone.go
@@ -345,7 +345,7 @@ func getDiskSpec(ctx *context.VMContext, devices object.VirtualDeviceList) ([]ty
 
 	// There is at least one disk
 	var diskSpecs []types.BaseVirtualDeviceConfigSpec
-	primaryDisk := disks[0].(*types.VirtualDisk) //nolint:forcetypeassert
+	primaryDisk := disks[0].(*types.VirtualDisk)
 	primaryCloneCapacityKB := int64(ctx.VSphereVM.Spec.DiskGiB) * 1024 * 1024
 	primaryDiskConfigSpec, err := getDiskConfigSpec(primaryDisk, primaryCloneCapacityKB)
 	if err != nil {