From b941208f48639ac86fa0c738966b7840d6963dc8 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Mon, 3 Jun 2024 11:08:07 +0000
Subject: [PATCH] Resolve "Fix deprecated options run.skip-files and
 run.skip-dirs in golangci-lint"

See merge request danet/gosdn!892
---
 .gitignore    |  1 +
 .golangci.yml | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdaaaa30d..2df65224e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # tooling
 **/build-tools/
 artifacts/
+gl-codeclimate.json
 
 # containerlab
 clab-gosdn*/
diff --git a/.golangci.yml b/.golangci.yml
index 30f446c5c..67e271bd5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,21 +5,7 @@ run:
     concurrency: 8
     timeout: 20m
     issues-exit-code: 1
-    # directories to be ignored by linters
-    skip-dirs:
-        - api/
-        - artifacts/
-        - controller/test
-        - controller/mocks
-        - models/
-        - forks/
-        - plugins/examples/
-        - clab-gosdn_csbi_arista_base/
-        # ignore csbi, since we do not maintain it at the moment
-        - csbi/
     skip-dirs-default: true
-    skip-files:
-        - http.go
     modules-download-mode: readonly
 
 # output settings -> code-climate for GitLab
@@ -37,6 +23,20 @@ issues:
     exclude-use-default: false
     max-issues-per-linter: 0
     max-same-issues: 0
+    exclude-files:
+        - http.go
+    # directories to be ignored by linters
+    exclude-dirs:
+        - api/
+        - artifacts/
+        - controller/test
+        - controller/mocks
+        - models/
+        - forks/
+        - plugins/examples/
+        - clab-gosdn_csbi_arista_base/
+        # ignore csbi, since we do not maintain it at the moment
+        - csbi/
 
 linters:
     # enable the specific needed linters
-- 
GitLab