From d18d8351345b32e8dba4154a7f49237cba076393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?=
 <1005065+DeepDiver1975@users.noreply.github.com>
Date: Tue, 7 May 2024 08:39:21 +0200
Subject: [PATCH] test: fix linter tagalign to respect oCIS custom order +
 migrate skip-dirs to exclude-dirs (#9062)

---
 .golangci.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index f9e9e1bd6..7ff6dabf7 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -44,8 +44,16 @@ linters:
     - depguard # disabled for now. Needs configuration
 
 linters-settings:
+  tagalign:
+    align: false
+    sort: true
+    order:
+      - yaml
+      - env
+      - desc
+      - introductionVersion
   gocyclo:
-    min-complexity: 35 # there are some func unforuntately who need this - should we refactor them?
+    min-complexity: 35 # there are some func unfortunately who need this - should we refactor them?
   gomoddirectives:
     replace-allow-list:
       - github.com/studio-b12/gowebdav
@@ -57,12 +65,6 @@ linters-settings:
 severity:
   default-severity: error
 
-skip-dirs:
-  - protogen/gen
-  - docs
-  - deployments
-  - changelog
-
 issues:
   exclude-use-default: true
   exclude-rules:
@@ -76,6 +78,12 @@ issues:
     - EXC0014
     - EXC0015
 
+  exclude-dirs:
+    - protogen/gen
+    - docs
+    - deployments
+    - changelog
+
 # Enabled by default linters:
 # deadcode: Finds unused code [fast: false, auto-fix: false]
 # errcheck: Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]