Merge the worker_status table with the worker table (#2111)

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

@@ -2153,7 +2153,7 @@ func (w workerList) filtered(eval *bexpr.Evaluator) (workerList, error) {
 		//   we are separating reported status name and the resource name.
 		name := worker.GetName()
 		if name == "" {
-			name = worker.ReportedStatus.GetName()
+			name = worker.GetWorkerReportedName()
 		}
 		filterInput := map[string]interface{}{
 			"name": name,

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

@@ -34,20 +34,22 @@ func TestWorkerList_Addresses(t *testing.T) {
 func TestWorkerList_Filter(t *testing.T) {
 	var workers []*servers.Worker
 	for i := 0; i < 5; i++ {
-		w := servers.NewWorker(scope.Global.String(),
-			servers.WithName(fmt.Sprintf("test_worker_%d", i)),
-			servers.WithWorkerTags(&servers.Tag{
-				Key:   fmt.Sprintf("key%d", i),
-				Value: fmt.Sprintf("value%d", i),
-			}))
-		w.ReportedStatus = servers.NewWorkerStatus("",
-			servers.WithName(fmt.Sprintf("config%d", i)),
-			servers.WithWorkerTags(&servers.Tag{
-				Key: "key",
-				// Note that the value is either 0 or 1
-				Value: fmt.Sprintf("configvalue%d", i%2),
-			}))
-		workers = append(workers, w)
+		switch {
+		case i%2 == 0:
+			workers = append(workers, servers.NewWorker(scope.Global.String(),
+				servers.WithName(fmt.Sprintf("test_worker_%d", i)),
+				servers.WithWorkerTags(&servers.Tag{
+					Key:   fmt.Sprintf("key%d", i),
+					Value: fmt.Sprintf("value%d", i),
+				})))
+		default:
+			workers = append(workers, servers.NewWorkerForStatus(scope.Global.String(),
+				servers.WithName(fmt.Sprintf("test_worker_%d", i)),
+				servers.WithWorkerTags(&servers.Tag{
+					Key:   "key",
+					Value: "configvalue",
+				})))
+		}
 	}
 
 	{
@@ -58,17 +60,17 @@ func TestWorkerList_Filter(t *testing.T) {
 		assert.Len(t, got, 0)
 	}
 	{
-		ev, err := bexpr.CreateEvaluator(`"/name" matches "test_worker_[12]" and "configvalue0" in "/tags/key"`)
+		ev, err := bexpr.CreateEvaluator(`"/name" matches "test_worker_[12]" and "configvalue" in "/tags/key"`)
 		require.NoError(t, err)
 		got, err := workerList(workers).filtered(ev)
 		require.NoError(t, err)
 		assert.Len(t, got, 1)
 	}
 	{
-		ev, err := bexpr.CreateEvaluator(`"configvalue0" in "/tags/key"`)
+		ev, err := bexpr.CreateEvaluator(`"configvalue" in "/tags/key"`)
 		require.NoError(t, err)
 		got, err := workerList(workers).filtered(ev)
 		require.NoError(t, err)
-		assert.Len(t, got, 3)
+		assert.Len(t, got, 2)
 	}
 }

internal/daemon/controller/testing.go

@@ -705,10 +705,10 @@ func (tc *TestController) AddClusterControllerMember(t testing.TB, opts *TestCon
 // WaitForNextWorkerStatusUpdate waits for the next status check from a worker to
 // come in. If it does not come in within the default status grace
 // period, this function returns an error.
-func (tc *TestController) WaitForNextWorkerStatusUpdate(workerId string) error {
+func (tc *TestController) WaitForNextWorkerStatusUpdate(workerStatusName string) error {
 	const op = "controller.(TestController).WaitForNextWorkerStatusUpdate"
 	ctx := context.TODO()
-	event.WriteSysEvent(ctx, op, "waiting for next status report from worker", "worker", workerId)
+	event.WriteSysEvent(ctx, op, "waiting for next status report from worker", "worker", workerStatusName)
 	waitStatusStart := time.Now()
 	ctx, cancel := context.WithTimeout(tc.ctx, tc.b.StatusGracePeriodDuration)
 	defer cancel()
@@ -747,7 +747,7 @@ func (tc *TestController) WaitForNextWorkerStatusUpdate(workerId string) error {
 				return false
 			}
 
-			if workerStatusUpdateId == workerId {
+			if workerStatusUpdateId == workerStatusName {
 				waitStatusCurrent = workerStatusUpdateTime
 				return false
 			}
@@ -765,10 +765,10 @@ func (tc *TestController) WaitForNextWorkerStatusUpdate(workerId string) error {
 	}
 
 	if err != nil {
-		event.WriteError(ctx, op, err, event.WithInfoMsg("error waiting for next status report from worker", "worker", workerId))
+		event.WriteError(ctx, op, err, event.WithInfoMsg("error waiting for next status report from worker", "worker", workerStatusName))
 		return err
 	}
-	event.WriteSysEvent(ctx, op, "waiting for next status report from worker received successfully", "worker", workerId)
+	event.WriteSysEvent(ctx, op, "waiting for next status report from worker received successfully", "worker", workerStatusName)
 	return nil
 }