This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/develop by this push:
new 8a065bb feat(plc4go): go 1.26 upgrade
8a065bb is described below
commit 8a065bb8290aeaa45bd965702d0218148a83e1c4
Author: Sebastian Rühl <[email protected]>
AuthorDate: Thu Feb 12 16:00:26 2026 +0100
feat(plc4go): go 1.26 upgrade
---
plc4go/go.mod | 20 ++++++++++----------
plc4go/go.sum | 19 +++++++++++++++++++
plc4go/pom.xml | 2 +-
plc4go/tools/plc4xbrowser/ui/actions.go | 11 +++++------
plc4go/tools/plc4xbrowser/ui/config.go | 7 +++----
plc4go/tools/plc4xpcapanalyzer/cmd/root.go | 4 ++--
plc4go/tools/plc4xpcapanalyzer/ui/actions.go | 11 +++++------
plc4go/tools/plc4xpcapanalyzer/ui/commands.go | 4 ++--
plc4go/tools/plc4xpcapanalyzer/ui/config.go | 7 +++----
9 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/plc4go/go.mod b/plc4go/go.mod
index 9741a50..fb9513b 100644
--- a/plc4go/go.mod
+++ b/plc4go/go.mod
@@ -19,10 +19,10 @@
module github.com/apache/plc4x-extras/plc4go
-go 1.25
+go 1.26
require (
- github.com/apache/plc4x/plc4go v0.0.0-20251124092144-6738c00ca1a7
+ github.com/apache/plc4x/plc4go v0.0.0-20260212145602-54f644996874
github.com/fatih/color v1.18.0
github.com/gdamore/tcell/v2 v2.13.8
github.com/gopacket/gopacket v1.5.0
@@ -46,7 +46,7 @@ require (
github.com/dnephin/pflag v1.0.7 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/gdamore/encoding v1.0.1 // indirect
- github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
+ github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
@@ -66,7 +66,7 @@ require (
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 //
indirect
github.com/rivo/uniseg v0.4.7 // indirect
- github.com/sagikazarmark/locafero v0.11.0 // indirect
+ github.com/sagikazarmark/locafero v0.12.0 // indirect
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 //
indirect
github.com/spf13/afero v1.15.0 // indirect
github.com/spf13/cast v1.10.0 // indirect
@@ -76,12 +76,12 @@ require (
github.com/vektra/mockery/v2 v2.53.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
- golang.org/x/mod v0.30.0 // indirect
- golang.org/x/sync v0.18.0 // indirect
- golang.org/x/sys v0.38.0 // indirect
- golang.org/x/term v0.37.0 // indirect
- golang.org/x/text v0.31.0 // indirect
- golang.org/x/tools v0.39.0 // indirect
+ golang.org/x/mod v0.32.0 // indirect
+ golang.org/x/sync v0.19.0 // indirect
+ golang.org/x/sys v0.41.0 // indirect
+ golang.org/x/term v0.40.0 // indirect
+ golang.org/x/text v0.34.0 // indirect
+ golang.org/x/tools v0.41.0 // indirect
gotest.tools/gotestsum v1.13.0 // indirect
)
diff --git a/plc4go/go.sum b/plc4go/go.sum
index 5804a05..3681619 100644
--- a/plc4go/go.sum
+++ b/plc4go/go.sum
@@ -6,6 +6,8 @@ github.com/antchfx/xpath v0.0.0-20170515025933-1f3266e77307
h1:C735MoY/X+UOx6SEC
github.com/antchfx/xpath v0.0.0-20170515025933-1f3266e77307/go.mod
h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
github.com/apache/plc4x/plc4go v0.0.0-20251124092144-6738c00ca1a7
h1:kDoe4hT0iZcB/2+mbHPnLdPCEkmeqPUCGxaxMFw+5CA=
github.com/apache/plc4x/plc4go v0.0.0-20251124092144-6738c00ca1a7/go.mod
h1:yDBaYPcJ6jyhjEAMVN0TryBpyKAmpxYF/3MQ9IXhWmY=
+github.com/apache/plc4x/plc4go v0.0.0-20260212145602-54f644996874
h1:Ir+Hw93VNo+seD0QG7B22U0ksV+4PE1e5UoHnnUOrVw=
+github.com/apache/plc4x/plc4go v0.0.0-20260212145602-54f644996874/go.mod
h1:clKIXYiPRa6Mj73gzkbJdissuLvvzYTkFR6ln9/OTR4=
github.com/bitfield/gotestdox v0.2.2
h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE=
github.com/bitfield/gotestdox v0.2.2/go.mod
h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
github.com/chengxilo/virtualterm v1.0.4
h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
@@ -33,6 +35,8 @@ github.com/gdamore/tcell/v2 v2.13.8
h1:Mys/Kl5wfC/GcC5Cx4C2BIQH9dbnhnkPgS9/wF3Rl
github.com/gdamore/tcell/v2 v2.13.8/go.mod
h1:+Wfe208WDdB7INEtCsNrAN6O2m+wsTPk1RAovjaILlo=
github.com/go-viper/mapstructure/v2 v2.4.0
h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod
h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.5.0
h1:vM5IJoUAy3d7zRSVtIwQgBj7BiWtMPfmPEgAXnvj1Ro=
+github.com/go-viper/mapstructure/v2 v2.5.0/go.mod
h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
github.com/godbus/dbus/v5 v5.0.4/go.mod
h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod
h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
@@ -104,6 +108,8 @@ github.com/rs/zerolog v1.34.0/go.mod
h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6
github.com/russross/blackfriday/v2 v2.1.0/go.mod
h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sagikazarmark/locafero v0.11.0
h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
github.com/sagikazarmark/locafero v0.11.0/go.mod
h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
+github.com/sagikazarmark/locafero v0.12.0
h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
+github.com/sagikazarmark/locafero v0.12.0/go.mod
h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
github.com/schollz/progressbar/v3 v3.19.0
h1:Ea18xuIRQXLAUidVDox3AbwfUhD0/1IvohyTutOIFoc=
github.com/schollz/progressbar/v3 v3.19.0/go.mod
h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
@@ -141,17 +147,22 @@ golang.org/x/mod
v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
+golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod
h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod
h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
golang.org/x/sync v0.18.0/go.mod
h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod
h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod
h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -163,11 +174,15 @@ golang.org/x/sys v0.6.0/go.mod
h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod
h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod
h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
golang.org/x/term v0.37.0/go.mod
h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
+golang.org/x/term v0.40.0/go.mod
h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -175,12 +190,16 @@ golang.org/x/text v0.7.0/go.mod
h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.14.0/go.mod
h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
golang.org/x/text v0.31.0/go.mod
h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
+golang.org/x/text v0.34.0/go.mod
h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod
h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod
h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod
h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod
h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
golang.org/x/tools v0.39.0/go.mod
h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
+golang.org/x/tools v0.41.0/go.mod
h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod
h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
diff --git a/plc4go/pom.xml b/plc4go/pom.xml
index ec77d81..703d528 100644
--- a/plc4go/pom.xml
+++ b/plc4go/pom.xml
@@ -55,7 +55,7 @@
<go.cover.flag>-coverprofile=target/coverage.out</go.cover.flag>
- <go.version>1.24.2</go.version>
+ <go.version>1.26</go.version>
</properties>
<build>
diff --git a/plc4go/tools/plc4xbrowser/ui/actions.go
b/plc4go/tools/plc4xbrowser/ui/actions.go
index 1355b46..aad545f 100644
--- a/plc4go/tools/plc4xbrowser/ui/actions.go
+++ b/plc4go/tools/plc4xbrowser/ui/actions.go
@@ -22,6 +22,7 @@ package ui
import (
"bytes"
"fmt"
+ "slices"
"strings"
plc4go "github.com/apache/plc4x/plc4go/pkg/api"
@@ -51,13 +52,13 @@ func InitSubsystem() {
w.Out = tview.ANSIWriter(consoleOutput)
},
func(w *zerolog.ConsoleWriter) {
- w.FormatFieldValue = func(i interface{}) string
{
+ w.FormatFieldValue = func(i any) string {
if aString, ok := i.(string); ok &&
strings.Contains(aString, "\\n") {
return
fmt.Sprintf("\x1b[%dm%v\x1b[0m", 31, "see below")
}
return fmt.Sprintf("%s", i)
}
- w.FormatExtra = func(m map[string]interface{},
buffer *bytes.Buffer) error {
+ w.FormatExtra = func(m map[string]any, buffer
*bytes.Buffer) error {
for key, i := range m {
if aString, ok := i.(string);
ok && strings.Contains(aString, "\n") {
buffer.WriteString("\n")
@@ -96,10 +97,8 @@ func outputCommandHistory() {
}
func validateDriverParam(driver string) error {
- for _, protocol := range protocolList {
- if protocol == driver {
- return nil
- }
+ if slices.Contains(protocolList, driver) {
+ return nil
}
return errors.Errorf("protocol %s not found", driver)
}
diff --git a/plc4go/tools/plc4xbrowser/ui/config.go
b/plc4go/tools/plc4xbrowser/ui/config.go
index 02c6a51..4eb4377 100644
--- a/plc4go/tools/plc4xbrowser/ui/config.go
+++ b/plc4go/tools/plc4xbrowser/ui/config.go
@@ -22,6 +22,7 @@ package ui
import (
"os"
"path"
+ "slices"
"sync"
"time"
@@ -157,10 +158,8 @@ func enableAutoRegister(driver string) error {
if err := validateDriverParam(driver); err != nil {
return err
}
- for _, autoRegisterDriver := range config.AutoRegisterDrivers {
- if autoRegisterDriver == driver {
- return errors.Errorf("%s already registered for auto
register", driver)
- }
+ if slices.Contains(config.AutoRegisterDrivers, driver) {
+ return errors.Errorf("%s already registered for auto register",
driver)
}
config.AutoRegisterDrivers = append(config.AutoRegisterDrivers, driver)
log.Info().Str("driver", driver).Msg("Auto register enabled")
diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/root.go
b/plc4go/tools/plc4xpcapanalyzer/cmd/root.go
index 9921bff..9f47cef 100644
--- a/plc4go/tools/plc4xpcapanalyzer/cmd/root.go
+++ b/plc4go/tools/plc4xpcapanalyzer/cmd/root.go
@@ -97,13 +97,13 @@ func initConfig() {
w.Out = os.Stderr
},
func(w *zerolog.ConsoleWriter) {
- w.FormatFieldValue = func(i
interface{}) string {
+ w.FormatFieldValue = func(i any) string
{
if aString, ok := i.(string);
ok && strings.Contains(aString, "\\n") {
return
fmt.Sprintf("\x1b[%dm%v\x1b[0m", 31, "see below")
}
return fmt.Sprintf("%s", i)
}
- w.FormatExtra = func(m
map[string]interface{}, buffer *bytes.Buffer) error {
+ w.FormatExtra = func(m map[string]any,
buffer *bytes.Buffer) error {
for key, i := range m {
if aString, ok :=
i.(string); ok && strings.Contains(aString, "\n") {
buffer.WriteString("\n")
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
index be91014..9e5da06 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go
@@ -24,6 +24,7 @@ import (
"fmt"
"os"
"path"
+ "slices"
"strings"
plc4go "github.com/apache/plc4x/plc4go/pkg/api"
@@ -55,13 +56,13 @@ func InitSubsystem() {
w.Out = tview.ANSIWriter(consoleOutput)
},
func(w *zerolog.ConsoleWriter) {
- w.FormatFieldValue = func(i interface{}) string
{
+ w.FormatFieldValue = func(i any) string {
if aString, ok := i.(string); ok &&
strings.Contains(aString, "\\n") {
return
fmt.Sprintf("\x1b[%dm%v\x1b[0m", 31, "see below")
}
return fmt.Sprintf("%s", i)
}
- w.FormatExtra = func(m map[string]interface{},
buffer *bytes.Buffer) error {
+ w.FormatExtra = func(m map[string]any, buffer
*bytes.Buffer) error {
for key, i := range m {
if aString, ok := i.(string);
ok && strings.Contains(aString, "\n") {
buffer.WriteString("\n")
@@ -124,10 +125,8 @@ func outputCommandHistory() {
}
func validateDriverParam(driver string) error {
- for _, protocol := range protocolList {
- if protocol == driver {
- return nil
- }
+ if slices.Contains(protocolList, driver) {
+ return nil
}
return errors.Errorf("protocol %s not found", driver)
}
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
index fe68a6e..b9e73fc 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go
@@ -304,7 +304,7 @@ var rootCommand = Command{
allConfigFieldType :=
allCliConfigsValue.Type().Field(i)
_, _ =
fmt.Fprintf(commandOutput, "%s:\n", allConfigFieldType.Name)
configInstanceReflectValue := reflect.ValueOf(allConfigField.Interface())
- if
configInstanceReflectValue.Kind() == reflect.Ptr {
+ if
configInstanceReflectValue.Kind() == reflect.Pointer {
configInstanceReflectValue = configInstanceReflectValue.Elem()
}
for j := 0; j <
configInstanceReflectValue.NumField(); j++ {
@@ -335,7 +335,7 @@ var rootCommand = Command{
subCommands:
func() []Command {
var
configElementCommands []Command
configInstanceReflectValue := reflect.ValueOf(allConfigField.Interface())
- if
configInstanceReflectValue.Kind() == reflect.Ptr {
+ if
configInstanceReflectValue.Kind() == reflect.Pointer {
configInstanceReflectValue = configInstanceReflectValue.Elem()
}
for i
:= 0; i < configInstanceReflectValue.NumField(); i++ {
diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/config.go
b/plc4go/tools/plc4xpcapanalyzer/ui/config.go
index 37875c9..2423443 100644
--- a/plc4go/tools/plc4xpcapanalyzer/ui/config.go
+++ b/plc4go/tools/plc4xpcapanalyzer/ui/config.go
@@ -22,6 +22,7 @@ package ui
import (
"os"
"path"
+ "slices"
"time"
"github.com/pkg/errors"
@@ -175,10 +176,8 @@ func enableAutoRegister(driver string) error {
if err := validateDriverParam(driver); err != nil {
return err
}
- for _, autoRegisterDriver := range config.AutoRegisterDrivers {
- if autoRegisterDriver == driver {
- return errors.Errorf("%s already registered for auto
register", driver)
- }
+ if slices.Contains(config.AutoRegisterDrivers, driver) {
+ return errors.Errorf("%s already registered for auto register",
driver)
}
config.AutoRegisterDrivers = append(config.AutoRegisterDrivers, driver)
log.Info().Str("driver", driver).Msg("Auto register enabled")
