From b83f4ece395ca2501fe09be066cb06ff7538b9b5 Mon Sep 17 00:00:00 2001 From: Todd Date: Mon, 9 May 2022 14:45:30 -0700 Subject: [PATCH] Manual merge of main into llb-byow. --- internal/daemon/controller/handlers/targets/target_service.go | 1 - internal/daemon/worker/listeners.go | 2 +- internal/daemon/worker/status.go | 1 - internal/daemon/worker/worker.go | 3 --- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/daemon/controller/handlers/targets/target_service.go b/internal/daemon/controller/handlers/targets/target_service.go index 81fdfef9f2..5c98b087e8 100644 --- a/internal/daemon/controller/handlers/targets/target_service.go +++ b/internal/daemon/controller/handlers/targets/target_service.go @@ -27,7 +27,6 @@ import ( "github.com/hashicorp/boundary/internal/kms" "github.com/hashicorp/boundary/internal/perms" "github.com/hashicorp/boundary/internal/requests" - "github.com/hashicorp/boundary/internal/servers" "github.com/hashicorp/boundary/internal/session" "github.com/hashicorp/boundary/internal/target" "github.com/hashicorp/boundary/internal/types/action" diff --git a/internal/daemon/worker/listeners.go b/internal/daemon/worker/listeners.go index 7dc71a2fd0..a2bfdaad27 100644 --- a/internal/daemon/worker/listeners.go +++ b/internal/daemon/worker/listeners.go @@ -13,9 +13,9 @@ import ( "time" "github.com/hashicorp/boundary/internal/cmd/base" + "github.com/hashicorp/boundary/internal/daemon/controller/handlers/workers" pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services" "github.com/hashicorp/boundary/internal/observability/event" - "github.com/hashicorp/boundary/internal/servers/controller/handlers/workers" "github.com/hashicorp/go-multierror" nodee "github.com/hashicorp/nodeenrollment" "github.com/hashicorp/nodeenrollment/multihop" diff --git a/internal/daemon/worker/status.go b/internal/daemon/worker/status.go index a7986d8ea1..1a29642b3b 100644 --- a/internal/daemon/worker/status.go +++ b/internal/daemon/worker/status.go @@ -12,7 +12,6 @@ import ( "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/types/resource" "google.golang.org/grpc/resolver" ) diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go index 84da2eb3ea..9cd3e7f6f9 100644 --- a/internal/daemon/worker/worker.go +++ b/internal/daemon/worker/worker.go @@ -23,9 +23,6 @@ import ( "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"