This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/main by this push: new b35f70c fix(plc4go): rename package b35f70c is described below commit b35f70c4350ee32d6a53a8a99932a5cf53235b15 Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Mon Apr 8 08:49:15 2024 +0200 fix(plc4go): rename package --- plc4go/go.mod | 77 ++++++++++++++++++++++ plc4go/tools/plc4xbrowser/main.go | 2 +- plc4go/tools/plc4xbrowser/ui/actions.go | 4 +- plc4go/tools/plc4xbrowser/ui/common.go | 8 ++- plc4go/tools/plc4xbrowser/ui/config.go | 9 +-- plc4go/tools/plc4xpcapanalyzer/cmd/analyze.go | 7 +- plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go | 7 +- plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go | 7 +- plc4go/tools/plc4xpcapanalyzer/cmd/extract.go | 7 +- plc4go/tools/plc4xpcapanalyzer/cmd/root.go | 9 +-- plc4go/tools/plc4xpcapanalyzer/cmd/ui.go | 7 +- .../internal/analyzer/analyzer.go | 20 +++--- .../internal/bacnetanalyzer/analyzer.go | 4 +- .../internal/cbusanalyzer/analyzer.go | 5 +- .../plc4xpcapanalyzer/internal/common/common.go | 5 +- .../internal/extractor/extractor.go | 12 ++-- .../internal/pcaphandler/pcaphandler.go | 3 +- plc4go/tools/plc4xpcapanalyzer/main.go | 2 +- plc4go/tools/plc4xpcapanalyzer/ui/actions.go | 8 ++- plc4go/tools/plc4xpcapanalyzer/ui/commands.go | 32 ++++----- plc4go/tools/plc4xpcapanalyzer/ui/config.go | 10 +-- 21 files changed, 174 insertions(+), 71 deletions(-) diff --git a/plc4go/go.mod b/plc4go/go.mod new file mode 100644 index 0000000..9c229f3 --- /dev/null +++ b/plc4go/go.mod @@ -0,0 +1,77 @@ +// +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// + +module github.com/apache/plc4x/plc4go-extras + +go 1.20 + +require ( + github.com/apache/plc4x/plc4go v0.0.0-20240405131220-64e372d1a91e + github.com/fatih/color v1.16.0 + github.com/gdamore/tcell/v2 v2.7.4 + github.com/gopacket/gopacket v1.2.0 + github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 + github.com/pkg/errors v0.9.1 + github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854 + github.com/rs/zerolog v1.32.0 + github.com/schollz/progressbar/v3 v3.14.2 + github.com/spf13/cobra v1.8.0 + github.com/spf13/viper v1.18.2 + github.com/stretchr/testify v1.9.0 + gopkg.in/yaml.v3 v3.0.1 +) + +require ( + github.com/IBM/netaddr v1.5.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/dchest/uniuri v1.2.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/gdamore/encoding v1.0.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/icza/bitio v1.1.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jacobsa/go-serial v0.0.0-20180131005756-15cf729a72d4 // indirect + github.com/libp2p/go-reuseport v0.4.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/magiconair/properties v1.8.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // 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.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + go.uber.org/atomic v1.9.0 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/term v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect +) diff --git a/plc4go/tools/plc4xbrowser/main.go b/plc4go/tools/plc4xbrowser/main.go index 0427d9c..277dea4 100644 --- a/plc4go/tools/plc4xbrowser/main.go +++ b/plc4go/tools/plc4xbrowser/main.go @@ -20,7 +20,7 @@ package main import ( - "github.com/apache/plc4x/plc4go/tools/plc4xbrowser/ui" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xbrowser/ui" ) func main() { diff --git a/plc4go/tools/plc4xbrowser/ui/actions.go b/plc4go/tools/plc4xbrowser/ui/actions.go index 2a9b442..ef6ca83 100644 --- a/plc4go/tools/plc4xbrowser/ui/actions.go +++ b/plc4go/tools/plc4xbrowser/ui/actions.go @@ -22,6 +22,8 @@ package ui import ( "bytes" "fmt" + "strings" + "github.com/apache/plc4x/plc4go/internal/ads" "github.com/apache/plc4x/plc4go/internal/bacnetip" "github.com/apache/plc4x/plc4go/internal/cbus" @@ -29,11 +31,11 @@ import ( "github.com/apache/plc4x/plc4go/internal/s7" plc4go "github.com/apache/plc4x/plc4go/pkg/api" "github.com/apache/plc4x/plc4go/pkg/api/transports" + "github.com/pkg/errors" "github.com/rivo/tview" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "strings" ) func InitSubsystem() { diff --git a/plc4go/tools/plc4xbrowser/ui/common.go b/plc4go/tools/plc4xbrowser/ui/common.go index c052901..7eaa323 100644 --- a/plc4go/tools/plc4xbrowser/ui/common.go +++ b/plc4go/tools/plc4xbrowser/ui/common.go @@ -20,13 +20,15 @@ package ui import ( - plc4go "github.com/apache/plc4x/plc4go/pkg/api" - plc4goModel "github.com/apache/plc4x/plc4go/pkg/api/model" - "github.com/rs/zerolog" "io" "strings" "sync" "time" + + plc4go "github.com/apache/plc4x/plc4go/pkg/api" + plc4goModel "github.com/apache/plc4x/plc4go/pkg/api/model" + + "github.com/rs/zerolog" ) const protocols = "ads,bacnetip,c-bus,opcua,s7" diff --git a/plc4go/tools/plc4xbrowser/ui/config.go b/plc4go/tools/plc4xbrowser/ui/config.go index 47a325b..02c6a51 100644 --- a/plc4go/tools/plc4xbrowser/ui/config.go +++ b/plc4go/tools/plc4xbrowser/ui/config.go @@ -20,14 +20,15 @@ package ui import ( - "github.com/pkg/errors" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - "gopkg.in/yaml.v3" "os" "path" "sync" "time" + + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "gopkg.in/yaml.v3" ) var plc4xBrowserConfigDir string diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/analyze.go b/plc4go/tools/plc4xpcapanalyzer/cmd/analyze.go index fa0c119..bde4e51 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/analyze.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/analyze.go @@ -20,12 +20,13 @@ package cmd import ( - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer" - "github.com/pkg/errors" "math" "os" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/analyzer" + + "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go b/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go index b268414..cfaa4ef 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/bacnet.go @@ -20,11 +20,12 @@ package cmd import ( - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer" - "github.com/pkg/errors" "os" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/analyzer" + + "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go b/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go index 5c76e98..98e390e 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/cbus.go @@ -20,11 +20,12 @@ package cmd import ( - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer" - "github.com/pkg/errors" "os" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/analyzer" + + "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/extract.go b/plc4go/tools/plc4xpcapanalyzer/cmd/extract.go index 441d1a9..1ba55a5 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/extract.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/extract.go @@ -20,11 +20,12 @@ package cmd import ( - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/extractor" - "github.com/pkg/errors" "os" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/extractor" + + "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/root.go b/plc4go/tools/plc4xpcapanalyzer/cmd/root.go index 4132f48..c96a304 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/root.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/root.go @@ -22,13 +22,14 @@ package cmd import ( "bytes" "fmt" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" - "github.com/rs/zerolog/pkgerrors" "os" "strings" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" + "github.com/rs/zerolog/pkgerrors" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go b/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go index 3d3f83a..f0a5dc1 100644 --- a/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go +++ b/plc4go/tools/plc4xpcapanalyzer/cmd/ui.go @@ -20,11 +20,12 @@ package cmd import ( - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/ui" - "github.com/pkg/errors" - "github.com/rs/zerolog/log" "os" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/ui" + + "github.com/pkg/errors" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go index de49729..fc646f9 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/analyzer/analyzer.go @@ -24,22 +24,24 @@ import ( "context" "encoding/hex" "fmt" + "io" + "net" + "os" + "time" + + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/bacnetanalyzer" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/cbusanalyzer" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/common" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/pcaphandler" "github.com/apache/plc4x/plc4go/spi" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/bacnetanalyzer" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler" + "github.com/gopacket/gopacket" "github.com/gopacket/gopacket/layers" "github.com/k0kubun/go-ansi" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/schollz/progressbar/v3" - "io" - "net" - "os" - "time" ) func Analyze(pcapFile, protocolType string) error { diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/bacnetanalyzer/analyzer.go b/plc4go/tools/plc4xpcapanalyzer/internal/bacnetanalyzer/analyzer.go index f7a5d8b..cf06617 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/bacnetanalyzer/analyzer.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/bacnetanalyzer/analyzer.go @@ -21,9 +21,11 @@ package bacnetanalyzer import ( "context" + + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/common" "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" "github.com/apache/plc4x/plc4go/spi" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common" + "github.com/pkg/errors" "github.com/rs/zerolog/log" ) diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go b/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go index bef46f4..7583239 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/cbusanalyzer/analyzer.go @@ -25,11 +25,12 @@ import ( "net" "reflect" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/common" "github.com/apache/plc4x/plc4go/internal/cbus" "github.com/apache/plc4x/plc4go/protocols/cbus/readwrite/model" "github.com/apache/plc4x/plc4go/spi" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common" + "github.com/gopacket/gopacket" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go b/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go index afab92d..d917b96 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/common/common.go @@ -21,10 +21,11 @@ package common import ( "fmt" - "github.com/gopacket/gopacket" - "github.com/pkg/errors" "net" "time" + + "github.com/gopacket/gopacket" + "github.com/pkg/errors" ) type PacketInformation struct { diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go b/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go index 03ffa92..3a6f2a2 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/extractor/extractor.go @@ -22,17 +22,19 @@ package extractor import ( "context" "fmt" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/common" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler" + "io" + "net" + + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/common" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/pcaphandler" + "github.com/fatih/color" "github.com/gopacket/gopacket/layers" "github.com/k0kubun/go-ansi" "github.com/pkg/errors" "github.com/rs/zerolog/log" "github.com/schollz/progressbar/v3" - "io" - "net" ) func Extract(pcapFile, protocolType string) error { diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go b/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go index 2cd9896..fa3fa1f 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/pcaphandler/pcaphandler.go @@ -20,10 +20,11 @@ package pcaphandler import ( + "time" + "github.com/gopacket/gopacket" "github.com/gopacket/gopacket/pcap" "github.com/pkg/errors" - "time" ) // GetPacketSource gets a packet source from a handle diff --git a/plc4go/tools/plc4xpcapanalyzer/main.go b/plc4go/tools/plc4xpcapanalyzer/main.go index cb3fd52..e13b0bf 100644 --- a/plc4go/tools/plc4xpcapanalyzer/main.go +++ b/plc4go/tools/plc4xpcapanalyzer/main.go @@ -19,7 +19,7 @@ package main -import "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/cmd" +import "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/cmd" func main() { cmd.Execute() diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go index 085558c..117dae0 100644 --- a/plc4go/tools/plc4xpcapanalyzer/ui/actions.go +++ b/plc4go/tools/plc4xpcapanalyzer/ui/actions.go @@ -22,6 +22,10 @@ package ui import ( "bytes" "fmt" + "os" + "path" + "strings" + "github.com/apache/plc4x/plc4go/internal/ads" "github.com/apache/plc4x/plc4go/internal/bacnetip" "github.com/apache/plc4x/plc4go/internal/cbus" @@ -29,13 +33,11 @@ import ( plc4go "github.com/apache/plc4x/plc4go/pkg/api" "github.com/apache/plc4x/plc4go/spi" "github.com/apache/plc4x/plc4go/spi/transports/pcap" + "github.com/pkg/errors" "github.com/rivo/tview" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "os" - "path" - "strings" ) func InitSubsystem() { diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go index b6b752d..f7f2064 100644 --- a/plc4go/tools/plc4xpcapanalyzer/ui/commands.go +++ b/plc4go/tools/plc4xpcapanalyzer/ui/commands.go @@ -22,21 +22,23 @@ package ui import ( "context" "fmt" - plc4x_config "github.com/apache/plc4x/plc4go/pkg/api/config" - "github.com/apache/plc4x/plc4go/spi" - cliConfig "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/analyzer" - "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/internal/extractor" - "github.com/pkg/errors" - "github.com/rivo/tview" - "github.com/rs/zerolog" - "github.com/rs/zerolog/log" "os" "path" "reflect" "runtime/debug" "strings" "time" + + cliConfig "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/analyzer" + "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/internal/extractor" + plc4xconfig "github.com/apache/plc4x/plc4go/pkg/api/config" + "github.com/apache/plc4x/plc4go/spi" + + "github.com/pkg/errors" + "github.com/rivo/tview" + "github.com/rs/zerolog" + "github.com/rs/zerolog/log" ) const rootCommandIndicator = "rootCommand" @@ -436,7 +438,7 @@ var rootCommand = Command{ Name: "on", Description: "trace on", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceTransactionManagerWorkers = true + plc4xconfig.TraceTransactionManagerWorkers = true return nil }, }, @@ -444,7 +446,7 @@ var rootCommand = Command{ Name: "off", Description: "trace off", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceTransactionManagerWorkers = false + plc4xconfig.TraceTransactionManagerWorkers = false return nil }, }, @@ -458,7 +460,7 @@ var rootCommand = Command{ Name: "on", Description: "trace on", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceTransactionManagerTransactions = true + plc4xconfig.TraceTransactionManagerTransactions = true return nil }, }, @@ -466,7 +468,7 @@ var rootCommand = Command{ Name: "off", Description: "trace off", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceTransactionManagerTransactions = false + plc4xconfig.TraceTransactionManagerTransactions = false return nil }, }, @@ -480,7 +482,7 @@ var rootCommand = Command{ Name: "on", Description: "trace on", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceDefaultMessageCodecWorker = true + plc4xconfig.TraceDefaultMessageCodecWorker = true return nil }, }, @@ -488,7 +490,7 @@ var rootCommand = Command{ Name: "off", Description: "trace off", action: func(_ context.Context, _ Command, _ string) error { - plc4x_config.TraceDefaultMessageCodecWorker = false + plc4xconfig.TraceDefaultMessageCodecWorker = false return nil }, }, diff --git a/plc4go/tools/plc4xpcapanalyzer/ui/config.go b/plc4go/tools/plc4xpcapanalyzer/ui/config.go index dc96f61..2c21c4b 100644 --- a/plc4go/tools/plc4xpcapanalyzer/ui/config.go +++ b/plc4go/tools/plc4xpcapanalyzer/ui/config.go @@ -20,14 +20,16 @@ package ui import ( - cliConfig "github.com/apache/plc4x/plc4go/tools/plc4xpcapanalyzer/config" + "os" + "path" + "time" + + cliConfig "github.com/apache/plc4x/plc4go-extras/tools/plc4xpcapanalyzer/config" + "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" - "os" - "path" - "time" ) var plc4xpcapanalyzerConfigDir string