fix lint

.github/workflows/ci.yml

@@ -18,11 +18,15 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Clean duplicate toolchain files
+        run: rm -rf "$(go env GOPATH)/pkg/mod/golang.org/toolchain*"
+
       - name: Setup Go
         uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version-file: go.mod
 
+
       - name: ci/check-style
         run: make check-style
 

.golangci.yml

@@ -1,5 +1,4 @@
-# Docs: https://golangci-lint.run/usage/configuration/#config-file
-
+version: 2
 run:
   timeout: 5m
 
@@ -20,8 +19,6 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    - gofmt
-    - gosimple
     - govet
     - ineffassign
     - predeclared

Makefile

@@ -66,7 +66,7 @@ GOIMPORTS_VER := master
 GOIMPORTS_BIN := goimports
 GOIMPORTS := $(TOOLS_BIN_DIR)/$(GOIMPORTS_BIN)
 
-GOLANGCILINT_VER := v1.64.8
+GOLANGCILINT_VER := v2.0.2
 GOLANGCILINT_BIN := golangci-lint
 GOLANGCILINT := $(TOOLS_BIN_DIR)/$(GOLANGCILINT_BIN)
 
@@ -96,12 +96,12 @@ check-style: govet lint goformat goimports
 ## Runs lint against all packages.
 lint: $(GOLANGCILINT)
 	@echo Running golangci-lint
-	$(GOLANGCILINT) run
+	$(GOLANGCILINT) run --config .golangci.yml
 
 ## Runs lint against all packages for changes only
 lint-changes: $(GOLANGCILINT)
 	@echo Running golangci-lint over changes only
-	$(GOLANGCILINT) run -n
+	$(GOLANGCILINT) run -n --config .golangci.yml
 
 ## Runs govet against all packages.
 .PHONY: vet

cmd/cloud/clicontext/clicontext.go

