Changes per review

fetcher/fetcher.go

@@ -81,6 +81,7 @@ func (c *Fetcher) workInit() {
 	c.worker.PushIf("service_bindings", c.fetchServiceBindings, filters.ServiceBindings)
 	c.worker.PushIf("users", c.fetchUsers, filters.Events)
 	c.worker.PushIf("events", c.fetchEvents, filters.Events)
+	c.worker.PushIf("droplets", c.fetchDroplets, filters.Droplets)
 }
 
 func (c *Fetcher) fetch() *models.CFObjects {
@@ -95,15 +96,6 @@ func (c *Fetcher) fetch() *models.CFObjects {
 
 	c.workInit()
 
-	// Fetch and filter droplets
-	appDropletMap, err := c.fetchAndFilterDroplets(session)
-	if err != nil {
-		log.WithError(err).Error("unable to fetch and filter droplets")
-		result.Error = err
-		return result
-	}
-	result.AppDroplets = appDropletMap
-
 	result.Error = c.worker.Do(session, result)
 	return result
 }

fetcher/fetcher_handlers.go

@@ -115,6 +115,16 @@ func (c *Fetcher) fetchAndFilterDroplets(session *SessionExt) (map[string]models
 	return appDropletMap, nil
 }
 
+func (c *Fetcher) fetchDroplets(session *SessionExt, result *models.CFObjects) error {
+	appDropletMap, err := c.fetchAndFilterDroplets(session)
+	if err != nil {
+		log.WithError(err).Error("unable to fetch and filter droplets")
+		return err
+	}
+	result.AppDroplets = appDropletMap
+	return nil
+}
+
 func (c *Fetcher) fetchProcesses(session *SessionExt, entry *models.CFObjects) error {
 	processes, _, err := session.V3().GetProcesses(LargeQuery)
 	if err != nil {

filters/filters.go

@@ -9,6 +9,7 @@ const (
 	Applications      = "applications"
 	Buildpacks        = "buildpacks"
 	Domains           = "domains"
+	Droplets          = "droplets"
 	Events            = "events"
 	IsolationSegments = "isolationsegments"
 	Organizations     = "organizations"
@@ -28,6 +29,7 @@ var (
 		Applications,
 		Buildpacks,
 		Domains,
+		Droplets,
 		Events,
 		IsolationSegments,
 		Organizations,
@@ -53,6 +55,7 @@ func NewFilter(active ...string) (*Filter, error) {
 			Applications:      true,
 			Buildpacks:        true,
 			Domains:           true,
+			Droplets:          true,
 			IsolationSegments: true,
 			Organizations:     true,
 			Routes:            true,
@@ -83,6 +86,7 @@ func (f *Filter) setActive(active []string) error {
 		Applications:      false,
 		Buildpacks:        false,
 		Domains:           false,
+		Droplets:          false,
 		IsolationSegments: false,
 		Organizations:     false,
 		Routes:            false,