Skip to content

Commit 9853c32

Browse files
mbussolottombussolotto
committed
bump golangci
1 parent 3e0ceb3 commit 9853c32

33 files changed

Lines changed: 158 additions & 150 deletions

File tree

‎.github/workflows/golangci-lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
23-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 #v5.3.0
23+
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #v5.5.0
2424
with:
25-
go-version: '1.22'
25+
go-version: '>=1.23.0'
2626
cache: false
2727
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea #v6.5.1
28+
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 #v8.0.0
2929
with:
3030
# Require: The version of golangci-lint to use.
3131
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
3232
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
33-
version: v1.59.1
33+
version: v2.1.0
3434

3535
# Optional: working directory, useful for monorepos
3636
# working-directory: somedir

‎.golangci.yml‎

Lines changed: 77 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,92 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
linters-settings:
6-
stylecheck:
7-
dot-import-whitelist:
8-
- github.com/uyuni-project/uyuni-tools/shared/l10n
9-
initialisms:
10-
# Default
11-
- ACL
12-
- API
13-
- ASCII
14-
- CPU
15-
- DNS
16-
- EOF
17-
- GUID
18-
- HTML
19-
- HTTP
20-
- HTTPS
21-
- ID
22-
- IP
23-
- JSON
24-
- RPC
25-
- SLA
26-
- SMTP
27-
- SQL
28-
- SSH
29-
- TCP
30-
- TLS
31-
- TTL
32-
- UDP
33-
- UI
34-
- GID
35-
- UID
36-
- UUID
37-
- URI
38-
- URL
39-
- UTF8
40-
- VM
41-
- XML
42-
- RTP
43-
- DB
44-
# Added
45-
- SCC
46-
- SSL
47-
gofmt:
48-
simplify: true
49-
gocyclo:
50-
min-complexity: 10
51-
govet:
52-
disable:
53-
- printf
54-
5+
version: "2"
556
linters:
567
enable:
57-
- unused
588
- dupl
59-
- errcheck
609
- errname
6110
- errorlint
6211
- godot
63-
- gofmt
64-
- goimports
65-
- gosimple
66-
#- gocyclo
67-
- ineffassign
68-
- govet
6912
- lll
7013
- misspell
7114
- revive
7215
- staticcheck
73-
- stylecheck
7416
- unparam
75-
- unused
7617
- whitespace
77-
issues:
78-
exclude-rules:
79-
- linters:
80-
- revive
81-
text: "dot-imports"
82-
- linters:
83-
- revive
84-
text: "stutters"
18+
settings:
19+
gocyclo:
20+
min-complexity: 10
21+
govet:
22+
disable:
23+
- printf
24+
staticcheck:
25+
initialisms:
26+
- ACL
27+
- API
28+
- ASCII
29+
- CPU
30+
- DNS
31+
- EOF
32+
- GUID
33+
- HTML
34+
- HTTP
35+
- HTTPS
36+
- ID
37+
- IP
38+
- JSON
39+
- RPC
40+
- SLA
41+
- SMTP
42+
- SQL
43+
- SSH
44+
- TCP
45+
- TLS
46+
- TTL
47+
- UDP
48+
- UI
49+
- GID
50+
- UID
51+
- UUID
52+
- URI
53+
- URL
54+
- UTF8
55+
- VM
56+
- XML
57+
- RTP
58+
- DB
59+
- SCC
60+
- SSL
61+
dot-import-whitelist:
62+
- github.com/uyuni-project/uyuni-tools/shared/l10n
63+
exclusions:
64+
generated: lax
65+
presets:
66+
- comments
67+
- common-false-positives
68+
- legacy
69+
- std-error-handling
70+
rules:
71+
- linters:
72+
- revive
73+
text: dot-imports
74+
- linters:
75+
- revive
76+
text: stutters
77+
paths:
78+
- third_party$
79+
- builtin$
80+
- examples$
81+
formatters:
82+
enable:
83+
- gofmt
84+
- goimports
85+
settings:
86+
gofmt:
87+
simplify: true
88+
exclusions:
89+
generated: lax
90+
paths:
91+
- third_party$
92+
- builtin$
93+
- examples$

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repos:
1313
- id: check-yaml
1414
- id: check-added-large-files
1515
- repo: https://github.com/golangci/golangci-lint
16-
rev: v1.59.1
16+
rev: v2.1.6
1717
hooks:
1818
- id: golangci-lint
1919
fail_fast: true

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ for shell in "bash" "zsh" "fish"; do
2828
./bin/mgrpxy completion ${shell} >> "${COMPLETION_FILE}"
2929
done
3030

31-
#GOFLAGS="-tags=ptf" golangci-lint run
31+
GOFLAGS="-tags=ptf" golangci-lint run
3232
./check_localizable
3333
echo "DONE"

‎mgradm/cmd/distro/cp.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 SUSE LLC
1+
// SPDX-FileCopyrightText: 2025 SUSE LLC
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

