fix(tasks): improve logic for tags in kv and make the http test cleaner.

http/task_test.go

@@ -67,7 +67,12 @@ func TestTaskService(t *testing.T) {
 				Token: auth.Token,
 			}
 
-			cFunc := func() (servicetest.TestCreds, error) {
+			cFunc := func(t *testing.T) (servicetest.TestCreds, error) {
+				org := &platform.Organization{Name: t.Name() + "_org"}
+				if err := service.CreateOrganization(ctx, org); err != nil {
+					t.Fatal(err)
+				}
+
 				return servicetest.TestCreds{
 					OrgID:           org.ID,
 					Org:             org.Name,

kv/task.go

@@ -304,18 +304,16 @@ func (s *Service) findTaskByOrg(ctx context.Context, tx Tx, filter influxdb.Task
 				return nil, 0, err
 			}
 
-			if filter.Type == nil {
-				ft := ""
-				filter.Type = &ft
-			}
-			if *filter.Type != influxdb.TaskTypeWildcard && *filter.Type != t.Type {
-				t = nil
-			}
-
-			// insert the new task into the list
 			if t != nil {
-				ts = append(ts, t)
-
+				typ := ""
+				if filter.Type != nil {
+					typ = *filter.Type
+				}
+
+				// if the filter type matches task type or filter type is a wildcard
+				if typ == t.Type || typ == influxdb.TaskTypeWildcard {
+					ts = append(ts, t)
+				}
 			}
 		}
 	}

task/servicetest/servicetest.go

@@ -155,7 +155,7 @@ type System struct {
 	// However, if the system needs to verify credentials,
 	// the caller should set this value and return valid IDs and a valid token.
 	// It is safe if this returns the same values every time it is called.
-	CredsFunc func() (TestCreds, error)
+	CredsFunc func(*testing.T) (TestCreds, error)
 }
 
 func testTaskCRUD(t *testing.T, sys *System) {
@@ -1411,7 +1411,7 @@ func creds(t *testing.T, s *System) TestCreds {
 		}
 	}
 
-	c, err := s.CredsFunc()
+	c, err := s.CredsFunc(t)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1522,8 +1522,7 @@ func testTaskType(t *testing.T, sys *System) {
 		t.Fatal(err)
 	}
 
-	// this is to account for the concurrency test creating tasks in the same organization
-	if len(tasks) < 3 {
+	if len(tasks) != 3 {
 		t.Fatalf("failed to return tasks with wildcard, expected 3, got %d", len(tasks))
 	}
 }