Reactivate some previously removed linters (#4204)

Also fix the various errors reactivation found

Author: matthchr

.golangci.yml

@@ -5,7 +5,9 @@ run:
 linters:
   enable:
     - gofmt
-    - megacheck
+    - staticcheck
+    - gosimple
+    - unused
     - tparallel
     - paralleltest
     - prealloc
@@ -15,11 +17,16 @@ linters:
     - unused
   disable:
     # The below rules are disabled due to bug with go1.18 and generics: https://github.com/golangci/golangci-lint/issues/2859
-    - staticcheck
-    - gosimple
     - stylecheck
-    - unused
     - musttag # Extremely slow, at least on CI machines
 linters-settings:
   govet:
     check-shadowing: true
+  unused:
+    generated-is-used: true
+  gosimple:
+    # See https://golangci-lint.run/usage/linters#gosimple for a breakdown of what's checked by this linter
+    checks:
+      - "all"
+      - "-S1002" # Comparison to bool explicitly can sometimes add clarity
+      - "-S1016" # Uncommon language feature, encourages coupling when it may not be appropriate

v2/api/dataprotection/customizations/backup_vaults_backup_instance_extensions.go

@@ -107,8 +107,7 @@ func (extension *BackupVaultsBackupInstanceExtension) PostReconcileCheck(
 
 	if protectionStatus == protectionError {
 		// call sync api only when protection status is ProtectionError and error code is usererror
-		var protectionStatusErrorCode string
-		protectionStatusErrorCode = strings.ToLower(*backupInstance.Status.Properties.ProtectionStatus.ErrorDetails.Code)
+		protectionStatusErrorCode := strings.ToLower(*backupInstance.Status.Properties.ProtectionStatus.ErrorDetails.Code)
 		log.V(Debug).Info(fmt.Sprintf("Protection Error code is  %q", protectionStatusErrorCode))
 
 		if strings.Contains(protectionStatusErrorCode, "usererror") {

v2/api/dbformariadb/customizations/server_extensions.go

@@ -61,11 +61,7 @@ func secretsSpecified(obj *mariadb.Server) bool {
 	}
 
 	secrets := obj.Spec.OperatorSpec.Secrets
-	if secrets.FullyQualifiedDomainName != nil {
-		return true
-	}
-
-	return false
+	return secrets.FullyQualifiedDomainName != nil
 }
 
 func secretsToWrite(obj *mariadb.Server) ([]*v1.Secret, error) {

v2/api/dbformysql/customizations/flexible_server_extensions.go

@@ -61,11 +61,7 @@ func secretsSpecified(obj *mysql.FlexibleServer) bool {
 	}
 
 	secrets := obj.Spec.OperatorSpec.Secrets
-	if secrets.FullyQualifiedDomainName != nil {
-		return true
-	}
-
-	return false
+	return secrets.FullyQualifiedDomainName != nil
 }
 
 func secretsToWrite(obj *mysql.FlexibleServer) ([]*v1.Secret, error) {

v2/api/dbforpostgresql/customizations/flexible_server_extensions.go

@@ -67,11 +67,7 @@ func secretsSpecified(obj *postgresql.FlexibleServer) bool {
 	}
 
 	operatorSecrets := obj.Spec.OperatorSpec.Secrets
-	if operatorSecrets.FullyQualifiedDomainName != nil {
-		return true
-	}
-
-	return false
+	return operatorSecrets.FullyQualifiedDomainName != nil
 }
 
 func secretsToWrite(obj *postgresql.FlexibleServer) ([]*v1.Secret, error) {

v2/api/machinelearningservices/customizations/workspace_extension.go

@@ -124,8 +124,6 @@ func secretsToWrite(obj *storage.Workspace, keysResp armmachinelearning.ListWork
 		collector.AddValue(operatorSpecSecrets.PrimaryNotebookAccessKey, to.Value(keysResp.NotebookAccessKeys.PrimaryAccessKey))
 		collector.AddValue(operatorSpecSecrets.SecondaryNotebookAccessKey, to.Value(keysResp.NotebookAccessKeys.SecondaryAccessKey))
 	}
-	if keysResp.ContainerRegistryCredentials != nil {
-	}
 
 	return collector.Values()
 }

v2/api/network/customizations/private_endpoints_extensions.go

@@ -90,7 +90,7 @@ func (extension *PrivateEndpointExtension) ExportKubernetesResources(
 		return nil, nil
 	}
 
-	if endpoint.Status.NetworkInterfaces == nil || len(endpoint.Status.NetworkInterfaces) == 0 {
+	if len(endpoint.Status.NetworkInterfaces) == 0 {
 		log.V(Debug).Info("no configmap retrieval to perform as there are no NetworkInterfaces attached")
 		return nil, nil
 	}

v2/cmd/asoctl/internal/importing/resource_importer_report.go

@@ -37,12 +37,6 @@ const (
 	Failed   resourceImportReportStatus = "Failed"
 )
 
-var resourceImportReportStatusOrder = map[resourceImportReportStatus]int{
-	Imported: 0,
-	Skipped:  1,
-	Failed:   2,
-}
-
 // newResourceImportReport creates a new resourceImportReport
 func newResourceImportReport() *resourceImportReport {
 	return &resourceImportReport{

v2/cmd/controller/main.go

@@ -17,7 +17,7 @@ import (
 
 func main() {
 	setupLog := ctrl.Log.WithName("setup")
-	ctrl.SetLogger(klogr.New())
+	ctrl.SetLogger(klogr.New()) //nolint: staticcheck
 	ctx := ctrl.SetupSignalHandler()
 
 	flgs, err := app.ParseFlags(os.Args)

v2/internal/controllers/cdn_profile_afd_test.go

@@ -12,8 +12,6 @@ import (
 
 	cdn "github.com/Azure/azure-service-operator/v2/api/cdn/v1api20230501"
 	frontdoor "github.com/Azure/azure-service-operator/v2/api/network.frontdoor/v1api20220501"
-	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
-
 	"github.com/Azure/azure-service-operator/v2/internal/testcommon"
 	"github.com/Azure/azure-service-operator/v2/internal/util/to"
 )
@@ -127,17 +125,6 @@ func Test_CDN_Profile_AFD_CRUD(t *testing.T) {
 	tc.Expect(profile.Status.Id).To(tc.MatchAzure.BeDeleted(string(cdn.APIVersion_Value)))
 }
 
-func expectCDNDeleteSucceeds(tc *testcommon.KubePerTestContext, obj genruntime.ARMMetaObject, id string) {
-	tc.DeleteResourceAndWait(obj)
-
-	exists, _, err := tc.AzureClient.CheckExistenceWithGetByID(
-		tc.Ctx,
-		id,
-		string(cdn.APIVersion_Value))
-	tc.Expect(err).ToNot(HaveOccurred())
-	tc.Expect(exists).To(BeFalse())
-}
-
 func newAFDEndpoint(tc *testcommon.KubePerTestContext, profile *cdn.Profile) *cdn.AfdEndpoint {
 	return &cdn.AfdEndpoint{
 		ObjectMeta: tc.MakeObjectMeta("cdn-endpoint"),