FEATURE/fix-linter-issues (#529)

Author: ajanikow

Makefile

@@ -123,7 +123,9 @@ ifdef VERBOSE
 	TESTVERBOSEOPTIONS := -v
 endif
 
-SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
+SOURCES_QUERY := find $(SRCDIR) -name '*.go' -type f -not -path '$(SRCDIR)/tests/*' -not -path '$(SRCDIR)/vendor/*' -not -path '$(SRCDIR)/.gobuild/*' -not -path '$(SRCDIR)/deps/*' -not -path '$(SRCDIR)/tools/*'
+SOURCES := $(shell $(SOURCES_QUERY))
+SOURCES_PACKAGES := $(shell $(SOURCES_QUERY) -exec dirname {} \; | sort | uniq)
 DASHBOARDSOURCES := $(shell find $(DASHBOARDDIR)/src -name '*.js' -not -path './test/*') $(DASHBOARDDIR)/package.json
 
 ifndef ARANGOSYNCSRCDIR
@@ -157,13 +159,22 @@ allall: all
 # Tip: Run `eval $(minikube docker-env)` before calling make if you're developing on minikube.
 #
 
+GOLANGCI_ENABLED=deadcode gocyclo golint varcheck structcheck maligned errcheck \
+                 ineffassign interfacer unconvert goconst \
+                 megacheck
+
+#GOLANGCI_ENABLED+=dupl - disable dupl check
+
 .PHONY: fmt
 fmt:
-	golangci-lint run --no-config --issues-exit-code=1 --deadline=30m --disable-all --enable=deadcode --enable=gocyclo \
-	                  --enable=golint --enable=varcheck --enable=structcheck --enable=maligned --enable=errcheck \
-	                  --enable=dupl --enable=ineffassign --enable=interfacer --enable=unconvert --enable=goconst \
-	                  --enable=gosec --enable=megacheck --exclude-use-default=false \
-	                  $(ROOTDIR)/pkg/backup/...
+	@goimports -w $(SOURCES)
+
+.PHONY: linter
+linter: fmt
+	@golangci-lint run --no-config --issues-exit-code=1 --deadline=30m --disable-all \
+	                  $(foreach MODE,$(GOLANGCI_ENABLED),--enable $(MODE) ) \
+	                  --exclude-use-default=false \
+	                  $(SOURCES_PACKAGES)
 
 .PHONY: build
 build: docker docker-ubi manifests

main.go

@@ -31,6 +31,8 @@ import (
 	"strings"
 	"time"
 
+	utilsError "github.com/arangodb/kube-arangodb/pkg/util/errors"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
@@ -232,7 +234,7 @@ func cmdMainRun(cmd *cobra.Command, args []string) {
 	}); err != nil {
 		cliLog.Fatal().Err(err).Msg("Failed to create HTTP server")
 	} else {
-		go svr.Run()
+		go utilsError.LogError(cliLog, "error while starting service", svr.Run)
 	}
 
 	//	startChaos(context.Background(), cfg.KubeCli, cfg.Namespace, chaosLevel)

pkg/apis/backup/definitions.go

@@ -38,4 +38,4 @@ var (
 	ArangoBackupShortNames = []string{"arangobackup"}
 
 	ArangoBackupPolicyShortNames = []string{"arangobackuppolicy"}
-)
+)

pkg/apis/backup/v1/backup_status.go

@@ -80,7 +80,7 @@ func (a *ArangoBackupDetails) Equal(b *ArangoBackupDetails) bool {
 		compareBoolPointer(a.Imported, b.Imported)
 }
 
-func compareBoolPointer(a, b * bool) bool {
+func compareBoolPointer(a, b *bool) bool {
 	if a == nil && b != nil || a != nil && b == nil {
 		return false
 	}
@@ -94,4 +94,4 @@ func compareBoolPointer(a, b * bool) bool {
 	}
 
 	return false
-}
+}

pkg/apis/backup/v1/register.go

@@ -37,7 +37,6 @@ var (
 	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 	AddToScheme   = SchemeBuilder.AddToScheme
 
-
 	SchemeGroupVersion = schema.GroupVersion{Group: backup.ArangoBackupGroupName, Version: ArangoBackupVersion}
 )
 

pkg/apis/deployment/definitions.go

@@ -32,4 +32,4 @@ const (
 
 var (
 	ArangoDeploymentShortNames = []string{"arangodb", "arango"}
-)
+)

pkg/apis/deployment/v1/server_group_spec.go

@@ -125,9 +125,7 @@ func (s *ServerGroupSpecSecurityContext) NewSecurityContext() *v1.SecurityContex
 	if caps := s.GetAddCapabilities(); caps != nil {
 		capabilities.Add = []v1.Capability{}
 
-		for _, capability := range caps {
-			capabilities.Add = append(capabilities.Add, capability)
-		}
+		capabilities.Add = append(capabilities.Add, caps...)
 	}
 
 	r.Capabilities = capabilities

pkg/apis/replication/definitions.go

@@ -25,10 +25,10 @@ package replication
 const (
 	ArangoDeploymentReplicationResourceKind   = "ArangoDeploymentReplication"
 	ArangoDeploymentReplicationResourcePlural = "arangodeploymentreplications"
-	ArangoDeploymentReplicationGroupName                                 = "replication.database.arangodb.com"
+	ArangoDeploymentReplicationGroupName      = "replication.database.arangodb.com"
 )
 
 var (
 	ArangoDeploymentReplicationCRDName    = ArangoDeploymentReplicationResourcePlural + "." + ArangoDeploymentReplicationGroupName
 	ArangoDeploymentReplicationShortNames = []string{"arangorepl"}
-)
+)

pkg/backup/handlers/arango/backup/arango_client.go

@@ -23,9 +23,10 @@
 package backup
 
 import (
-	"github.com/arangodb/kube-arangodb/pkg/backup/utils"
 	"net/http"
 
+	"github.com/arangodb/kube-arangodb/pkg/backup/utils"
+
 	"github.com/arangodb/go-driver"
 	backupApi "github.com/arangodb/kube-arangodb/pkg/apis/backup/v1"
 	database "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"

pkg/backup/handlers/arango/backup/arango_client_mock_test.go

@@ -98,9 +98,7 @@ func (m *mockArangoClientBackup) Abort(d driver.BackupTransferJobID) error {
 		return m.state.errors.abortError
 	}
 
-	if _, ok := m.state.progresses[d]; ok {
-		delete(m.state.progresses, d)
-	}
+	delete(m.state.progresses, d)
 
 	return nil
 }
@@ -126,9 +124,7 @@ func (m *mockArangoClientBackup) Delete(id driver.BackupID) error {
 		return m.state.errors.deleteError
 	}
 
-	if _, ok := m.state.backups[id]; ok {
-		delete(m.state.backups, id)
-	}
+	delete(m.state.backups, id)
 
 	return nil
 }