more compose trigger fixes

Author: Crow-Control

app/registry/index.test.ts

@@ -307,20 +307,49 @@ test('ensureDockercomposeTriggerForContainer should create trigger with parent f
   expect(Object.keys(registry.getState().trigger)).toContain(triggerId);
 });
 
-test('ensureDockercomposeTriggerForContainer should append a number when name conflicts', async () => {
+test('ensureDockercomposeTriggerForContainer should reuse existing trigger when name conflicts', async () => {
   const triggerId1 = await registry.ensureDockercomposeTriggerForContainer('my-service');
   const triggerId2 = await registry.ensureDockercomposeTriggerForContainer('my-service');
 
   expect(triggerId1).toBe('dockercompose.my-service');
-  expect(triggerId2).toBe('dockercompose.my-service-2');
+  expect(triggerId2).toBe('dockercompose.my-service');
+  expect(
+    Object.keys(registry.getState().trigger).filter((id) => id === 'dockercompose.my-service')
+      .length,
+  ).toBe(1);
 });
 
-test('ensureDockercomposeTriggerForContainer should append a number when name conflicts with compose path', async () => {
+test('ensureDockercomposeTriggerForContainer should reuse existing trigger when name conflicts with compose path', async () => {
   const triggerId1 = await registry.ensureDockercomposeTriggerForContainer('my-service', '/home/user/myapp/docker-compose.yml');
   const triggerId2 = await registry.ensureDockercomposeTriggerForContainer('my-service', '/home/user/myapp/docker-compose.yml');
 
   expect(triggerId1).toBe('dockercompose.myapp-my-service');
-  expect(triggerId2).toBe('dockercompose.myapp-my-service-2');
+  expect(triggerId2).toBe('dockercompose.myapp-my-service');
+  expect(
+    Object.keys(registry.getState().trigger).filter((id) => id === 'dockercompose.myapp-my-service')
+      .length,
+  ).toBe(1);
+});
+
+test('ensureDockercomposeTriggerForContainer should update configuration on existing trigger', async () => {
+  const triggerId1 = await registry.ensureDockercomposeTriggerForContainer(
+    'my-service',
+    '/home/user/myapp/docker-compose.yml',
+    { prune: 'false' },
+  );
+  const triggerId2 = await registry.ensureDockercomposeTriggerForContainer(
+    'my-service',
+    '/home/user/myapp/docker-compose.yml',
+    { prune: 'true', backup: 'true' },
+  );
+
+  expect(triggerId1).toBe('dockercompose.myapp-my-service');
+  expect(triggerId2).toBe('dockercompose.myapp-my-service');
+  expect(registry.getState().trigger[triggerId2].configuration).toMatchObject({
+    prune: true,
+    backup: true,
+    requireinclude: true,
+  });
 });
 
 test('ensureDockercomposeTriggerForContainer should handle Windows paths', async () => {

app/registry/index.ts

@@ -281,7 +281,7 @@ function sanitizeComponentName(name: string): string {
 
 /**
  * Ensure a dockercompose trigger exists for a container name.
- * Name collision strategy: append a number to the trigger name.
+ * Name collision strategy: update the existing trigger configuration.
  */
 export async function ensureDockercomposeTriggerForContainer(
   containerName: string,
@@ -314,18 +314,10 @@ export async function ensureDockercomposeTriggerForContainer(
     triggerBaseName = sanitizeComponentName(containerName);
   }
 
-  let triggerName = triggerBaseName;
-  let conflictIndex = 2;
-
-  while (state.trigger[`dockercompose.${triggerName}`]) {
-    triggerName = `${triggerBaseName}-${conflictIndex}`;
-    conflictIndex += 1;
-  }
-
   const triggerRegistered = await registerComponent({
     kind: 'trigger',
     provider: 'dockercompose',
-    name: triggerName,
+    name: triggerBaseName,
     configuration: {
       ...triggerConfiguration,
       requireinclude: true,

app/triggers/providers/apprise/Apprise.test.ts

@@ -15,6 +15,7 @@ const configurationValid = {
   threshold: 'all',
   auto: true,
   order: 100,
+  requireinclude: false,
   once: true,
   mode: 'simple',
 

app/triggers/providers/command/Command.test.ts

@@ -14,6 +14,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',
   simplebody:
     'Container ${container.name} running with ${container.updateKind.kind} ${container.updateKind.localValue} can be updated to ${container.updateKind.kind} ${container.updateKind.remoteValue}${container.result && container.result.link ? "\\n" + container.result.link : ""}',

app/triggers/providers/docker/Docker.test.ts

@@ -11,6 +11,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   autoremovetimeout: 10000,
   backupcount: 3,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',

app/triggers/providers/googlechat/Googlechat.test.ts

@@ -23,6 +23,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'Test Title',
   simplebody: 'Test Body',
   batchtitle: 'Batch Title',

app/triggers/providers/gotify/Gotify.test.ts

@@ -15,6 +15,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',
   simplebody:
     'Container ${container.name} running with ${container.updateKind.kind} ${container.updateKind.localValue} can be updated to ${container.updateKind.kind} ${container.updateKind.remoteValue}${container.result && container.result.link ? "\\n" + container.result.link : ""}',
@@ -61,6 +62,7 @@ test('maskConfiguration should mask sensitive data', async () => {
     once: true,
     auto: true,
     order: 100,
+    requireinclude: false,
     simpletitle: configurationValid.simpletitle,
     simplebody: configurationValid.simplebody,
     batchtitle: configurationValid.batchtitle,

app/triggers/providers/ifttt/Ifttt.test.ts

@@ -17,6 +17,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',
 
   simplebody:

app/triggers/providers/kafka/Kafka.test.ts

@@ -18,6 +18,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'New ${container.updateKind.kind} found for container ${container.name}',
 
   simplebody:

app/triggers/providers/matrix/Matrix.test.ts

@@ -25,6 +25,7 @@ const configurationValid = {
   once: true,
   auto: true,
   order: 100,
+  requireinclude: false,
   simpletitle: 'Test Title',
   simplebody: 'Test Body',
   batchtitle: 'Batch Title',