From 3473ea7b20d4cd6c3a48e9e5ba0f36e9e17037da Mon Sep 17 00:00:00 2001 From: hwipl <33433250+hwipl@users.noreply.github.com> Date: Wed, 31 May 2023 20:12:17 +0200 Subject: [PATCH 1/2] Update Go module name The repository was moved into a new GitHub organization. Update the Go module name accordingly. Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com> --- cmd/oc-client/main.go | 2 +- cmd/oc-daemon-vpncscript/main.go | 2 +- cmd/oc-daemon/main.go | 2 +- go.mod | 2 +- internal/client/client.go | 6 +++--- internal/client/cmd.go | 4 ++-- internal/daemon/daemon.go | 24 ++++++++++++------------ internal/daemon/vpnconfig.go | 2 +- internal/daemon/vpnconfig_test.go | 2 +- internal/daemon/vpnconfigupdate.go | 2 +- internal/daemon/vpnconfigupdate_test.go | 2 +- internal/ocrunner/connect.go | 2 +- internal/splitrt/addresses.go | 2 +- internal/splitrt/addresses_test.go | 2 +- internal/splitrt/devices.go | 2 +- internal/splitrt/devices_test.go | 2 +- internal/splitrt/splitrt.go | 8 ++++---- internal/splitrt/splitrt_test.go | 8 ++++---- internal/trafpol/filter.go | 2 +- internal/trafpol/trafpol.go | 6 +++--- internal/trafpol/trafpol_test.go | 4 ++-- internal/vpncscript/client.go | 4 ++-- internal/vpncscript/cmd.go | 2 +- internal/vpncscript/config.go | 4 ++-- internal/vpncscript/config_test.go | 2 +- pkg/client/client.go | 8 ++++---- pkg/client/client_test.go | 6 +++--- pkg/client/config.go | 2 +- pkg/vpnstatus/status.go | 2 +- tools/dbusclient/main.go | 2 +- tools/devmon/main.go | 2 +- tools/dnsproxy/main.go | 2 +- tools/ocrunner/main.go | 4 ++-- 33 files changed, 64 insertions(+), 64 deletions(-) diff --git a/cmd/oc-client/main.go b/cmd/oc-client/main.go index 3d1ad80..73a8071 100644 --- a/cmd/oc-client/main.go +++ b/cmd/oc-client/main.go @@ -1,6 +1,6 @@ package main -import "github.com/T-Systems-MMS/oc-daemon/internal/client" +import "github.com/telekom-mms/oc-daemon/internal/client" func main() { client.Run() diff --git a/cmd/oc-daemon-vpncscript/main.go b/cmd/oc-daemon-vpncscript/main.go index cffc0e7..ef1154b 100644 --- a/cmd/oc-daemon-vpncscript/main.go +++ b/cmd/oc-daemon-vpncscript/main.go @@ -1,6 +1,6 @@ package main -import "github.com/T-Systems-MMS/oc-daemon/internal/vpncscript" +import "github.com/telekom-mms/oc-daemon/internal/vpncscript" func main() { vpncscript.Run() diff --git a/cmd/oc-daemon/main.go b/cmd/oc-daemon/main.go index a7c34c1..7a5ddd1 100644 --- a/cmd/oc-daemon/main.go +++ b/cmd/oc-daemon/main.go @@ -1,6 +1,6 @@ package main -import "github.com/T-Systems-MMS/oc-daemon/internal/daemon" +import "github.com/telekom-mms/oc-daemon/internal/daemon" func main() { daemon.Run() diff --git a/go.mod b/go.mod index a0f8cd6..57f740a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/T-Systems-MMS/oc-daemon +module github.com/telekom-mms/oc-daemon go 1.18 diff --git a/internal/client/client.go b/internal/client/client.go index 2aa5344..519563e 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/T-Systems-MMS/oc-daemon/pkg/client" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnstatus" - "github.com/T-Systems-MMS/oc-daemon/pkg/xmlprofile" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/pkg/client" + "github.com/telekom-mms/oc-daemon/pkg/vpnstatus" + "github.com/telekom-mms/oc-daemon/pkg/xmlprofile" ) const ( diff --git a/internal/client/cmd.go b/internal/client/cmd.go index 6d35f3c..cc8a9b2 100644 --- a/internal/client/cmd.go +++ b/internal/client/cmd.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/T-Systems-MMS/oc-daemon/internal/daemon" - "github.com/T-Systems-MMS/oc-daemon/pkg/client" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/daemon" + "github.com/telekom-mms/oc-daemon/pkg/client" ) var ( diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index b0e2975..fc8faf5 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -9,20 +9,20 @@ import ( "syscall" "time" - "github.com/T-Systems-MMS/oc-daemon/internal/api" - "github.com/T-Systems-MMS/oc-daemon/internal/dbusapi" - "github.com/T-Systems-MMS/oc-daemon/internal/dnsproxy" - "github.com/T-Systems-MMS/oc-daemon/internal/ocrunner" - "github.com/T-Systems-MMS/oc-daemon/internal/profilemon" - "github.com/T-Systems-MMS/oc-daemon/internal/sleepmon" - "github.com/T-Systems-MMS/oc-daemon/internal/splitrt" - "github.com/T-Systems-MMS/oc-daemon/internal/trafpol" - "github.com/T-Systems-MMS/oc-daemon/pkg/logininfo" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnstatus" - "github.com/T-Systems-MMS/oc-daemon/pkg/xmlprofile" "github.com/T-Systems-MMS/tnd/pkg/trustnet" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/api" + "github.com/telekom-mms/oc-daemon/internal/dbusapi" + "github.com/telekom-mms/oc-daemon/internal/dnsproxy" + "github.com/telekom-mms/oc-daemon/internal/ocrunner" + "github.com/telekom-mms/oc-daemon/internal/profilemon" + "github.com/telekom-mms/oc-daemon/internal/sleepmon" + "github.com/telekom-mms/oc-daemon/internal/splitrt" + "github.com/telekom-mms/oc-daemon/internal/trafpol" + "github.com/telekom-mms/oc-daemon/pkg/logininfo" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnstatus" + "github.com/telekom-mms/oc-daemon/pkg/xmlprofile" "golang.org/x/sys/unix" ) diff --git a/internal/daemon/vpnconfig.go b/internal/daemon/vpnconfig.go index 6fd4fbc..2ba9372 100644 --- a/internal/daemon/vpnconfig.go +++ b/internal/daemon/vpnconfig.go @@ -5,8 +5,8 @@ import ( "net" "os/exec" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" "github.com/vishvananda/netlink" ) diff --git a/internal/daemon/vpnconfig_test.go b/internal/daemon/vpnconfig_test.go index 95b4170..aa43fbf 100644 --- a/internal/daemon/vpnconfig_test.go +++ b/internal/daemon/vpnconfig_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" "github.com/vishvananda/netlink" ) diff --git a/internal/daemon/vpnconfigupdate.go b/internal/daemon/vpnconfigupdate.go index a6c666e..0f858df 100644 --- a/internal/daemon/vpnconfigupdate.go +++ b/internal/daemon/vpnconfigupdate.go @@ -3,7 +3,7 @@ package daemon import ( "encoding/json" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // VPNConfigUpdate is a VPN configuration update diff --git a/internal/daemon/vpnconfigupdate_test.go b/internal/daemon/vpnconfigupdate_test.go index e68268a..71fe400 100644 --- a/internal/daemon/vpnconfigupdate_test.go +++ b/internal/daemon/vpnconfigupdate_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // TestVPNConfigUpdateValid tests Valid of VPNConfigUpdate diff --git a/internal/ocrunner/connect.go b/internal/ocrunner/connect.go index b67d8f2..6dea253 100644 --- a/internal/ocrunner/connect.go +++ b/internal/ocrunner/connect.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/T-Systems-MMS/oc-daemon/pkg/logininfo" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/pkg/logininfo" ) const ( diff --git a/internal/splitrt/addresses.go b/internal/splitrt/addresses.go index 1b3032c..e4e7a0c 100644 --- a/internal/splitrt/addresses.go +++ b/internal/splitrt/addresses.go @@ -3,7 +3,7 @@ package splitrt import ( "net" - "github.com/T-Systems-MMS/oc-daemon/internal/addrmon" + "github.com/telekom-mms/oc-daemon/internal/addrmon" ) // Addresses is a set of addresses diff --git a/internal/splitrt/addresses_test.go b/internal/splitrt/addresses_test.go index 25030c6..0de7b29 100644 --- a/internal/splitrt/addresses_test.go +++ b/internal/splitrt/addresses_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/internal/addrmon" + "github.com/telekom-mms/oc-daemon/internal/addrmon" ) // getTestAddrMonUpdate returns an AddrMon update for testing diff --git a/internal/splitrt/devices.go b/internal/splitrt/devices.go index 0f6db46..5a7ab5d 100644 --- a/internal/splitrt/devices.go +++ b/internal/splitrt/devices.go @@ -1,7 +1,7 @@ package splitrt import ( - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/devmon" ) // Devices is a set of devices diff --git a/internal/splitrt/devices_test.go b/internal/splitrt/devices_test.go index c97d09a..427fd53 100644 --- a/internal/splitrt/devices_test.go +++ b/internal/splitrt/devices_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/devmon" ) // getTestDevMonUpdate returns a DevMon Update for testing diff --git a/internal/splitrt/splitrt.go b/internal/splitrt/splitrt.go index 17f7411..415b335 100644 --- a/internal/splitrt/splitrt.go +++ b/internal/splitrt/splitrt.go @@ -3,11 +3,11 @@ package splitrt import ( "net" - "github.com/T-Systems-MMS/oc-daemon/internal/addrmon" - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" - "github.com/T-Systems-MMS/oc-daemon/internal/dnsproxy" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/addrmon" + "github.com/telekom-mms/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/dnsproxy" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // SplitRouting is a split routing configuration diff --git a/internal/splitrt/splitrt_test.go b/internal/splitrt/splitrt_test.go index 2f2f803..f8292bf 100644 --- a/internal/splitrt/splitrt_test.go +++ b/internal/splitrt/splitrt_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/internal/addrmon" - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" - "github.com/T-Systems-MMS/oc-daemon/internal/dnsproxy" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/internal/addrmon" + "github.com/telekom-mms/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/dnsproxy" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" "github.com/vishvananda/netlink" ) diff --git a/internal/trafpol/filter.go b/internal/trafpol/filter.go index 6f6fb67..3d20b74 100644 --- a/internal/trafpol/filter.go +++ b/internal/trafpol/filter.go @@ -7,8 +7,8 @@ import ( "os/exec" "strings" - "github.com/T-Systems-MMS/oc-daemon/internal/splitrt" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/splitrt" ) // runNft runs nft and passes s to it via stdin diff --git a/internal/trafpol/trafpol.go b/internal/trafpol/trafpol.go index e43fd70..b22857c 100644 --- a/internal/trafpol/trafpol.go +++ b/internal/trafpol/trafpol.go @@ -1,10 +1,10 @@ package trafpol import ( - "github.com/T-Systems-MMS/oc-daemon/internal/cpd" - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" - "github.com/T-Systems-MMS/oc-daemon/internal/dnsmon" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/cpd" + "github.com/telekom-mms/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/dnsmon" ) // TrafPol is a traffic policing component diff --git a/internal/trafpol/trafpol_test.go b/internal/trafpol/trafpol_test.go index b5caf7f..155c5cc 100644 --- a/internal/trafpol/trafpol_test.go +++ b/internal/trafpol/trafpol_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - "github.com/T-Systems-MMS/oc-daemon/internal/cpd" - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" + "github.com/telekom-mms/oc-daemon/internal/cpd" + "github.com/telekom-mms/oc-daemon/internal/devmon" "github.com/vishvananda/netlink" ) diff --git a/internal/vpncscript/client.go b/internal/vpncscript/client.go index a69dfb6..c2ec58f 100644 --- a/internal/vpncscript/client.go +++ b/internal/vpncscript/client.go @@ -3,9 +3,9 @@ package vpncscript import ( "net" - "github.com/T-Systems-MMS/oc-daemon/internal/api" - "github.com/T-Systems-MMS/oc-daemon/internal/daemon" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/api" + "github.com/telekom-mms/oc-daemon/internal/daemon" ) const ( diff --git a/internal/vpncscript/cmd.go b/internal/vpncscript/cmd.go index 8d8306a..19bad51 100644 --- a/internal/vpncscript/cmd.go +++ b/internal/vpncscript/cmd.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/T-Systems-MMS/oc-daemon/internal/daemon" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/daemon" ) // Run is the main entry point of vpnc script diff --git a/internal/vpncscript/config.go b/internal/vpncscript/config.go index eeef8c3..61a8083 100644 --- a/internal/vpncscript/config.go +++ b/internal/vpncscript/config.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/T-Systems-MMS/oc-daemon/internal/daemon" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/daemon" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // createConfigGeneral creates the general configuration in config from env diff --git a/internal/vpncscript/config_test.go b/internal/vpncscript/config_test.go index f9fd95e..e9f05d4 100644 --- a/internal/vpncscript/config_test.go +++ b/internal/vpncscript/config_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // TestCreateConfigSplit tests createConfigSplit diff --git a/pkg/client/client.go b/pkg/client/client.go index 91fe391..244df10 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -9,11 +9,11 @@ import ( "strings" "sync" - "github.com/T-Systems-MMS/oc-daemon/internal/dbusapi" - "github.com/T-Systems-MMS/oc-daemon/pkg/logininfo" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnstatus" "github.com/godbus/dbus/v5" + "github.com/telekom-mms/oc-daemon/internal/dbusapi" + "github.com/telekom-mms/oc-daemon/pkg/logininfo" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnstatus" ) // Client is an OC-Daemon client diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go index 8f9ea84..4a43606 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/client_test.go @@ -4,10 +4,10 @@ import ( "reflect" "testing" - "github.com/T-Systems-MMS/oc-daemon/internal/dbusapi" - "github.com/T-Systems-MMS/oc-daemon/pkg/logininfo" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnstatus" "github.com/godbus/dbus/v5" + "github.com/telekom-mms/oc-daemon/internal/dbusapi" + "github.com/telekom-mms/oc-daemon/pkg/logininfo" + "github.com/telekom-mms/oc-daemon/pkg/vpnstatus" ) // TestDBusClientSetGetConfig tests SetConfig and GetConfig of DBusClient diff --git a/pkg/client/config.go b/pkg/client/config.go index ee49719..51a7350 100644 --- a/pkg/client/config.go +++ b/pkg/client/config.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/T-Systems-MMS/oc-daemon/pkg/xmlprofile" + "github.com/telekom-mms/oc-daemon/pkg/xmlprofile" ) var ( diff --git a/pkg/vpnstatus/status.go b/pkg/vpnstatus/status.go index 2890b7c..871b588 100644 --- a/pkg/vpnstatus/status.go +++ b/pkg/vpnstatus/status.go @@ -3,7 +3,7 @@ package vpnstatus import ( "encoding/json" - "github.com/T-Systems-MMS/oc-daemon/pkg/vpnconfig" + "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" ) // TrustedNetwork is the current trusted network state diff --git a/tools/dbusclient/main.go b/tools/dbusclient/main.go index 146cc0a..89309a3 100644 --- a/tools/dbusclient/main.go +++ b/tools/dbusclient/main.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/T-Systems-MMS/oc-daemon/internal/dbusapi" "github.com/godbus/dbus/v5" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/dbusapi" ) func main() { diff --git a/tools/devmon/main.go b/tools/devmon/main.go index 17397f6..595bf58 100644 --- a/tools/devmon/main.go +++ b/tools/devmon/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/T-Systems-MMS/oc-daemon/internal/devmon" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/devmon" ) func main() { diff --git a/tools/dnsproxy/main.go b/tools/dnsproxy/main.go index cd8988f..c0db478 100644 --- a/tools/dnsproxy/main.go +++ b/tools/dnsproxy/main.go @@ -4,8 +4,8 @@ import ( "flag" "strings" - "github.com/T-Systems-MMS/oc-daemon/internal/dnsproxy" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/dnsproxy" ) var ( diff --git a/tools/ocrunner/main.go b/tools/ocrunner/main.go index 2a30800..8a10162 100644 --- a/tools/ocrunner/main.go +++ b/tools/ocrunner/main.go @@ -4,9 +4,9 @@ import ( "flag" "time" - "github.com/T-Systems-MMS/oc-daemon/internal/ocrunner" - "github.com/T-Systems-MMS/oc-daemon/pkg/client" log "github.com/sirupsen/logrus" + "github.com/telekom-mms/oc-daemon/internal/ocrunner" + "github.com/telekom-mms/oc-daemon/pkg/client" ) func main() { From f1819e6776c846e1cf3f0be1e3ccd26a9b4d04ae Mon Sep 17 00:00:00 2001 From: hwipl <33433250+hwipl@users.noreply.github.com> Date: Wed, 31 May 2023 20:23:40 +0200 Subject: [PATCH 2/2] Update Go module name of TND The TND repository was moved into a new GitHub organization. Update the Go module name accordingly. Signed-off-by: hwipl <33433250+hwipl@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- internal/daemon/daemon.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 57f740a..180b317 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/telekom-mms/oc-daemon go 1.18 require ( - github.com/T-Systems-MMS/tnd v0.0.0-20230404085219-434ecc2a5379 github.com/fsnotify/fsnotify v1.6.0 github.com/godbus/dbus/v5 v5.1.0 github.com/miekg/dns v1.1.53 github.com/sirupsen/logrus v1.9.0 + github.com/telekom-mms/tnd v0.0.0-20230531180948-b1baa08c638b github.com/vishvananda/netlink v1.1.0 golang.org/x/sys v0.6.0 ) diff --git a/go.sum b/go.sum index dc93eff..b7caf23 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/T-Systems-MMS/tnd v0.0.0-20230404085219-434ecc2a5379 h1:nKPbpauxqcArtC5Td+LnnQQcZ+bxs5zm15QjTeMECmM= -github.com/T-Systems-MMS/tnd v0.0.0-20230404085219-434ecc2a5379/go.mod h1:u0Su8iHxWHsa/v8QKxiIZHhtjRZPaOEoxCv17xaHxSE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -16,6 +14,8 @@ github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/telekom-mms/tnd v0.0.0-20230531180948-b1baa08c638b h1:gmtBIhYgqSPuwhJb3dfegFoUc97QfhDTgyxAQl3h/WI= +github.com/telekom-mms/tnd v0.0.0-20230531180948-b1baa08c638b/go.mod h1:MYxL04Fs4kJfHEBOLsTWsC0DS1stAo9uhDoI9wMJbRs= github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index fc8faf5..25aa660 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -9,7 +9,6 @@ import ( "syscall" "time" - "github.com/T-Systems-MMS/tnd/pkg/trustnet" log "github.com/sirupsen/logrus" "github.com/telekom-mms/oc-daemon/internal/api" "github.com/telekom-mms/oc-daemon/internal/dbusapi" @@ -23,6 +22,7 @@ import ( "github.com/telekom-mms/oc-daemon/pkg/vpnconfig" "github.com/telekom-mms/oc-daemon/pkg/vpnstatus" "github.com/telekom-mms/oc-daemon/pkg/xmlprofile" + "github.com/telekom-mms/tnd/pkg/trustnet" "golang.org/x/sys/unix" )