restructure native default via env vars

Author: Crow-Control

CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Compose-file digest update support** — Docker-compose trigger now supports digest-pinned image references in compose files (`image@sha256:...` and `image:tag@sha256:...`) so digest-based services can be updated without dropping pinning.
 
 - **Compose-native auto-compose discovery** — Added `dd.compose.native` / `wud.compose.native` container labels to enable deriving compose file paths from native Compose labels (`com.docker.compose.project.config_files` + `com.docker.compose.project.working_dir`) when `dd.compose.file` is not set. This requires the resolved compose path to exist inside the drydock container (same path context used by `docker compose`).
-- **Watcher-wide compose-native default** — Added `DD_WATCHER_DOCKER_{name}_COMPOSENATIVE=true` to enable compose-native path discovery for all containers watched by a Docker watcher, with per-container `dd.compose.native` still taking precedence.
+- **Watcher-wide compose-native default** — Added `DD_WATCHER_{name}_COMPOSE_NATIVE=true` to enable compose-native path discovery for all containers watched by a Docker watcher, with per-container `dd.compose.native` still taking precedence.
 
 ### Fixed
 

README.md

@@ -402,7 +402,7 @@ When using the Docker Compose trigger, container labels can override trigger set
 | `dd.compose.prune` | `wud.compose.prune` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_PRUNE` | `true` / `false` |
 | `dd.compose.dryrun` | `wud.compose.dryrun` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_DRYRUN` | `true` / `false` |
 | `dd.compose.auto` | `wud.compose.auto` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_AUTO` | `true` / `false` |
-| `dd.compose.native` | `wud.compose.native` | `DD_WATCHER_DOCKER_xxx_COMPOSENATIVE` | `true` / `false` |
+| `dd.compose.native` | `wud.compose.native` | `DD_WATCHER_<WATCHER_NAME>_COMPOSE_NATIVE` | `true` / `false` |
 | `dd.compose.threshold` | `wud.compose.threshold` | `DD_TRIGGER_DOCKERCOMPOSE_xxx_THRESHOLD` | `all` / `major` / `minor` / `patch` |
 
 Behavior notes:
@@ -411,13 +411,14 @@ Behavior notes:
 - That generated compose trigger is set with `requireinclude=true` and auto-appended to the container include list, so it only runs for explicitly associated containers.
 - `dd.compose.native` / `wud.compose.native` enables deriving compose file paths from native Compose labels (`com.docker.compose.project.config_files` and `com.docker.compose.project.working_dir`).
 - Compose-native/automatic detection requires the resolved compose file path to be valid inside the drydock container (same path that `docker compose` uses); if Compose was run from a host-only path, bind-mount that path into drydock at the same location or set `dd.compose.file` explicitly.
-- `DD_WATCHER_DOCKER_xxx_COMPOSENATIVE=true` enables compose-native lookup by default for all containers in that watcher (container label can still override).
+- `DD_WATCHER_<WATCHER_NAME>_COMPOSE_NATIVE=true` enables compose-native lookup by default for all containers in that watcher (container label can still override).
 - If `dd.compose.auto` is omitted, normal trigger default applies (`auto=true`).
 - You can set watcher-level defaults via env vars (per watcher):
   - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_BACKUP`
   - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_PRUNE`
   - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_DRYRUN`
   - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_AUTO`
+  - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_NATIVE`
   - `DD_WATCHER_<WATCHER_NAME>_COMPOSE_THRESHOLD`
   These defaults apply when corresponding compose labels are not present.
 

app/configuration/index.test.ts

@@ -48,6 +48,15 @@ test('getWatcherConfiguration should return configured watchers when overridden'
   });
 });
 