@@ -140,10 +140,7 @@ func distroCp(
140140
}
141141
}
142142

143-
attemptRegistration := false
144-
if flags.ConnectionDetails.User != "" && flags.ConnectionDetails.Password != "" {
145-
attemptRegistration = true
146-
}
143+
attemptRegistration := flags.ConnectionDetails.User != "" && flags.ConnectionDetails.Password != ""
147144

148145
srcdir, cleaner, err := prepareSource(source)
149146
if err != nil {

‎mgradm/cmd/install/kubernetes/kubernetes.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ NOTE: installing on a remote cluster is not supported yet!
3535
RunE: func(cmd *cobra.Command, args []string) error {
3636
var flags kubernetes.KubernetesServerFlags
3737
flagsUpdater := func(v *viper.Viper) {
38-
flags.ServerFlags.Coco.IsChanged = v.IsSet("coco.replicas")
39-
flags.ServerFlags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
40-
flags.ServerFlags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
41-
flags.ServerFlags.Pgsql.IsChanged = v.IsSet("pgsql.replicas")
38+
flags.Coco.IsChanged = v.IsSet("coco.replicas")
39+
flags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
40+
flags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
41+
flags.Pgsql.IsChanged = v.IsSet("pgsql.replicas")
4242
}
4343
return utils.CommandHelper(globalFlags, cmd, args, &flags, flagsUpdater, run)
4444
},

‎mgradm/cmd/install/podman/podman.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ NOTE: installing on a remote podman is not supported yet!
3434
RunE: func(cmd *cobra.Command, args []string) error {
3535
var flags podmanInstallFlags
3636
flagsUpdater := func(v *viper.Viper) {
37-
flags.ServerFlags.Coco.IsChanged = v.IsSet("coco.replicas")
38-
flags.ServerFlags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
39-
flags.ServerFlags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
37+
flags.Coco.IsChanged = v.IsSet("coco.replicas")
38+
flags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
39+
flags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
4040
}
4141
return utils.CommandHelper(globalFlags, cmd, args, &flags, flagsUpdater, run)
4242
},

‎mgradm/cmd/install/podman/utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func installForPodman(
9191
return err
9292
}
9393

94-
if flags.ServerFlags.Installation.DB.IsLocal() {
94+
if flags.Installation.DB.IsLocal() {
9595
// The admin password is not needed for external databases
9696
if err := shared_podman.CreateCredentialsSecrets(
9797
shared_podman.DBAdminUserSecret, flags.Installation.DB.Admin.User,
@@ -107,7 +107,7 @@ func installForPodman(
107107
} else {
108108
log.Info().Msgf(
109109
L("Skipped database container setup to use external database %s"),
110-
flags.ServerFlags.Installation.DB.Host,
110+
flags.Installation.DB.Host,
111111
)
112112
}
113113

‎mgradm/cmd/migrate/kubernetes/dataExtractor.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2024 SUSE LLC
1+
// SPDX-FileCopyrightText: 2025 SUSE LLC
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

@@ -51,15 +51,16 @@ func extractMigrationData(
5151

5252
var result MigrationData
5353
for file, content := range files {
54-
if file == "RHN-ORG-PRIVATE-SSL-KEY" {
54+
switch file {
55+
case "RHN-ORG-PRIVATE-SSL-KEY":
5556
result.CaKey = content
56-
} else if file == "RHN-ORG-TRUSTED-SSL-CERT" {
57+
case "RHN-ORG-TRUSTED-SSL-CERT":
5758
result.CaCert = content
58-
} else if file == "spacewalk.crt" {
59+
case "spacewalk.crt":
5960
result.ServerCert = content
60-
} else if file == "spacewalk.key" {
61+
case "spacewalk.key":
6162
result.ServerKey = content
62-
} else if file == "data" {
63+
case "data":
6364
parsedData, err := utils.ReadInspectDataString[utils.InspectResult]([]byte(content))
6465
if err != nil {
6566
return nil, utils.Errorf(err, L("failed to parse migration data file"))

‎mgradm/cmd/migrate/kubernetes/kubernetes.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ This is not needed if the source server does not have a generated SSL CA certifi
4141
RunE: func(cmd *cobra.Command, args []string) error {
4242
var flags kubernetes.KubernetesServerFlags
4343
flagsUpdater := func(v *viper.Viper) {
44-
flags.ServerFlags.Coco.IsChanged = v.IsSet("coco.replicas")
45-
flags.ServerFlags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
46-
flags.ServerFlags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
47-
flags.ServerFlags.Pgsql.IsChanged = v.IsSet("pgsql.replicas")
44+
flags.Coco.IsChanged = v.IsSet("coco.replicas")
45+
flags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
46+
flags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
47+
flags.Pgsql.IsChanged = v.IsSet("pgsql.replicas")
4848
}
4949
return utils.CommandHelper(globalFlags, cmd, args, &flags, flagsUpdater, run)
5050
},

0 commit comments

Comments
 (0)