Merge pull request #132 from kouprlabs/feat/enable-auto-fixable-linters

Feature: enable auto fixable linters
kouprlabs · Jul 10, 2024 · f2ec471 · f2ec471
2 parents c46c6fc + 6c4ffcf
commit f2ec471
Show file tree

Hide file tree

Showing 90 changed files with 520 additions and 413 deletions.
diff --git a/.github/workflows/build-api.yml b/.github/workflows/build-api.yml
@@ -26,21 +26,6 @@ on:
       - "api/**"
 
 jobs:
-  linting:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Lint using Golanci lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          working-directory: api
-    permissions:
-      contents: read
-      pull-requests: read
-      checks: write
-
   build_and_push:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/build-conversion.yml b/.github/workflows/build-conversion.yml
@@ -26,21 +26,6 @@ on:
       - "conversion/**"
 
 jobs:
-  linting:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Lint using Golanci lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          working-directory: conversion
-    permissions:
-      contents: read
-      pull-requests: read
-      checks: write
-
   build_and_push:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/build-mosaic.yml b/.github/workflows/build-mosaic.yml
@@ -26,21 +26,6 @@ on:
       - "mosaic/**"
 
 jobs:
-  linting:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Lint using Golanci lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          working-directory: mosaic
-    permissions:
-      contents: read
-      pull-requests: read
-      checks: write
-
   build_and_push:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/build-ui.yml b/.github/workflows/build-ui.yml
@@ -26,26 +26,6 @@ on:
       - "ui/**"
 
 jobs:
-  linting:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Add dummy embedded files
-        run: |
-          mkdir ui/dist
-          touch ui/dist/index.html
-
-      - name: Lint using Golanci lint
-        uses: golangci/golangci-lint-action@v6
-        with:
-          working-directory: ui
-    permissions:
-      contents: read
-      pull-requests: read
-      checks: write
-
   build_and_push:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/lint-ui.yml b/.github/workflows/lint-ui.yml
@@ -24,6 +24,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      - name: Add dummy embedded files
+        run: |
+          mkdir ui/dist
+          touch ui/dist/index.html
+
       - name: Lint using Golanci lint
         uses: golangci/golangci-lint-action@v6
         with:

diff --git a/.github/workflows/lint-webdav.yml b/.github/workflows/lint-webdav.yml
@@ -0,0 +1,34 @@
+# Copyright 2023 Daniël Sonck, Piotr Łoboda.
+#
+# Use of this software is governed by the Business Source License
+# included in the file licenses/BSL.txt.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the GNU Affero General Public License v3.0 only, included in the file
+# licenses/AGPL.txt.
+
+name: Lint voltaserve/webdav
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "webdav/**"
+
+jobs:
+  linting:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Lint using Golanci lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          working-directory: webdav
+    permissions:
+      contents: read
+      pull-requests: read
+      checks: write
diff --git a/api/.golangci.yml b/api/.golangci.yml
@@ -32,7 +32,6 @@ linters:
     - asasalint
     - bodyclose
     - unparam
-    - tagalign
     - revive
     - predeclared
     - interfacebloat
@@ -41,11 +40,8 @@ linters:
     - nestif
     - lll
     - gosec
-    - gofumpt
-    - godot
     - gocritic
     - gocognit
-    - gci
     - funlen
     - forbidigo
     - errcheck
@@ -78,7 +74,7 @@ linters-settings:
       - standard
       - default
       - prefix(github.com/kouprlabs)
-      - prefix(github.com/kouprlabs/voltaserve)
+      - prefix(github.com/kouprlabs/voltaserve/api)
 
   mnd:
     ignored-numbers: ['2', '4', '8', '16', '32', '64', '10', '100', '1000']

diff --git a/api/errorpkg/error_creators.go b/api/errorpkg/error_creators.go
@@ -15,9 +15,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/kouprlabs/voltaserve/api/model"
-
 	"github.com/go-playground/validator/v10"
