Moved services to the internal structure

aau-network-security · Jul 24, 2022 · 30b1de9 · 30b1de9
1 parent 195a9aa
commit 30b1de9
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 14 deletions.
diff --git a/api/proxy/proxy.go b/api/proxy/proxy.go
@@ -9,8 +9,8 @@ import (
 	"github.com/riotpot/api"
 	"github.com/riotpot/api/service"
 	"github.com/riotpot/internal/proxy"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/internal/validators"
-	"github.com/riotpot/pkg/services"
 )
 
 // Structures used to serialize data:

diff --git a/api/service/service.go b/api/service/service.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/riotpot/api"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/internal/validators"
-	"github.com/riotpot/pkg/services"
 )
 
 type GetService struct {

diff --git a/configs/plugin.go b/configs/plugin.go
@@ -15,7 +15,7 @@ TIP: To create your own plugin...
 package main
 
 import (
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 )
 
 // Place here the name of the function which returns the service interface.

diff --git a/internal/proxy/manager.go b/internal/proxy/manager.go
@@ -6,7 +6,7 @@ package proxy
 import (
 	"fmt"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 )
 
 var (

diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/google/uuid"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/internal/validators"
-	"github.com/riotpot/pkg/services"
 )
 
 const (

diff --git a/pkg/services/manager.go → internal/services/manager.go b/pkg/services/manager.go → internal/services/manager.go
diff --git a/pkg/services/services.go → internal/services/services.go b/pkg/services/services.go → internal/services/services.go
diff --git a/pkg/plugin/coapd/coapd.go b/pkg/plugin/coapd/coapd.go
@@ -19,7 +19,7 @@ import (
 	"github.com/plgd-dev/go-coap/v2/message"
 	"github.com/plgd-dev/go-coap/v2/message/codes"
 	"github.com/plgd-dev/go-coap/v2/mux"
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 )
 
 var Plugin string

diff --git a/pkg/plugin/echod/echod.go b/pkg/plugin/echod/echod.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/tools/errors"
 )
 

diff --git a/pkg/plugin/httpd/httpd.go b/pkg/plugin/httpd/httpd.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 )
 
 var Plugin string

diff --git a/pkg/plugin/modbusd/modbusd.go b/pkg/plugin/modbusd/modbusd.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/tools/errors"
 	"github.com/xiegeo/modbusone"
 )

diff --git a/pkg/plugin/mqttd/mqttd.go b/pkg/plugin/mqttd/mqttd.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/tools/errors"
 )
 

diff --git a/pkg/plugin/sshd/sshd.go b/pkg/plugin/sshd/sshd.go
@@ -7,8 +7,8 @@ import (
 	"net"
 	"sync"
 
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/pkg/fake/shell"
-	"github.com/riotpot/pkg/services"
 	"github.com/riotpot/tools/errors"
 	"github.com/traetox/pty"
 	"golang.org/x/crypto/ssh"

diff --git a/pkg/plugin/telnetd/telnetd.go b/pkg/plugin/telnetd/telnetd.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"net"
 
+	"github.com/riotpot/internal/services"
 	"github.com/riotpot/pkg/fake/shell"
-	"github.com/riotpot/pkg/services"
 	"github.com/riotpot/tools/errors"
 )
 

diff --git a/test/internal/proxy/proxy_test.go b/test/internal/proxy/proxy_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/riotpot/internal/proxy"
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/test/pkg/services/mqtt/mqtt.py → test/internal/services/mqtt/mqtt.py b/test/pkg/services/mqtt/mqtt.py → test/internal/services/mqtt/mqtt.py
diff --git a/test/pkg/services/services_test.go → test/internal/services/services_test.go b/test/pkg/services/services_test.go → test/internal/services/services_test.go
@@ -10,7 +10,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/riotpot/pkg/services"
+	"github.com/riotpot/internal/services"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/plgd-dev/go-coap/v2/message"