From 8143dc35b5b2349a75df637af85cd12be7e2611a Mon Sep 17 00:00:00 2001
From: renovate_bot
<group_8045_bot_c14af90fcc2e9e0c89e91dd630ad2f8d@noreply.code.fbi.h-da.de>
Date: Tue, 4 Jun 2024 09:59:15 +0000
Subject: [PATCH] [renovate] Update golangci/golangci-lint Docker tag to
v1.59.0
See merge request danet/gosdn!883
Co-authored-by: Fabian Seidl <fabian.seidl@h-da.de>
Co-authored-by: Neil Schark <neil.schark@h-da.de>
Co-authored-by: Renovate Bot <renovate@danet.fbi.h-da.de>
---
.gitlab/ci/.code-quality-ci.yml | 2 +-
Makefile | 2 +-
.../nucleus/networkElementServiceMock.go | 5 ++--
controller/nucleus/pluginServiceMock.go | 2 +-
csbi/write.go | 28 +++++++++----------
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 4b0cb5387..727e791d0 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
code-quality:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.58.1-alpine
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.59.0-alpine
stage: analyze
script:
# writes golangci-lint output to gl-code-quality-report.json
diff --git a/Makefile b/Makefile
index 6bc9584ac..8f47e9595 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ PLUGIN_NAME= bundled_plugin.zip
# Tool Versions
GOTESTSUM_VERSION=v1.8.1
-GOLANGCI_LINT_VERSION=v1.57.2
+GOLANGCI_LINT_VERSION=v1.59.0
MOCKERY_VERSION=v2.20.0
YGOT_GENERATOR_VERSION=v0.27.0
YGOT_GENERATOR_GENERATOR_VERSION=v0.0.4
diff --git a/controller/nucleus/networkElementServiceMock.go b/controller/nucleus/networkElementServiceMock.go
index 4735109b8..78b9f60f4 100644
--- a/controller/nucleus/networkElementServiceMock.go
+++ b/controller/nucleus/networkElementServiceMock.go
@@ -1,6 +1,7 @@
package nucleus
import (
+ "code.fbi.h-da.de/danet/gosdn/controller/customerrs"
"code.fbi.h-da.de/danet/gosdn/controller/interfaces/networkelement"
"code.fbi.h-da.de/danet/gosdn/controller/store"
"github.com/google/uuid"
@@ -66,12 +67,12 @@ func (t *NetworkElementServiceMock) Get(query store.Query) (networkelement.Netwo
// Second search for name
id, ok := t.nameLookupTable[query.Name]
if !ok {
- return nil, nil
+ return nil, customerrs.CouldNotFindError{Name: query.Name}
}
item, ok := t.Store[id]
if !ok {
- return nil, nil
+ return nil, customerrs.CouldNotFindError{ID: id}
}
return item, nil
diff --git a/controller/nucleus/pluginServiceMock.go b/controller/nucleus/pluginServiceMock.go
index a580657fc..0cdfa6b8f 100644
--- a/controller/nucleus/pluginServiceMock.go
+++ b/controller/nucleus/pluginServiceMock.go
@@ -62,5 +62,5 @@ func (t *PluginServiceMock) GetAll() ([]plugin.Plugin, error) {
// RequestPlugin is a mock for requesting a plugin from the registry.
// TODO: add plugin mock here.
func (t *PluginServiceMock) RequestPlugin(uuid.UUID) (plugin.Plugin, error) {
- return nil, nil
+ return nil, nil //nolint:nilnil
}
diff --git a/csbi/write.go b/csbi/write.go
index 674f2329a..b9ed31815 100644
--- a/csbi/write.go
+++ b/csbi/write.go
@@ -128,29 +128,29 @@ func writeGoStruct(path string, code *gogen.GeneratedCode, t spb.Type) error {
defer genutil.SyncFile(generatedCode)
// Write the package header to the supplier writer.
- fmt.Fprint(generatedCode, code.CommonHeader)
- fmt.Fprint(generatedCode, code.OneOffHeader)
+ fmt.Fprint(generatedCode, code.CommonHeader) //nolint:errcheck
+ fmt.Fprint(generatedCode, code.OneOffHeader) //nolint:errcheck
// Write the returned Go code out. First the Structs - which is the struct
// definitions for the generated YANG entity, followed by the enumerations.
for _, snippet := range code.Structs {
- fmt.Fprintln(generatedCode, snippet.String())
+ fmt.Fprintln(generatedCode, snippet.String()) //nolint:errcheck
}
for _, snippet := range code.Enums {
- fmt.Fprintln(generatedCode, snippet)
+ fmt.Fprintln(generatedCode, snippet) //nolint:errcheck
}
// Write the generated enumeration map out.
- fmt.Fprintln(generatedCode, code.EnumMap)
+ fmt.Fprintln(generatedCode, code.EnumMap) //nolint:errcheck
// Write the schema out if it was received.
if len(code.JSONSchemaCode) > 0 {
- fmt.Fprintln(generatedCode, code.JSONSchemaCode)
+ fmt.Fprintln(generatedCode, code.JSONSchemaCode) //nolint:errcheck
}
if len(code.EnumTypeMap) > 0 {
- fmt.Fprintln(generatedCode, code.EnumTypeMap)
+ fmt.Fprintln(generatedCode, code.EnumTypeMap) //nolint:errcheck
}
if err := writeManifest(path, &Manifest{
@@ -179,29 +179,29 @@ func writeCode(path string, code *gogen.GeneratedCode, t spb.Type) error {
generatedCode := genutil.OpenFile(file)
defer genutil.SyncFile(generatedCode)
// Write the package header to the supplier writer.
- fmt.Fprint(generatedCode, code.CommonHeader)
- fmt.Fprint(generatedCode, code.OneOffHeader)
+ fmt.Fprint(generatedCode, code.CommonHeader) //nolint:errcheck
+ fmt.Fprint(generatedCode, code.OneOffHeader) //nolint:errcheck
// Write the returned Go code out. First the Structs - which is the struct
// definitions for the generated YANG entity, followed by the enumerations.
for _, snippet := range code.Structs {
- fmt.Fprintln(generatedCode, snippet)
+ fmt.Fprintln(generatedCode, snippet) //nolint:errcheck
}
for _, snippet := range code.Enums {
- fmt.Fprintln(generatedCode, snippet)
+ fmt.Fprintln(generatedCode, snippet) //nolint:errcheck
}
// Write the generated enumeration map out.
- fmt.Fprintln(generatedCode, code.EnumMap)
+ fmt.Fprintln(generatedCode, code.EnumMap) //nolint:errcheck
// Write the schema out if it was received.
if len(code.JSONSchemaCode) > 0 {
- fmt.Fprintln(generatedCode, code.JSONSchemaCode)
+ fmt.Fprintln(generatedCode, code.JSONSchemaCode) //nolint:errcheck
}
if len(code.EnumTypeMap) > 0 {
- fmt.Fprintln(generatedCode, code.EnumTypeMap)
+ fmt.Fprintln(generatedCode, code.EnumTypeMap) //nolint:errcheck
}
if err := writeManifest(path, &Manifest{
--
GitLab