From abd152ee5a66abbe2b04dbe1bbd9fa14fbdc1977 Mon Sep 17 00:00:00 2001 From: Viktor Liu <17948409+lixmal@users.noreply.github.com> Date: Tue, 5 Aug 2025 18:34:41 +0200 Subject: [PATCH] [misc] Separate shared code dependencies (#4288) * Separate shared code dependencies * Fix import * Test respective shared code * Update openapi ref * Fix test * Fix test path --- .../workflows/check-license-dependencies.yml | 41 +++++++++++++++++++ .github/workflows/golang-test-linux.yml | 12 +++--- .github/workflows/update-docs.yml | 2 +- client/internal/profilemanager/config.go | 1 - formatter/hook/hook.go | 2 +- management/server/account.go | 2 +- management/server/context/keys.go | 10 +++-- management/server/dns.go | 2 +- management/server/dns_test.go | 2 +- management/server/event.go | 2 +- management/server/geolocation/store.go | 2 +- management/server/group.go | 2 +- management/server/group_test.go | 2 +- management/server/groups/manager.go | 2 +- management/server/grpcserver.go | 2 +- .../handlers/accounts/accounts_handler.go | 6 +-- .../accounts/accounts_handler_test.go | 4 +- .../http/handlers/dns/dns_settings_handler.go | 4 +- .../handlers/dns/dns_settings_handler_test.go | 4 +- .../http/handlers/dns/nameservers_handler.go | 6 +-- .../handlers/dns/nameservers_handler_test.go | 4 +- .../http/handlers/events/events_handler.go | 4 +- .../handlers/events/events_handler_test.go | 2 +- .../http/handlers/groups/groups_handler.go | 6 +-- .../handlers/groups/groups_handler_test.go | 6 +-- .../server/http/handlers/networks/handler.go | 6 +-- .../handlers/networks/resources_handler.go | 4 +- .../http/handlers/networks/routers_handler.go | 4 +- .../http/handlers/peers/peers_handler.go | 6 +-- .../http/handlers/peers/peers_handler_test.go | 2 +- .../policies/geolocation_handler_test.go | 2 +- .../handlers/policies/geolocations_handler.go | 6 +-- .../handlers/policies/policies_handler.go | 6 +-- .../policies/policies_handler_test.go | 4 +- .../policies/posture_checks_handler.go | 6 +-- .../policies/posture_checks_handler_test.go | 4 +- .../http/handlers/routes/routes_handler.go | 6 +-- .../handlers/routes/routes_handler_test.go | 4 +- .../handlers/setup_keys/setupkeys_handler.go | 6 +-- .../setup_keys/setupkeys_handler_test.go | 4 +- .../server/http/handlers/users/pat_handler.go | 6 +-- .../http/handlers/users/pat_handler_test.go | 4 +- .../http/handlers/users/users_handler.go | 6 +-- .../http/handlers/users/users_handler_test.go | 4 +- .../server/http/middleware/auth_middleware.go | 4 +- .../peers_handler_benchmark_test.go | 2 +- .../setupkeys_handler_benchmark_test.go | 2 +- .../users_handler_benchmark_test.go | 2 +- .../setupkeys_handler_integration_test.go | 2 +- management/server/nameserver.go | 2 +- management/server/networks/manager.go | 2 +- .../server/networks/resources/manager.go | 2 +- .../server/networks/resources/manager_test.go | 2 +- .../networks/resources/types/resource.go | 2 +- management/server/networks/routers/manager.go | 2 +- .../server/networks/routers/manager_test.go | 2 +- .../server/networks/routers/types/router.go | 2 +- management/server/networks/types/network.go | 2 +- management/server/peer.go | 2 +- management/server/peer_test.go | 2 +- management/server/peers/manager.go | 2 +- management/server/permissions/manager.go | 2 +- management/server/policy.go | 2 +- management/server/posture/checks.go | 4 +- management/server/posture/network.go | 2 +- management/server/posture_checks.go | 2 +- management/server/route.go | 2 +- management/server/settings/manager.go | 2 +- management/server/setupkey.go | 2 +- management/server/store/sql_store.go | 2 +- management/server/store/sql_store_test.go | 2 +- management/server/types/account.go | 2 +- management/server/types/network.go | 2 +- management/server/types/resource.go | 2 +- management/server/user.go | 2 +- management/server/user_test.go | 2 +- relay/server/handshake.go | 6 +-- relay/server/listener/ws/listener.go | 4 +- relay/server/peer.go | 4 +- relay/server/server.go | 2 +- relay/server/store/listener.go | 2 +- relay/server/store/notifier.go | 2 +- relay/server/store/store.go | 2 +- relay/server/store/store_test.go | 2 +- route/route.go | 2 +- shared/context/keys.go | 8 ++++ shared/management/client/client_test.go | 4 +- shared/management/client/rest/accounts.go | 2 +- .../management/client/rest/accounts_test.go | 4 +- shared/management/client/rest/client.go | 2 +- shared/management/client/rest/client_test.go | 2 +- shared/management/client/rest/dns.go | 2 +- shared/management/client/rest/dns_test.go | 4 +- shared/management/client/rest/events.go | 2 +- shared/management/client/rest/events_test.go | 4 +- shared/management/client/rest/geo.go | 2 +- shared/management/client/rest/geo_test.go | 4 +- shared/management/client/rest/groups.go | 2 +- shared/management/client/rest/groups_test.go | 4 +- .../client/rest/impersonation_test.go | 2 +- shared/management/client/rest/networks.go | 2 +- .../management/client/rest/networks_test.go | 4 +- shared/management/client/rest/peers.go | 2 +- shared/management/client/rest/peers_test.go | 4 +- shared/management/client/rest/policies.go | 2 +- .../management/client/rest/policies_test.go | 4 +- .../management/client/rest/posturechecks.go | 2 +- .../client/rest/posturechecks_test.go | 4 +- shared/management/client/rest/routes.go | 2 +- shared/management/client/rest/routes_test.go | 4 +- shared/management/client/rest/setupkeys.go | 2 +- .../management/client/rest/setupkeys_test.go | 4 +- shared/management/client/rest/tokens.go | 2 +- shared/management/client/rest/tokens_test.go | 4 +- shared/management/client/rest/users.go | 2 +- shared/management/client/rest/users_test.go | 4 +- shared/management/domain/go.sum | 1 - .../management}/http/api/cfg.yaml | 0 .../management}/http/api/generate.sh | 0 .../management}/http/api/openapi.yml | 0 .../management}/http/api/types.gen.go | 0 .../management}/http/util/util.go | 2 +- shared/management/operations/operation.go | 4 ++ .../management}/status/error.go | 2 +- shared/relay/client/client.go | 4 +- shared/relay/client/conn.go | 2 +- shared/relay/client/dialer/quic/quic.go | 2 +- shared/relay/client/dialer/ws/ws.go | 4 +- shared/relay/client/peer_subscription.go | 2 +- shared/relay/client/peer_subscription_test.go | 2 +- shared/relay/constants.go | 6 +++ {relay => shared/relay}/healthcheck/doc.go | 0 .../relay}/healthcheck/receiver.go | 0 .../relay}/healthcheck/receiver_test.go | 0 {relay => shared/relay}/healthcheck/sender.go | 0 .../relay}/healthcheck/sender_test.go | 0 .../relay}/messages/address/address.go | 0 {relay => shared/relay}/messages/auth/auth.go | 0 {relay => shared/relay}/messages/doc.go | 0 {relay => shared/relay}/messages/id.go | 0 {relay => shared/relay}/messages/message.go | 0 .../relay}/messages/message_test.go | 0 .../relay}/messages/peer_state.go | 0 .../relay}/messages/peer_state_test.go | 0 {relay => shared/relay}/tls/alpn.go | 0 {relay => shared/relay}/tls/client_dev.go | 0 {relay => shared/relay}/tls/client_prod.go | 0 {relay => shared/relay}/tls/doc.go | 0 {relay => shared/relay}/tls/server_dev.go | 0 {relay => shared/relay}/tls/server_prod.go | 0 150 files changed, 252 insertions(+), 191 deletions(-) create mode 100644 .github/workflows/check-license-dependencies.yml create mode 100644 shared/context/keys.go delete mode 100644 shared/management/domain/go.sum rename {management/server => shared/management}/http/api/cfg.yaml (100%) rename {management/server => shared/management}/http/api/generate.sh (100%) rename {management/server => shared/management}/http/api/openapi.yml (100%) rename {management/server => shared/management}/http/api/types.gen.go (100%) rename {management/server => shared/management}/http/util/util.go (98%) create mode 100644 shared/management/operations/operation.go rename {management/server => shared/management}/status/error.go (99%) create mode 100644 shared/relay/constants.go rename {relay => shared/relay}/healthcheck/doc.go (100%) rename {relay => shared/relay}/healthcheck/receiver.go (100%) rename {relay => shared/relay}/healthcheck/receiver_test.go (100%) rename {relay => shared/relay}/healthcheck/sender.go (100%) rename {relay => shared/relay}/healthcheck/sender_test.go (100%) rename {relay => shared/relay}/messages/address/address.go (100%) rename {relay => shared/relay}/messages/auth/auth.go (100%) rename {relay => shared/relay}/messages/doc.go (100%) rename {relay => shared/relay}/messages/id.go (100%) rename {relay => shared/relay}/messages/message.go (100%) rename {relay => shared/relay}/messages/message_test.go (100%) rename {relay => shared/relay}/messages/peer_state.go (100%) rename {relay => shared/relay}/messages/peer_state_test.go (100%) rename {relay => shared/relay}/tls/alpn.go (100%) rename {relay => shared/relay}/tls/client_dev.go (100%) rename {relay => shared/relay}/tls/client_prod.go (100%) rename {relay => shared/relay}/tls/doc.go (100%) rename {relay => shared/relay}/tls/server_dev.go (100%) rename {relay => shared/relay}/tls/server_prod.go (100%) diff --git a/.github/workflows/check-license-dependencies.yml b/.github/workflows/check-license-dependencies.yml new file mode 100644 index 000000000..d3da427b0 --- /dev/null +++ b/.github/workflows/check-license-dependencies.yml @@ -0,0 +1,41 @@ +name: Check License Dependencies + +on: + push: + branches: [ main ] + pull_request: + +jobs: + check-dependencies: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Check for problematic license dependencies + run: | + echo "Checking for dependencies on management/, signal/, and relay/ packages..." + + # Find all directories except the problematic ones and system dirs + FOUND_ISSUES=0 + find . -maxdepth 1 -type d -not -name "." -not -name "management" -not -name "signal" -not -name "relay" -not -name ".git*" | sort | while read dir; do + echo "=== Checking $dir ===" + # Search for problematic imports, excluding test files + RESULTS=$(grep -r "github.com/netbirdio/netbird/\(management\|signal\|relay\)" "$dir" --include="*.go" | grep -v "_test.go" | grep -v "test_" | grep -v "/test/" || true) + if [ ! -z "$RESULTS" ]; then + echo "❌ Found problematic dependencies:" + echo "$RESULTS" + FOUND_ISSUES=1 + else + echo "✓ No problematic dependencies found" + fi + done + if [ $FOUND_ISSUES -eq 1 ]; then + echo "" + echo "❌ Found dependencies on management/, signal/, or relay/ packages" + echo "These packages will change license and should not be imported by client or shared code" + exit 1 + else + echo "" + echo "✅ All license dependencies are clean" + fi diff --git a/.github/workflows/golang-test-linux.yml b/.github/workflows/golang-test-linux.yml index 0d7233c3e..0013833c4 100644 --- a/.github/workflows/golang-test-linux.yml +++ b/.github/workflows/golang-test-linux.yml @@ -259,7 +259,7 @@ jobs: CGO_ENABLED=1 GOARCH=${{ matrix.arch }} \ go test ${{ matrix.raceFlag }} \ -exec 'sudo' \ - -timeout 10m ./relay/... + -timeout 10m ./relay/... ./shared/relay/... test_signal: name: "Signal / Unit" @@ -309,7 +309,7 @@ jobs: CGO_ENABLED=1 GOARCH=${{ matrix.arch }} \ go test \ -exec 'sudo' \ - -timeout 10m ./signal/... + -timeout 10m ./signal/... ./shared/signal/... test_management: name: "Management / Unit" @@ -369,7 +369,7 @@ jobs: CI=true \ go test -tags=devcert \ -exec "sudo --preserve-env=CI,NETBIRD_STORE_ENGINE" \ - -timeout 20m ./management/... + -timeout 20m ./management/... ./shared/management/... benchmark: name: "Management / Benchmark" @@ -430,7 +430,7 @@ jobs: CI=true \ go test -tags devcert -run=^$ -bench=. \ -exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE' \ - -timeout 20m ./management/... + -timeout 20m ./management/... ./shared/management/... api_benchmark: name: "Management / Benchmark (API)" @@ -521,7 +521,7 @@ jobs: -run=^$ \ -bench=. \ -exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE,GIT_BRANCH,GITHUB_RUN_ID' \ - -timeout 20m ./management/... + -timeout 20m ./management/... ./shared/management/... api_integration_test: name: "Management / Integration" @@ -571,4 +571,4 @@ jobs: CI=true \ go test -tags=integration \ -exec 'sudo --preserve-env=CI,NETBIRD_STORE_ENGINE' \ - -timeout 20m ./management/... + -timeout 20m ./management/... ./shared/management/... \ No newline at end of file diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index 77096790f..26f3b8f02 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -5,7 +5,7 @@ on: tags: - 'v*' paths: - - 'management/server/http/api/openapi.yml' + - 'shared/management/http/api/openapi.yml' jobs: trigger_docs_api_update: diff --git a/client/internal/profilemanager/config.go b/client/internal/profilemanager/config.go index 806595574..084a03d88 100644 --- a/client/internal/profilemanager/config.go +++ b/client/internal/profilemanager/config.go @@ -28,7 +28,6 @@ import ( const ( // managementLegacyPortString is the port that was used before by the Management gRPC server. // It is used for backward compatibility now. - // NB: hardcoded from github.com/netbirdio/netbird/management/cmd to avoid import managementLegacyPortString = "33073" // DefaultManagementURL points to the NetBird's cloud management endpoint DefaultManagementURL = "https://api.netbird.io:443" diff --git a/formatter/hook/hook.go b/formatter/hook/hook.go index 290c3377d..c0d8c4eba 100644 --- a/formatter/hook/hook.go +++ b/formatter/hook/hook.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/management/server/context" + "github.com/netbirdio/netbird/shared/context" ) type ExecutionContext string diff --git a/management/server/account.go b/management/server/account.go index 395634769..49ea38fe1 100644 --- a/management/server/account.go +++ b/management/server/account.go @@ -40,7 +40,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions/operations" "github.com/netbirdio/netbird/management/server/posture" "github.com/netbirdio/netbird/management/server/settings" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/telemetry" "github.com/netbirdio/netbird/management/server/types" diff --git a/management/server/context/keys.go b/management/server/context/keys.go index c5b5da044..9697997a8 100644 --- a/management/server/context/keys.go +++ b/management/server/context/keys.go @@ -1,8 +1,10 @@ package context +import "github.com/netbirdio/netbird/shared/context" + const ( - RequestIDKey = "requestID" - AccountIDKey = "accountID" - UserIDKey = "userID" - PeerIDKey = "peerID" + RequestIDKey = context.RequestIDKey + AccountIDKey = context.AccountIDKey + UserIDKey = context.UserIDKey + PeerIDKey = context.PeerIDKey ) diff --git a/management/server/dns.go b/management/server/dns.go index 019282e65..489618c17 100644 --- a/management/server/dns.go +++ b/management/server/dns.go @@ -12,7 +12,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/dns_test.go b/management/server/dns_test.go index 2af07d8e4..d58689544 100644 --- a/management/server/dns_test.go +++ b/management/server/dns_test.go @@ -24,7 +24,7 @@ import ( "github.com/netbirdio/netbird/dns" "github.com/netbirdio/netbird/management/server/activity" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) const ( diff --git a/management/server/event.go b/management/server/event.go index d94714e2c..3144c52ea 100644 --- a/management/server/event.go +++ b/management/server/event.go @@ -11,7 +11,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/geolocation/store.go b/management/server/geolocation/store.go index 5af8276b5..4b9a6b2d9 100644 --- a/management/server/geolocation/store.go +++ b/management/server/geolocation/store.go @@ -13,7 +13,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) type GeoNames struct { diff --git a/management/server/group.go b/management/server/group.go index 95bed7d18..2b804b5f6 100644 --- a/management/server/group.go +++ b/management/server/group.go @@ -14,7 +14,7 @@ import ( routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/group_test.go b/management/server/group_test.go index 51069dc56..c31280156 100644 --- a/management/server/group_test.go +++ b/management/server/group_test.go @@ -26,7 +26,7 @@ import ( networkTypes "github.com/netbirdio/netbird/management/server/networks/types" peer2 "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/permissions" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/route" diff --git a/management/server/groups/manager.go b/management/server/groups/manager.go index df4b6c3d6..8647eeb68 100644 --- a/management/server/groups/manager.go +++ b/management/server/groups/manager.go @@ -6,7 +6,7 @@ import ( "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go index c52e8a3d7..f5d9c250b 100644 --- a/management/server/grpcserver.go +++ b/management/server/grpcserver.go @@ -32,7 +32,7 @@ import ( nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/posture" "github.com/netbirdio/netbird/management/server/settings" - internalStatus "github.com/netbirdio/netbird/management/server/status" + internalStatus "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/telemetry" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/accounts/accounts_handler.go b/management/server/http/handlers/accounts/accounts_handler.go index 1a22b8b9f..aeda61184 100644 --- a/management/server/http/handlers/accounts/accounts_handler.go +++ b/management/server/http/handlers/accounts/accounts_handler.go @@ -11,10 +11,10 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/settings" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/accounts/accounts_handler_test.go b/management/server/http/handlers/accounts/accounts_handler_test.go index dbf0c22bc..1dad33a6f 100644 --- a/management/server/http/handlers/accounts/accounts_handler_test.go +++ b/management/server/http/handlers/accounts/accounts_handler_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/assert" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/settings" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/dns/dns_settings_handler.go b/management/server/http/handlers/dns/dns_settings_handler.go index 60822c883..08a0b2afd 100644 --- a/management/server/http/handlers/dns/dns_settings_handler.go +++ b/management/server/http/handlers/dns/dns_settings_handler.go @@ -9,8 +9,8 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/dns/dns_settings_handler_test.go b/management/server/http/handlers/dns/dns_settings_handler_test.go index ca81adf43..42b519c29 100644 --- a/management/server/http/handlers/dns/dns_settings_handler_test.go +++ b/management/server/http/handlers/dns/dns_settings_handler_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" "github.com/gorilla/mux" diff --git a/management/server/http/handlers/dns/nameservers_handler.go b/management/server/http/handlers/dns/nameservers_handler.go index 970be6d8a..bce1c4b78 100644 --- a/management/server/http/handlers/dns/nameservers_handler.go +++ b/management/server/http/handlers/dns/nameservers_handler.go @@ -11,9 +11,9 @@ import ( nbdns "github.com/netbirdio/netbird/dns" "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" ) // nameserversHandler is the nameserver group handler of the account diff --git a/management/server/http/handlers/dns/nameservers_handler_test.go b/management/server/http/handlers/dns/nameservers_handler_test.go index 45283bc37..d49b6c7e0 100644 --- a/management/server/http/handlers/dns/nameservers_handler_test.go +++ b/management/server/http/handlers/dns/nameservers_handler_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" nbdns "github.com/netbirdio/netbird/dns" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/status" "github.com/gorilla/mux" diff --git a/management/server/http/handlers/events/events_handler.go b/management/server/http/handlers/events/events_handler.go index eee5d8aa7..ae1e64e5c 100644 --- a/management/server/http/handlers/events/events_handler.go +++ b/management/server/http/handlers/events/events_handler.go @@ -10,8 +10,8 @@ import ( "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) // handler HTTP handler diff --git a/management/server/http/handlers/events/events_handler_test.go b/management/server/http/handlers/events/events_handler_test.go index 3a643fe90..a0695fa3f 100644 --- a/management/server/http/handlers/events/events_handler_test.go +++ b/management/server/http/handlers/events/events_handler_test.go @@ -16,7 +16,7 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/activity" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/groups/groups_handler.go b/management/server/http/handlers/groups/groups_handler.go index bede652f5..e861e873c 100644 --- a/management/server/http/handlers/groups/groups_handler.go +++ b/management/server/http/handlers/groups/groups_handler.go @@ -11,9 +11,9 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/groups/groups_handler_test.go b/management/server/http/handlers/groups/groups_handler_test.go index 2caa2f5bf..34694ec8c 100644 --- a/management/server/http/handlers/groups/groups_handler_test.go +++ b/management/server/http/handlers/groups/groups_handler_test.go @@ -19,11 +19,11 @@ import ( "github.com/netbirdio/netbird/management/server" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/mock_server" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/networks/handler.go b/management/server/http/handlers/networks/handler.go index 1809019a6..d7b598a5d 100644 --- a/management/server/http/handlers/networks/handler.go +++ b/management/server/http/handlers/networks/handler.go @@ -12,14 +12,14 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/groups" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/networks" "github.com/netbirdio/netbird/management/server/networks/resources" "github.com/netbirdio/netbird/management/server/networks/routers" routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types" "github.com/netbirdio/netbird/management/server/networks/types" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" nbtypes "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/networks/resources_handler.go b/management/server/http/handlers/networks/resources_handler.go index 616083302..59396dceb 100644 --- a/management/server/http/handlers/networks/resources_handler.go +++ b/management/server/http/handlers/networks/resources_handler.go @@ -8,8 +8,8 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/groups" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/networks/resources" "github.com/netbirdio/netbird/management/server/networks/resources/types" ) diff --git a/management/server/http/handlers/networks/routers_handler.go b/management/server/http/handlers/networks/routers_handler.go index 6b00534fc..2e64c637f 100644 --- a/management/server/http/handlers/networks/routers_handler.go +++ b/management/server/http/handlers/networks/routers_handler.go @@ -7,8 +7,8 @@ import ( "github.com/gorilla/mux" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/networks/routers" "github.com/netbirdio/netbird/management/server/networks/routers/types" ) diff --git a/management/server/http/handlers/peers/peers_handler.go b/management/server/http/handlers/peers/peers_handler.go index 644693e19..eed07e95d 100644 --- a/management/server/http/handlers/peers/peers_handler.go +++ b/management/server/http/handlers/peers/peers_handler.go @@ -14,10 +14,10 @@ import ( "github.com/netbirdio/netbird/management/server/activity" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/groups" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/peers/peers_handler_test.go b/management/server/http/handlers/peers/peers_handler_test.go index d49ec6b46..94564113f 100644 --- a/management/server/http/handlers/peers/peers_handler_test.go +++ b/management/server/http/handlers/peers/peers_handler_test.go @@ -17,7 +17,7 @@ import ( "golang.org/x/exp/maps" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/types" diff --git a/management/server/http/handlers/policies/geolocation_handler_test.go b/management/server/http/handlers/policies/geolocation_handler_test.go index b7b53f53f..cedd5ac88 100644 --- a/management/server/http/handlers/policies/geolocation_handler_test.go +++ b/management/server/http/handlers/policies/geolocation_handler_test.go @@ -16,7 +16,7 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/geolocation" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" diff --git a/management/server/http/handlers/policies/geolocations_handler.go b/management/server/http/handlers/policies/geolocations_handler.go index 84c8ea0aa..cb6995793 100644 --- a/management/server/http/handlers/policies/geolocations_handler.go +++ b/management/server/http/handlers/policies/geolocations_handler.go @@ -9,12 +9,12 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/geolocation" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) var ( diff --git a/management/server/http/handlers/policies/policies_handler.go b/management/server/http/handlers/policies/policies_handler.go index 267d5744f..4d6bad5e3 100644 --- a/management/server/http/handlers/policies/policies_handler.go +++ b/management/server/http/handlers/policies/policies_handler.go @@ -10,9 +10,9 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/geolocation" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/policies/policies_handler_test.go b/management/server/http/handlers/policies/policies_handler_test.go index 6f3dbc792..fd39ae2a3 100644 --- a/management/server/http/handlers/policies/policies_handler_test.go +++ b/management/server/http/handlers/policies/policies_handler_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/policies/posture_checks_handler.go b/management/server/http/handlers/policies/posture_checks_handler.go index 2925f96ef..3ebc4d1e1 100644 --- a/management/server/http/handlers/policies/posture_checks_handler.go +++ b/management/server/http/handlers/policies/posture_checks_handler.go @@ -9,10 +9,10 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/geolocation" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) // postureChecksHandler is a handler that returns posture checks of the account. diff --git a/management/server/http/handlers/policies/posture_checks_handler_test.go b/management/server/http/handlers/policies/posture_checks_handler_test.go index e875b3738..c644b533a 100644 --- a/management/server/http/handlers/policies/posture_checks_handler_test.go +++ b/management/server/http/handlers/policies/posture_checks_handler_test.go @@ -16,10 +16,10 @@ import ( nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/geolocation" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) var berlin = "Berlin" diff --git a/management/server/http/handlers/routes/routes_handler.go b/management/server/http/handlers/routes/routes_handler.go index eba06fbec..7950db1e8 100644 --- a/management/server/http/handlers/routes/routes_handler.go +++ b/management/server/http/handlers/routes/routes_handler.go @@ -11,9 +11,9 @@ import ( "github.com/netbirdio/netbird/shared/management/domain" "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/route" ) diff --git a/management/server/http/handlers/routes/routes_handler_test.go b/management/server/http/handlers/routes/routes_handler_test.go index bed42514f..fc0e112f7 100644 --- a/management/server/http/handlers/routes/routes_handler_test.go +++ b/management/server/http/handlers/routes/routes_handler_test.go @@ -17,9 +17,9 @@ import ( "github.com/netbirdio/netbird/shared/management/domain" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/util" "github.com/netbirdio/netbird/route" ) diff --git a/management/server/http/handlers/setup_keys/setupkeys_handler.go b/management/server/http/handlers/setup_keys/setupkeys_handler.go index 38ba86fb1..2287dadfe 100644 --- a/management/server/http/handlers/setup_keys/setupkeys_handler.go +++ b/management/server/http/handlers/setup_keys/setupkeys_handler.go @@ -10,9 +10,9 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/setup_keys/setupkeys_handler_test.go b/management/server/http/handlers/setup_keys/setupkeys_handler_test.go index e9135469f..7b46b486b 100644 --- a/management/server/http/handlers/setup_keys/setupkeys_handler_test.go +++ b/management/server/http/handlers/setup_keys/setupkeys_handler_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/users/pat_handler.go b/management/server/http/handlers/users/pat_handler.go index 90913eac1..bae07af4a 100644 --- a/management/server/http/handlers/users/pat_handler.go +++ b/management/server/http/handlers/users/pat_handler.go @@ -8,9 +8,9 @@ import ( "github.com/netbirdio/netbird/management/server/account" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/users/pat_handler_test.go b/management/server/http/handlers/users/pat_handler_test.go index 6593de64a..92544c56d 100644 --- a/management/server/http/handlers/users/pat_handler_test.go +++ b/management/server/http/handlers/users/pat_handler_test.go @@ -17,9 +17,9 @@ import ( "github.com/netbirdio/netbird/management/server/util" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/handlers/users/users_handler.go b/management/server/http/handlers/users/users_handler.go index ac04b8e35..bcd637db4 100644 --- a/management/server/http/handlers/users/users_handler.go +++ b/management/server/http/handlers/users/users_handler.go @@ -9,9 +9,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/users" diff --git a/management/server/http/handlers/users/users_handler_test.go b/management/server/http/handlers/users/users_handler_test.go index 58e33a6d5..f7dc81919 100644 --- a/management/server/http/handlers/users/users_handler_test.go +++ b/management/server/http/handlers/users/users_handler_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/require" nbcontext "github.com/netbirdio/netbird/management/server/context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/roles" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/users" ) diff --git a/management/server/http/middleware/auth_middleware.go b/management/server/http/middleware/auth_middleware.go index f2732fbf8..f221e64a9 100644 --- a/management/server/http/middleware/auth_middleware.go +++ b/management/server/http/middleware/auth_middleware.go @@ -13,8 +13,8 @@ import ( "github.com/netbirdio/netbird/management/server/auth" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/http/middleware/bypass" - "github.com/netbirdio/netbird/management/server/http/util" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/http/util" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/http/testing/benchmarks/peers_handler_benchmark_test.go b/management/server/http/testing/benchmarks/peers_handler_benchmark_test.go index d82e08be9..52737e4eb 100644 --- a/management/server/http/testing/benchmarks/peers_handler_benchmark_test.go +++ b/management/server/http/testing/benchmarks/peers_handler_benchmark_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/netbirdio/netbird/management/server" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/http/testing/testing_tools" ) diff --git a/management/server/http/testing/benchmarks/setupkeys_handler_benchmark_test.go b/management/server/http/testing/benchmarks/setupkeys_handler_benchmark_test.go index f99b541f8..9404c4ee4 100644 --- a/management/server/http/testing/benchmarks/setupkeys_handler_benchmark_test.go +++ b/management/server/http/testing/benchmarks/setupkeys_handler_benchmark_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/netbirdio/netbird/management/server" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/http/testing/testing_tools" ) diff --git a/management/server/http/testing/benchmarks/users_handler_benchmark_test.go b/management/server/http/testing/benchmarks/users_handler_benchmark_test.go index c0b641a70..844b3e7a6 100644 --- a/management/server/http/testing/benchmarks/users_handler_benchmark_test.go +++ b/management/server/http/testing/benchmarks/users_handler_benchmark_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/netbirdio/netbird/management/server" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/http/testing/testing_tools" ) diff --git a/management/server/http/testing/integration/setupkeys_handler_integration_test.go b/management/server/http/testing/integration/setupkeys_handler_integration_test.go index ed6e642a2..9f04e3c24 100644 --- a/management/server/http/testing/integration/setupkeys_handler_integration_test.go +++ b/management/server/http/testing/integration/setupkeys_handler_integration_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/http/handlers/setup_keys" "github.com/netbirdio/netbird/management/server/http/testing/testing_tools" ) diff --git a/management/server/nameserver.go b/management/server/nameserver.go index 18339335d..ef62d0eaf 100644 --- a/management/server/nameserver.go +++ b/management/server/nameserver.go @@ -13,7 +13,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/networks/manager.go b/management/server/networks/manager.go index 1c46e9281..cb1116b0e 100644 --- a/management/server/networks/manager.go +++ b/management/server/networks/manager.go @@ -14,7 +14,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/networks/resources/manager.go b/management/server/networks/resources/manager.go index 21d1e54de..7c8c68e32 100644 --- a/management/server/networks/resources/manager.go +++ b/management/server/networks/resources/manager.go @@ -12,7 +12,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" nbtypes "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/networks/resources/manager_test.go b/management/server/networks/resources/manager_test.go index 3a91b4af8..c6cec6f7e 100644 --- a/management/server/networks/resources/manager_test.go +++ b/management/server/networks/resources/manager_test.go @@ -10,7 +10,7 @@ import ( "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/networks/resources/types" "github.com/netbirdio/netbird/management/server/permissions" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/networks/resources/types/resource.go b/management/server/networks/resources/types/resource.go index 3033a1fa0..7874be858 100644 --- a/management/server/networks/resources/types/resource.go +++ b/management/server/networks/resources/types/resource.go @@ -14,7 +14,7 @@ import ( nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/route" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) type NetworkResourceType string diff --git a/management/server/networks/routers/manager.go b/management/server/networks/routers/manager.go index 7b488b361..ff5a771d6 100644 --- a/management/server/networks/routers/manager.go +++ b/management/server/networks/routers/manager.go @@ -14,7 +14,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/networks/routers/manager_test.go b/management/server/networks/routers/manager_test.go index 541643222..8054d05c6 100644 --- a/management/server/networks/routers/manager_test.go +++ b/management/server/networks/routers/manager_test.go @@ -9,7 +9,7 @@ import ( "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/networks/routers/types" "github.com/netbirdio/netbird/management/server/permissions" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/networks/routers/types/router.go b/management/server/networks/routers/types/router.go index 71465868f..72b15fd9a 100644 --- a/management/server/networks/routers/types/router.go +++ b/management/server/networks/routers/types/router.go @@ -5,7 +5,7 @@ import ( "github.com/rs/xid" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/management/server/networks/types" ) diff --git a/management/server/networks/types/network.go b/management/server/networks/types/network.go index d1c7f2b33..69d596f8b 100644 --- a/management/server/networks/types/network.go +++ b/management/server/networks/types/network.go @@ -3,7 +3,7 @@ package types import ( "github.com/rs/xid" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) type Network struct { diff --git a/management/server/peer.go b/management/server/peer.go index a8c944dce..6cd519f27 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -32,7 +32,7 @@ import ( "github.com/netbirdio/netbird/shared/management/proto" "github.com/netbirdio/netbird/management/server/activity" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) // GetPeers returns a list of peers under the given account filtering out peers that do not belong to a user if diff --git a/management/server/peer_test.go b/management/server/peer_test.go index 46df48345..a78f220d3 100644 --- a/management/server/peer_test.go +++ b/management/server/peer_test.go @@ -29,7 +29,7 @@ import ( "github.com/netbirdio/netbird/management/server/mock_server" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/settings" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/peers/manager.go b/management/server/peers/manager.go index fe48bf576..7e0262ef9 100644 --- a/management/server/peers/manager.go +++ b/management/server/peers/manager.go @@ -10,7 +10,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/permissions/manager.go b/management/server/permissions/manager.go index ebbce5d4a..4b2d91c3b 100644 --- a/management/server/permissions/manager.go +++ b/management/server/permissions/manager.go @@ -11,7 +11,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" "github.com/netbirdio/netbird/management/server/permissions/roles" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/policy.go b/management/server/policy.go index b5440266f..b19f99960 100644 --- a/management/server/policy.go +++ b/management/server/policy.go @@ -14,7 +14,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) // GetPolicy from the store diff --git a/management/server/posture/checks.go b/management/server/posture/checks.go index b2f308d76..d65dc5045 100644 --- a/management/server/posture/checks.go +++ b/management/server/posture/checks.go @@ -7,9 +7,9 @@ import ( "regexp" "github.com/hashicorp/go-version" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) const ( diff --git a/management/server/posture/network.go b/management/server/posture/network.go index 0fa6f6e71..f78744143 100644 --- a/management/server/posture/network.go +++ b/management/server/posture/network.go @@ -7,7 +7,7 @@ import ( "slices" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) type PeerNetworkRangeCheck struct { diff --git a/management/server/posture_checks.go b/management/server/posture_checks.go index f91e89b45..50f7e4776 100644 --- a/management/server/posture_checks.go +++ b/management/server/posture_checks.go @@ -13,7 +13,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" ) diff --git a/management/server/route.go b/management/server/route.go index ee5835a8b..50c4bdc4a 100644 --- a/management/server/route.go +++ b/management/server/route.go @@ -14,7 +14,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/route" diff --git a/management/server/settings/manager.go b/management/server/settings/manager.go index 94392ebf7..9cb142938 100644 --- a/management/server/settings/manager.go +++ b/management/server/settings/manager.go @@ -11,7 +11,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/users" diff --git a/management/server/setupkey.go b/management/server/setupkey.go index b0903c8d0..e3647f6df 100644 --- a/management/server/setupkey.go +++ b/management/server/setupkey.go @@ -10,7 +10,7 @@ import ( "github.com/netbirdio/netbird/management/server/activity" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go index c2f0dff6d..c0f683124 100644 --- a/management/server/store/sql_store.go +++ b/management/server/store/sql_store.go @@ -29,7 +29,7 @@ import ( networkTypes "github.com/netbirdio/netbird/management/server/networks/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/telemetry" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" diff --git a/management/server/store/sql_store_test.go b/management/server/store/sql_store_test.go index 44bb3f599..fdce9d735 100644 --- a/management/server/store/sql_store_test.go +++ b/management/server/store/sql_store_test.go @@ -27,7 +27,7 @@ import ( networkTypes "github.com/netbirdio/netbird/management/server/networks/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/util" nbroute "github.com/netbirdio/netbird/route" diff --git a/management/server/types/account.go b/management/server/types/account.go index 18259b220..17a838aae 100644 --- a/management/server/types/account.go +++ b/management/server/types/account.go @@ -22,7 +22,7 @@ import ( networkTypes "github.com/netbirdio/netbird/management/server/networks/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/posture" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/telemetry" "github.com/netbirdio/netbird/management/server/util" "github.com/netbirdio/netbird/route" diff --git a/management/server/types/network.go b/management/server/types/network.go index 4b0602cd6..f072a4294 100644 --- a/management/server/types/network.go +++ b/management/server/types/network.go @@ -14,7 +14,7 @@ import ( nbdns "github.com/netbirdio/netbird/dns" "github.com/netbirdio/netbird/shared/management/proto" nbpeer "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/util" "github.com/netbirdio/netbird/route" ) diff --git a/management/server/types/resource.go b/management/server/types/resource.go index 820872f20..84d8e4b88 100644 --- a/management/server/types/resource.go +++ b/management/server/types/resource.go @@ -1,7 +1,7 @@ package types import ( - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) type Resource struct { diff --git a/management/server/user.go b/management/server/user.go index 58d2d0c41..e33f89dfd 100644 --- a/management/server/user.go +++ b/management/server/user.go @@ -17,7 +17,7 @@ import ( nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/operations" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/users" diff --git a/management/server/user_test.go b/management/server/user_test.go index 8ab6584cf..7515439b8 100644 --- a/management/server/user_test.go +++ b/management/server/user_test.go @@ -15,7 +15,7 @@ import ( "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" "github.com/netbirdio/netbird/management/server/permissions/roles" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" "github.com/netbirdio/netbird/management/server/users" "github.com/netbirdio/netbird/management/server/util" diff --git a/relay/server/handshake.go b/relay/server/handshake.go index eb72b3bae..922369798 100644 --- a/relay/server/handshake.go +++ b/relay/server/handshake.go @@ -6,11 +6,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" //nolint:staticcheck - "github.com/netbirdio/netbird/relay/messages/address" + "github.com/netbirdio/netbird/shared/relay/messages/address" //nolint:staticcheck - authmsg "github.com/netbirdio/netbird/relay/messages/auth" + authmsg "github.com/netbirdio/netbird/shared/relay/messages/auth" ) type Validator interface { diff --git a/relay/server/listener/ws/listener.go b/relay/server/listener/ws/listener.go index 3a95951ee..8579fb137 100644 --- a/relay/server/listener/ws/listener.go +++ b/relay/server/listener/ws/listener.go @@ -10,10 +10,12 @@ import ( "github.com/coder/websocket" log "github.com/sirupsen/logrus" + + "github.com/netbirdio/netbird/shared/relay" ) // URLPath is the path for the websocket connection. -const URLPath = "/relay" +const URLPath = relay.WebSocketURLPath type Listener struct { // Address is the address to listen on. diff --git a/relay/server/peer.go b/relay/server/peer.go index 9caa5b06f..c47f2e960 100644 --- a/relay/server/peer.go +++ b/relay/server/peer.go @@ -9,8 +9,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/relay/healthcheck" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/healthcheck" + "github.com/netbirdio/netbird/shared/relay/messages" "github.com/netbirdio/netbird/relay/metrics" "github.com/netbirdio/netbird/relay/server/store" ) diff --git a/relay/server/server.go b/relay/server/server.go index f0b480ee4..59695e8a9 100644 --- a/relay/server/server.go +++ b/relay/server/server.go @@ -10,7 +10,7 @@ import ( "github.com/netbirdio/netbird/relay/server/listener" "github.com/netbirdio/netbird/relay/server/listener/quic" "github.com/netbirdio/netbird/relay/server/listener/ws" - quictls "github.com/netbirdio/netbird/relay/tls" + quictls "github.com/netbirdio/netbird/shared/relay/tls" log "github.com/sirupsen/logrus" ) diff --git a/relay/server/store/listener.go b/relay/server/store/listener.go index e9c77d953..f09f2ffdd 100644 --- a/relay/server/store/listener.go +++ b/relay/server/store/listener.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) type event struct { diff --git a/relay/server/store/notifier.go b/relay/server/store/notifier.go index 335522537..0140d6633 100644 --- a/relay/server/store/notifier.go +++ b/relay/server/store/notifier.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) type PeerNotifier struct { diff --git a/relay/server/store/store.go b/relay/server/store/store.go index fd0578603..556307885 100644 --- a/relay/server/store/store.go +++ b/relay/server/store/store.go @@ -3,7 +3,7 @@ package store import ( "sync" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) type IPeer interface { diff --git a/relay/server/store/store_test.go b/relay/server/store/store_test.go index ad549a62c..1bf68aa59 100644 --- a/relay/server/store/store_test.go +++ b/relay/server/store/store_test.go @@ -3,7 +3,7 @@ package store import ( "testing" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) type MocPeer struct { diff --git a/route/route.go b/route/route.go index c46dff8c8..bf62bf666 100644 --- a/route/route.go +++ b/route/route.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/netbirdio/netbird/shared/management/domain" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) // Windows has some limitation regarding metric size that differ from Unix-like systems. diff --git a/shared/context/keys.go b/shared/context/keys.go new file mode 100644 index 000000000..5345ee214 --- /dev/null +++ b/shared/context/keys.go @@ -0,0 +1,8 @@ +package context + +const ( + RequestIDKey = "requestID" + AccountIDKey = "accountID" + UserIDKey = "userID" + PeerIDKey = "peerID" +) \ No newline at end of file diff --git a/shared/management/client/client_test.go b/shared/management/client/client_test.go index 6431ccd45..061f21d44 100644 --- a/shared/management/client/client_test.go +++ b/shared/management/client/client_test.go @@ -52,7 +52,7 @@ func startManagement(t *testing.T) (*grpc.Server, net.Listener) { log.SetLevel(level) config := &types.Config{} - _, err := util.ReadJson("../server/testdata/management.json", config) + _, err := util.ReadJson("../../../management/server/testdata/management.json", config) if err != nil { t.Fatal(err) } @@ -62,7 +62,7 @@ func startManagement(t *testing.T) (*grpc.Server, net.Listener) { t.Fatal(err) } s := grpc.NewServer() - store, cleanUp, err := store.NewTestStoreFromSQL(context.Background(), "../server/testdata/store.sql", t.TempDir()) + store, cleanUp, err := store.NewTestStoreFromSQL(context.Background(), "../../../management/server/testdata/store.sql", t.TempDir()) if err != nil { t.Fatal(err) } diff --git a/shared/management/client/rest/accounts.go b/shared/management/client/rest/accounts.go index fbe3010e1..2211f4a43 100644 --- a/shared/management/client/rest/accounts.go +++ b/shared/management/client/rest/accounts.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // AccountsAPI APIs for accounts, do not use directly diff --git a/shared/management/client/rest/accounts_test.go b/shared/management/client/rest/accounts_test.go index ae45de7ab..be0066488 100644 --- a/shared/management/client/rest/accounts_test.go +++ b/shared/management/client/rest/accounts_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/client.go b/shared/management/client/rest/client.go index b5945985f..2a5de5bbc 100644 --- a/shared/management/client/rest/client.go +++ b/shared/management/client/rest/client.go @@ -8,7 +8,7 @@ import ( "io" "net/http" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/util" ) // Client Management service HTTP REST API Client diff --git a/shared/management/client/rest/client_test.go b/shared/management/client/rest/client_test.go index 437ffa836..56c859652 100644 --- a/shared/management/client/rest/client_test.go +++ b/shared/management/client/rest/client_test.go @@ -26,7 +26,7 @@ func ptr[T any, PT *T](x T) PT { func withBlackBoxServer(t *testing.T, callback func(*rest.Client)) { t.Helper() - handler, _, _ := testing_tools.BuildApiBlackBoxWithDBState(t, "../../server/testdata/store.sql", nil, false) + handler, _, _ := testing_tools.BuildApiBlackBoxWithDBState(t, "../../../../management/server/testdata/store.sql", nil, false) server := httptest.NewServer(handler) defer server.Close() c := rest.New(server.URL, "nbp_apTmlmUXHSC4PKmHwtIZNaGr8eqcVI2gMURp") diff --git a/shared/management/client/rest/dns.go b/shared/management/client/rest/dns.go index 3fb74d5f5..aeef02735 100644 --- a/shared/management/client/rest/dns.go +++ b/shared/management/client/rest/dns.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // DNSAPI APIs for DNS Management, do not use directly diff --git a/shared/management/client/rest/dns_test.go b/shared/management/client/rest/dns_test.go index e467659c1..58082abe8 100644 --- a/shared/management/client/rest/dns_test.go +++ b/shared/management/client/rest/dns_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/events.go b/shared/management/client/rest/events.go index 775d3ba2e..2d25333ae 100644 --- a/shared/management/client/rest/events.go +++ b/shared/management/client/rest/events.go @@ -3,7 +3,7 @@ package rest import ( "context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // EventsAPI APIs for Events, do not use directly diff --git a/shared/management/client/rest/events_test.go b/shared/management/client/rest/events_test.go index f3c5627f2..b28390001 100644 --- a/shared/management/client/rest/events_test.go +++ b/shared/management/client/rest/events_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/geo.go b/shared/management/client/rest/geo.go index dfecee09e..3c4a3ff9f 100644 --- a/shared/management/client/rest/geo.go +++ b/shared/management/client/rest/geo.go @@ -3,7 +3,7 @@ package rest import ( "context" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // GeoLocationAPI APIs for Geo-Location, do not use directly diff --git a/shared/management/client/rest/geo_test.go b/shared/management/client/rest/geo_test.go index 909744b47..fcb4808a1 100644 --- a/shared/management/client/rest/geo_test.go +++ b/shared/management/client/rest/geo_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/groups.go b/shared/management/client/rest/groups.go index 7d4bac62c..af068e077 100644 --- a/shared/management/client/rest/groups.go +++ b/shared/management/client/rest/groups.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // GroupsAPI APIs for Groups, do not use directly diff --git a/shared/management/client/rest/groups_test.go b/shared/management/client/rest/groups_test.go index 8b8207def..fcd759e9a 100644 --- a/shared/management/client/rest/groups_test.go +++ b/shared/management/client/rest/groups_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/impersonation_test.go b/shared/management/client/rest/impersonation_test.go index e5739b8f5..4fb8f24eb 100644 --- a/shared/management/client/rest/impersonation_test.go +++ b/shared/management/client/rest/impersonation_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) var ( diff --git a/shared/management/client/rest/networks.go b/shared/management/client/rest/networks.go index 9441780f3..cb25dcbef 100644 --- a/shared/management/client/rest/networks.go +++ b/shared/management/client/rest/networks.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // NetworksAPI APIs for Networks, do not use directly diff --git a/shared/management/client/rest/networks_test.go b/shared/management/client/rest/networks_test.go index 45cc81d8d..ca2a294ae 100644 --- a/shared/management/client/rest/networks_test.go +++ b/shared/management/client/rest/networks_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/peers.go b/shared/management/client/rest/peers.go index f4364bb62..359c21e42 100644 --- a/shared/management/client/rest/peers.go +++ b/shared/management/client/rest/peers.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // PeersAPI APIs for peers, do not use directly diff --git a/shared/management/client/rest/peers_test.go b/shared/management/client/rest/peers_test.go index 5701455de..a45f9d6ec 100644 --- a/shared/management/client/rest/peers_test.go +++ b/shared/management/client/rest/peers_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/policies.go b/shared/management/client/rest/policies.go index a6e0e38d3..206205984 100644 --- a/shared/management/client/rest/policies.go +++ b/shared/management/client/rest/policies.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // PoliciesAPI APIs for Policies, do not use directly diff --git a/shared/management/client/rest/policies_test.go b/shared/management/client/rest/policies_test.go index 6254077e9..a19d0a728 100644 --- a/shared/management/client/rest/policies_test.go +++ b/shared/management/client/rest/policies_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/posturechecks.go b/shared/management/client/rest/posturechecks.go index 2ab8f4549..1a440f058 100644 --- a/shared/management/client/rest/posturechecks.go +++ b/shared/management/client/rest/posturechecks.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // PostureChecksAPI APIs for PostureChecks, do not use directly diff --git a/shared/management/client/rest/posturechecks_test.go b/shared/management/client/rest/posturechecks_test.go index c8489ac31..9b1b618df 100644 --- a/shared/management/client/rest/posturechecks_test.go +++ b/shared/management/client/rest/posturechecks_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/routes.go b/shared/management/client/rest/routes.go index 183c363cf..31024fe92 100644 --- a/shared/management/client/rest/routes.go +++ b/shared/management/client/rest/routes.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // RoutesAPI APIs for Routes, do not use directly diff --git a/shared/management/client/rest/routes_test.go b/shared/management/client/rest/routes_test.go index dc83f6ba4..9452a07fc 100644 --- a/shared/management/client/rest/routes_test.go +++ b/shared/management/client/rest/routes_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/setupkeys.go b/shared/management/client/rest/setupkeys.go index 6f26cd0b7..34c07c6ab 100644 --- a/shared/management/client/rest/setupkeys.go +++ b/shared/management/client/rest/setupkeys.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // SetupKeysAPI APIs for Setup keys, do not use directly diff --git a/shared/management/client/rest/setupkeys_test.go b/shared/management/client/rest/setupkeys_test.go index eafdc54a5..0fa782da5 100644 --- a/shared/management/client/rest/setupkeys_test.go +++ b/shared/management/client/rest/setupkeys_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/tokens.go b/shared/management/client/rest/tokens.go index 7a63d0c9d..38b305722 100644 --- a/shared/management/client/rest/tokens.go +++ b/shared/management/client/rest/tokens.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // TokensAPI APIs for PATs, do not use directly diff --git a/shared/management/client/rest/tokens_test.go b/shared/management/client/rest/tokens_test.go index 8abbca0a9..ce3748751 100644 --- a/shared/management/client/rest/tokens_test.go +++ b/shared/management/client/rest/tokens_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/client/rest/users.go b/shared/management/client/rest/users.go index f0ef54be2..b0ea46d55 100644 --- a/shared/management/client/rest/users.go +++ b/shared/management/client/rest/users.go @@ -5,7 +5,7 @@ import ( "context" "encoding/json" - "github.com/netbirdio/netbird/management/server/http/api" + "github.com/netbirdio/netbird/shared/management/http/api" ) // UsersAPI APIs for users, do not use directly diff --git a/shared/management/client/rest/users_test.go b/shared/management/client/rest/users_test.go index 28f955380..d53c4eb6a 100644 --- a/shared/management/client/rest/users_test.go +++ b/shared/management/client/rest/users_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/management/server/http/api" - "github.com/netbirdio/netbird/management/server/http/util" + "github.com/netbirdio/netbird/shared/management/http/api" + "github.com/netbirdio/netbird/shared/management/http/util" ) var ( diff --git a/shared/management/domain/go.sum b/shared/management/domain/go.sum deleted file mode 100644 index 4ce43119c..000000000 --- a/shared/management/domain/go.sum +++ /dev/null @@ -1 +0,0 @@ -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= diff --git a/management/server/http/api/cfg.yaml b/shared/management/http/api/cfg.yaml similarity index 100% rename from management/server/http/api/cfg.yaml rename to shared/management/http/api/cfg.yaml diff --git a/management/server/http/api/generate.sh b/shared/management/http/api/generate.sh similarity index 100% rename from management/server/http/api/generate.sh rename to shared/management/http/api/generate.sh diff --git a/management/server/http/api/openapi.yml b/shared/management/http/api/openapi.yml similarity index 100% rename from management/server/http/api/openapi.yml rename to shared/management/http/api/openapi.yml diff --git a/management/server/http/api/types.gen.go b/shared/management/http/api/types.gen.go similarity index 100% rename from management/server/http/api/types.gen.go rename to shared/management/http/api/types.gen.go diff --git a/management/server/http/util/util.go b/shared/management/http/util/util.go similarity index 98% rename from management/server/http/util/util.go rename to shared/management/http/util/util.go index 3d7eed498..3ae321023 100644 --- a/management/server/http/util/util.go +++ b/shared/management/http/util/util.go @@ -11,7 +11,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/management/server/status" + "github.com/netbirdio/netbird/shared/management/status" ) // EmptyObject is an empty struct used to return empty JSON object diff --git a/shared/management/operations/operation.go b/shared/management/operations/operation.go new file mode 100644 index 000000000..b9b500362 --- /dev/null +++ b/shared/management/operations/operation.go @@ -0,0 +1,4 @@ +package operations + +// Operation represents a permission operation type +type Operation string \ No newline at end of file diff --git a/management/server/status/error.go b/shared/management/status/error.go similarity index 99% rename from management/server/status/error.go rename to shared/management/status/error.go index e3cc27b29..7660174d6 100644 --- a/management/server/status/error.go +++ b/shared/management/status/error.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/netbirdio/netbird/management/server/permissions/operations" + "github.com/netbirdio/netbird/shared/management/operations" ) const ( diff --git a/shared/relay/client/client.go b/shared/relay/client/client.go index f9f5b70e4..37c9debc2 100644 --- a/shared/relay/client/client.go +++ b/shared/relay/client/client.go @@ -13,8 +13,8 @@ import ( "github.com/netbirdio/netbird/shared/relay/client/dialer" "github.com/netbirdio/netbird/shared/relay/client/dialer/quic" "github.com/netbirdio/netbird/shared/relay/client/dialer/ws" - "github.com/netbirdio/netbird/relay/healthcheck" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/healthcheck" + "github.com/netbirdio/netbird/shared/relay/messages" ) const ( diff --git a/shared/relay/client/conn.go b/shared/relay/client/conn.go index d8cffa695..4e151aaa4 100644 --- a/shared/relay/client/conn.go +++ b/shared/relay/client/conn.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) // Conn represent a connection to a relayed remote peer. diff --git a/shared/relay/client/dialer/quic/quic.go b/shared/relay/client/dialer/quic/quic.go index 3fd48fb19..b496f6a9b 100644 --- a/shared/relay/client/dialer/quic/quic.go +++ b/shared/relay/client/dialer/quic/quic.go @@ -11,7 +11,7 @@ import ( "github.com/quic-go/quic-go" log "github.com/sirupsen/logrus" - quictls "github.com/netbirdio/netbird/relay/tls" + quictls "github.com/netbirdio/netbird/shared/relay/tls" nbnet "github.com/netbirdio/netbird/util/net" ) diff --git a/shared/relay/client/dialer/ws/ws.go b/shared/relay/client/dialer/ws/ws.go index cb525865b..109651f5d 100644 --- a/shared/relay/client/dialer/ws/ws.go +++ b/shared/relay/client/dialer/ws/ws.go @@ -14,7 +14,7 @@ import ( "github.com/coder/websocket" log "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/relay/server/listener/ws" + "github.com/netbirdio/netbird/shared/relay" "github.com/netbirdio/netbird/util/embeddedroots" nbnet "github.com/netbirdio/netbird/util/net" ) @@ -40,7 +40,7 @@ func (d Dialer) Dial(ctx context.Context, address string) (net.Conn, error) { if err != nil { return nil, err } - parsedURL.Path = ws.URLPath + parsedURL.Path = relay.WebSocketURLPath wsConn, resp, err := websocket.Dial(ctx, parsedURL.String(), opts) if err != nil { diff --git a/shared/relay/client/peer_subscription.go b/shared/relay/client/peer_subscription.go index 85bd41cbd..b594b65b7 100644 --- a/shared/relay/client/peer_subscription.go +++ b/shared/relay/client/peer_subscription.go @@ -9,7 +9,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" ) const ( diff --git a/shared/relay/client/peer_subscription_test.go b/shared/relay/client/peer_subscription_test.go index 0437efa04..bcc7a552d 100644 --- a/shared/relay/client/peer_subscription_test.go +++ b/shared/relay/client/peer_subscription_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/netbirdio/netbird/relay/messages" + "github.com/netbirdio/netbird/shared/relay/messages" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/shared/relay/constants.go b/shared/relay/constants.go new file mode 100644 index 000000000..3c7c3cd29 --- /dev/null +++ b/shared/relay/constants.go @@ -0,0 +1,6 @@ +package relay + +const ( + // WebSocketURLPath is the path for the websocket relay connection + WebSocketURLPath = "/relay" +) \ No newline at end of file diff --git a/relay/healthcheck/doc.go b/shared/relay/healthcheck/doc.go similarity index 100% rename from relay/healthcheck/doc.go rename to shared/relay/healthcheck/doc.go diff --git a/relay/healthcheck/receiver.go b/shared/relay/healthcheck/receiver.go similarity index 100% rename from relay/healthcheck/receiver.go rename to shared/relay/healthcheck/receiver.go diff --git a/relay/healthcheck/receiver_test.go b/shared/relay/healthcheck/receiver_test.go similarity index 100% rename from relay/healthcheck/receiver_test.go rename to shared/relay/healthcheck/receiver_test.go diff --git a/relay/healthcheck/sender.go b/shared/relay/healthcheck/sender.go similarity index 100% rename from relay/healthcheck/sender.go rename to shared/relay/healthcheck/sender.go diff --git a/relay/healthcheck/sender_test.go b/shared/relay/healthcheck/sender_test.go similarity index 100% rename from relay/healthcheck/sender_test.go rename to shared/relay/healthcheck/sender_test.go diff --git a/relay/messages/address/address.go b/shared/relay/messages/address/address.go similarity index 100% rename from relay/messages/address/address.go rename to shared/relay/messages/address/address.go diff --git a/relay/messages/auth/auth.go b/shared/relay/messages/auth/auth.go similarity index 100% rename from relay/messages/auth/auth.go rename to shared/relay/messages/auth/auth.go diff --git a/relay/messages/doc.go b/shared/relay/messages/doc.go similarity index 100% rename from relay/messages/doc.go rename to shared/relay/messages/doc.go diff --git a/relay/messages/id.go b/shared/relay/messages/id.go similarity index 100% rename from relay/messages/id.go rename to shared/relay/messages/id.go diff --git a/relay/messages/message.go b/shared/relay/messages/message.go similarity index 100% rename from relay/messages/message.go rename to shared/relay/messages/message.go diff --git a/relay/messages/message_test.go b/shared/relay/messages/message_test.go similarity index 100% rename from relay/messages/message_test.go rename to shared/relay/messages/message_test.go diff --git a/relay/messages/peer_state.go b/shared/relay/messages/peer_state.go similarity index 100% rename from relay/messages/peer_state.go rename to shared/relay/messages/peer_state.go diff --git a/relay/messages/peer_state_test.go b/shared/relay/messages/peer_state_test.go similarity index 100% rename from relay/messages/peer_state_test.go rename to shared/relay/messages/peer_state_test.go diff --git a/relay/tls/alpn.go b/shared/relay/tls/alpn.go similarity index 100% rename from relay/tls/alpn.go rename to shared/relay/tls/alpn.go diff --git a/relay/tls/client_dev.go b/shared/relay/tls/client_dev.go similarity index 100% rename from relay/tls/client_dev.go rename to shared/relay/tls/client_dev.go diff --git a/relay/tls/client_prod.go b/shared/relay/tls/client_prod.go similarity index 100% rename from relay/tls/client_prod.go rename to shared/relay/tls/client_prod.go diff --git a/relay/tls/doc.go b/shared/relay/tls/doc.go similarity index 100% rename from relay/tls/doc.go rename to shared/relay/tls/doc.go diff --git a/relay/tls/server_dev.go b/shared/relay/tls/server_dev.go similarity index 100% rename from relay/tls/server_dev.go rename to shared/relay/tls/server_dev.go diff --git a/relay/tls/server_prod.go b/shared/relay/tls/server_prod.go similarity index 100% rename from relay/tls/server_prod.go rename to shared/relay/tls/server_prod.go