Add some target fields and move some things around (#3879)

In preparation for putting proxy code in the api package this creates some necessary fields in the target output and it pre-moves credential parsing and proxy handshake code to their new places. This will make the diff for the actual proxy code move quite a bit smaller.

Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>

internal/daemon/worker/handler.go

@@ -22,8 +22,8 @@ import (
 	"github.com/hashicorp/boundary/internal/errors"
 	"github.com/hashicorp/boundary/internal/event"
 	pbs "github.com/hashicorp/boundary/internal/gen/controller/servers/services"
-	"github.com/hashicorp/boundary/internal/proxy"
 	"github.com/hashicorp/boundary/internal/util"
+	"github.com/hashicorp/boundary/sdk/pbs/proxy"
 	"github.com/hashicorp/go-secure-stdlib/listenerutil"
 	"github.com/hashicorp/nodeenrollment"
 	"github.com/hashicorp/nodeenrollment/types"

internal/daemon/worker/workerdisconnect_test.go

@@ -33,23 +33,30 @@ func TestDeleteConnectedWorkers(t *testing.T) {
 
 	serverRepo, err := c.Controller().ServersRepoFn()
 	require.NoError(t, err)
-	workers, err := serverRepo.ListWorkers(ctx, []string{"global"}, server.WithLiveness(-1))
-	require.NoError(t, err)
+	workerTimeoutCtx, workerTimeoutCancel := context.WithTimeout(ctx, 5*time.Minute)
+	defer workerTimeoutCancel()
 	var pkiWorker, childPkiWorker, childKmsWorker *server.Worker
-	for _, w := range workers {
-		if w.Type == "pki" && w.GetAddress() == multiHoppedPkiWorker.ProxyAddrs()[0] {
-			childPkiWorker = w
-		}
-		if w.Type == "pki" && w.GetAddress() == multiHoppedKmsWorker.ProxyAddrs()[0] {
-			childKmsWorker = w
-		}
-		if w.Type == "pki" && w.GetAddress() == directPkiWorker.ProxyAddrs()[0] {
-			pkiWorker = w
+	for pkiWorker == nil || childPkiWorker == nil || childKmsWorker == nil {
+		time.Sleep(time.Second)
+		select {
+		case <-workerTimeoutCtx.Done():
+			require.FailNow(t, "timeout waiting for all workers to connect")
+		default:
+			workers, err := serverRepo.ListWorkers(workerTimeoutCtx, []string{"global"}, server.WithLiveness(-1))
+			require.NoError(t, err)
+			for _, w := range workers {
+				if w.Type == "pki" && w.GetAddress() == multiHoppedPkiWorker.ProxyAddrs()[0] {
+					childPkiWorker = w
+				}
+				if w.Type == "pki" && w.GetAddress() == multiHoppedKmsWorker.ProxyAddrs()[0] {
+					childKmsWorker = w
+				}
+				if w.Type == "pki" && w.GetAddress() == directPkiWorker.ProxyAddrs()[0] {
+					pkiWorker = w
+				}
+			}
 		}
 	}
-	require.NotNil(t, childKmsWorker)
-	require.NotNil(t, childPkiWorker)
-	require.NotNil(t, pkiWorker)
 
 	cases := []struct {
 		name       string