+test('getWatcherConfiguration should map COMPOSE_NATIVE into compose.native', async () => {
+  configuration.ddEnvVars.DD_WATCHER_LOCAL_COMPOSE_NATIVE = 'true';
+
+  const watcherConfigurations = configuration.getWatcherConfigurations();
+  expect(watcherConfigurations.local.compose.native).toStrictEqual('true');
+
+  delete configuration.ddEnvVars.DD_WATCHER_LOCAL_COMPOSE_NATIVE;
+});
+
 test('getWatcherConfiguration should map MAINTENANCE_WINDOW aliases', async () => {
   configuration.ddEnvVars.DD_WATCHER_LOCAL_MAINTENANCE_WINDOW = '0 2 * * *';
   configuration.ddEnvVars.DD_WATCHER_LOCAL_MAINTENANCE_WINDOW_TZ = 'Europe/Paris';

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

@@ -2920,10 +2920,12 @@ describe('Docker Watcher', () => {
       expect(result.triggerInclude).toBe('dockercompose.my-stack-test-container-native');
     });
 
-    test('should auto-include dockercompose trigger from compose-native labels when watcher composenative is enabled', async () => {
+    test('should auto-include dockercompose trigger from compose-native labels when watcher compose.native is enabled', async () => {
       const container = await setupContainerDetailTest(docker, {
         registerConfig: {
-          composenative: true,
+          compose: {
+            native: true,
+          },
         },
         container: {
           Image: 'nginx:1.0.0',
@@ -2948,7 +2950,9 @@ describe('Docker Watcher', () => {
     test('should not auto-include dockercompose trigger from compose-native labels when dd.compose.native is false', async () => {
       const container = await setupContainerDetailTest(docker, {
         registerConfig: {
-          composenative: true,
+          compose: {
+            native: true,
+          },
         },
         container: {
           Image: 'nginx:1.0.0',

app/watchers/providers/docker/Docker.ts

@@ -100,14 +100,14 @@ export interface DockerWatcherConfiguration extends ComponentConfiguration {
   watchdigest?: any;
   watchevents: boolean;
   watchatstart: boolean;
-  composenative: boolean;
   maintenancewindow?: string;
   maintenancewindowtz: string;
   compose?: {
     backup?: boolean;
     prune?: boolean;
     dryrun?: boolean;
     auto?: boolean;
+    native?: boolean;
     threshold?: string;
   };
   imgset?: Record<string, any>;
@@ -1159,7 +1159,6 @@ class Docker extends Watcher {
       watchdigest: this.joi.any(),
       watchevents: this.joi.boolean().default(true),
       watchatstart: this.joi.boolean().default(true),
-      composenative: this.joi.boolean().default(false),
       maintenancewindow: joi.string().cron().optional(),
       maintenancewindowtz: this.joi.string().default('UTC'),
       compose: this.joi
@@ -1168,6 +1167,7 @@ class Docker extends Watcher {
           prune: this.joi.boolean(),
           dryrun: this.joi.boolean(),
           auto: this.joi.boolean(),
+          native: this.joi.boolean(),
           threshold: this.joi.string(),
         })
         .default({}),
@@ -1371,7 +1371,7 @@ class Docker extends Watcher {
       const containerLabels = containerInStore.labels || {};
       const composeFilePath = getComposeFilePathFromLabels(
         containerLabels,
-        this.configuration.composenative,
+        Boolean(this.configuration.compose?.native),
       );
       if (!composeFilePath) {
         continue;
@@ -2156,7 +2156,7 @@ class Docker extends Watcher {
     const containerId = containerFound.id;
     const composeFilePath = getComposeFilePathFromLabels(
       labelsToApply,
-      this.configuration.composenative,
+      Boolean(this.configuration.compose?.native),
     );
     if (composeFilePath) {
       let dockercomposeTriggerId = this.composeTriggersByContainer[containerId];
@@ -2631,7 +2631,7 @@ class Docker extends Watcher {
     const containerLabels = container.Labels || {};
     const composeFilePath = getComposeFilePathFromLabels(
       containerLabels,
-      this.configuration.composenative,
+      Boolean(this.configuration.compose?.native),
     );
     const needsComposeTriggerCreation =
       !!composeFilePath && !this.composeTriggersByContainer[containerId];