chore: add more linting rules

fix: delete combined version after upload
fix: do not panic if version is not found

Author: Vilsol

.golangci.yml

@@ -14,32 +14,58 @@ linters-settings:
     ignorePackageGlobs:
       - github.com/satisfactorymodding/smr-api/*
 
+  govet:
+    check-shadowing: true
+    enable-all: true
+    disable:
+      - shadow
+
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/satisfactorymodding/smr-api)
+      - blank
+      - dot
+
+run:
+  skip-files:
+    - ./generated/generated.go
+    - ./generated/models_gen.go
+  skip-dirs:
+    - ./docs/
+
 issues:
   exclude:
     - should pass the context parameter
 
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - gosimple
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - typecheck
     - unused
-    - varcheck
     - bidichk
     - contextcheck
     - durationcheck
     - errorlint
     - goconst
     - goimports
     - revive
-    - ifshort
     - misspell
     - prealloc
     - whitespace
-    - wrapcheck
+    - wrapcheck
+    - gci
+    - gocritic
+    - gofumpt
+    - nonamedreturns

api.go

@@ -9,30 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/satisfactorymodding/smr-api/auth"
-	"github.com/satisfactorymodding/smr-api/config"
-	"github.com/satisfactorymodding/smr-api/dataloader"
-	"github.com/satisfactorymodding/smr-api/db"
-	"github.com/satisfactorymodding/smr-api/db/postgres"
-
-	"github.com/pkg/errors"
-
-	// Load REST docs
-	_ "github.com/satisfactorymodding/smr-api/docs"
-	"github.com/satisfactorymodding/smr-api/generated"
-	"github.com/satisfactorymodding/smr-api/gql"
-	"github.com/satisfactorymodding/smr-api/migrations"
-	"github.com/satisfactorymodding/smr-api/nodes"
-	"github.com/satisfactorymodding/smr-api/oauth"
-	"github.com/satisfactorymodding/smr-api/redis"
-	"github.com/satisfactorymodding/smr-api/redis/jobs"
-
-	// Load redis consumers
-	_ "github.com/satisfactorymodding/smr-api/redis/jobs/consumers"
-	"github.com/satisfactorymodding/smr-api/storage"
-	"github.com/satisfactorymodding/smr-api/util"
-	"github.com/satisfactorymodding/smr-api/validation"
-
 	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/99designs/gqlgen/graphql/handler/extension"
 	"github.com/99designs/gqlgen/graphql/handler/lru"
@@ -42,6 +18,7 @@ import (
 	"github.com/labstack/echo-contrib/pprof"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	echoSwagger "github.com/swaggo/echo-swagger"
@@ -54,6 +31,27 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
 	"go.opentelemetry.io/otel/trace"
 	"gopkg.in/go-playground/validator.v9"
+
+	"github.com/satisfactorymodding/smr-api/auth"
+	"github.com/satisfactorymodding/smr-api/config"
+	"github.com/satisfactorymodding/smr-api/dataloader"
+	"github.com/satisfactorymodding/smr-api/db"
+	"github.com/satisfactorymodding/smr-api/db/postgres"
+	"github.com/satisfactorymodding/smr-api/generated"
+	"github.com/satisfactorymodding/smr-api/gql"
+	"github.com/satisfactorymodding/smr-api/migrations"
+	"github.com/satisfactorymodding/smr-api/nodes"
+	"github.com/satisfactorymodding/smr-api/oauth"
+	"github.com/satisfactorymodding/smr-api/redis"
+	"github.com/satisfactorymodding/smr-api/redis/jobs"
+	"github.com/satisfactorymodding/smr-api/storage"
+	"github.com/satisfactorymodding/smr-api/util"
+	"github.com/satisfactorymodding/smr-api/validation"
+
+	// Load REST docs
+	_ "github.com/satisfactorymodding/smr-api/docs"
+	// Load redis consumers
+	_ "github.com/satisfactorymodding/smr-api/redis/jobs/consumers"
 )
 
 type CustomValidator struct {

auth/permissions.go

@@ -105,8 +105,10 @@ var (
 	}
 )
 
-var idToGroupMapping = make(map[string]*Group)
-var roleToGroupMapping = make(map[*Role][]*Group)
+var (
+	idToGroupMapping   = make(map[string]*Group)
+	roleToGroupMapping = make(map[*Role][]*Group)
+)
 
 func initializePermissions() {
 	groups := []*Group{GroupAdmin, GroupModerator, GroupSMLDev, GroupBootstrapDev, GroupCompatibilityOfficer}

cmd/paseto/main.go

@@ -7,7 +7,6 @@ import (
 
 func main() {
 	publicKey, privateKey, err := ed25519.GenerateKey(nil)
-
 	if err != nil {
 		panic(err)
 	}

cmd/validate-zip/main.go

@@ -16,7 +16,6 @@ func main() {
 
 	validation.InitializeValidator()
 	_, err := validation.ExtractModInfo(context.Background(), f, true, true, "N/A")
-
 	if err != nil {
 		panic(err)
 	}

config/config.go

@@ -78,6 +78,7 @@ func initializeDefaults() {
 	viper.SetDefault("storage.endpoint", "http://localhost:9000")
 	viper.SetDefault("storage.region", "eu-central-1")
 	viper.SetDefault("storage.base_url", "http://localhost:9000")
+	viper.SetDefault("storage.keypath", "%s/file/%s/%s")
 
 	viper.SetDefault("oauth.github.client_id", "")
 	viper.SetDefault("oauth.github.client_secret", "")

dataloader/loaders.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/satisfactorymodding/smr-api/db/postgres"
-
 	"github.com/labstack/echo/v4"
 	"github.com/patrickmn/go-cache"
+
+	"github.com/satisfactorymodding/smr-api/db/postgres"
 )
 
 type loadersKey struct{}