Upsert creates a new KMS and Updates PKI workers (#2187)

internal/daemon/controller/handlers/targets/target_service.go

@@ -2159,15 +2159,8 @@ func (w workerList) workerInfos() []*pb.WorkerInfo {
 func (w workerList) filtered(eval *bexpr.Evaluator) (workerList, error) {
 	var ret []*servers.Worker
 	for _, worker := range w {
-
-		// TODO: Decide how we are actually going to filter by name now that
-		//   we are separating reported status name and the resource name.
-		name := worker.GetName()
-		if name == "" {
-			name = worker.GetWorkerReportedName()
-		}
 		filterInput := map[string]interface{}{
-			"name": name,
+			"name": worker.GetName(),
 			"tags": worker.CanonicalTags(),
 		}
 		ok, err := eval.Evaluate(filterInput)

internal/daemon/controller/handlers/targets/tcp/target_service_test.go

@@ -2784,7 +2784,7 @@ func TestAuthorizeSession(t *testing.T) {
 			require.NoError(t, err)
 
 			// Tell our DB that there is a worker ready to serve the data
-			servers.TestWorker(t, conn, wrapper)
+			servers.TestKmsWorker(t, conn, wrapper)
 
 			asRes1, err := s.AuthorizeSession(ctx, &pbs.AuthorizeSessionRequest{
 				Id: tar.GetPublicId(),
@@ -3062,7 +3062,7 @@ func TestAuthorizeSessionTypedCredentials(t *testing.T) {
 			require.NoError(t, err)
 
 			// Tell our DB that there is a worker ready to serve the data
-			servers.TestWorker(t, conn, wrapper)
+			servers.TestKmsWorker(t, conn, wrapper)
 
 			asRes, err := s.AuthorizeSession(ctx, &pbs.AuthorizeSessionRequest{
 				Id: tar.GetPublicId(),

internal/daemon/controller/handlers/workers/worker_service.go

@@ -457,7 +457,7 @@ func toProto(ctx context.Context, in *servers.Worker, opt ...handlers.Option) (*
 		out.AuthorizedActions = opts.WithAuthorizedActions
 		if in.Type == KmsWorkerType {
 			// KMS workers cannot be updated through the API
-			out.AuthorizedActions = strutil.StrListDelete(action.Update.String())
+			out.AuthorizedActions = strutil.StrListDelete(out.AuthorizedActions, action.Update.String())
 		}
 	}
 	if outputFields.Has(globals.AddressField) && in.GetAddress() != "" {

internal/daemon/controller/handlers/workers/worker_service_test.go

@@ -63,7 +63,7 @@ func TestGet(t *testing.T) {
 		return repo, nil
 	}
 
-	worker := servers.TestWorker(t, conn, wrap,
+	worker := servers.TestKmsWorker(t, conn, wrap,
 		servers.WithName("test worker names"),
 		servers.WithDescription("test worker description"),
 		servers.WithAddress("test worker address"),
@@ -174,7 +174,7 @@ func TestList(t *testing.T) {
 
 	var wantWorkers []*pb.Worker
 	for i := 0; i < 10; i++ {
-		w := servers.TestWorker(t, conn, wrap, servers.WithName(fmt.Sprintf("worker%d", i)))
+		w := servers.TestKmsWorker(t, conn, wrap, servers.WithName(fmt.Sprintf("worker%d", i)))
 		wantWorkers = append(wantWorkers, &pb.Worker{
 			Id:                w.GetPublicId(),
 			ScopeId:           w.GetScopeId(),
@@ -285,7 +285,7 @@ func TestDelete(t *testing.T) {
 	s, err := NewService(ctx, repoFn, iamRepoFn)
 	require.NoError(t, err, "Error when getting new worker service.")
 
-	w := servers.TestWorker(t, conn, wrap)
+	w := servers.TestKmsWorker(t, conn, wrap)
 
 	cases := []struct {
 		name    string
@@ -349,7 +349,7 @@ func TestUpdate(t *testing.T) {
 		return repo, nil
 	}
 
-	wkr := servers.TestWorker(t, conn, wrapper,
+	wkr := servers.TestKmsWorker(t, conn, wrapper,
 		servers.WithName("default"),
 		servers.WithDescription("default"),
 		servers.WithAddress("default"))
@@ -806,7 +806,7 @@ func TestUpdate_BadVersion(t *testing.T) {
 	workerService, err := NewService(ctx, repoFn, iamRepoFn)
 	require.NoError(t, err, "Failed to create a new host set service.")
 
-	wkr := servers.TestWorker(t, conn, wrapper)
+	wkr := servers.TestKmsWorker(t, conn, wrapper)
 
 	upTar, err := workerService.UpdateWorker(auth.DisabledAuthTestContext(iamRepoFn, proj.GetPublicId()), &pbs.UpdateWorkerRequest{
 		Id: wkr.GetPublicId(),