From 5f130959eaf002ccc9f8a568ab91c89d2678f99b Mon Sep 17 00:00:00 2001 From: mlsmaycon Date: Sat, 27 Jun 2026 02:55:27 +0200 Subject: [PATCH] [agent-network] Relocate agentnetwork package to internals/modules Move management/server/agentnetwork (and its catalog/, labelgen/, types/ subpackages) to management/internals/modules/agentnetwork, alongside the reverse-proxy module, and rewrite all importers. Pure relocation: package names, the synthesizer + affectedpeers registration hook, and store access (shared store.Store) are unchanged, so no import cycle is introduced (affectedpeers still depends only on the agentnetwork/types leaf). --- .../controllers/network_map/controller/repository.go | 2 +- .../modules}/agentnetwork/affectedpeers_hook.go | 0 .../modules}/agentnetwork/catalog/catalog.go | 0 .../modules}/agentnetwork/labelgen/labelgen.go | 0 .../modules}/agentnetwork/labelgen/labelgen_test.go | 0 .../modules}/agentnetwork/labelgen/words.go | 0 .../{server => internals/modules}/agentnetwork/manager.go | 4 ++-- .../modules}/agentnetwork/policyselect.go | 2 +- .../agentnetwork/policyselect_account_realstore_test.go | 2 +- .../modules}/agentnetwork/policyselect_realstore_test.go | 2 +- .../modules}/agentnetwork/policyselect_test.go | 2 +- .../{server => internals/modules}/agentnetwork/reconcile.go | 0 .../modules}/agentnetwork/reconcile_test.go | 2 +- .../modules}/agentnetwork/synthesizer.go | 4 ++-- .../agentnetwork/synthesizer_guardrail_realstore_test.go | 2 +- .../synthesizer_log_collection_realstore_test.go | 0 .../synthesizer_parser_redact_realstore_test.go | 0 .../modules}/agentnetwork/synthesizer_realstore_test.go | 0 .../modules}/agentnetwork/synthesizer_test.go | 2 +- .../modules}/agentnetwork/types/accesslog.go | 0 .../modules}/agentnetwork/types/accesslogfilter.go | 0 .../modules}/agentnetwork/types/budgetrule.go | 0 .../modules}/agentnetwork/types/consumption.go | 0 .../modules}/agentnetwork/types/consumption_test.go | 0 .../modules}/agentnetwork/types/guardrail.go | 0 .../modules}/agentnetwork/types/policy.go | 0 .../modules}/agentnetwork/types/provider.go | 0 .../modules}/agentnetwork/types/settings.go | 0 .../modules}/agentnetwork/types/usage.go | 0 .../modules}/agentnetwork/types/usageoverview.go | 0 .../modules}/agentnetwork/wire_shape_test.go | 2 +- .../modules/reverseproxy/accesslogs/manager/manager.go | 2 +- management/internals/server/boot.go | 2 +- management/internals/server/modules.go | 2 +- management/internals/shared/grpc/proxy.go | 2 +- management/server/agentnetwork_budgetrule_realstack_test.go | 4 ++-- management/server/agentnetwork_proxypeer_restart_test.go | 4 ++-- management/server/agentnetwork_realstack_test.go | 4 ++-- management/server/http/handler.go | 2 +- .../server/http/handlers/agentnetwork/access_log_handler.go | 2 +- .../server/http/handlers/agentnetwork/budget_handler.go | 2 +- .../http/handlers/agentnetwork/budget_handler_test.go | 2 +- .../http/handlers/agentnetwork/consumption_handler.go | 2 +- .../server/http/handlers/agentnetwork/guardrails_handler.go | 2 +- .../server/http/handlers/agentnetwork/handlers_test.go | 4 ++-- .../server/http/handlers/agentnetwork/policies_handler.go | 2 +- .../server/http/handlers/agentnetwork/providers_handler.go | 6 +++--- .../server/http/handlers/agentnetwork/settings_handler.go | 2 +- management/server/store/sql_store.go | 2 +- management/server/store/sql_store_agentnetwork.go | 2 +- .../server/store/sql_store_agentnetwork_accesslog_test.go | 2 +- .../server/store/sql_store_agentnetwork_budgetrule_test.go | 2 +- management/server/store/store.go | 2 +- management/server/store/store_mock_agentnetwork.go | 2 +- .../builtin/agentnetwork_chain_integration_test.go | 4 ++-- proxy/internal/proxy/agent_network_chain_realstack_test.go | 4 ++-- 56 files changed, 46 insertions(+), 46 deletions(-) rename management/{server => internals/modules}/agentnetwork/affectedpeers_hook.go (100%) rename management/{server => internals/modules}/agentnetwork/catalog/catalog.go (100%) rename management/{server => internals/modules}/agentnetwork/labelgen/labelgen.go (100%) rename management/{server => internals/modules}/agentnetwork/labelgen/labelgen_test.go (100%) rename management/{server => internals/modules}/agentnetwork/labelgen/words.go (100%) rename management/{server => internals/modules}/agentnetwork/manager.go (99%) rename management/{server => internals/modules}/agentnetwork/policyselect.go (99%) rename management/{server => internals/modules}/agentnetwork/policyselect_account_realstore_test.go (99%) rename management/{server => internals/modules}/agentnetwork/policyselect_realstore_test.go (99%) rename management/{server => internals/modules}/agentnetwork/policyselect_test.go (99%) rename management/{server => internals/modules}/agentnetwork/reconcile.go (100%) rename management/{server => internals/modules}/agentnetwork/reconcile_test.go (99%) rename management/{server => internals/modules}/agentnetwork/synthesizer.go (99%) rename management/{server => internals/modules}/agentnetwork/synthesizer_guardrail_realstore_test.go (98%) rename management/{server => internals/modules}/agentnetwork/synthesizer_log_collection_realstore_test.go (100%) rename management/{server => internals/modules}/agentnetwork/synthesizer_parser_redact_realstore_test.go (100%) rename management/{server => internals/modules}/agentnetwork/synthesizer_realstore_test.go (100%) rename management/{server => internals/modules}/agentnetwork/synthesizer_test.go (99%) rename management/{server => internals/modules}/agentnetwork/types/accesslog.go (100%) rename management/{server => internals/modules}/agentnetwork/types/accesslogfilter.go (100%) rename management/{server => internals/modules}/agentnetwork/types/budgetrule.go (100%) rename management/{server => internals/modules}/agentnetwork/types/consumption.go (100%) rename management/{server => internals/modules}/agentnetwork/types/consumption_test.go (100%) rename management/{server => internals/modules}/agentnetwork/types/guardrail.go (100%) rename management/{server => internals/modules}/agentnetwork/types/policy.go (100%) rename management/{server => internals/modules}/agentnetwork/types/provider.go (100%) rename management/{server => internals/modules}/agentnetwork/types/settings.go (100%) rename management/{server => internals/modules}/agentnetwork/types/usage.go (100%) rename management/{server => internals/modules}/agentnetwork/types/usageoverview.go (100%) rename management/{server => internals/modules}/agentnetwork/wire_shape_test.go (98%) diff --git a/management/internals/controllers/network_map/controller/repository.go b/management/internals/controllers/network_map/controller/repository.go index 1b76e6a0b..c0fcefc7d 100644 --- a/management/internals/controllers/network_map/controller/repository.go +++ b/management/internals/controllers/network_map/controller/repository.go @@ -5,7 +5,7 @@ import ( "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" "github.com/netbirdio/netbird/management/internals/modules/zones" - "github.com/netbirdio/netbird/management/server/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/management/server/types" diff --git a/management/server/agentnetwork/affectedpeers_hook.go b/management/internals/modules/agentnetwork/affectedpeers_hook.go similarity index 100% rename from management/server/agentnetwork/affectedpeers_hook.go rename to management/internals/modules/agentnetwork/affectedpeers_hook.go diff --git a/management/server/agentnetwork/catalog/catalog.go b/management/internals/modules/agentnetwork/catalog/catalog.go similarity index 100% rename from management/server/agentnetwork/catalog/catalog.go rename to management/internals/modules/agentnetwork/catalog/catalog.go diff --git a/management/server/agentnetwork/labelgen/labelgen.go b/management/internals/modules/agentnetwork/labelgen/labelgen.go similarity index 100% rename from management/server/agentnetwork/labelgen/labelgen.go rename to management/internals/modules/agentnetwork/labelgen/labelgen.go diff --git a/management/server/agentnetwork/labelgen/labelgen_test.go b/management/internals/modules/agentnetwork/labelgen/labelgen_test.go similarity index 100% rename from management/server/agentnetwork/labelgen/labelgen_test.go rename to management/internals/modules/agentnetwork/labelgen/labelgen_test.go diff --git a/management/server/agentnetwork/labelgen/words.go b/management/internals/modules/agentnetwork/labelgen/words.go similarity index 100% rename from management/server/agentnetwork/labelgen/words.go rename to management/internals/modules/agentnetwork/labelgen/words.go diff --git a/management/server/agentnetwork/manager.go b/management/internals/modules/agentnetwork/manager.go similarity index 99% rename from management/server/agentnetwork/manager.go rename to management/internals/modules/agentnetwork/manager.go index 2a9e4fa87..03f3d2f34 100644 --- a/management/server/agentnetwork/manager.go +++ b/management/internals/modules/agentnetwork/manager.go @@ -12,12 +12,12 @@ import ( log "github.com/sirupsen/logrus" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/labelgen" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/proxy" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/sessionkey" "github.com/netbirdio/netbird/management/server/account" "github.com/netbirdio/netbird/management/server/activity" - "github.com/netbirdio/netbird/management/server/agentnetwork/labelgen" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "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/agentnetwork/policyselect.go b/management/internals/modules/agentnetwork/policyselect.go similarity index 99% rename from management/server/agentnetwork/policyselect.go rename to management/internals/modules/agentnetwork/policyselect.go index baec154e2..9203a1910 100644 --- a/management/server/agentnetwork/policyselect.go +++ b/management/internals/modules/agentnetwork/policyselect.go @@ -7,7 +7,7 @@ import ( "sort" "time" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/shared/management/status" ) diff --git a/management/server/agentnetwork/policyselect_account_realstore_test.go b/management/internals/modules/agentnetwork/policyselect_account_realstore_test.go similarity index 99% rename from management/server/agentnetwork/policyselect_account_realstore_test.go rename to management/internals/modules/agentnetwork/policyselect_account_realstore_test.go index a3bfc4769..c3b13a6cc 100644 --- a/management/server/agentnetwork/policyselect_account_realstore_test.go +++ b/management/internals/modules/agentnetwork/policyselect_account_realstore_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/agentnetwork/policyselect_realstore_test.go b/management/internals/modules/agentnetwork/policyselect_realstore_test.go similarity index 99% rename from management/server/agentnetwork/policyselect_realstore_test.go rename to management/internals/modules/agentnetwork/policyselect_realstore_test.go index aac4bd276..cc8cfb1e7 100644 --- a/management/server/agentnetwork/policyselect_realstore_test.go +++ b/management/internals/modules/agentnetwork/policyselect_realstore_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/agentnetwork/policyselect_test.go b/management/internals/modules/agentnetwork/policyselect_test.go similarity index 99% rename from management/server/agentnetwork/policyselect_test.go rename to management/internals/modules/agentnetwork/policyselect_test.go index 8ac8032db..dd7687fe1 100644 --- a/management/server/agentnetwork/policyselect_test.go +++ b/management/internals/modules/agentnetwork/policyselect_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" nbstatus "github.com/netbirdio/netbird/shared/management/status" ) diff --git a/management/server/agentnetwork/reconcile.go b/management/internals/modules/agentnetwork/reconcile.go similarity index 100% rename from management/server/agentnetwork/reconcile.go rename to management/internals/modules/agentnetwork/reconcile.go diff --git a/management/server/agentnetwork/reconcile_test.go b/management/internals/modules/agentnetwork/reconcile_test.go similarity index 99% rename from management/server/agentnetwork/reconcile_test.go rename to management/internals/modules/agentnetwork/reconcile_test.go index 5a92b60a0..0855f0dc1 100644 --- a/management/server/agentnetwork/reconcile_test.go +++ b/management/internals/modules/agentnetwork/reconcile_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/proxy" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/shared/management/proto" ) diff --git a/management/server/agentnetwork/synthesizer.go b/management/internals/modules/agentnetwork/synthesizer.go similarity index 99% rename from management/server/agentnetwork/synthesizer.go rename to management/internals/modules/agentnetwork/synthesizer.go index 156b41df3..3e59c1146 100644 --- a/management/server/agentnetwork/synthesizer.go +++ b/management/internals/modules/agentnetwork/synthesizer.go @@ -9,10 +9,10 @@ import ( "sort" "strings" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/catalog" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/sessionkey" - "github.com/netbirdio/netbird/management/server/agentnetwork/catalog" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/shared/management/status" ) diff --git a/management/server/agentnetwork/synthesizer_guardrail_realstore_test.go b/management/internals/modules/agentnetwork/synthesizer_guardrail_realstore_test.go similarity index 98% rename from management/server/agentnetwork/synthesizer_guardrail_realstore_test.go rename to management/internals/modules/agentnetwork/synthesizer_guardrail_realstore_test.go index 7c7bb8bcf..8ed4910da 100644 --- a/management/server/agentnetwork/synthesizer_guardrail_realstore_test.go +++ b/management/internals/modules/agentnetwork/synthesizer_guardrail_realstore_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/agentnetwork/synthesizer_log_collection_realstore_test.go b/management/internals/modules/agentnetwork/synthesizer_log_collection_realstore_test.go similarity index 100% rename from management/server/agentnetwork/synthesizer_log_collection_realstore_test.go rename to management/internals/modules/agentnetwork/synthesizer_log_collection_realstore_test.go diff --git a/management/server/agentnetwork/synthesizer_parser_redact_realstore_test.go b/management/internals/modules/agentnetwork/synthesizer_parser_redact_realstore_test.go similarity index 100% rename from management/server/agentnetwork/synthesizer_parser_redact_realstore_test.go rename to management/internals/modules/agentnetwork/synthesizer_parser_redact_realstore_test.go diff --git a/management/server/agentnetwork/synthesizer_realstore_test.go b/management/internals/modules/agentnetwork/synthesizer_realstore_test.go similarity index 100% rename from management/server/agentnetwork/synthesizer_realstore_test.go rename to management/internals/modules/agentnetwork/synthesizer_realstore_test.go diff --git a/management/server/agentnetwork/synthesizer_test.go b/management/internals/modules/agentnetwork/synthesizer_test.go similarity index 99% rename from management/server/agentnetwork/synthesizer_test.go rename to management/internals/modules/agentnetwork/synthesizer_test.go index 70e956358..0b07f27b3 100644 --- a/management/server/agentnetwork/synthesizer_test.go +++ b/management/internals/modules/agentnetwork/synthesizer_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/shared/management/status" ) diff --git a/management/server/agentnetwork/types/accesslog.go b/management/internals/modules/agentnetwork/types/accesslog.go similarity index 100% rename from management/server/agentnetwork/types/accesslog.go rename to management/internals/modules/agentnetwork/types/accesslog.go diff --git a/management/server/agentnetwork/types/accesslogfilter.go b/management/internals/modules/agentnetwork/types/accesslogfilter.go similarity index 100% rename from management/server/agentnetwork/types/accesslogfilter.go rename to management/internals/modules/agentnetwork/types/accesslogfilter.go diff --git a/management/server/agentnetwork/types/budgetrule.go b/management/internals/modules/agentnetwork/types/budgetrule.go similarity index 100% rename from management/server/agentnetwork/types/budgetrule.go rename to management/internals/modules/agentnetwork/types/budgetrule.go diff --git a/management/server/agentnetwork/types/consumption.go b/management/internals/modules/agentnetwork/types/consumption.go similarity index 100% rename from management/server/agentnetwork/types/consumption.go rename to management/internals/modules/agentnetwork/types/consumption.go diff --git a/management/server/agentnetwork/types/consumption_test.go b/management/internals/modules/agentnetwork/types/consumption_test.go similarity index 100% rename from management/server/agentnetwork/types/consumption_test.go rename to management/internals/modules/agentnetwork/types/consumption_test.go diff --git a/management/server/agentnetwork/types/guardrail.go b/management/internals/modules/agentnetwork/types/guardrail.go similarity index 100% rename from management/server/agentnetwork/types/guardrail.go rename to management/internals/modules/agentnetwork/types/guardrail.go diff --git a/management/server/agentnetwork/types/policy.go b/management/internals/modules/agentnetwork/types/policy.go similarity index 100% rename from management/server/agentnetwork/types/policy.go rename to management/internals/modules/agentnetwork/types/policy.go diff --git a/management/server/agentnetwork/types/provider.go b/management/internals/modules/agentnetwork/types/provider.go similarity index 100% rename from management/server/agentnetwork/types/provider.go rename to management/internals/modules/agentnetwork/types/provider.go diff --git a/management/server/agentnetwork/types/settings.go b/management/internals/modules/agentnetwork/types/settings.go similarity index 100% rename from management/server/agentnetwork/types/settings.go rename to management/internals/modules/agentnetwork/types/settings.go diff --git a/management/server/agentnetwork/types/usage.go b/management/internals/modules/agentnetwork/types/usage.go similarity index 100% rename from management/server/agentnetwork/types/usage.go rename to management/internals/modules/agentnetwork/types/usage.go diff --git a/management/server/agentnetwork/types/usageoverview.go b/management/internals/modules/agentnetwork/types/usageoverview.go similarity index 100% rename from management/server/agentnetwork/types/usageoverview.go rename to management/internals/modules/agentnetwork/types/usageoverview.go diff --git a/management/server/agentnetwork/wire_shape_test.go b/management/internals/modules/agentnetwork/wire_shape_test.go similarity index 98% rename from management/server/agentnetwork/wire_shape_test.go rename to management/internals/modules/agentnetwork/wire_shape_test.go index 5aa580549..b574ab3e1 100644 --- a/management/server/agentnetwork/wire_shape_test.go +++ b/management/internals/modules/agentnetwork/wire_shape_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/proxy" rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/shared/management/proto" ) diff --git a/management/internals/modules/reverseproxy/accesslogs/manager/manager.go b/management/internals/modules/reverseproxy/accesslogs/manager/manager.go index 5f8d80ccd..d8303bc90 100644 --- a/management/internals/modules/reverseproxy/accesslogs/manager/manager.go +++ b/management/internals/modules/reverseproxy/accesslogs/manager/manager.go @@ -10,7 +10,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/accesslogs" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/geolocation" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/permissions/modules" diff --git a/management/internals/server/boot.go b/management/internals/server/boot.go index 82d18b591..1c78af9d0 100644 --- a/management/internals/server/boot.go +++ b/management/internals/server/boot.go @@ -30,7 +30,7 @@ import ( nbgrpc "github.com/netbirdio/netbird/management/internals/shared/grpc" "github.com/netbirdio/netbird/management/server/activity" activitystore "github.com/netbirdio/netbird/management/server/activity/store" - "github.com/netbirdio/netbird/management/server/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" nbcache "github.com/netbirdio/netbird/management/server/cache" nbContext "github.com/netbirdio/netbird/management/server/context" nbhttp "github.com/netbirdio/netbird/management/server/http" diff --git a/management/internals/server/modules.go b/management/internals/server/modules.go index d99af3971..6b1365f3b 100644 --- a/management/internals/server/modules.go +++ b/management/internals/server/modules.go @@ -20,7 +20,7 @@ import ( recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager" "github.com/netbirdio/netbird/management/server" "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/server/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" "github.com/netbirdio/netbird/management/server/geolocation" "github.com/netbirdio/netbird/management/server/groups" "github.com/netbirdio/netbird/management/server/idp" diff --git a/management/internals/shared/grpc/proxy.go b/management/internals/shared/grpc/proxy.go index 336d74e7e..0dfa24bc4 100644 --- a/management/internals/shared/grpc/proxy.go +++ b/management/internals/shared/grpc/proxy.go @@ -36,7 +36,7 @@ import ( "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/sessionkey" "github.com/netbirdio/netbird/management/server/idp" "github.com/netbirdio/netbird/management/server/peer" - "github.com/netbirdio/netbird/management/server/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/management/server/users" proxyauth "github.com/netbirdio/netbird/proxy/auth" diff --git a/management/server/agentnetwork_budgetrule_realstack_test.go b/management/server/agentnetwork_budgetrule_realstack_test.go index 31f62b1b5..d17f2e26a 100644 --- a/management/server/agentnetwork_budgetrule_realstack_test.go +++ b/management/server/agentnetwork_budgetrule_realstack_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agenttypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agenttypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/store" ) diff --git a/management/server/agentnetwork_proxypeer_restart_test.go b/management/server/agentnetwork_proxypeer_restart_test.go index 0957cc555..1e4b8d016 100644 --- a/management/server/agentnetwork_proxypeer_restart_test.go +++ b/management/server/agentnetwork_proxypeer_restart_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "github.com/netbirdio/netbird/management/internals/modules/peers" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agenttypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agenttypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/store" diff --git a/management/server/agentnetwork_realstack_test.go b/management/server/agentnetwork_realstack_test.go index 59282eda0..e7855c575 100644 --- a/management/server/agentnetwork_realstack_test.go +++ b/management/server/agentnetwork_realstack_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" networkmap "github.com/netbirdio/netbird/management/internals/controllers/network_map" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agenttypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agenttypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbpeer "github.com/netbirdio/netbird/management/server/peer" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/store" diff --git a/management/server/http/handler.go b/management/server/http/handler.go index 6e61eb129..af49be29d 100644 --- a/management/server/http/handler.go +++ b/management/server/http/handler.go @@ -28,7 +28,7 @@ import ( "github.com/netbirdio/netbird/management/internals/modules/zones/records" recordsManager "github.com/netbirdio/netbird/management/internals/modules/zones/records/manager" "github.com/netbirdio/netbird/management/server/account" - "github.com/netbirdio/netbird/management/server/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" agentnetworkhandlers "github.com/netbirdio/netbird/management/server/http/handlers/agentnetwork" "github.com/netbirdio/netbird/management/server/settings" diff --git a/management/server/http/handlers/agentnetwork/access_log_handler.go b/management/server/http/handlers/agentnetwork/access_log_handler.go index 0a7d5fd58..e0b4e9e0b 100644 --- a/management/server/http/handlers/agentnetwork/access_log_handler.go +++ b/management/server/http/handlers/agentnetwork/access_log_handler.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/budget_handler.go b/management/server/http/handlers/agentnetwork/budget_handler.go index 9dd6ea0ed..9fb02d07c 100644 --- a/management/server/http/handlers/agentnetwork/budget_handler.go +++ b/management/server/http/handlers/agentnetwork/budget_handler.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/budget_handler_test.go b/management/server/http/handlers/agentnetwork/budget_handler_test.go index f3c09ee96..ff9974b3e 100644 --- a/management/server/http/handlers/agentnetwork/budget_handler_test.go +++ b/management/server/http/handlers/agentnetwork/budget_handler_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/shared/management/http/api" ) diff --git a/management/server/http/handlers/agentnetwork/consumption_handler.go b/management/server/http/handlers/agentnetwork/consumption_handler.go index 09a9d6b9a..135d27e62 100644 --- a/management/server/http/handlers/agentnetwork/consumption_handler.go +++ b/management/server/http/handlers/agentnetwork/consumption_handler.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/guardrails_handler.go b/management/server/http/handlers/agentnetwork/guardrails_handler.go index b98bb01f5..5e0b01bc7 100644 --- a/management/server/http/handlers/agentnetwork/guardrails_handler.go +++ b/management/server/http/handlers/agentnetwork/guardrails_handler.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/handlers_test.go b/management/server/http/handlers/agentnetwork/handlers_test.go index 51b11aa88..6f847dafd 100644 --- a/management/server/http/handlers/agentnetwork/handlers_test.go +++ b/management/server/http/handlers/agentnetwork/handlers_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/management/server/permissions" "github.com/netbirdio/netbird/management/server/store" diff --git a/management/server/http/handlers/agentnetwork/policies_handler.go b/management/server/http/handlers/agentnetwork/policies_handler.go index 7e5a3e8cb..fce852e42 100644 --- a/management/server/http/handlers/agentnetwork/policies_handler.go +++ b/management/server/http/handlers/agentnetwork/policies_handler.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/providers_handler.go b/management/server/http/handlers/agentnetwork/providers_handler.go index b05dc83aa..e550400d5 100644 --- a/management/server/http/handlers/agentnetwork/providers_handler.go +++ b/management/server/http/handlers/agentnetwork/providers_handler.go @@ -13,9 +13,9 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork" - "github.com/netbirdio/netbird/management/server/agentnetwork/catalog" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/catalog" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/http/handlers/agentnetwork/settings_handler.go b/management/server/http/handlers/agentnetwork/settings_handler.go index f28486790..407ca48cb 100644 --- a/management/server/http/handlers/agentnetwork/settings_handler.go +++ b/management/server/http/handlers/agentnetwork/settings_handler.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" nbcontext "github.com/netbirdio/netbird/management/server/context" "github.com/netbirdio/netbird/shared/management/http/api" "github.com/netbirdio/netbird/shared/management/http/util" diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go index 1ff9d92d4..69b075fd3 100644 --- a/management/server/store/sql_store.go +++ b/management/server/store/sql_store.go @@ -37,7 +37,7 @@ import ( rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" "github.com/netbirdio/netbird/management/internals/modules/zones" "github.com/netbirdio/netbird/management/internals/modules/zones/records" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types" routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types" networkTypes "github.com/netbirdio/netbird/management/server/networks/types" diff --git a/management/server/store/sql_store_agentnetwork.go b/management/server/store/sql_store_agentnetwork.go index f0f1f8327..bb265437b 100644 --- a/management/server/store/sql_store_agentnetwork.go +++ b/management/server/store/sql_store_agentnetwork.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/shared/management/status" ) diff --git a/management/server/store/sql_store_agentnetwork_accesslog_test.go b/management/server/store/sql_store_agentnetwork_accesslog_test.go index c624f10a4..821f6f725 100644 --- a/management/server/store/sql_store_agentnetwork_accesslog_test.go +++ b/management/server/store/sql_store_agentnetwork_accesslog_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" ) // TestAgentNetworkUsage_RealStore_RoundTrip drives CreateAgentNetworkUsage and diff --git a/management/server/store/sql_store_agentnetwork_budgetrule_test.go b/management/server/store/sql_store_agentnetwork_budgetrule_test.go index 4e896e859..3bf7b797d 100644 --- a/management/server/store/sql_store_agentnetwork_budgetrule_test.go +++ b/management/server/store/sql_store_agentnetwork_budgetrule_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" ) // TestAgentNetworkBudgetRule_RealStore_RoundTrip is the GC-0 no-mock guard: it diff --git a/management/server/store/store.go b/management/server/store/store.go index 70d201bb8..3ba6facc3 100644 --- a/management/server/store/store.go +++ b/management/server/store/store.go @@ -37,7 +37,7 @@ import ( "github.com/netbirdio/netbird/util" "github.com/netbirdio/netbird/util/crypt" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/migration" resourceTypes "github.com/netbirdio/netbird/management/server/networks/resources/types" routerTypes "github.com/netbirdio/netbird/management/server/networks/routers/types" diff --git a/management/server/store/store_mock_agentnetwork.go b/management/server/store/store_mock_agentnetwork.go index 22e793a65..8ad1498c1 100644 --- a/management/server/store/store_mock_agentnetwork.go +++ b/management/server/store/store_mock_agentnetwork.go @@ -7,7 +7,7 @@ import ( gomock "github.com/golang/mock/gomock" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" ) // GetAllAgentNetworkProviders mocks base method. diff --git a/proxy/internal/middleware/builtin/agentnetwork_chain_integration_test.go b/proxy/internal/middleware/builtin/agentnetwork_chain_integration_test.go index 643990876..96777025c 100644 --- a/proxy/internal/middleware/builtin/agentnetwork_chain_integration_test.go +++ b/proxy/internal/middleware/builtin/agentnetwork_chain_integration_test.go @@ -15,8 +15,8 @@ import ( "google.golang.org/grpc/test/bufconn" mgmtgrpc "github.com/netbirdio/netbird/management/internals/shared/grpc" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" nbtypes "github.com/netbirdio/netbird/management/server/types" "github.com/netbirdio/netbird/proxy/internal/middleware" diff --git a/proxy/internal/proxy/agent_network_chain_realstack_test.go b/proxy/internal/proxy/agent_network_chain_realstack_test.go index 7b7075256..bc611fc98 100644 --- a/proxy/internal/proxy/agent_network_chain_realstack_test.go +++ b/proxy/internal/proxy/agent_network_chain_realstack_test.go @@ -20,8 +20,8 @@ import ( rpservice "github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service" mgmtgrpc "github.com/netbirdio/netbird/management/internals/shared/grpc" - "github.com/netbirdio/netbird/management/server/agentnetwork" - agentNetworkTypes "github.com/netbirdio/netbird/management/server/agentnetwork/types" + "github.com/netbirdio/netbird/management/internals/modules/agentnetwork" + agentNetworkTypes "github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types" "github.com/netbirdio/netbird/management/server/store" "github.com/netbirdio/netbird/proxy/internal/middleware" "github.com/netbirdio/netbird/proxy/internal/middleware/bodytap"