Merge pull request #109 from thin-edge/fix-filter-options

fix: respect filter options when triggered by engine events

Author: reubenmiller

pkg/app/app.go

@@ -280,6 +280,7 @@ func (a *App) Monitor(ctx context.Context, filterOptions container.FilterOptions
 			slog.Info("Stopping engine monitor")
 			return ctx.Err()
 		case evt := <-evtCh:
+			slog.Info("Received event.", "value", evt)
 			switch evt.Type {
 			case events.ContainerEventType:
 				// Note: health checks will run command inside the containers periodically, and this results
@@ -315,26 +316,33 @@ func (a *App) Monitor(ctx context.Context, filterOptions container.FilterOptions
 
 				switch evt.Action {
 				case events.ActionExecDie, events.ActionCreate, events.ActionStart, events.ActionStop, events.ActionPause, events.ActionUnPause, events.ActionHealthStatusHealthy, events.ActionHealthStatusUnhealthy:
-					go func() {
+					go func(evt events.Message) {
 						// Delay before trigger update to allow the service status to be updated
 						time.Sleep(500 * time.Millisecond)
 						if err := a.Update(container.FilterOptions{
 							IDs: []string{evt.Actor.ID},
+
+							// Preserve default filter options
+							Names:            filterOptions.Names,
+							Labels:           filterOptions.Labels,
+							Types:            filterOptions.Types,
+							ExcludeNames:     filterOptions.ExcludeNames,
+							ExcludeWithLabel: filterOptions.ExcludeWithLabel,
 						}); err != nil {
 							slog.Warn("Error updating container state.", "err", err)
 						}
-					}()
+					}(evt)
 				case events.ActionDestroy, events.ActionRemove, events.ActionDie:
 					slog.Info("Container removed/destroyed", "container", evt.Actor.ID, "attributes", evt.Actor.Attributes)
 					// TODO: Trigger a removal instead of checking the whole state
 					// Lookup container name by container id (from the entity store) as lookup by name won't work for container-groups
-					go func() {
+					go func(evt events.Message) {
 						// Delay before trigger update to allow the service status to be updated
 						time.Sleep(500 * time.Millisecond)
-						if err := a.Update(container.FilterOptions{}); err != nil {
+						if err := a.Update(filterOptions); err != nil {
 							slog.Warn("Error updating container state.", "err", err)
 						}
-					}()
+					}(evt)
 				}
 
 				if a.config.EnableEngineEvents {
@@ -345,8 +353,6 @@ func (a *App) Monitor(ctx context.Context, filterOptions container.FilterOptions
 					}
 				}
 			}
-
-			slog.Info("Received event.", "value", evt)
 		case err := <-errCh:
 			if errors.Is(err, io.EOF) {
 				slog.Info("No more events")

pkg/container/container.go

@@ -418,8 +418,6 @@ func (c *ContainerClient) List(ctx context.Context, options FilterOptions) ([]Te
 		})
 	}
 
-	// filterValues = append(filterValues, filters.Arg("label", "com.docker.compose.project"))
-
 	// Match by label
 	for _, label := range options.Labels {
 		filterValues = append(filterValues, filters.KeyValuePair{

tests/operations-clone.robot

@@ -59,6 +59,19 @@ Clone Existing Container but Waiting For Exit
     ${next_container_id}=    DeviceLibrary.Execute Command    cmd=tedge-container engine docker inspect app4 --format "{{.Id}}"
     Should Not Be Equal    ${next_container_id}    ${prev_container_id}
 
+Ignore Containers With Given Label
+    # ignore using label
+    ${prev_container_id}=    DeviceLibrary.Execute Command    cmd=sudo tedge-container engine docker run -d --label tedge.ignore=1 --name httpapp1 httpd:2.4.61-alpine
+    Sleep    10s
+    DeviceLibrary.Execute Command    cmd=sudo tedge-container engine docker inspect httpapp1
+    Cumulocity.Should Have Services    service_type=container    name=httpapp1    min_count=0    max_count=0    timeout=10
+
+    # don't ignore
+    ${prev_container_id}=    DeviceLibrary.Execute Command    cmd=sudo tedge-container engine docker run -d --name httpapp2 httpd:2.4.61-alpine
+    Sleep    10s
+    DeviceLibrary.Execute Command    cmd=sudo tedge-container engine docker inspect httpapp2
+    Cumulocity.Should Have Services    service_type=container    name=httpapp2    min_count=1    max_count=1    timeout=10
+
 *** Keywords ***
 
 Suite Setup