make sure we can more-easily scope triggers

Author: Crow-Control

.github/workflows/ci.yml

@@ -99,7 +99,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
 
-      - name: Start labeled workload container
+      - name: Start workload containers
         run: |
           docker run -d \
             --name dd-compose-label-test \
@@ -109,6 +109,11 @@ jobs:
             --label dd.compose.prune=false \
             alpine:3.21 sleep 600
 
+          docker run -d \
+            --name dd-compose-unlabeled-test \
+            --label dd.watch=true \
+            alpine:3.21 sleep 600
+
       - name: Build drydock image
         run: docker build -t drydock:ci-trigger --build-arg DD_VERSION=ci .
 
@@ -153,6 +158,16 @@ jobs:
             docker logs drydock-ci-trigger 2>&1 || true
             exit 1
           fi
+          if ! echo "$logs" | grep -Eq '"requireinclude":("true"|true)'; then
+            echo "Did not find scoped requireinclude=true configuration in logs"
+            docker logs drydock-ci-trigger 2>&1 || true
+            exit 1
+          fi
+          if echo "$logs" | grep -Eq 'trigger\.dockercompose\..*dd-compose-unlabeled-test'; then
+            echo "Unexpected dockercompose trigger registration for unlabeled container"
+            docker logs drydock-ci-trigger 2>&1 || true
+            exit 1
+          fi
 
       - name: Dump drydock logs on failure
         if: failure()
@@ -161,7 +176,7 @@ jobs:
       - name: Cleanup containers
         if: always()
         run: |
-          docker rm -f drydock-ci-trigger dd-compose-label-test >/dev/null 2>&1 || true
+          docker rm -f drydock-ci-trigger dd-compose-label-test dd-compose-unlabeled-test >/dev/null 2>&1 || true
 
   build:
     name: Build

app/registry/index.test.ts

@@ -357,9 +357,17 @@ test('ensureDockercomposeTriggerForContainer should set trigger configuration wh
     dryrun: true,
     auto: false,
     threshold: 'minor',
+    requireinclude: true,
   });
 });
 
+test('ensureDockercomposeTriggerForContainer should always scope trigger to explicitly included containers', async () => {
+  const triggerId = await registry.ensureDockercomposeTriggerForContainer('my-service');
+
+  expect(triggerId).toBe('dockercompose.my-service');
+  expect(registry.getState().trigger[triggerId].configuration.requireinclude).toBe(true);
+});
+
 test('sanitizeComponentName should handle empty string', () => {
   const result = registry.testable_sanitizeComponentName('');
   expect(result).toBe('container');

app/registry/index.ts

@@ -326,7 +326,10 @@ export async function ensureDockercomposeTriggerForContainer(
     kind: 'trigger',
     provider: 'dockercompose',
     name: triggerName,
-    configuration: triggerConfiguration,
+    configuration: {
+      ...triggerConfiguration,
+      requireinclude: true,
+    },
     componentPath: 'triggers/providers',
   });
 

app/triggers/providers/Trigger.test.ts

@@ -20,6 +20,7 @@ const configurationValid = {
   mode: 'simple',
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',
 
   simplebody:
@@ -618,6 +619,43 @@ test('mustTrigger should support name-only include with threshold for hybrid tri
   expect(discordTrigger.mustTrigger(containerMajor)).toBe(false);
 });
 
+test('mustTrigger should require explicit include when requireinclude is enabled', () => {
+  trigger.type = 'dockercompose';
+  trigger.name = 'scoped';
+  trigger.configuration = {
+    ...configurationValid,
+    requireinclude: true,
+  };
+
+  expect(
+    trigger.mustTrigger({
+      updateKind: {
+        kind: 'tag',
+        semverDiff: 'major',
+      },
+    }),
+  ).toBe(false);
+});
+
+test('mustTrigger should allow execution when requireinclude is enabled and trigger is explicitly included', () => {
+  trigger.type = 'dockercompose';
+  trigger.name = 'scoped';
+  trigger.configuration = {
+    ...configurationValid,
+    requireinclude: true,
+  };
+
+  expect(
+    trigger.mustTrigger({
+      triggerInclude: 'dockercompose.scoped',
+      updateKind: {
+        kind: 'tag',
+        semverDiff: 'major',
+      },
+    }),
+  ).toBe(true);
+});
+
 test('renderSimpleTitle should replace placeholders when called', async () => {
   expect(
     trigger.renderSimpleTitle({

app/triggers/providers/Trigger.ts

@@ -20,6 +20,7 @@ export interface TriggerConfiguration extends ComponentConfiguration {
   auto?: boolean;
   order?: number;
   threshold?: string;
+  requireinclude?: boolean;
   mode?: string;
   once?: boolean;
   disabletitle?: boolean;
@@ -257,6 +258,9 @@ class Trigger extends Component {
       return false;
     }
     const { triggerInclude, triggerExclude } = containerResult;
+    if (this.configuration.requireinclude && !triggerInclude) {
+      return false;
+    }
     return (
       this.isTriggerIncluded(containerResult, triggerInclude) &&
       !this.isTriggerExcluded(containerResult, triggerExclude)
@@ -337,6 +341,7 @@ class Trigger extends Component {
         ),
       batchtitle: this.joi.string().default('${containers.length} updates available'),
       resolvenotifications: this.joi.boolean().default(false),
+        requireinclude: this.joi.boolean().default(false),
     });
     const schemaValidated = schemaWithDefaultOptions.validate(configuration);
     if (schemaValidated.error) {