+
+	"github.com/kouprlabs/voltaserve/api/model"
 )
 
 func NewGroupNotFoundError(err error) *ErrorResponse {

diff --git a/api/errorpkg/error_handler.go b/api/errorpkg/error_handler.go
@@ -14,9 +14,9 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/kouprlabs/voltaserve/api/log"
-
 	"github.com/gofiber/fiber/v2"
+
+	"github.com/kouprlabs/voltaserve/api/log"
 )
 
 func ErrorHandler(c *fiber.Ctx, err error) error {

diff --git a/api/infra/mail.go b/api/infra/mail.go
@@ -16,14 +16,13 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-
-	"github.com/kouprlabs/voltaserve/api/config"
-	"github.com/kouprlabs/voltaserve/api/log"
+	"text/template"
 
 	"gopkg.in/gomail.v2"
 	"sigs.k8s.io/yaml"
 
-	"text/template"
+	"github.com/kouprlabs/voltaserve/api/config"
+	"github.com/kouprlabs/voltaserve/api/log"
 )
 
 type MessageParams struct {

diff --git a/api/infra/postgres.go b/api/infra/postgres.go
@@ -11,16 +11,15 @@
 package infra
 
 import (
-	"github.com/kouprlabs/voltaserve/api/config"
-
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
+
+	"github.com/kouprlabs/voltaserve/api/config"
 )
 
 var db *gorm.DB
 
-type PostgresManager struct {
-}
+type PostgresManager struct{}
 
 func NewPostgresManager() *PostgresManager {
 	return &PostgresManager{}

diff --git a/api/infra/redis.go b/api/infra/redis.go
@@ -14,9 +14,9 @@ import (
 	"context"
 	"strings"
 
-	"github.com/kouprlabs/voltaserve/api/config"
-
 	"github.com/redis/go-redis/v9"
+
+	"github.com/kouprlabs/voltaserve/api/config"
 )
 
 type RedisManager struct {

diff --git a/api/infra/s3.go b/api/infra/s3.go
@@ -16,11 +16,11 @@ import (
 	"io"
 	"strings"
 
-	"github.com/kouprlabs/voltaserve/api/config"
-	"github.com/kouprlabs/voltaserve/api/errorpkg"
-
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
+
+	"github.com/kouprlabs/voltaserve/api/config"
+	"github.com/kouprlabs/voltaserve/api/errorpkg"
 )
 
 type S3Manager struct {

diff --git a/api/infra/search.go b/api/infra/search.go
@@ -11,9 +11,9 @@
 package infra
 
 import (
-	"github.com/kouprlabs/voltaserve/api/config"
-
 	"github.com/meilisearch/meilisearch-go"
+
+	"github.com/kouprlabs/voltaserve/api/config"
 )
 
 var searchClient *meilisearch.Client

diff --git a/api/main.go b/api/main.go
@@ -15,21 +15,22 @@ import (
 	"os"
 	"strings"
 
+	jwtware "github.com/gofiber/contrib/jwt"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
+	"github.com/joho/godotenv"
 
 	"github.com/kouprlabs/voltaserve/api/config"
 	"github.com/kouprlabs/voltaserve/api/errorpkg"
 	"github.com/kouprlabs/voltaserve/api/helper"
 	"github.com/kouprlabs/voltaserve/api/router"
-
-	jwtware "github.com/gofiber/contrib/jwt"
-	"github.com/joho/godotenv"
 )
 
 // @title		Voltaserve API
 // @version	2.0.0
 // @BasePath	/v2
+//
+// .
 func main() {
 	if _, err := os.Stat(".env.local"); err == nil {
 		err := godotenv.Load(".env.local")

diff --git a/api/repo/file_repo.go b/api/repo/file_repo.go
@@ -14,12 +14,12 @@ import (
 	"errors"
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/kouprlabs/voltaserve/api/errorpkg"
 	"github.com/kouprlabs/voltaserve/api/helper"
 	"github.com/kouprlabs/voltaserve/api/infra"
 	"github.com/kouprlabs/voltaserve/api/model"
-
-	"gorm.io/gorm"
 )
 
 type FileRepo interface {
@@ -54,17 +54,17 @@ func NewFile() model.File {
 }
 
 type fileEntity struct {
-	ID               string                  `json:"id" gorm:"column:id"`
-	WorkspaceID      string                  `json:"workspaceId" gorm:"column:workspace_id"`
-	Name             string                  `json:"name" gorm:"column:name"`
-	Type             string                  `json:"type" gorm:"column:type"`
-	ParentID         *string                 `json:"parentId,omitempty" gorm:"column:parent_id"`
-	UserPermissions  []*UserPermissionValue  `json:"userPermissions" gorm:"-"`
-	GroupPermissions []*GroupPermissionValue `json:"groupPermissions" gorm:"-"`
-	Text             *string                 `json:"text,omitempty" gorm:"-"`
-	SnapshotID       *string                 `json:"snapshotId,omitempty" gorm:"column:snapshot_id"`
-	CreateTime       string                  `json:"createTime" gorm:"column:create_time"`
-	UpdateTime       *string                 `json:"updateTime,omitempty" gorm:"column:update_time"`
+	ID               string                  `gorm:"column:id"           json:"id"`
+	WorkspaceID      string                  `gorm:"column:workspace_id" json:"workspaceId"`
+	Name             string                  `gorm:"column:name"         json:"name"`
+	Type             string                  `gorm:"column:type"         json:"type"`
+	ParentID         *string                 `gorm:"column:parent_id"    json:"parentId,omitempty"`
+	UserPermissions  []*UserPermissionValue  `gorm:"-"                   json:"userPermissions"`
+	GroupPermissions []*GroupPermissionValue `gorm:"-"                   json:"groupPermissions"`
+	Text             *string                 `gorm:"-"                   json:"text,omitempty"`
+	SnapshotID       *string                 `gorm:"column:snapshot_id"  json:"snapshotId,omitempty"`
+	CreateTime       string                  `gorm:"column:create_time"  json:"createTime"`
+	UpdateTime       *string                 `gorm:"column:update_time"  json:"updateTime,omitempty"`
 }
 
 func (*fileEntity) TableName() string {
@@ -223,7 +223,7 @@ func (repo *fileRepo) Find(id string) (model.File, error) {
 }
 
 func (repo *fileRepo) find(id string) (*fileEntity, error) {
-	var res = fileEntity{}
+	res := fileEntity{}
 	db := repo.db.Raw("SELECT * FROM file WHERE id = ?", id).Scan(&res)
 	if db.Error != nil {
 		if errors.Is(db.Error, gorm.ErrRecordNotFound) {

diff --git a/api/repo/group_repo.go b/api/repo/group_repo.go
@@ -14,12 +14,12 @@ import (
 	"errors"
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/kouprlabs/voltaserve/api/errorpkg"
 	"github.com/kouprlabs/voltaserve/api/helper"
 	"github.com/kouprlabs/voltaserve/api/infra"
 	"github.com/kouprlabs/voltaserve/api/model"
-
-	"gorm.io/gorm"
 )
 
 type GroupRepo interface {
@@ -47,14 +47,14 @@ func NewGroup() model.Group {
 }
 
 type groupEntity struct {
-	ID               string                  `json:"id" gorm:"column:id"`
-	Name             string                  `json:"name" gorm:"column:name"`
-	OrganizationID   string                  `json:"organizationId" gorm:"column:organization_id"`
-	UserPermissions  []*UserPermissionValue  `json:"userPermissions" gorm:"-"`
-	GroupPermissions []*GroupPermissionValue `json:"groupPermissions" gorm:"-"`
-	Members          []string                `json:"members" gorm:"-"`
-	CreateTime       string                  `json:"createTime" gorm:"column:create_time"`
-	UpdateTime       *string                 `json:"updateTime" gorm:"column:update_time"`
+	ID               string                  `gorm:"column:id"              json:"id"`
+	Name             string                  `gorm:"column:name"            json:"name"`
+	OrganizationID   string                  `gorm:"column:organization_id" json:"organizationId"`
+	UserPermissions  []*UserPermissionValue  `gorm:"-"                      json:"userPermissions"`
+	GroupPermissions []*GroupPermissionValue `gorm:"-"                      json:"groupPermissions"`
+	Members          []string                `gorm:"-"                      json:"members"`
+	CreateTime       string                  `gorm:"column:create_time"     json:"createTime"`
+	UpdateTime       *string                 `gorm:"column:update_time"     json:"updateTime"`
 }
 
 func (*groupEntity) TableName() string {
@@ -156,7 +156,7 @@ func (repo *groupRepo) Insert(opts GroupInsertOptions) (model.Group, error) {
 }
 
 func (repo *groupRepo) find(id string) (*groupEntity, error) {
-	var res = groupEntity{}
+	res := groupEntity{}
 	db := repo.db.Where("id = ?", id).First(&res)
 	if db.Error != nil {
 		if errors.Is(db.Error, gorm.ErrRecordNotFound) {