more fixing

Author: Crow-Control

app/triggers/providers/dockercompose/Dockercompose.test.ts

@@ -1271,6 +1271,73 @@ describe('Dockercompose Trigger', () => {
     expect(result).toBeNull();
   });
 
+  test('getComposeFileForContainer should use native compose labels when watcher compose.native is enabled', () => {
+    trigger.configuration.file = undefined;
+    getState.mockReturnValueOnce({
+      registry: {
+        hub: {
+          getImageFullName: (image, tag) => `${image.name}:${tag}`,
+        },
+      },
+      watcher: {
+        'docker.local': {
+          configuration: {
+            compose: {
+              native: 'true',
+            },
+          },
+          dockerApi: mockDockerApi,
+        },
+      },
+    });
+
+    const container = {
+      watcher: 'local',
+      labels: {
+        'com.docker.compose.project.working_dir': '/opt/stack',
+        'com.docker.compose.project.config_files': 'compose.yml',
+      },
+    };
+
+    const result = trigger.getComposeFileForContainer(container);
+
+    expect(result).toBe('/opt/stack/compose.yml');
+  });
+
+  test('getComposeFileForContainer should prioritize dd.compose.native label over watcher compose.native', () => {
+    trigger.configuration.file = undefined;
+    getState.mockReturnValueOnce({
+      registry: {
+        hub: {
+          getImageFullName: (image, tag) => `${image.name}:${tag}`,
+        },
+      },
+      watcher: {
+        'docker.local': {
+          configuration: {
+            compose: {
+              native: 'true',
+            },
+          },
+          dockerApi: mockDockerApi,
+        },
+      },
+    });
+
+    const container = {
+      watcher: 'local',
+      labels: {
+        'dd.compose.native': 'false',
+        'com.docker.compose.project.working_dir': '/opt/stack',
+        'com.docker.compose.project.config_files': 'compose.yml',
+      },
+    };
+
+    const result = trigger.getComposeFileForContainer(container);
+
+    expect(result).toBeNull();
+  });
+
   test('getComposeFileForContainer should fall back to default config file', () => {
     trigger.configuration.file = '/default/compose.yml';
     const container = { labels: {} };

app/triggers/providers/dockercompose/Dockercompose.ts

@@ -12,12 +12,14 @@ const DD_COMPOSE_NATIVE_LABEL = 'dd.compose.native';
 const WUD_COMPOSE_NATIVE_LABEL = 'wud.compose.native';
 
 function isNativeComposeEnabled(labels = {}) {
+  const normalizeToBoolean = (value) => `${value}`.trim().toLowerCase() === 'true';
+
   const nativeLabel = labels[DD_COMPOSE_NATIVE_LABEL] ?? labels[WUD_COMPOSE_NATIVE_LABEL];
-  if (nativeLabel === undefined) {
-    return false;
+  if (nativeLabel !== undefined) {
+    return normalizeToBoolean(nativeLabel);
   }
-  const normalizedNativeLabel = `${nativeLabel}`.trim().toLowerCase();
-  return normalizedNativeLabel === 'true';
+
+  return false;
 }
 
 function splitDigestReference(image) {
@@ -236,7 +238,12 @@ class Dockercompose extends Docker {
     }
 
     // Fall back to native Docker Compose labels when explicitly enabled
-    const nativeComposeEnabled = isNativeComposeEnabled(container.labels);
+    const watcherComposeNativeEnabled = this.getWatcher(container)?.configuration?.compose?.native;
+    const nativeComposeEnabled =
+      isNativeComposeEnabled(container.labels) ||
+      (container.labels?.[DD_COMPOSE_NATIVE_LABEL] === undefined &&
+        container.labels?.[WUD_COMPOSE_NATIVE_LABEL] === undefined &&
+        `${watcherComposeNativeEnabled}`.trim().toLowerCase() === 'true');
     const composeConfigFiles = container.labels?.[COMPOSE_PROJECT_CONFIG_FILES_LABEL];
     if (nativeComposeEnabled && composeConfigFiles && composeConfigFiles.trim() !== '') {
       const composeProjectWorkingDir = container.labels?.[COMPOSE_PROJECT_WORKING_DIR_LABEL];