diff --git a/cmd/boundary/package_registry_oss.go b/cmd/boundary/package_registry_oss.go index b43025f1c..b29527359 100644 --- a/cmd/boundary/package_registry_oss.go +++ b/cmd/boundary/package_registry_oss.go @@ -2,6 +2,6 @@ package main import ( // Enable tcp target support. - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" _ "github.com/hashicorp/boundary/internal/target/tcp" ) diff --git a/internal/adding-a-new-field-readme.md b/internal/adding-a-new-field-readme.md index a314e323d..223257463 100644 --- a/internal/adding-a-new-field-readme.md +++ b/internal/adding-a-new-field-readme.md @@ -53,7 +53,7 @@ The first step in the process is to add it to the API/SDK protobufs. Now that the API protobufs have been updated, you can move on to adding this new field to the API service handler. -* Service handlers are under: `internal/servers/controller/handlers` +* Service handlers are under: `internal/daemon/controller/handlers` * Incorporate the new field into the handlers `updateInRepo` func. You'll need to incorporate the inbound protobuf's field with the repository's update function. This could include adding repository options to the Update function call diff --git a/internal/auth/additional_verification_test.go b/internal/auth/additional_verification_test.go index 2f0b6e633..fd2096e53 100644 --- a/internal/auth/additional_verification_test.go +++ b/internal/auth/additional_verification_test.go @@ -11,12 +11,12 @@ import ( "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + authmethodsservice "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - authmethodsservice "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/auth/oidc/repository_managed_group_members_test.go b/internal/auth/oidc/repository_managed_group_members_test.go index 429d9266e..3018869a7 100644 --- a/internal/auth/oidc/repository_managed_group_members_test.go +++ b/internal/auth/oidc/repository_managed_group_members_test.go @@ -8,11 +8,11 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/oidc/store" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/cmd/base/initial_resources.go b/internal/cmd/base/initial_resources.go index a7b13a6f2..3f2560429 100644 --- a/internal/cmd/base/initial_resources.go +++ b/internal/cmd/base/initial_resources.go @@ -6,12 +6,12 @@ import ( "strings" "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" - "github.com/hashicorp/boundary/internal/servers/controller/auth" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/cmd/commands/dev/dev.go b/internal/cmd/commands/dev/dev.go index 5861b398a..ac2561eb4 100644 --- a/internal/cmd/commands/dev/dev.go +++ b/internal/cmd/commands/dev/dev.go @@ -18,13 +18,13 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/cmd/ops" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/target/tcp" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-secure-stdlib/parseutil" diff --git a/internal/cmd/commands/server/server.go b/internal/cmd/commands/server/server.go index bd9e3a2e4..1b28e2fbf 100644 --- a/internal/cmd/commands/server/server.go +++ b/internal/cmd/commands/server/server.go @@ -16,13 +16,13 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/cmd/ops" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/db/schema" "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/types/scope" kms_plugin_assets "github.com/hashicorp/boundary/plugins/kms" "github.com/hashicorp/boundary/sdk/wrapper" diff --git a/internal/cmd/commands/server/server_test.go b/internal/cmd/commands/server/server_test.go index 1ff4aa0ed..bfe1619c8 100644 --- a/internal/cmd/commands/server/server_test.go +++ b/internal/cmd/commands/server/server_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/mitchellh/cli" "github.com/stretchr/testify/require" ) diff --git a/internal/cmd/commands/server/worker_shutdown_reload_test.go b/internal/cmd/commands/server/worker_shutdown_reload_test.go index 9fafaee11..20475a3ad 100644 --- a/internal/cmd/commands/server/worker_shutdown_reload_test.go +++ b/internal/cmd/commands/server/worker_shutdown_reload_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" ) const shutdownReloadApiAddr = "http://127.0.0.1:9203" diff --git a/internal/cmd/ops/server.go b/internal/cmd/ops/server.go index e24986c00..9c5ec52e9 100644 --- a/internal/cmd/ops/server.go +++ b/internal/cmd/ops/server.go @@ -11,7 +11,7 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/base" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" diff --git a/internal/cmd/ops/server_test.go b/internal/cmd/ops/server_test.go index c481ee30c..57351d115 100644 --- a/internal/cmd/ops/server_test.go +++ b/internal/cmd/ops/server_test.go @@ -18,8 +18,8 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/base" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/health" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/health" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-secure-stdlib/configutil/v2" diff --git a/internal/credential/vault/setup_manual_test.go b/internal/credential/vault/setup_manual_test.go index dab4c0a38..cbd01a81f 100644 --- a/internal/credential/vault/setup_manual_test.go +++ b/internal/credential/vault/setup_manual_test.go @@ -16,12 +16,12 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/credential/vault" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" ) func TestSetupSleepyDevEnvironment(t *testing.T) { diff --git a/internal/servers/common/client_ip.go b/internal/daemon/common/client_ip.go similarity index 100% rename from internal/servers/common/client_ip.go rename to internal/daemon/common/client_ip.go diff --git a/internal/servers/common/client_ip_test.go b/internal/daemon/common/client_ip_test.go similarity index 100% rename from internal/servers/common/client_ip_test.go rename to internal/daemon/common/client_ip_test.go diff --git a/internal/servers/common/handler.go b/internal/daemon/common/handler.go similarity index 99% rename from internal/servers/common/handler.go rename to internal/daemon/common/handler.go index 6cf7df10a..944f272b5 100644 --- a/internal/servers/common/handler.go +++ b/internal/daemon/common/handler.go @@ -6,10 +6,10 @@ import ( "net/http" "time" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller/auth" "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-secure-stdlib/listenerutil" ) diff --git a/internal/servers/common/handler_test.go b/internal/daemon/common/handler_test.go similarity index 100% rename from internal/servers/common/handler_test.go rename to internal/daemon/common/handler_test.go diff --git a/internal/servers/controller/auth/auth.go b/internal/daemon/controller/auth/auth.go similarity index 99% rename from internal/servers/controller/auth/auth.go rename to internal/daemon/controller/auth/auth.go index 56fa2861c..54b729644 100644 --- a/internal/servers/controller/auth/auth.go +++ b/internal/daemon/controller/auth/auth.go @@ -14,13 +14,13 @@ import ( authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/gen/controller/tokens" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/auth/auth_test.go b/internal/daemon/controller/auth/auth_test.go similarity index 99% rename from internal/servers/controller/auth/auth_test.go rename to internal/daemon/controller/auth/auth_test.go index 1569821d3..24bca4778 100644 --- a/internal/servers/controller/auth/auth_test.go +++ b/internal/daemon/controller/auth/auth_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/tests/api" "github.com/hashicorp/eventlogger/filters/encrypt" "github.com/hashicorp/go-hclog" diff --git a/internal/servers/controller/auth/authorized_actions.go b/internal/daemon/controller/auth/authorized_actions.go similarity index 100% rename from internal/servers/controller/auth/authorized_actions.go rename to internal/daemon/controller/auth/authorized_actions.go diff --git a/internal/servers/controller/auth/option.go b/internal/daemon/controller/auth/option.go similarity index 100% rename from internal/servers/controller/auth/option.go rename to internal/daemon/controller/auth/option.go diff --git a/internal/servers/controller/auth/options_test.go b/internal/daemon/controller/auth/options_test.go similarity index 100% rename from internal/servers/controller/auth/options_test.go rename to internal/daemon/controller/auth/options_test.go diff --git a/internal/servers/controller/auth/testing.go b/internal/daemon/controller/auth/testing.go similarity index 93% rename from internal/servers/controller/auth/testing.go rename to internal/daemon/controller/auth/testing.go index 6a50b5b49..f3b7d6bd6 100644 --- a/internal/servers/controller/auth/testing.go +++ b/internal/daemon/controller/auth/testing.go @@ -3,9 +3,9 @@ package auth import ( "context" + "github.com/hashicorp/boundary/internal/daemon/controller/common" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/common" ) // DisabledAuthTestContext is meant for testing, and uses a context that has diff --git a/internal/servers/controller/common/common.go b/internal/daemon/controller/common/common.go similarity index 100% rename from internal/servers/controller/common/common.go rename to internal/daemon/controller/common/common.go diff --git a/internal/servers/controller/common/doc.go b/internal/daemon/controller/common/doc.go similarity index 100% rename from internal/servers/controller/common/doc.go rename to internal/daemon/controller/common/doc.go diff --git a/internal/servers/controller/common/scopeids/scope_ids.go b/internal/daemon/controller/common/scopeids/scope_ids.go similarity index 98% rename from internal/servers/controller/common/scopeids/scope_ids.go rename to internal/daemon/controller/common/scopeids/scope_ids.go index 7219d9851..977eb7de4 100644 --- a/internal/servers/controller/common/scopeids/scope_ids.go +++ b/internal/daemon/controller/common/scopeids/scope_ids.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/hashicorp/boundary/internal/boundary" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/perms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/common/scopeids/scope_ids_test.go b/internal/daemon/controller/common/scopeids/scope_ids_test.go similarity index 96% rename from internal/servers/controller/common/scopeids/scope_ids_test.go rename to internal/daemon/controller/common/scopeids/scope_ids_test.go index d0598b975..622112f30 100644 --- a/internal/servers/controller/common/scopeids/scope_ids_test.go +++ b/internal/daemon/controller/common/scopeids/scope_ids_test.go @@ -5,16 +5,16 @@ import ( "testing" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/groups" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/require" diff --git a/internal/servers/controller/config.go b/internal/daemon/controller/config.go similarity index 100% rename from internal/servers/controller/config.go rename to internal/daemon/controller/config.go diff --git a/internal/servers/controller/controller.go b/internal/daemon/controller/controller.go similarity index 98% rename from internal/servers/controller/controller.go rename to internal/daemon/controller/controller.go index 175dbb345..c028e1c84 100644 --- a/internal/servers/controller/controller.go +++ b/internal/daemon/controller/controller.go @@ -13,6 +13,9 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/health" + "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" "github.com/hashicorp/boundary/internal/db" pluginhost "github.com/hashicorp/boundary/internal/host/plugin" "github.com/hashicorp/boundary/internal/host/static" @@ -24,9 +27,6 @@ import ( "github.com/hashicorp/boundary/internal/scheduler" "github.com/hashicorp/boundary/internal/scheduler/job" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/health" - "github.com/hashicorp/boundary/internal/servers/controller/internal/metric" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/controller_test.go b/internal/daemon/controller/controller_test.go similarity index 100% rename from internal/servers/controller/controller_test.go rename to internal/daemon/controller/controller_test.go diff --git a/internal/servers/controller/cors_test.go b/internal/daemon/controller/cors_test.go similarity index 100% rename from internal/servers/controller/cors_test.go rename to internal/daemon/controller/cors_test.go diff --git a/internal/servers/controller/gateway.go b/internal/daemon/controller/gateway.go similarity index 95% rename from internal/servers/controller/gateway.go rename to internal/daemon/controller/gateway.go index 05243cb07..56df5c94d 100644 --- a/internal/servers/controller/gateway.go +++ b/internal/daemon/controller/gateway.go @@ -9,12 +9,12 @@ import ( grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/subtypes" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" diff --git a/internal/servers/controller/handler.go b/internal/daemon/controller/handler.go similarity index 93% rename from internal/servers/controller/handler.go rename to internal/daemon/controller/handler.go index 2f13dbac9..e5218278c 100644 --- a/internal/servers/controller/handler.go +++ b/internal/daemon/controller/handler.go @@ -16,29 +16,29 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/auth/oidc" + "github.com/hashicorp/boundary/internal/daemon/common" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/accounts" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authtokens" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentiallibraries" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentialstores" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/groups" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/health" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_catalogs" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_sets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/hosts" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/managed_groups" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/roles" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/scopes" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/sessions" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/users" + "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" opsservices "github.com/hashicorp/boundary/internal/gen/controller/ops/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/common" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/accounts" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/credentiallibraries" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/credentialstores" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/health" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_catalogs" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_sets" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/hosts" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/managed_groups" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/roles" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/scopes" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/users" - "github.com/hashicorp/boundary/internal/servers/controller/internal/metric" "github.com/hashicorp/go-cleanhttp" "github.com/hashicorp/go-secure-stdlib/listenerutil" "github.com/hashicorp/go-secure-stdlib/strutil" @@ -47,7 +47,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" ) type HandlerProperties struct { diff --git a/internal/servers/controller/handler_noui.go b/internal/daemon/controller/handler_noui.go similarity index 100% rename from internal/servers/controller/handler_noui.go rename to internal/daemon/controller/handler_noui.go diff --git a/internal/servers/controller/handler_test.go b/internal/daemon/controller/handler_test.go similarity index 99% rename from internal/servers/controller/handler_test.go rename to internal/daemon/controller/handler_test.go index 649ec2f0a..dca2c877f 100644 --- a/internal/servers/controller/handler_test.go +++ b/internal/daemon/controller/handler_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/servers/controller/handler_ui.go b/internal/daemon/controller/handler_ui.go similarity index 100% rename from internal/servers/controller/handler_ui.go rename to internal/daemon/controller/handler_ui.go diff --git a/internal/servers/controller/handler_ui_test.go b/internal/daemon/controller/handler_ui_test.go similarity index 100% rename from internal/servers/controller/handler_ui_test.go rename to internal/daemon/controller/handler_ui_test.go diff --git a/internal/servers/controller/handlers/accounts/account_service.go b/internal/daemon/controller/handlers/accounts/account_service.go similarity index 99% rename from internal/servers/controller/handlers/accounts/account_service.go rename to internal/daemon/controller/handlers/accounts/account_service.go index 6336200a2..fb3bcf856 100644 --- a/internal/servers/controller/handlers/accounts/account_service.go +++ b/internal/daemon/controller/handlers/accounts/account_service.go @@ -13,14 +13,14 @@ import ( oidcstore "github.com/hashicorp/boundary/internal/auth/oidc/store" "github.com/hashicorp/boundary/internal/auth/password" pwstore "github.com/hashicorp/boundary/internal/auth/password/store" + requestauth "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - requestauth "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/accounts/account_service_test.go b/internal/daemon/controller/handlers/accounts/account_service_test.go similarity index 99% rename from internal/servers/controller/handlers/accounts/account_service_test.go rename to internal/daemon/controller/handlers/accounts/account_service_test.go index 36ed27078..6993381bc 100644 --- a/internal/servers/controller/handlers/accounts/account_service_test.go +++ b/internal/daemon/controller/handlers/accounts/account_service_test.go @@ -13,15 +13,15 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + requestauth "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/accounts" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/kms" - requestauth "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/accounts" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/accounts/validate_test.go b/internal/daemon/controller/handlers/accounts/validate_test.go similarity index 100% rename from internal/servers/controller/handlers/accounts/validate_test.go rename to internal/daemon/controller/handlers/accounts/validate_test.go diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service.go b/internal/daemon/controller/handlers/authmethods/authmethod_service.go similarity index 98% rename from internal/servers/controller/handlers/authmethods/authmethod_service.go rename to internal/daemon/controller/handlers/authmethods/authmethod_service.go index 7d58b43f1..dd95baeb9 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service.go +++ b/internal/daemon/controller/handlers/authmethods/authmethod_service.go @@ -11,18 +11,18 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + requestauth "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/accounts" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authtokens" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/managed_groups" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - requestauth "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/accounts" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/managed_groups" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go b/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go similarity index 99% rename from internal/servers/controller/handlers/authmethods/authmethod_service_test.go rename to internal/daemon/controller/handlers/authmethods/authmethod_service_test.go index 9653c8412..97963eb2c 100644 --- a/internal/servers/controller/handlers/authmethods/authmethod_service_test.go +++ b/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go @@ -11,14 +11,14 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + requestauth "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - requestauth "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" diff --git a/internal/servers/controller/handlers/authmethods/authmethod_test.go b/internal/daemon/controller/handlers/authmethods/authmethod_test.go similarity index 100% rename from internal/servers/controller/handlers/authmethods/authmethod_test.go rename to internal/daemon/controller/handlers/authmethods/authmethod_test.go diff --git a/internal/servers/controller/handlers/authmethods/oidc.go b/internal/daemon/controller/handlers/authmethods/oidc.go similarity index 99% rename from internal/servers/controller/handlers/authmethods/oidc.go rename to internal/daemon/controller/handlers/authmethods/oidc.go index 9ff63efd7..e52da632d 100644 --- a/internal/servers/controller/handlers/authmethods/oidc.go +++ b/internal/daemon/controller/handlers/authmethods/oidc.go @@ -9,11 +9,11 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" oidcstore "github.com/hashicorp/boundary/internal/auth/oidc/store" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/handlers/authmethods/oidc_test.go b/internal/daemon/controller/handlers/authmethods/oidc_test.go similarity index 99% rename from internal/servers/controller/handlers/authmethods/oidc_test.go rename to internal/daemon/controller/handlers/authmethods/oidc_test.go index 142d0a5ae..e2c8cc381 100644 --- a/internal/servers/controller/handlers/authmethods/oidc_test.go +++ b/internal/daemon/controller/handlers/authmethods/oidc_test.go @@ -18,6 +18,10 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" @@ -25,10 +29,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/requests" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" scopepb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/authmethods/password.go b/internal/daemon/controller/handlers/authmethods/password.go similarity index 97% rename from internal/servers/controller/handlers/authmethods/password.go rename to internal/daemon/controller/handlers/authmethods/password.go index 98914c3b0..a5badec25 100644 --- a/internal/servers/controller/handlers/authmethods/password.go +++ b/internal/daemon/controller/handlers/authmethods/password.go @@ -7,10 +7,10 @@ import ( "github.com/hashicorp/boundary/internal/auth/password" pwstore "github.com/hashicorp/boundary/internal/auth/password/store" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" pba "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authtokens" diff --git a/internal/servers/controller/handlers/authmethods/password_test.go b/internal/daemon/controller/handlers/authmethods/password_test.go similarity index 99% rename from internal/servers/controller/handlers/authmethods/password_test.go rename to internal/daemon/controller/handlers/authmethods/password_test.go index 9ee65aee2..0acff2058 100644 --- a/internal/servers/controller/handlers/authmethods/password_test.go +++ b/internal/daemon/controller/handlers/authmethods/password_test.go @@ -9,14 +9,14 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authmethods" scopepb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/authtokens/authtoken_service.go b/internal/daemon/controller/handlers/authtokens/authtoken_service.go similarity index 97% rename from internal/servers/controller/handlers/authtokens/authtoken_service.go rename to internal/daemon/controller/handlers/authtokens/authtoken_service.go index 2ee04e1bf..e9e91b459 100644 --- a/internal/servers/controller/handlers/authtokens/authtoken_service.go +++ b/internal/daemon/controller/handlers/authtokens/authtoken_service.go @@ -6,14 +6,14 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/authtokens/authtoken_service_test.go b/internal/daemon/controller/handlers/authtokens/authtoken_service_test.go similarity index 98% rename from internal/servers/controller/handlers/authtokens/authtoken_service_test.go rename to internal/daemon/controller/handlers/authtokens/authtoken_service_test.go index cff486682..0f50a3b20 100644 --- a/internal/servers/controller/handlers/authtokens/authtoken_service_test.go +++ b/internal/daemon/controller/handlers/authtokens/authtoken_service_test.go @@ -9,6 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authtokens" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" @@ -16,9 +19,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/requests" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/authtokens" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go b/internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service.go similarity index 99% rename from internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go rename to internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service.go index ab46f68f5..1df38bffd 100644 --- a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service.go +++ b/internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service.go @@ -9,13 +9,13 @@ import ( "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/credential/vault" "github.com/hashicorp/boundary/internal/credential/vault/store" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service_test.go b/internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service_test.go similarity index 99% rename from internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service_test.go rename to internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service_test.go index a615115bf..94d53b829 100644 --- a/internal/servers/controller/handlers/credentiallibraries/credentiallibrary_service_test.go +++ b/internal/daemon/controller/handlers/credentiallibraries/credentiallibrary_service_test.go @@ -10,6 +10,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" @@ -17,8 +19,6 @@ import ( "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/scheduler" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/credentiallibraries" scopepb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/credentialstores/credentialstore_service.go b/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go similarity index 98% rename from internal/servers/controller/handlers/credentialstores/credentialstore_service.go rename to internal/daemon/controller/handlers/credentialstores/credentialstore_service.go index 9fb8ff03b..54ff1419f 100644 --- a/internal/servers/controller/handlers/credentialstores/credentialstore_service.go +++ b/internal/daemon/controller/handlers/credentialstores/credentialstore_service.go @@ -10,15 +10,15 @@ import ( "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/credential/vault" "github.com/hashicorp/boundary/internal/credential/vault/store" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentiallibraries" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/credentiallibraries" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/credentialstores/credentialstore_service_test.go b/internal/daemon/controller/handlers/credentialstores/credentialstore_service_test.go similarity index 99% rename from internal/servers/controller/handlers/credentialstores/credentialstore_service_test.go rename to internal/daemon/controller/handlers/credentialstores/credentialstore_service_test.go index babd0524a..50ba67293 100644 --- a/internal/servers/controller/handlers/credentialstores/credentialstore_service_test.go +++ b/internal/daemon/controller/handlers/credentialstores/credentialstore_service_test.go @@ -12,6 +12,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" @@ -19,8 +21,6 @@ import ( "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/scheduler" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/credentialstores" scopepb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/credentialstores/vault.go b/internal/daemon/controller/handlers/credentialstores/vault.go similarity index 100% rename from internal/servers/controller/handlers/credentialstores/vault.go rename to internal/daemon/controller/handlers/credentialstores/vault.go diff --git a/internal/servers/controller/handlers/credentialstores/vault_test.go b/internal/daemon/controller/handlers/credentialstores/vault_test.go similarity index 100% rename from internal/servers/controller/handlers/credentialstores/vault_test.go rename to internal/daemon/controller/handlers/credentialstores/vault_test.go diff --git a/internal/servers/controller/handlers/errors.go b/internal/daemon/controller/handlers/errors.go similarity index 100% rename from internal/servers/controller/handlers/errors.go rename to internal/daemon/controller/handlers/errors.go diff --git a/internal/servers/controller/handlers/errors_test.go b/internal/daemon/controller/handlers/errors_test.go similarity index 100% rename from internal/servers/controller/handlers/errors_test.go rename to internal/daemon/controller/handlers/errors_test.go diff --git a/internal/servers/controller/handlers/filtering.go b/internal/daemon/controller/handlers/filtering.go similarity index 100% rename from internal/servers/controller/handlers/filtering.go rename to internal/daemon/controller/handlers/filtering.go diff --git a/internal/servers/controller/handlers/filtering_test.go b/internal/daemon/controller/handlers/filtering_test.go similarity index 100% rename from internal/servers/controller/handlers/filtering_test.go rename to internal/daemon/controller/handlers/filtering_test.go diff --git a/internal/servers/controller/handlers/groups/group_service.go b/internal/daemon/controller/handlers/groups/group_service.go similarity index 98% rename from internal/servers/controller/handlers/groups/group_service.go rename to internal/daemon/controller/handlers/groups/group_service.go index e7ffb5389..ddba0efa4 100644 --- a/internal/servers/controller/handlers/groups/group_service.go +++ b/internal/daemon/controller/handlers/groups/group_service.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/iam/store" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/groups/group_service_test.go b/internal/daemon/controller/handlers/groups/group_service_test.go similarity index 99% rename from internal/servers/controller/handlers/groups/group_service_test.go rename to internal/daemon/controller/handlers/groups/group_service_test.go index 735d8701c..68ce4c79a 100644 --- a/internal/servers/controller/handlers/groups/group_service_test.go +++ b/internal/daemon/controller/handlers/groups/group_service_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/groups" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/groups" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/health/health.go b/internal/daemon/controller/handlers/health/health.go similarity index 92% rename from internal/servers/controller/handlers/health/health.go rename to internal/daemon/controller/handlers/health/health.go index f73257339..70fbc6eca 100644 --- a/internal/servers/controller/handlers/health/health.go +++ b/internal/daemon/controller/handlers/health/health.go @@ -4,8 +4,8 @@ import ( "context" "net/http" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" pbs "github.com/hashicorp/boundary/internal/gen/controller/ops/services" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" ) type Service struct { diff --git a/internal/servers/controller/handlers/health/health_test.go b/internal/daemon/controller/handlers/health/health_test.go similarity index 100% rename from internal/servers/controller/handlers/health/health_test.go rename to internal/daemon/controller/handlers/health/health_test.go diff --git a/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go similarity index 98% rename from internal/servers/controller/handlers/host_catalogs/host_catalog_service.go rename to internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go index 3f961f990..b5cf2d1fa 100644 --- a/internal/servers/controller/handlers/host_catalogs/host_catalog_service.go +++ b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service.go @@ -5,6 +5,12 @@ import ( "fmt" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_sets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/hosts" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host" @@ -15,12 +21,6 @@ import ( "github.com/hashicorp/boundary/internal/perms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_sets" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/hosts" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service_test.go similarity index 99% rename from internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go rename to internal/daemon/controller/handlers/host_catalogs/host_catalog_service_test.go index 7d490cb4b..30a630a3b 100644 --- a/internal/servers/controller/handlers/host_catalogs/host_catalog_service_test.go +++ b/internal/daemon/controller/handlers/host_catalogs/host_catalog_service_test.go @@ -11,6 +11,9 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_catalogs" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host/plugin" @@ -19,9 +22,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/scheduler" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_catalogs" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/internal/types/subtypes" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostcatalogs" diff --git a/internal/servers/controller/handlers/host_sets/host_set_service.go b/internal/daemon/controller/handlers/host_sets/host_set_service.go similarity index 99% rename from internal/servers/controller/handlers/host_sets/host_set_service.go rename to internal/daemon/controller/handlers/host_sets/host_set_service.go index 1a6c73a4c..fe3a655c0 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service.go +++ b/internal/daemon/controller/handlers/host_sets/host_set_service.go @@ -5,6 +5,9 @@ import ( "fmt" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host" @@ -16,9 +19,6 @@ import ( "github.com/hashicorp/boundary/internal/perms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/host_sets/host_set_service_test.go b/internal/daemon/controller/handlers/host_sets/host_set_service_test.go similarity index 99% rename from internal/servers/controller/handlers/host_sets/host_set_service_test.go rename to internal/daemon/controller/handlers/host_sets/host_set_service_test.go index dd73aa7df..bbb624be3 100644 --- a/internal/servers/controller/handlers/host_sets/host_set_service_test.go +++ b/internal/daemon/controller/handlers/host_sets/host_set_service_test.go @@ -10,6 +10,9 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_sets" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host" @@ -19,9 +22,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/scheduler" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_sets" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/internal/types/subtypes" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hostsets" diff --git a/internal/servers/controller/handlers/hosts/host_service.go b/internal/daemon/controller/handlers/hosts/host_service.go similarity index 99% rename from internal/servers/controller/handlers/hosts/host_service.go rename to internal/daemon/controller/handlers/hosts/host_service.go index 3f052c8fa..59ee484e2 100644 --- a/internal/servers/controller/handlers/hosts/host_service.go +++ b/internal/daemon/controller/handlers/hosts/host_service.go @@ -7,6 +7,9 @@ import ( "strings" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host" @@ -16,9 +19,6 @@ import ( "github.com/hashicorp/boundary/internal/perms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/hosts/host_service_test.go b/internal/daemon/controller/handlers/hosts/host_service_test.go similarity index 99% rename from internal/servers/controller/handlers/hosts/host_service_test.go rename to internal/daemon/controller/handlers/hosts/host_service_test.go index 4e76ff0bb..50f12d492 100644 --- a/internal/servers/controller/handlers/hosts/host_service_test.go +++ b/internal/daemon/controller/handlers/hosts/host_service_test.go @@ -10,6 +10,9 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/hosts" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/host/plugin" @@ -18,9 +21,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" hostplugin "github.com/hashicorp/boundary/internal/plugin/host" "github.com/hashicorp/boundary/internal/scheduler" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/hosts" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/internal/types/subtypes" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/hosts" diff --git a/internal/servers/controller/handlers/managed_groups/managed_group_service.go b/internal/daemon/controller/handlers/managed_groups/managed_group_service.go similarity index 99% rename from internal/servers/controller/handlers/managed_groups/managed_group_service.go rename to internal/daemon/controller/handlers/managed_groups/managed_group_service.go index 1c5ecd3f4..042b2e07d 100644 --- a/internal/servers/controller/handlers/managed_groups/managed_group_service.go +++ b/internal/daemon/controller/handlers/managed_groups/managed_group_service.go @@ -8,14 +8,14 @@ import ( "github.com/hashicorp/boundary/internal/auth" "github.com/hashicorp/boundary/internal/auth/oidc" oidcstore "github.com/hashicorp/boundary/internal/auth/oidc/store" + requestauth "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - requestauth "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/subtypes" diff --git a/internal/servers/controller/handlers/managed_groups/managed_group_service_test.go b/internal/daemon/controller/handlers/managed_groups/managed_group_service_test.go similarity index 99% rename from internal/servers/controller/handlers/managed_groups/managed_group_service_test.go rename to internal/daemon/controller/handlers/managed_groups/managed_group_service_test.go index 71f8c7698..0d8cdc2e9 100644 --- a/internal/servers/controller/handlers/managed_groups/managed_group_service_test.go +++ b/internal/daemon/controller/handlers/managed_groups/managed_group_service_test.go @@ -14,15 +14,15 @@ import ( "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/managed_groups" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/managed_groups" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/managedgroups" diff --git a/internal/servers/controller/handlers/managed_groups/validate_test.go b/internal/daemon/controller/handlers/managed_groups/validate_test.go similarity index 100% rename from internal/servers/controller/handlers/managed_groups/validate_test.go rename to internal/daemon/controller/handlers/managed_groups/validate_test.go diff --git a/internal/servers/controller/handlers/marshler.go b/internal/daemon/controller/handlers/marshler.go similarity index 100% rename from internal/servers/controller/handlers/marshler.go rename to internal/daemon/controller/handlers/marshler.go diff --git a/internal/servers/controller/handlers/mask_manager.go b/internal/daemon/controller/handlers/mask_manager.go similarity index 100% rename from internal/servers/controller/handlers/mask_manager.go rename to internal/daemon/controller/handlers/mask_manager.go diff --git a/internal/servers/controller/handlers/mask_manager_test.go b/internal/daemon/controller/handlers/mask_manager_test.go similarity index 100% rename from internal/servers/controller/handlers/mask_manager_test.go rename to internal/daemon/controller/handlers/mask_manager_test.go diff --git a/internal/servers/controller/handlers/option_test.go b/internal/daemon/controller/handlers/option_test.go similarity index 100% rename from internal/servers/controller/handlers/option_test.go rename to internal/daemon/controller/handlers/option_test.go diff --git a/internal/servers/controller/handlers/options.go b/internal/daemon/controller/handlers/options.go similarity index 100% rename from internal/servers/controller/handlers/options.go rename to internal/daemon/controller/handlers/options.go diff --git a/internal/servers/controller/handlers/outgoing_response_filter.go b/internal/daemon/controller/handlers/outgoing_response_filter.go similarity index 100% rename from internal/servers/controller/handlers/outgoing_response_filter.go rename to internal/daemon/controller/handlers/outgoing_response_filter.go diff --git a/internal/servers/controller/handlers/outgoing_response_filter_test.go b/internal/daemon/controller/handlers/outgoing_response_filter_test.go similarity index 100% rename from internal/servers/controller/handlers/outgoing_response_filter_test.go rename to internal/daemon/controller/handlers/outgoing_response_filter_test.go diff --git a/internal/servers/controller/handlers/roles/role_service.go b/internal/daemon/controller/handlers/roles/role_service.go similarity index 99% rename from internal/servers/controller/handlers/roles/role_service.go rename to internal/daemon/controller/handlers/roles/role_service.go index c9e867cb4..1a3655836 100644 --- a/internal/servers/controller/handlers/roles/role_service.go +++ b/internal/daemon/controller/handlers/roles/role_service.go @@ -5,6 +5,10 @@ import ( "fmt" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" @@ -12,10 +16,6 @@ import ( "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/roles/role_service_test.go b/internal/daemon/controller/handlers/roles/role_service_test.go similarity index 99% rename from internal/servers/controller/handlers/roles/role_service_test.go rename to internal/daemon/controller/handlers/roles/role_service_test.go index b2e9fcfc2..bb753daab 100644 --- a/internal/servers/controller/handlers/roles/role_service_test.go +++ b/internal/daemon/controller/handlers/roles/role_service_test.go @@ -9,14 +9,14 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/auth/oidc" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/roles" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/perms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/roles" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/roles" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" diff --git a/internal/servers/controller/handlers/scopes/scope_service.go b/internal/daemon/controller/handlers/scopes/scope_service.go similarity index 96% rename from internal/servers/controller/handlers/scopes/scope_service.go rename to internal/daemon/controller/handlers/scopes/scope_service.go index 58eed4ea8..0c23f14c6 100644 --- a/internal/servers/controller/handlers/scopes/scope_service.go +++ b/internal/daemon/controller/handlers/scopes/scope_service.go @@ -9,25 +9,25 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authmethods" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/authtokens" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentialstores" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/groups" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/host_catalogs" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/roles" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/sessions" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/users" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/iam/store" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authmethods" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/authtokens" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/credentialstores" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/groups" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/host_catalogs" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/roles" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/users" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/scopes/scope_service_test.go b/internal/daemon/controller/handlers/scopes/scope_service_test.go similarity index 99% rename from internal/servers/controller/handlers/scopes/scope_service_test.go rename to internal/daemon/controller/handlers/scopes/scope_service_test.go index 7467104c8..989f45e9d 100644 --- a/internal/servers/controller/handlers/scopes/scope_service_test.go +++ b/internal/daemon/controller/handlers/scopes/scope_service_test.go @@ -9,13 +9,13 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/scopes" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/perms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/scopes" "github.com/hashicorp/boundary/internal/types/scope" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" "google.golang.org/genproto/protobuf/field_mask" diff --git a/internal/servers/controller/handlers/sessions/session_list_benchmarks_test.go b/internal/daemon/controller/handlers/sessions/session_list_benchmarks_test.go similarity index 97% rename from internal/servers/controller/handlers/sessions/session_list_benchmarks_test.go rename to internal/daemon/controller/handlers/sessions/session_list_benchmarks_test.go index f46c1b231..010e088c9 100644 --- a/internal/servers/controller/handlers/sessions/session_list_benchmarks_test.go +++ b/internal/daemon/controller/handlers/sessions/session_list_benchmarks_test.go @@ -7,14 +7,14 @@ import ( "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/testing/dbtest" diff --git a/internal/servers/controller/handlers/sessions/session_service.go b/internal/daemon/controller/handlers/sessions/session_service.go similarity index 98% rename from internal/servers/controller/handlers/sessions/session_service.go rename to internal/daemon/controller/handlers/sessions/session_service.go index 056587996..4fa4d01c6 100644 --- a/internal/servers/controller/handlers/sessions/session_service.go +++ b/internal/daemon/controller/handlers/sessions/session_service.go @@ -6,14 +6,14 @@ import ( "fmt" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/action" diff --git a/internal/servers/controller/handlers/sessions/session_service_test.go b/internal/daemon/controller/handlers/sessions/session_service_test.go similarity index 99% rename from internal/servers/controller/handlers/sessions/session_service_test.go rename to internal/daemon/controller/handlers/sessions/session_service_test.go index d26ba4691..2b3d7b7a6 100644 --- a/internal/servers/controller/handlers/sessions/session_service_test.go +++ b/internal/daemon/controller/handlers/sessions/session_service_test.go @@ -9,6 +9,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" @@ -17,9 +20,6 @@ import ( "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/sessions" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" diff --git a/internal/servers/controller/handlers/subtypes.go b/internal/daemon/controller/handlers/subtypes.go similarity index 100% rename from internal/servers/controller/handlers/subtypes.go rename to internal/daemon/controller/handlers/subtypes.go diff --git a/internal/servers/controller/handlers/subtypes_test.go b/internal/daemon/controller/handlers/subtypes_test.go similarity index 100% rename from internal/servers/controller/handlers/subtypes_test.go rename to internal/daemon/controller/handlers/subtypes_test.go diff --git a/internal/servers/controller/handlers/targets/registry.go b/internal/daemon/controller/handlers/targets/registry.go similarity index 97% rename from internal/servers/controller/handlers/targets/registry.go rename to internal/daemon/controller/handlers/targets/registry.go index 8b50b1ec3..98d6aa95e 100644 --- a/internal/servers/controller/handlers/targets/registry.go +++ b/internal/daemon/controller/handlers/targets/registry.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/subtypes" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets" diff --git a/internal/servers/controller/handlers/targets/target_service.go b/internal/daemon/controller/handlers/targets/target_service.go similarity index 99% rename from internal/servers/controller/handlers/targets/target_service.go rename to internal/daemon/controller/handlers/targets/target_service.go index d90528da0..6e57826e3 100644 --- a/internal/servers/controller/handlers/targets/target_service.go +++ b/internal/daemon/controller/handlers/targets/target_service.go @@ -13,6 +13,10 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db/timestamp" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" @@ -24,10 +28,6 @@ import ( "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/action" diff --git a/internal/servers/controller/handlers/targets/tcp/target_service_test.go b/internal/daemon/controller/handlers/targets/tcp/target_service_test.go similarity index 99% rename from internal/servers/controller/handlers/targets/tcp/target_service_test.go rename to internal/daemon/controller/handlers/targets/tcp/target_service_test.go index 5467c0d26..46e256643 100644 --- a/internal/servers/controller/handlers/targets/tcp/target_service_test.go +++ b/internal/daemon/controller/handlers/targets/tcp/target_service_test.go @@ -16,6 +16,11 @@ import ( "github.com/hashicorp/boundary/internal/authtoken" "github.com/hashicorp/boundary/internal/credential" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/credentiallibraries" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" @@ -29,11 +34,6 @@ import ( "github.com/hashicorp/boundary/internal/scheduler" "github.com/hashicorp/boundary/internal/servers" spb "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/credentiallibraries" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/workers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" @@ -54,7 +54,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/wrapperspb" - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" ) var testAuthorizedActions = []string{ diff --git a/internal/servers/controller/handlers/targets/tcp/tcp.go b/internal/daemon/controller/handlers/targets/tcp/tcp.go similarity index 92% rename from internal/servers/controller/handlers/targets/tcp/tcp.go rename to internal/daemon/controller/handlers/targets/tcp/tcp.go index be182e94a..442c1bc84 100644 --- a/internal/servers/controller/handlers/targets/tcp/tcp.go +++ b/internal/daemon/controller/handlers/targets/tcp/tcp.go @@ -2,8 +2,8 @@ package tcp import ( "github.com/golang/protobuf/ptypes/wrappers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" "github.com/hashicorp/boundary/internal/target/tcp/store" diff --git a/internal/servers/controller/handlers/users/user_service.go b/internal/daemon/controller/handlers/users/user_service.go similarity index 98% rename from internal/servers/controller/handlers/users/user_service.go rename to internal/daemon/controller/handlers/users/user_service.go index 0b0e417d5..963c212b9 100644 --- a/internal/servers/controller/handlers/users/user_service.go +++ b/internal/daemon/controller/handlers/users/user_service.go @@ -6,6 +6,10 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/auth/oidc" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/common/scopeids" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" @@ -13,10 +17,6 @@ import ( "github.com/hashicorp/boundary/internal/intglobals" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/common/scopeids" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/action" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/internal/types/scope" diff --git a/internal/servers/controller/handlers/users/user_service_test.go b/internal/daemon/controller/handlers/users/user_service_test.go similarity index 99% rename from internal/servers/controller/handlers/users/user_service_test.go rename to internal/daemon/controller/handlers/users/user_service_test.go index 169434a8b..c9da51be9 100644 --- a/internal/servers/controller/handlers/users/user_service_test.go +++ b/internal/daemon/controller/handlers/users/user_service_test.go @@ -11,13 +11,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/hashicorp/boundary/internal/auth/oidc" "github.com/hashicorp/boundary/internal/auth/password" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/users" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/api/services" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/users" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/scopes" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/users" diff --git a/internal/servers/controller/handlers/verifiers.go b/internal/daemon/controller/handlers/verifiers.go similarity index 100% rename from internal/servers/controller/handlers/verifiers.go rename to internal/daemon/controller/handlers/verifiers.go diff --git a/internal/servers/controller/handlers/verifiers_test.go b/internal/daemon/controller/handlers/verifiers_test.go similarity index 100% rename from internal/servers/controller/handlers/verifiers_test.go rename to internal/daemon/controller/handlers/verifiers_test.go diff --git a/internal/servers/controller/handlers/workers/worker_service.go b/internal/daemon/controller/handlers/workers/worker_service.go similarity index 99% rename from internal/servers/controller/handlers/workers/worker_service.go rename to internal/daemon/controller/handlers/workers/worker_service.go index 29df3393c..bd44def7a 100644 --- a/internal/servers/controller/handlers/workers/worker_service.go +++ b/internal/daemon/controller/handlers/workers/worker_service.go @@ -7,12 +7,12 @@ import ( "sync" "time" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/types/resource" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets" diff --git a/internal/servers/controller/handlers/workers/worker_service_status_test.go b/internal/daemon/controller/handlers/workers/worker_service_status_test.go similarity index 99% rename from internal/servers/controller/handlers/workers/worker_service_status_test.go rename to internal/daemon/controller/handlers/workers/worker_service_status_test.go index c1efb3ba7..b871584d8 100644 --- a/internal/servers/controller/handlers/workers/worker_service_status_test.go +++ b/internal/daemon/controller/handlers/workers/worker_service_status_test.go @@ -8,13 +8,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/workers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" diff --git a/internal/servers/controller/handlers/workers/worker_service_test.go b/internal/daemon/controller/handlers/workers/worker_service_test.go similarity index 98% rename from internal/servers/controller/handlers/workers/worker_service_test.go rename to internal/daemon/controller/handlers/workers/worker_service_test.go index 025ea901c..8bd637002 100644 --- a/internal/servers/controller/handlers/workers/worker_service_test.go +++ b/internal/daemon/controller/handlers/workers/worker_service_test.go @@ -8,13 +8,13 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" "github.com/hashicorp/boundary/internal/db" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/workers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/target/tcp" diff --git a/internal/servers/controller/intercepting_listener.go b/internal/daemon/controller/intercepting_listener.go similarity index 100% rename from internal/servers/controller/intercepting_listener.go rename to internal/daemon/controller/intercepting_listener.go diff --git a/internal/servers/controller/interceptor.go b/internal/daemon/controller/interceptor.go similarity index 97% rename from internal/servers/controller/interceptor.go rename to internal/daemon/controller/interceptor.go index 13c8c1413..353d75267 100644 --- a/internal/servers/controller/interceptor.go +++ b/internal/daemon/controller/interceptor.go @@ -8,6 +8,10 @@ import ( "runtime/debug" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" + commonSrv "github.com/hashicorp/boundary/internal/daemon/common" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/errors" pb "github.com/hashicorp/boundary/internal/gen/controller/api" authpb "github.com/hashicorp/boundary/internal/gen/controller/auth" @@ -15,10 +19,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/requests" - commonSrv "github.com/hashicorp/boundary/internal/servers/common" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/mr-tron/base58" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/servers/controller/interceptor_test.go b/internal/daemon/controller/interceptor_test.go similarity index 98% rename from internal/servers/controller/interceptor_test.go rename to internal/daemon/controller/interceptor_test.go index 87a23c81f..7f9bdc4b0 100644 --- a/internal/servers/controller/interceptor_test.go +++ b/internal/daemon/controller/interceptor_test.go @@ -10,6 +10,9 @@ import ( "testing" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller/auth" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/errors" pb_api "github.com/hashicorp/boundary/internal/gen/controller/api" @@ -20,9 +23,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller/auth" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/go-hclog" "github.com/mr-tron/base58" "github.com/stretchr/testify/assert" diff --git a/internal/servers/controller/internal/metric/api.go b/internal/daemon/controller/internal/metric/api.go similarity index 100% rename from internal/servers/controller/internal/metric/api.go rename to internal/daemon/controller/internal/metric/api.go diff --git a/internal/servers/controller/internal/metric/api_test.go b/internal/daemon/controller/internal/metric/api_test.go similarity index 100% rename from internal/servers/controller/internal/metric/api_test.go rename to internal/daemon/controller/internal/metric/api_test.go diff --git a/internal/servers/controller/internal/metric/cluster.go b/internal/daemon/controller/internal/metric/cluster.go similarity index 100% rename from internal/servers/controller/internal/metric/cluster.go rename to internal/daemon/controller/internal/metric/cluster.go diff --git a/internal/servers/controller/internal/metric/cluster_test.go b/internal/daemon/controller/internal/metric/cluster_test.go similarity index 100% rename from internal/servers/controller/internal/metric/cluster_test.go rename to internal/daemon/controller/internal/metric/cluster_test.go diff --git a/internal/servers/controller/listeners.go b/internal/daemon/controller/listeners.go similarity index 97% rename from internal/servers/controller/listeners.go rename to internal/daemon/controller/listeners.go index aa9df9ed6..b0429cb62 100644 --- a/internal/servers/controller/listeners.go +++ b/internal/daemon/controller/listeners.go @@ -13,9 +13,9 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" + "github.com/hashicorp/boundary/internal/daemon/controller/internal/metric" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/workers" - "github.com/hashicorp/boundary/internal/servers/controller/internal/metric" "github.com/hashicorp/go-multierror" "google.golang.org/grpc" ) diff --git a/internal/servers/controller/listeners_test.go b/internal/daemon/controller/listeners_test.go similarity index 100% rename from internal/servers/controller/listeners_test.go rename to internal/daemon/controller/listeners_test.go diff --git a/internal/servers/controller/multi_test.go b/internal/daemon/controller/multi_test.go similarity index 97% rename from internal/servers/controller/multi_test.go rename to internal/daemon/controller/multi_test.go index c2d7cec21..2b4886d1b 100644 --- a/internal/servers/controller/multi_test.go +++ b/internal/daemon/controller/multi_test.go @@ -7,7 +7,7 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/api/scopes" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/servers/controller/testing.go b/internal/daemon/controller/testing.go similarity index 100% rename from internal/servers/controller/testing.go rename to internal/daemon/controller/testing.go diff --git a/internal/servers/controller/testing_test.go b/internal/daemon/controller/testing_test.go similarity index 100% rename from internal/servers/controller/testing_test.go rename to internal/daemon/controller/testing_test.go diff --git a/internal/servers/controller/tickers.go b/internal/daemon/controller/tickers.go similarity index 100% rename from internal/servers/controller/tickers.go rename to internal/daemon/controller/tickers.go diff --git a/internal/servers/controller/worker_tls_config.go b/internal/daemon/controller/worker_tls_config.go similarity index 100% rename from internal/servers/controller/worker_tls_config.go rename to internal/daemon/controller/worker_tls_config.go diff --git a/internal/servers/worker/common/common.go b/internal/daemon/worker/common/common.go similarity index 100% rename from internal/servers/worker/common/common.go rename to internal/daemon/worker/common/common.go diff --git a/internal/servers/worker/common/doc.go b/internal/daemon/worker/common/doc.go similarity index 100% rename from internal/servers/worker/common/doc.go rename to internal/daemon/worker/common/doc.go diff --git a/internal/servers/worker/config.go b/internal/daemon/worker/config.go similarity index 100% rename from internal/servers/worker/config.go rename to internal/daemon/worker/config.go diff --git a/internal/servers/worker/controller_connection.go b/internal/daemon/worker/controller_connection.go similarity index 98% rename from internal/servers/worker/controller_connection.go rename to internal/daemon/worker/controller_connection.go index 210f31936..cb07dee20 100644 --- a/internal/servers/worker/controller_connection.go +++ b/internal/daemon/worker/controller_connection.go @@ -19,9 +19,9 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/daemon/worker/internal/metric" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/worker/internal/metric" "github.com/hashicorp/go-secure-stdlib/base62" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/internal/servers/worker/handler.go b/internal/daemon/worker/handler.go similarity index 97% rename from internal/servers/worker/handler.go rename to internal/daemon/worker/handler.go index aea2c15ce..fb8100768 100644 --- a/internal/servers/worker/handler.go +++ b/internal/daemon/worker/handler.go @@ -12,13 +12,13 @@ import ( "strings" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/common" + "github.com/hashicorp/boundary/internal/daemon/worker/internal/metric" + proxyHandlers "github.com/hashicorp/boundary/internal/daemon/worker/proxy" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/proxy" - "github.com/hashicorp/boundary/internal/servers/common" - "github.com/hashicorp/boundary/internal/servers/worker/internal/metric" - proxyHandlers "github.com/hashicorp/boundary/internal/servers/worker/proxy" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/hashicorp/go-secure-stdlib/listenerutil" "nhooyr.io/websocket" "nhooyr.io/websocket/wspb" diff --git a/internal/servers/worker/internal/metric/cluster_client.go b/internal/daemon/worker/internal/metric/cluster_client.go similarity index 100% rename from internal/servers/worker/internal/metric/cluster_client.go rename to internal/daemon/worker/internal/metric/cluster_client.go diff --git a/internal/servers/worker/internal/metric/cluster_client_test.go b/internal/daemon/worker/internal/metric/cluster_client_test.go similarity index 100% rename from internal/servers/worker/internal/metric/cluster_client_test.go rename to internal/daemon/worker/internal/metric/cluster_client_test.go diff --git a/internal/servers/worker/internal/metric/proxy_http.go b/internal/daemon/worker/internal/metric/proxy_http.go similarity index 100% rename from internal/servers/worker/internal/metric/proxy_http.go rename to internal/daemon/worker/internal/metric/proxy_http.go diff --git a/internal/servers/worker/internal/metric/proxy_ws.go b/internal/daemon/worker/internal/metric/proxy_ws.go similarity index 100% rename from internal/servers/worker/internal/metric/proxy_ws.go rename to internal/daemon/worker/internal/metric/proxy_ws.go diff --git a/internal/servers/worker/internal/metric/proxy_ws_test.go b/internal/daemon/worker/internal/metric/proxy_ws_test.go similarity index 100% rename from internal/servers/worker/internal/metric/proxy_ws_test.go rename to internal/daemon/worker/internal/metric/proxy_ws_test.go diff --git a/internal/servers/worker/listeners.go b/internal/daemon/worker/listeners.go similarity index 100% rename from internal/servers/worker/listeners.go rename to internal/daemon/worker/listeners.go diff --git a/internal/servers/worker/listeners_test.go b/internal/daemon/worker/listeners_test.go similarity index 100% rename from internal/servers/worker/listeners_test.go rename to internal/daemon/worker/listeners_test.go diff --git a/internal/daemon/worker/package_registration.go b/internal/daemon/worker/package_registration.go new file mode 100644 index 000000000..3d8c66485 --- /dev/null +++ b/internal/daemon/worker/package_registration.go @@ -0,0 +1,5 @@ +package worker + +import ( + _ "github.com/hashicorp/boundary/internal/daemon/worker/proxy/tcp" +) diff --git a/internal/servers/worker/proxy/doc.go b/internal/daemon/worker/proxy/doc.go similarity index 100% rename from internal/servers/worker/proxy/doc.go rename to internal/daemon/worker/proxy/doc.go diff --git a/internal/servers/worker/proxy/options.go b/internal/daemon/worker/proxy/options.go similarity index 100% rename from internal/servers/worker/proxy/options.go rename to internal/daemon/worker/proxy/options.go diff --git a/internal/servers/worker/proxy/options_test.go b/internal/daemon/worker/proxy/options_test.go similarity index 100% rename from internal/servers/worker/proxy/options_test.go rename to internal/daemon/worker/proxy/options_test.go diff --git a/internal/servers/worker/proxy/proxy.go b/internal/daemon/worker/proxy/proxy.go similarity index 97% rename from internal/servers/worker/proxy/proxy.go rename to internal/daemon/worker/proxy/proxy.go index 43c38cc52..1050c2985 100644 --- a/internal/servers/worker/proxy/proxy.go +++ b/internal/daemon/worker/proxy/proxy.go @@ -6,8 +6,8 @@ import ( "net" "sync" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/worker/session" "nhooyr.io/websocket" ) diff --git a/internal/servers/worker/proxy/proxy_test.go b/internal/daemon/worker/proxy/proxy_test.go similarity index 98% rename from internal/servers/worker/proxy/proxy_test.go rename to internal/daemon/worker/proxy/proxy_test.go index 42081cdea..e570fe47d 100644 --- a/internal/servers/worker/proxy/proxy_test.go +++ b/internal/daemon/worker/proxy/proxy_test.go @@ -5,8 +5,8 @@ import ( "net" "testing" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "nhooyr.io/websocket" diff --git a/internal/servers/worker/proxy/tcp/tcp.go b/internal/daemon/worker/proxy/tcp/tcp.go similarity index 95% rename from internal/servers/worker/proxy/tcp/tcp.go rename to internal/daemon/worker/proxy/tcp/tcp.go index f91b7a7f1..b885abb04 100644 --- a/internal/servers/worker/proxy/tcp/tcp.go +++ b/internal/daemon/worker/proxy/tcp/tcp.go @@ -8,9 +8,9 @@ import ( "net/url" "sync" + "github.com/hashicorp/boundary/internal/daemon/worker/proxy" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/worker/proxy" - "github.com/hashicorp/boundary/internal/servers/worker/session" "nhooyr.io/websocket" ) diff --git a/internal/servers/worker/proxy/tcp/tcp_test.go b/internal/daemon/worker/proxy/tcp/tcp_test.go similarity index 95% rename from internal/servers/worker/proxy/tcp/tcp_test.go rename to internal/daemon/worker/proxy/tcp/tcp_test.go index 6ad0179ef..481db8dda 100644 --- a/internal/servers/worker/proxy/tcp/tcp_test.go +++ b/internal/daemon/worker/proxy/tcp/tcp_test.go @@ -6,9 +6,9 @@ import ( "net" "testing" + "github.com/hashicorp/boundary/internal/daemon/worker/proxy" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/worker/proxy" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets" "github.com/hashicorp/boundary/sdk/testutil" "github.com/stretchr/testify/assert" diff --git a/internal/servers/worker/proxy/testing.go b/internal/daemon/worker/proxy/testing.go similarity index 100% rename from internal/servers/worker/proxy/testing.go rename to internal/daemon/worker/proxy/testing.go diff --git a/internal/servers/worker/proxy/testing_test.go b/internal/daemon/worker/proxy/testing_test.go similarity index 100% rename from internal/servers/worker/proxy/testing_test.go rename to internal/daemon/worker/proxy/testing_test.go diff --git a/internal/servers/worker/session/session.go b/internal/daemon/worker/session/session.go similarity index 99% rename from internal/servers/worker/session/session.go rename to internal/daemon/worker/session/session.go index 3fc3092d8..9008423b5 100644 --- a/internal/servers/worker/session/session.go +++ b/internal/daemon/worker/session/session.go @@ -8,9 +8,9 @@ import ( "sync" "time" + "github.com/hashicorp/boundary/internal/daemon/worker/common" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/worker/common" "github.com/hashicorp/boundary/internal/session" ) diff --git a/internal/servers/worker/session/session_test.go b/internal/daemon/worker/session/session_test.go similarity index 100% rename from internal/servers/worker/session/session_test.go rename to internal/daemon/worker/session/session_test.go diff --git a/internal/servers/worker/status.go b/internal/daemon/worker/status.go similarity index 98% rename from internal/servers/worker/status.go rename to internal/daemon/worker/status.go index 45cb4496c..a7b0173b7 100644 --- a/internal/servers/worker/status.go +++ b/internal/daemon/worker/status.go @@ -6,11 +6,11 @@ import ( "math/rand" "time" + "github.com/hashicorp/boundary/internal/daemon/worker/common" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/worker/common" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/hashicorp/boundary/internal/types/resource" "google.golang.org/grpc/resolver" ) diff --git a/internal/servers/worker/status_test.go b/internal/daemon/worker/status_test.go similarity index 100% rename from internal/servers/worker/status_test.go rename to internal/daemon/worker/status_test.go diff --git a/internal/servers/worker/testing.go b/internal/daemon/worker/testing.go similarity index 99% rename from internal/servers/worker/testing.go rename to internal/daemon/worker/testing.go index a007ef6b6..9a8cf1c1c 100644 --- a/internal/servers/worker/testing.go +++ b/internal/daemon/worker/testing.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/hashicorp/go-hclog" wrapping "github.com/hashicorp/go-kms-wrapping/v2" "github.com/hashicorp/go-secure-stdlib/base62" diff --git a/internal/servers/worker/testing_test.go b/internal/daemon/worker/testing_test.go similarity index 95% rename from internal/servers/worker/testing_test.go rename to internal/daemon/worker/testing_test.go index b1ce3108e..0b9fe2536 100644 --- a/internal/servers/worker/testing_test.go +++ b/internal/daemon/worker/testing_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/stretchr/testify/require" ) diff --git a/internal/servers/worker/worker.go b/internal/daemon/worker/worker.go similarity index 98% rename from internal/servers/worker/worker.go rename to internal/daemon/worker/worker.go index beca2f74c..afb517332 100644 --- a/internal/servers/worker/worker.go +++ b/internal/daemon/worker/worker.go @@ -17,11 +17,11 @@ import ( "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/base" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/worker/internal/metric" + "github.com/hashicorp/boundary/internal/daemon/worker/session" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/worker/internal/metric" - "github.com/hashicorp/boundary/internal/servers/worker/session" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-secure-stdlib/base62" "github.com/hashicorp/go-secure-stdlib/mlock" diff --git a/internal/servers/worker/worker_test.go b/internal/daemon/worker/worker_test.go similarity index 100% rename from internal/servers/worker/worker_test.go rename to internal/daemon/worker/worker_test.go diff --git a/internal/db/schema/migrations/oss/postgres/9/managed_group_test.go b/internal/db/schema/migrations/oss/postgres/9/managed_group_test.go index d39cc1d14..5fa2bf795 100644 --- a/internal/db/schema/migrations/oss/postgres/9/managed_group_test.go +++ b/internal/db/schema/migrations/oss/postgres/9/managed_group_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/db" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/servers/repository_test.go b/internal/servers/repository_test.go index 3ff57b655..6e82aba46 100644 --- a/internal/servers/repository_test.go +++ b/internal/servers/repository_test.go @@ -8,10 +8,10 @@ import ( "github.com/hashicorp/boundary/api/recovery" "github.com/hashicorp/boundary/api/roles" "github.com/hashicorp/boundary/globals" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/db" "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/servers/worker/package_registration.go b/internal/servers/worker/package_registration.go deleted file mode 100644 index ebbbd56d3..000000000 --- a/internal/servers/worker/package_registration.go +++ /dev/null @@ -1,5 +0,0 @@ -package worker - -import ( - _ "github.com/hashicorp/boundary/internal/servers/worker/proxy/tcp" -) diff --git a/internal/tests/api/accounts/account_test.go b/internal/tests/api/accounts/account_test.go index 428dbf1d9..bf3e15372 100644 --- a/internal/tests/api/accounts/account_test.go +++ b/internal/tests/api/accounts/account_test.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/internal/auth/oidc" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/intglobals" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/authmethods/authenticate_test.go b/internal/tests/api/authmethods/authenticate_test.go index a5a74f39a..997096daa 100644 --- a/internal/tests/api/authmethods/authenticate_test.go +++ b/internal/tests/api/authmethods/authenticate_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/api/authtokens" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" tests_api "github.com/hashicorp/boundary/internal/tests/api" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/assert" diff --git a/internal/tests/api/authmethods/authmethod_test.go b/internal/tests/api/authmethods/authmethod_test.go index da4a0c64a..6ed4ad3db 100644 --- a/internal/tests/api/authmethods/authmethod_test.go +++ b/internal/tests/api/authmethods/authmethod_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/internal/auth/password" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" tests_api "github.com/hashicorp/boundary/internal/tests/api" capoidc "github.com/hashicorp/cap/oidc" "github.com/hashicorp/go-hclog" diff --git a/internal/tests/api/authtokens/authtoken_test.go b/internal/tests/api/authtokens/authtoken_test.go index f4e190d22..2341f73d5 100644 --- a/internal/tests/api/authtokens/authtoken_test.go +++ b/internal/tests/api/authtokens/authtoken_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/boundary/api/roles" "github.com/hashicorp/boundary/api/scopes" "github.com/hashicorp/boundary/internal/authtoken" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/credentiallibraries/credentiallibrary_test.go b/internal/tests/api/credentiallibraries/credentiallibrary_test.go index 09baa9d92..0e1b74be3 100644 --- a/internal/tests/api/credentiallibraries/credentiallibrary_test.go +++ b/internal/tests/api/credentiallibraries/credentiallibrary_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/boundary/api/credentiallibraries" "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/credentialstores/credentialstore_test.go b/internal/tests/api/credentialstores/credentialstore_test.go index a329e96ad..158a69ace 100644 --- a/internal/tests/api/credentialstores/credentialstore_test.go +++ b/internal/tests/api/credentialstores/credentialstore_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/credentialstores" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/groups/group_test.go b/internal/tests/api/groups/group_test.go index 6060b2ac9..28bf6a880 100644 --- a/internal/tests/api/groups/group_test.go +++ b/internal/tests/api/groups/group_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/groups" "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/hostcatalogs/host_catalog_test.go b/internal/tests/api/hostcatalogs/host_catalog_test.go index 04182a744..43d577437 100644 --- a/internal/tests/api/hostcatalogs/host_catalog_test.go +++ b/internal/tests/api/hostcatalogs/host_catalog_test.go @@ -7,9 +7,9 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/hostcatalogs" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/hosts/host_test.go b/internal/tests/api/hosts/host_test.go index 73802d6de..2d8ab9afe 100644 --- a/internal/tests/api/hosts/host_test.go +++ b/internal/tests/api/hosts/host_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/boundary/api/hostcatalogs" "github.com/hashicorp/boundary/api/hosts" "github.com/hashicorp/boundary/api/hostsets" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/hostsets/host_set_test.go b/internal/tests/api/hostsets/host_set_test.go index 945802f7e..2a9afb810 100644 --- a/internal/tests/api/hostsets/host_set_test.go +++ b/internal/tests/api/hostsets/host_set_test.go @@ -12,9 +12,9 @@ import ( "github.com/hashicorp/boundary/api/hostcatalogs" "github.com/hashicorp/boundary/api/hosts" "github.com/hashicorp/boundary/api/hostsets" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/host/static" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/managedgroups/managedgroups_test.go b/internal/tests/api/managedgroups/managedgroups_test.go index b5d41f09f..07300e1fa 100644 --- a/internal/tests/api/managedgroups/managedgroups_test.go +++ b/internal/tests/api/managedgroups/managedgroups_test.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/api/managedgroups" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" "github.com/hashicorp/boundary/internal/intglobals" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/roles/role_test.go b/internal/tests/api/roles/role_test.go index d607f0e4a..073df28fd 100644 --- a/internal/tests/api/roles/role_test.go +++ b/internal/tests/api/roles/role_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/boundary/api/groups" "github.com/hashicorp/boundary/api/roles" "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/scopes/scope_test.go b/internal/tests/api/scopes/scope_test.go index 7abadd347..836c36511 100644 --- a/internal/tests/api/scopes/scope_test.go +++ b/internal/tests/api/scopes/scope_test.go @@ -7,8 +7,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/scopes" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/api/targets/target_test.go b/internal/tests/api/targets/target_test.go index f2b71cdbb..c7966c319 100644 --- a/internal/tests/api/targets/target_test.go +++ b/internal/tests/api/targets/target_test.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/boundary/api/roles" "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/credential/vault" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/hashicorp/boundary/internal/target/tcp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" ) func TestHostSetASD(t *testing.T) { diff --git a/internal/tests/api/users/user_test.go b/internal/tests/api/users/user_test.go index 0e318fa46..87712f474 100644 --- a/internal/tests/api/users/user_test.go +++ b/internal/tests/api/users/user_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/boundary/api/accounts" "github.com/hashicorp/boundary/api/authmethods" "github.com/hashicorp/boundary/api/users" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/iam" - "github.com/hashicorp/boundary/internal/servers/controller" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/anon_listing_test.go b/internal/tests/cluster/anon_listing_test.go index 03f4d1a0a..04b19fad9 100644 --- a/internal/tests/cluster/anon_listing_test.go +++ b/internal/tests/cluster/anon_listing_test.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/boundary/api/scopes" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/types/scope" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" diff --git a/internal/tests/cluster/ipv6_listener_test.go b/internal/tests/cluster/ipv6_listener_test.go index 4f0527ce6..9de82f5d6 100644 --- a/internal/tests/cluster/ipv6_listener_test.go +++ b/internal/tests/cluster/ipv6_listener_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/scopes" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/multi_controller_worker_test.go b/internal/tests/cluster/multi_controller_worker_test.go index deadb22da..98b040d63 100644 --- a/internal/tests/cluster/multi_controller_worker_test.go +++ b/internal/tests/cluster/multi_controller_worker_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/package_registry_test.go b/internal/tests/cluster/package_registry_test.go index 4ca900c60..2c2e053de 100644 --- a/internal/tests/cluster/package_registry_test.go +++ b/internal/tests/cluster/package_registry_test.go @@ -2,6 +2,6 @@ package cluster import ( // Enable tcp target support. - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" _ "github.com/hashicorp/boundary/internal/target/tcp" ) diff --git a/internal/tests/cluster/recursive_anon_listing_test.go b/internal/tests/cluster/recursive_anon_listing_test.go index 9f5e01e3d..e9e3903d6 100644 --- a/internal/tests/cluster/recursive_anon_listing_test.go +++ b/internal/tests/cluster/recursive_anon_listing_test.go @@ -6,7 +6,7 @@ import ( amapi "github.com/hashicorp/boundary/api/authmethods" rolesapi "github.com/hashicorp/boundary/api/roles" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" "github.com/hashicorp/boundary/internal/types/scope" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/session_cleanup_test.go b/internal/tests/cluster/session_cleanup_test.go index eeb3e5ca5..150f474ce 100644 --- a/internal/tests/cluster/session_cleanup_test.go +++ b/internal/tests/cluster/session_cleanup_test.go @@ -8,9 +8,9 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/tests/helper" "github.com/hashicorp/dawdle" diff --git a/internal/tests/cluster/unix_listener_test.go b/internal/tests/cluster/unix_listener_test.go index ed8958fbf..9fa104bf4 100644 --- a/internal/tests/cluster/unix_listener_test.go +++ b/internal/tests/cluster/unix_listener_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/boundary/api" "github.com/hashicorp/boundary/api/scopes" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/util.go b/internal/tests/cluster/util.go index 00949bb20..ea06ab535 100644 --- a/internal/tests/cluster/util.go +++ b/internal/tests/cluster/util.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/worker_replay_test.go b/internal/tests/cluster/worker_replay_test.go index 3182ee6d3..ff2458e80 100644 --- a/internal/tests/cluster/worker_replay_test.go +++ b/internal/tests/cluster/worker_replay_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/boundary/internal/servers" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" ) diff --git a/internal/tests/cluster/worker_tagging_test.go b/internal/tests/cluster/worker_tagging_test.go index 586765fda..8c217b6e1 100644 --- a/internal/tests/cluster/worker_tagging_test.go +++ b/internal/tests/cluster/worker_tagging_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" pb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets" "github.com/hashicorp/go-hclog" "github.com/mr-tron/base58" diff --git a/internal/tests/cluster/x509_verification_test.go b/internal/tests/cluster/x509_verification_test.go index bb346dc6d..bf6aeca78 100644 --- a/internal/tests/cluster/x509_verification_test.go +++ b/internal/tests/cluster/x509_verification_test.go @@ -15,9 +15,9 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/config" + "github.com/hashicorp/boundary/internal/daemon/controller" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/tests/helper" "github.com/hashicorp/go-hclog" "github.com/stretchr/testify/require" diff --git a/internal/tests/helper/testing_helper.go b/internal/tests/helper/testing_helper.go index fdde7f160..4fab08943 100644 --- a/internal/tests/helper/testing_helper.go +++ b/internal/tests/helper/testing_helper.go @@ -16,9 +16,9 @@ import ( "github.com/hashicorp/boundary/api/targets" "github.com/hashicorp/boundary/globals" "github.com/hashicorp/boundary/internal/cmd/commands/connect" + "github.com/hashicorp/boundary/internal/daemon/controller/common" + "github.com/hashicorp/boundary/internal/daemon/worker" "github.com/hashicorp/boundary/internal/proxy" - "github.com/hashicorp/boundary/internal/servers/controller/common" - "github.com/hashicorp/boundary/internal/servers/worker" "github.com/hashicorp/boundary/internal/session" targetspb "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/targets" "github.com/hashicorp/go-cleanhttp" diff --git a/internal/types/subtypes/attribute_transform.go b/internal/types/subtypes/attribute_transform.go index dbc38668b..a63d9955e 100644 --- a/internal/types/subtypes/attribute_transform.go +++ b/internal/types/subtypes/attribute_transform.go @@ -3,7 +3,7 @@ package subtypes import ( "fmt" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/types/known/structpb" diff --git a/internal/types/subtypes/interceptor.go b/internal/types/subtypes/interceptor.go index b9dc9d578..6ba56945a 100644 --- a/internal/types/subtypes/interceptor.go +++ b/internal/types/subtypes/interceptor.go @@ -3,7 +3,7 @@ package subtypes import ( "context" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/sdk/pbs/controller/protooptions" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/types/subtypes/interceptor_ext_test.go b/internal/types/subtypes/interceptor_ext_test.go index 4d1d18dab..133453556 100644 --- a/internal/types/subtypes/interceptor_ext_test.go +++ b/internal/types/subtypes/interceptor_ext_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/gen/testing/attribute" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/hashicorp/boundary/internal/types/subtypes" "github.com/stretchr/testify/require" "google.golang.org/protobuf/testing/protocmp" diff --git a/internal/types/subtypes/interceptor_test.go b/internal/types/subtypes/interceptor_test.go index 58f039add..a6d5dae01 100644 --- a/internal/types/subtypes/interceptor_test.go +++ b/internal/types/subtypes/interceptor_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers" "github.com/hashicorp/boundary/internal/gen/testing/attribute" - "github.com/hashicorp/boundary/internal/servers/controller/handlers" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/proto" diff --git a/testing/controller/controller.go b/testing/controller/controller.go index bf9082d09..eeda16ebb 100644 --- a/testing/controller/controller.go +++ b/testing/controller/controller.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/hashicorp/boundary/internal/cmd/config" - "github.com/hashicorp/boundary/internal/servers/controller" + "github.com/hashicorp/boundary/internal/daemon/controller" wrapping "github.com/hashicorp/go-kms-wrapping/v2" - _ "github.com/hashicorp/boundary/internal/servers/controller/handlers/targets/tcp" + _ "github.com/hashicorp/boundary/internal/daemon/controller/handlers/targets/tcp" ) type option struct {