diff --git a/Dockerfile b/Dockerfile index f983cf602..9b1bac46a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,10 +72,10 @@ ARG SEM_VER=0.0.0 WORKDIR /app/agent-build RUN go build -ldflags="-extldflags=-static -s -w \ - -X 'mizuserver/pkg/version.GitCommitHash=${COMMIT_HASH}' \ - -X 'mizuserver/pkg/version.Branch=${GIT_BRANCH}' \ - -X 'mizuserver/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \ - -X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent . + -X 'github.com/up9inc/mizu/agent/pkg/version.GitCommitHash=${COMMIT_HASH}' \ + -X 'github.com/up9inc/mizu/agent/pkg/version.Branch=${GIT_BRANCH}' \ + -X 'github.com/up9inc/mizu/agent/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \ + -X 'github.com/up9inc/mizu/agent/pkg/version.SemVer=${SEM_VER}'" -o mizuagent . # Download Basenine executable, verify the sha1sum ADD https://github.com/up9inc/basenine/releases/download/v0.4.13/basenine_linux_${GOARCH} ./basenine_linux_${GOARCH} diff --git a/agent/go.mod b/agent/go.mod index dd8d8e4b9..10cf72e1e 100644 --- a/agent/go.mod +++ b/agent/go.mod @@ -1,4 +1,4 @@ -module mizuserver +module github.com/up9inc/mizu/agent go 1.16 diff --git a/agent/main.go b/agent/main.go index 1149ef367..205f98552 100644 --- a/agent/main.go +++ b/agent/main.go @@ -6,17 +6,6 @@ import ( "flag" "fmt" "io/ioutil" - "mizuserver/pkg/api" - "mizuserver/pkg/config" - "mizuserver/pkg/controllers" - "mizuserver/pkg/elastic" - "mizuserver/pkg/middlewares" - "mizuserver/pkg/models" - "mizuserver/pkg/oas" - "mizuserver/pkg/routes" - "mizuserver/pkg/servicemap" - "mizuserver/pkg/up9" - "mizuserver/pkg/utils" "net/http" "os" "os/signal" @@ -26,6 +15,21 @@ import ( "syscall" "time" + "github.com/up9inc/mizu/agent/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/oas" + "github.com/up9inc/mizu/agent/pkg/routes" + "github.com/up9inc/mizu/agent/pkg/servicemap" + "github.com/up9inc/mizu/agent/pkg/up9" + "github.com/up9inc/mizu/agent/pkg/utils" + + "github.com/up9inc/mizu/agent/pkg/elastic" + + "github.com/up9inc/mizu/agent/pkg/controllers" + + "github.com/up9inc/mizu/agent/pkg/api" + "github.com/up9inc/mizu/agent/pkg/config" + v1 "k8s.io/api/core/v1" "github.com/antelman107/net-wait-go/wait" diff --git a/agent/pkg/api/main.go b/agent/pkg/api/main.go index 0ecdc7542..89854b4b6 100644 --- a/agent/pkg/api/main.go +++ b/agent/pkg/api/main.go @@ -5,22 +5,23 @@ import ( "context" "encoding/json" "fmt" - "mizuserver/pkg/elastic" - "mizuserver/pkg/har" - "mizuserver/pkg/holder" - "mizuserver/pkg/providers" "os" "path" "sort" "strings" "time" - "mizuserver/pkg/servicemap" + "github.com/up9inc/mizu/agent/pkg/elastic" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/agent/pkg/holder" + "github.com/up9inc/mizu/agent/pkg/providers" - "mizuserver/pkg/models" - "mizuserver/pkg/oas" - "mizuserver/pkg/resolver" - "mizuserver/pkg/utils" + "github.com/up9inc/mizu/agent/pkg/servicemap" + + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/oas" + "github.com/up9inc/mizu/agent/pkg/resolver" + "github.com/up9inc/mizu/agent/pkg/utils" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger" diff --git a/agent/pkg/api/socket_routes.go b/agent/pkg/api/socket_routes.go index 0f0b73966..a58c7bf1f 100644 --- a/agent/pkg/api/socket_routes.go +++ b/agent/pkg/api/socket_routes.go @@ -3,11 +3,12 @@ package api import ( "encoding/json" "fmt" - "mizuserver/pkg/models" "net/http" "sync" "time" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/gin-gonic/gin" "github.com/gorilla/websocket" basenine "github.com/up9inc/basenine/client/go" diff --git a/agent/pkg/api/socket_server_handlers.go b/agent/pkg/api/socket_server_handlers.go index 3deaea3f9..d1422339e 100644 --- a/agent/pkg/api/socket_server_handlers.go +++ b/agent/pkg/api/socket_server_handlers.go @@ -3,12 +3,13 @@ package api import ( "encoding/json" "fmt" - "mizuserver/pkg/models" - "mizuserver/pkg/providers" - "mizuserver/pkg/providers/tappers" - "mizuserver/pkg/up9" "sync" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/providers" + "github.com/up9inc/mizu/agent/pkg/providers/tappers" + "github.com/up9inc/mizu/agent/pkg/up9" + tapApi "github.com/up9inc/mizu/tap/api" "github.com/up9inc/mizu/shared" diff --git a/agent/pkg/controllers/config_controller.go b/agent/pkg/controllers/config_controller.go index 44927581f..70052013e 100644 --- a/agent/pkg/controllers/config_controller.go +++ b/agent/pkg/controllers/config_controller.go @@ -2,21 +2,22 @@ package controllers import ( "context" + "net/http" + "regexp" + "time" + "github.com/gin-gonic/gin" + "github.com/up9inc/mizu/agent/pkg/config" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/providers" + "github.com/up9inc/mizu/agent/pkg/providers/tapConfig" + "github.com/up9inc/mizu/agent/pkg/providers/tappedPods" + "github.com/up9inc/mizu/agent/pkg/providers/tappers" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/kubernetes" "github.com/up9inc/mizu/shared/logger" tapApi "github.com/up9inc/mizu/tap/api" v1 "k8s.io/api/core/v1" - "mizuserver/pkg/config" - "mizuserver/pkg/models" - "mizuserver/pkg/providers" - "mizuserver/pkg/providers/tapConfig" - "mizuserver/pkg/providers/tappedPods" - "mizuserver/pkg/providers/tappers" - "net/http" - "regexp" - "time" ) var cancelTapperSyncer context.CancelFunc diff --git a/agent/pkg/controllers/entries_controller.go b/agent/pkg/controllers/entries_controller.go index a085f6bad..d556d32d4 100644 --- a/agent/pkg/controllers/entries_controller.go +++ b/agent/pkg/controllers/entries_controller.go @@ -2,13 +2,14 @@ package controllers import ( "encoding/json" - "mizuserver/pkg/har" - "mizuserver/pkg/models" - "mizuserver/pkg/validation" "net/http" "strconv" "time" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/validation" + "github.com/gin-gonic/gin" basenine "github.com/up9inc/basenine/client/go" diff --git a/agent/pkg/controllers/install_controller.go b/agent/pkg/controllers/install_controller.go index 9c1289465..74a1e5136 100644 --- a/agent/pkg/controllers/install_controller.go +++ b/agent/pkg/controllers/install_controller.go @@ -1,9 +1,10 @@ package controllers import ( - "mizuserver/pkg/providers" "net/http" + "github.com/up9inc/mizu/agent/pkg/providers" + "github.com/gin-gonic/gin" "github.com/up9inc/mizu/shared/logger" ) diff --git a/agent/pkg/controllers/metadata_controller.go b/agent/pkg/controllers/metadata_controller.go index 37de565c8..45021b710 100644 --- a/agent/pkg/controllers/metadata_controller.go +++ b/agent/pkg/controllers/metadata_controller.go @@ -1,10 +1,11 @@ package controllers import ( - "github.com/gin-gonic/gin" - "github.com/up9inc/mizu/shared" - "mizuserver/pkg/version" "net/http" + + "github.com/gin-gonic/gin" + "github.com/up9inc/mizu/agent/pkg/version" + "github.com/up9inc/mizu/shared" ) func GetVersion(c *gin.Context) { diff --git a/agent/pkg/controllers/oas_controller.go b/agent/pkg/controllers/oas_controller.go index 2311f53c1..7beb72f01 100644 --- a/agent/pkg/controllers/oas_controller.go +++ b/agent/pkg/controllers/oas_controller.go @@ -1,11 +1,12 @@ package controllers import ( + "net/http" + "github.com/chanced/openapi" "github.com/gin-gonic/gin" + "github.com/up9inc/mizu/agent/pkg/oas" "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/oas" - "net/http" ) func GetOASServers(c *gin.Context) { diff --git a/agent/pkg/controllers/oas_controller_test.go b/agent/pkg/controllers/oas_controller_test.go index 19c6bca2d..a91dd6481 100644 --- a/agent/pkg/controllers/oas_controller_test.go +++ b/agent/pkg/controllers/oas_controller_test.go @@ -1,10 +1,11 @@ package controllers import ( - "mizuserver/pkg/oas" "net/http/httptest" "testing" + "github.com/up9inc/mizu/agent/pkg/oas" + "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/controllers/service_map_controller.go b/agent/pkg/controllers/service_map_controller.go index f469a24ef..7b4d79ac4 100644 --- a/agent/pkg/controllers/service_map_controller.go +++ b/agent/pkg/controllers/service_map_controller.go @@ -1,9 +1,10 @@ package controllers import ( - "mizuserver/pkg/servicemap" "net/http" + "github.com/up9inc/mizu/agent/pkg/servicemap" + "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/controllers/service_map_controller_test.go b/agent/pkg/controllers/service_map_controller_test.go index 008463de7..45b8f8a27 100644 --- a/agent/pkg/controllers/service_map_controller_test.go +++ b/agent/pkg/controllers/service_map_controller_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "mizuserver/pkg/servicemap" + "github.com/up9inc/mizu/agent/pkg/servicemap" "github.com/gin-gonic/gin" "github.com/stretchr/testify/suite" diff --git a/agent/pkg/controllers/status_controller.go b/agent/pkg/controllers/status_controller.go index fce273cc6..d6424de89 100644 --- a/agent/pkg/controllers/status_controller.go +++ b/agent/pkg/controllers/status_controller.go @@ -2,17 +2,18 @@ package controllers import ( "encoding/json" + "net/http" + "github.com/gin-gonic/gin" + "github.com/up9inc/mizu/agent/pkg/api" + "github.com/up9inc/mizu/agent/pkg/holder" + "github.com/up9inc/mizu/agent/pkg/providers" + "github.com/up9inc/mizu/agent/pkg/providers/tappedPods" + "github.com/up9inc/mizu/agent/pkg/providers/tappers" + "github.com/up9inc/mizu/agent/pkg/up9" + "github.com/up9inc/mizu/agent/pkg/validation" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/api" - "mizuserver/pkg/holder" - "mizuserver/pkg/providers" - "mizuserver/pkg/providers/tappedPods" - "mizuserver/pkg/providers/tappers" - "mizuserver/pkg/up9" - "mizuserver/pkg/validation" - "net/http" ) func HealthCheck(c *gin.Context) { diff --git a/agent/pkg/controllers/user_controller.go b/agent/pkg/controllers/user_controller.go index 9e3cc60c6..b9fe3157a 100644 --- a/agent/pkg/controllers/user_controller.go +++ b/agent/pkg/controllers/user_controller.go @@ -1,7 +1,7 @@ package controllers import ( - "mizuserver/pkg/providers" + "github.com/up9inc/mizu/agent/pkg/providers" "github.com/gin-gonic/gin" "github.com/up9inc/mizu/shared/logger" diff --git a/agent/pkg/holder/main.go b/agent/pkg/holder/main.go index dae95c68a..54b83f118 100644 --- a/agent/pkg/holder/main.go +++ b/agent/pkg/holder/main.go @@ -1,6 +1,6 @@ package holder -import "mizuserver/pkg/resolver" +import "github.com/up9inc/mizu/agent/pkg/resolver" var k8sResolver *resolver.Resolver @@ -11,4 +11,3 @@ func SetResolver(param *resolver.Resolver) { func GetResolver() *resolver.Resolver { return k8sResolver } - diff --git a/agent/pkg/middlewares/auth.go b/agent/pkg/middlewares/auth.go index e019c159d..512427d6b 100644 --- a/agent/pkg/middlewares/auth.go +++ b/agent/pkg/middlewares/auth.go @@ -1,8 +1,8 @@ package middlewares import ( - "mizuserver/pkg/config" - "mizuserver/pkg/providers" + "github.com/up9inc/mizu/agent/pkg/config" + "github.com/up9inc/mizu/agent/pkg/providers" "github.com/gin-gonic/gin" ory "github.com/ory/kratos-client-go" diff --git a/agent/pkg/models/models.go b/agent/pkg/models/models.go index ba4ca0290..dee57f3f7 100644 --- a/agent/pkg/models/models.go +++ b/agent/pkg/models/models.go @@ -2,9 +2,10 @@ package models import ( "encoding/json" + + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/agent/pkg/rules" tapApi "github.com/up9inc/mizu/tap/api" - "mizuserver/pkg/har" - "mizuserver/pkg/rules" basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/shared" diff --git a/agent/pkg/oas/feeder_test.go b/agent/pkg/oas/feeder_test.go index 4550b1df1..228253024 100644 --- a/agent/pkg/oas/feeder_test.go +++ b/agent/pkg/oas/feeder_test.go @@ -6,13 +6,14 @@ import ( "errors" "io" "io/ioutil" - "mizuserver/pkg/har" "os" "path/filepath" "sort" "strings" "testing" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/shared/logger" ) diff --git a/agent/pkg/oas/oas_generator.go b/agent/pkg/oas/oas_generator.go index bc7e305d3..771f2d622 100644 --- a/agent/pkg/oas/oas_generator.go +++ b/agent/pkg/oas/oas_generator.go @@ -3,10 +3,11 @@ package oas import ( "context" "encoding/json" - "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/har" "net/url" "sync" + + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/shared/logger" ) var ( diff --git a/agent/pkg/oas/specgen.go b/agent/pkg/oas/specgen.go index 3b931dbbe..72bd58994 100644 --- a/agent/pkg/oas/specgen.go +++ b/agent/pkg/oas/specgen.go @@ -4,12 +4,13 @@ import ( "encoding/json" "errors" "mime" - "mizuserver/pkg/har" "net/url" "strconv" "strings" "sync" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/chanced/openapi" "github.com/google/uuid" "github.com/up9inc/mizu/shared/logger" diff --git a/agent/pkg/oas/specgen_test.go b/agent/pkg/oas/specgen_test.go index 90886fa68..f60348e9d 100644 --- a/agent/pkg/oas/specgen_test.go +++ b/agent/pkg/oas/specgen_test.go @@ -2,15 +2,16 @@ package oas import ( "encoding/json" - "github.com/chanced/openapi" - "github.com/op/go-logging" - "github.com/up9inc/mizu/shared/logger" "io/ioutil" - "mizuserver/pkg/har" "os" "strings" "testing" "time" + + "github.com/chanced/openapi" + "github.com/op/go-logging" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/shared/logger" ) // if started via env, write file into subdir diff --git a/agent/pkg/oas/utils.go b/agent/pkg/oas/utils.go index ffabb4d5d..31f1a30f4 100644 --- a/agent/pkg/oas/utils.go +++ b/agent/pkg/oas/utils.go @@ -3,10 +3,11 @@ package oas import ( "encoding/json" "errors" - "mizuserver/pkg/har" "strconv" "strings" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/chanced/openapi" "github.com/up9inc/mizu/shared/logger" ) diff --git a/agent/pkg/providers/install_provider.go b/agent/pkg/providers/install_provider.go index 6178c8a3e..840dd6408 100644 --- a/agent/pkg/providers/install_provider.go +++ b/agent/pkg/providers/install_provider.go @@ -3,7 +3,8 @@ package providers import ( "context" "errors" - "mizuserver/pkg/config" + + "github.com/up9inc/mizu/agent/pkg/config" "github.com/up9inc/mizu/shared/logger" diff --git a/agent/pkg/providers/stats_provider_test.go b/agent/pkg/providers/stats_provider_test.go index 932ebe6a3..7c0631957 100644 --- a/agent/pkg/providers/stats_provider_test.go +++ b/agent/pkg/providers/stats_provider_test.go @@ -2,8 +2,9 @@ package providers_test import ( "fmt" - "mizuserver/pkg/providers" "testing" + + "github.com/up9inc/mizu/agent/pkg/providers" ) func TestNoEntryAddedCount(t *testing.T) { diff --git a/agent/pkg/providers/status_provider.go b/agent/pkg/providers/status_provider.go index ab8ae4ab2..97b2cd792 100644 --- a/agent/pkg/providers/status_provider.go +++ b/agent/pkg/providers/status_provider.go @@ -3,12 +3,13 @@ package providers import ( "encoding/json" "fmt" - "github.com/patrickmn/go-cache" - "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/tap" - "mizuserver/pkg/models" "os" "time" + + "github.com/patrickmn/go-cache" + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/tap" ) const tlsLinkRetainmentTime = time.Minute * 15 diff --git a/agent/pkg/providers/tapConfig/tap_config_provider.go b/agent/pkg/providers/tapConfig/tap_config_provider.go index b907d7395..a8ff1fc9e 100644 --- a/agent/pkg/providers/tapConfig/tap_config_provider.go +++ b/agent/pkg/providers/tapConfig/tap_config_provider.go @@ -1,12 +1,13 @@ package tapConfig import ( - "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/models" - "mizuserver/pkg/utils" "os" "sync" + + "github.com/up9inc/mizu/agent/pkg/models" + "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" ) const FilePath = shared.DataDirPath + "tap-config.json" diff --git a/agent/pkg/providers/tappedPods/tapped_pods_provider.go b/agent/pkg/providers/tappedPods/tapped_pods_provider.go index 3791bd689..6ffaa1146 100644 --- a/agent/pkg/providers/tappedPods/tapped_pods_provider.go +++ b/agent/pkg/providers/tappedPods/tapped_pods_provider.go @@ -1,13 +1,14 @@ package tappedPods import ( - "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/providers/tappers" - "mizuserver/pkg/utils" "os" "strings" "sync" + + "github.com/up9inc/mizu/agent/pkg/providers/tappers" + "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" ) const FilePath = shared.DataDirPath + "tapped-pods.json" diff --git a/agent/pkg/providers/tappers/tappers_provider.go b/agent/pkg/providers/tappers/tappers_provider.go index cad982a7b..604857355 100644 --- a/agent/pkg/providers/tappers/tappers_provider.go +++ b/agent/pkg/providers/tappers/tappers_provider.go @@ -1,11 +1,12 @@ package tappers import ( - "github.com/up9inc/mizu/shared" - "github.com/up9inc/mizu/shared/logger" - "mizuserver/pkg/utils" "os" "sync" + + "github.com/up9inc/mizu/agent/pkg/utils" + "github.com/up9inc/mizu/shared" + "github.com/up9inc/mizu/shared/logger" ) const FilePath = shared.DataDirPath + "tappers-status.json" diff --git a/agent/pkg/providers/user_role_provider.go b/agent/pkg/providers/user_role_provider.go index 6508c5c24..96b782be2 100644 --- a/agent/pkg/providers/user_role_provider.go +++ b/agent/pkg/providers/user_role_provider.go @@ -15,7 +15,8 @@ more on keto here: https://www.ory.sh/keto/docs/ import ( "fmt" - "mizuserver/pkg/utils" + + "github.com/up9inc/mizu/agent/pkg/utils" ketoClient "github.com/ory/keto-client-go/client" ketoRead "github.com/ory/keto-client-go/client/read" diff --git a/agent/pkg/routes/config_routes.go b/agent/pkg/routes/config_routes.go index c2356a67b..fe3cf6426 100644 --- a/agent/pkg/routes/config_routes.go +++ b/agent/pkg/routes/config_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/entries_routes.go b/agent/pkg/routes/entries_routes.go index 75956d6f1..5be3651ec 100644 --- a/agent/pkg/routes/entries_routes.go +++ b/agent/pkg/routes/entries_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/install_routes.go b/agent/pkg/routes/install_routes.go index b878d4430..bdf8b602b 100644 --- a/agent/pkg/routes/install_routes.go +++ b/agent/pkg/routes/install_routes.go @@ -1,7 +1,7 @@ package routes import ( - "mizuserver/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/controllers" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/metadata_routes.go b/agent/pkg/routes/metadata_routes.go index 9a3c21b91..7428c5598 100644 --- a/agent/pkg/routes/metadata_routes.go +++ b/agent/pkg/routes/metadata_routes.go @@ -1,7 +1,7 @@ package routes import ( - "mizuserver/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/controllers" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/oas_routes.go b/agent/pkg/routes/oas_routes.go index 525eb8a44..34b988552 100644 --- a/agent/pkg/routes/oas_routes.go +++ b/agent/pkg/routes/oas_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/query_routes.go b/agent/pkg/routes/query_routes.go index 7ad8d0490..c64066a2c 100644 --- a/agent/pkg/routes/query_routes.go +++ b/agent/pkg/routes/query_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/service_map_routes.go b/agent/pkg/routes/service_map_routes.go index 52b973963..1fb831f5e 100644 --- a/agent/pkg/routes/service_map_routes.go +++ b/agent/pkg/routes/service_map_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/status_routes.go b/agent/pkg/routes/status_routes.go index 3c58a2f6a..f8a5c180b 100644 --- a/agent/pkg/routes/status_routes.go +++ b/agent/pkg/routes/status_routes.go @@ -1,8 +1,8 @@ package routes import ( - "mizuserver/pkg/controllers" - "mizuserver/pkg/middlewares" + "github.com/up9inc/mizu/agent/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/middlewares" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/routes/user_routes.go b/agent/pkg/routes/user_routes.go index 6b2090dd3..bf6e562bd 100644 --- a/agent/pkg/routes/user_routes.go +++ b/agent/pkg/routes/user_routes.go @@ -1,7 +1,7 @@ package routes import ( - "mizuserver/pkg/controllers" + "github.com/up9inc/mizu/agent/pkg/controllers" "github.com/gin-gonic/gin" ) diff --git a/agent/pkg/rules/rulesHTTP.go b/agent/pkg/rules/rulesHTTP.go index a47570d10..8b3cd7135 100644 --- a/agent/pkg/rules/rulesHTTP.go +++ b/agent/pkg/rules/rulesHTTP.go @@ -4,11 +4,12 @@ import ( "encoding/base64" "encoding/json" "fmt" - "mizuserver/pkg/har" "reflect" "regexp" "strings" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared" diff --git a/agent/pkg/up9/main.go b/agent/pkg/up9/main.go index 0a61619de..043c00838 100644 --- a/agent/pkg/up9/main.go +++ b/agent/pkg/up9/main.go @@ -6,8 +6,6 @@ import ( "encoding/json" "fmt" "io/ioutil" - "mizuserver/pkg/har" - "mizuserver/pkg/utils" "net/http" "net/url" "regexp" @@ -15,6 +13,9 @@ import ( "sync" "time" + "github.com/up9inc/mizu/agent/pkg/har" + "github.com/up9inc/mizu/agent/pkg/utils" + basenine "github.com/up9inc/basenine/client/go" "github.com/up9inc/mizu/shared" "github.com/up9inc/mizu/shared/logger"