@@ -121,7 +121,7 @@ func WriteContexts(contexts *Contexts) error {
 	if err != nil {
 		return err
 	}
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	encoder := json.NewEncoder(file)
 	err = encoder.Encode(contexts)

cmd/cloud/contexts.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"reflect"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/mattermost/mattermost-cloud/cmd/cloud/clicontext"
 	"github.com/mattermost/mattermost-cloud/internal/auth"
 	"github.com/spf13/cobra"
@@ -90,7 +92,9 @@ type updateContextFlags struct {
 func (f *updateContextFlags) addFlags(command *cobra.Command) {
 	f.createContextFlags.addFlags(command)
 	command.Flags().StringVar(&f.Context, "context", "", "Name of the context to update")
-	command.MarkFlagRequired("context")
+	if err := command.MarkFlagRequired("context"); err != nil {
+		log.Fatalf("failed to mark flag required: %v", err)
+	}
 	command.Flags().BoolVar(&f.ClearAuth, "clear-auth", false, "Turns off authentication for this context")
 	command.Flags().BoolVar(&f.ConfirmationRequired, "confirmation-required", false, "Require confirmation for commands run in this context")
 }
@@ -244,8 +248,9 @@ func newCmdContextCreate() *cobra.Command {
 	}
 
 	flags.addFlags(cmd)
-	cmd.MarkFlagRequired("server-url")
-
+	if err := cmd.MarkFlagRequired("server-url"); err != nil {
+		log.Fatalf("failed to mark flag required: %v", err)
+	}
 	return cmd
 }
 
@@ -255,7 +260,9 @@ type deleteContextFlags struct {
 
 func (f *deleteContextFlags) addFlags(command *cobra.Command) {
 	command.Flags().StringVar(&f.contextName, "context", "", "Name of the context to delete")
-	command.MarkFlagRequired("context")
+	if err := command.MarkFlagRequired("context"); err != nil {
+		log.Fatalf("failed to mark flag required: %v", err)
+	}
 }
 
 func newCmdContextDelete() *cobra.Command {

cmd/cloud/installation.go

@@ -309,7 +309,7 @@ func newCmdInstallationUpdateDeletion() *cobra.Command {
 			client := createClient(command.Context(), flags.clusterFlags)
 
 			request := &model.PatchInstallationDeletionRequest{}
-			if flags.installationDeletionPatchRequestOptionsChanged.futureDeletionTimeChanged {
+			if flags.futureDeletionTimeChanged {
 				newExpiryTimeMillis := model.GetMillisAtTime(time.Now().Add(flags.futureDeletionTime))
 				request.DeletionPendingExpiry = &newExpiryTimeMillis
 			}

cmd/cloud/installation_flag.go

@@ -186,7 +186,10 @@ func (flags *installationUpdateFlags) GetPatchInstallationRequest() (*model.Patc
 
 	if flags.allowedIPRangesChanged {
 		allowedIPRanges := &model.AllowedIPRanges{}
-		allowedIPRanges.FromJSONString(flags.allowedIPRanges)
+		_, jsonErr := allowedIPRanges.FromJSONString(flags.allowedIPRanges)
+		if jsonErr != nil {
+			return nil, jsonErr
+		}
 		allowedIPRanges, err := allowedIPRanges.FromJSONString(flags.allowedIPRanges)
 		if err != nil {
 			return nil, err

cmd/cloud/logger_hooks.go

@@ -82,7 +82,11 @@ func (hook *ClusterLoggerHook) fileWrite(entry *logrus.Entry, kind string) error
 		log.Println("failed to open logfile:", path, err)
 		return err
 	}
-	defer fd.Close()
+	defer func() {
+		if err := fd.Close(); err != nil {
+			log.Printf("failed to close fd: %v", err)
+		}
+	}()
 
 	// use our formatter instead of entry.String()
 	msg, err := hook.formatter.Format(entry)
@@ -91,7 +95,10 @@ func (hook *ClusterLoggerHook) fileWrite(entry *logrus.Entry, kind string) error
 		log.Println("failed to generate string for entry:", err)
 		return err
 	}
-	fd.Write(msg)
+	if _, err := fd.Write(msg); err != nil {
+		log.Println("failed to write to logfile:", err)
+		return err
+	}
 	return nil
 }
 

cmd/cloud/server.go

@@ -413,7 +413,11 @@ func executeServerCmd(flags serverFlags) error {
 	}
 
 	standardSupervisor := supervisor.NewScheduler(multiDoer, time.Duration(flags.poll)*time.Second, logger)
-	defer standardSupervisor.Close()
+	defer func() {
+		if err := standardSupervisor.Close(); err != nil {
+			logrus.WithError(err).Error("failed to close standardSupervisor")
+		}
+	}()
 
 	if flags.slowPoll == 0 {
 		logger.WithField("slow-poll", flags.slowPoll).Info("Slow scheduler is disabled")
@@ -422,7 +426,11 @@ func executeServerCmd(flags serverFlags) error {
 		var slowMultiDoer supervisor.MultiDoer
 		slowMultiDoer = append(slowMultiDoer, supervisor.NewInstallationDeletionSupervisor(instanceID, flags.installationDeletionPendingTime, flags.installationDeletionMaxUpdating, sqlStore, eventsProducer, logger))
 		slowSupervisor := supervisor.NewScheduler(slowMultiDoer, time.Duration(flags.slowPoll)*time.Second, logger)
-		defer slowSupervisor.Close()
+		defer func() {
+			if err := slowSupervisor.Close(); err != nil {
+				logrus.WithError(err).Error("failed to close slowSupervisor")
+			}
+		}()
 	}
 
 	metricsRouter := mux.NewRouter()

cmd/provisioner-code-gen/main.go

@@ -43,8 +43,13 @@ func newRootCmd() *cobra.Command {
 
 // Binds all flags as viper values
 func bindFlags(cmd *cobra.Command) {
-	viper.BindPFlags(cmd.PersistentFlags())
-	viper.BindPFlags(cmd.Flags())
+	if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
+		logrus.WithError(err).Fatal("failed to bind persistent flags")
+	}
+	if err := viper.BindPFlags(cmd.Flags()); err != nil {
+		logrus.WithError(err).Fatal("failed to bind command flags")
+	}
+
 	for _, c := range cmd.Commands() {
 		bindFlags(c)
 	}

cmd/tools/cloudburst/cloudburst.go

@@ -345,7 +345,9 @@ func (b *Blaster) cleanupInstallations(installations map[string]*cloud.Installat
 				fallthrough
 			case cloud.InstallationStateDeletionInProgress:
 			default:
-				b.client.DeleteInstallation(fetched.ID)
+				if err := b.client.DeleteInstallation(fetched.ID); err != nil {
+					log.WithError(err).Error("failed to delete installation")
+				}
 			}
 		}
 	}

cmd/tools/ctest/test.go

@@ -10,6 +10,8 @@ import (
 	"io"
 	"net/http"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/mattermost/mattermost-cloud/model"
 	"github.com/pkg/errors"
 )
@@ -36,7 +38,11 @@ func runInstallationLifecycleTest(request *model.CreateInstallationRequest, clie
 	if err != nil {
 		return errors.Wrap(err, "failed to run enhanced ping test")
 	}
-	defer resp.Body.Close()
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			log.WithError(err).Error("failed to close resp.Body")
+		}
+	}()
 
 	if resp.StatusCode != http.StatusOK {
 		var body []byte

cmd/tools/ctest/webhooks.go

@@ -10,11 +10,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/mattermost/mattermost-cloud/model"
 	cloud "github.com/mattermost/mattermost-cloud/model"
 )
 
-func webhookHandler(w http.ResponseWriter, r *http.Request, c chan *model.WebhookPayload) {
+func webhookHandler(w http.ResponseWriter, r *http.Request, c chan *cloud.WebhookPayload) {
 	webhook, err := cloud.WebhookPayloadFromReader(r.Body)
 	if err != nil {
 		logger.WithError(err).Error("Faled to parse webhook")
@@ -41,7 +40,7 @@ func webhookHandler(w http.ResponseWriter, r *http.Request, c chan *model.Webhoo
 	w.WriteHeader(http.StatusOK)
 }
 
-func startWebhookListener(port string, c chan *model.WebhookPayload) func() {
+func startWebhookListener(port string, c chan *cloud.WebhookPayload) func() {
 	logger.Infof("Starting cloud webhook listener on port %s", port)
 
 	srv := &http.Server{Addr: fmt.Sprintf(":%s", port)}

cmd/tools/cwl/cwl.go

@@ -11,6 +11,8 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/sirupsen/logrus"
+
 	cloud "github.com/mattermost/mattermost-cloud/model"
 
 	"github.com/0xAX/notificator"
@@ -51,7 +53,10 @@ func handler(w http.ResponseWriter, r *http.Request) {
 
 	message := fmt.Sprintf("[ %s | %s ] %s -> %s", wType, webhook.ID[0:4], webhook.OldState, webhook.NewState)
 	log.Print(message)
-	notify.Push("Cloud Webhook Listener", message, icon, notificator.UR_NORMAL)
+	err = notify.Push("Cloud Webhook Listener", message, icon, notificator.UR_NORMAL)
+	if err != nil {
+		logrus.Errorf("failed to send notification: %v", err)
+	}
 
 	w.WriteHeader(http.StatusOK)
 }