Merge remote-tracking branch 'origin/master' into lucia/package_size_analyzer_improvements

Author: luciasanchezbella01

.coveragerc

@@ -55,3 +55,6 @@ exclude_lines =
 
     # Ignore non-runnable code
     if __name__ == .__main__.:
+
+    # Ignore TYPE_CHECKING blocks
+    if TYPE_CHECKING:

.cursor/rules/documentation.mdc

@@ -0,0 +1,12 @@
+---
+description: 
+globs: *md
+alwaysApply: false
+---
+## New files added
+When a new file is added make sure to make it available through the navigation configuration in the mkdocs file. If it is not clear where it should go, ask.
+
+## Style
+Maintain style consistent. The style should be technical and professional.
+
+Do not start lines/paragraphs with an inline code.

.cursor/rules/python-type-hinting.mdc

@@ -0,0 +1,29 @@
+---
+description: 
+globs: **/*.py
+alwaysApply: false
+---
+## Generating new code
+When generating python code, always add type hinting to the methods. Use modern syntaxis, for example, instead of using `Optional[str]` use `str | None` and instead of using `List[str]` use `list[str]`.
+
+If a method yields a value but we are not returning anything or we do not accept anything sent to the generator, it is better to type the method as Iterator to explicitely expose the API of the method as simply something the caller can iterate over.
+
+## Refactoring code
+When refactoring existing code, never add type hints to method that are not type hinted unless asked explicitely.
+
+## The case of AnyStr
+AnyStr is normally used to define the type of a variable that can be either a string or bytes. This is soon to be deprecated and, instead, type parameter lits are a better solution. If AnyStr is used as type of several arguments in a given method signature, it is better to use type parameter lists and define the function as a generic function.
+
+```python
+# Soon to be deprecated
+def func(a: AnySTr, b: AnyStr):
+    pass
+
+# Preferred
+def func[T: (str, bytes)](a: T, b: T):
+    pass
+```
+
+This way, whether a and b are either strings or bytes, they cannot be mixed. 
+
+If a single argument is present in the function, `str | bytes` is preferred.

.github/CODEOWNERS

@@ -302,6 +302,11 @@ datadog_checks_base/datadog_checks/base/checks/windows/              @DataDog/wi
 /metabase/manifest.json                                             @DataDog/saas-integrations @DataDog/documentation
 /metabase/assets/logs/                                              @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend
 
+/microsoft_dns/                                                     @DataDog/agent-integrations
+/microsoft_dns/*.md                                                 @DataDog/agent-integrations @DataDog/documentation
+/microsoft_dns/manifest.json                                        @DataDog/agent-integrations @DataDog/documentation
+/microsoft_dns/assets/logs/                                         @DataDog/agent-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
+
 /microsoft_sysmon/                                                  @DataDog/agent-integrations
 /microsoft_sysmon/*.md                                              @DataDog/agent-integrations @DataDog/documentation
 /microsoft_sysmon/manifest.json                                     @DataDog/agent-integrations @DataDog/documentation

.github/workflows/config/labeler.yml

@@ -403,6 +403,8 @@ integration/mesos_slave:
 - mesos_slave/**/*
 integration/metabase:
 - metabase/**/*
+integration/microsoft_dns:
+- microsoft_dns/**/*
 integration/microsoft_sysmon:
 - microsoft_sysmon/**/*
 integration/milvus:

.gitignore

@@ -124,4 +124,7 @@ benchmark_*.svg
 .kube
 
 ## Direnv
-.envrc
+.envrc
+
+## Local overrides for ddev
+.ddev.toml

datadog_checks_dev/datadog_checks/dev/tooling/constants.py

@@ -27,6 +27,8 @@
     '-x': 'here',
 }
 
+# If we add or remove a new repo choice, make sure to keep the
+# enum in ddev/src/ddev/utils/metadata.py in sync.
 REPO_CHOICES = {
     'core': 'integrations-core',
     'extras': 'integrations-extras',

ddev/changelog.d/19877.added

@@ -0,0 +1 @@
+Allow ddev to override configuration values from a local .ddev.toml file found either in the local directory or any parent directory. This allows modifying ddev behavior when running it in different directories.

ddev/src/ddev/cli/__init__.py

@@ -95,9 +95,9 @@ def ddev(
 
     if config_file:
         app.config_file.path = Path(config_file).resolve()
-        if not app.config_file.path.is_file():
+        if not app.config_file.global_path.is_file():
             app.abort(f'The selected config file `{str(app.config_file.path)}` does not exist.')
-    elif not app.config_file.path.is_file():
+    elif not app.config_file.global_path.is_file():
         if app.verbose:
             app.display_waiting('No config file found, creating one with default settings now...')
 
@@ -107,8 +107,14 @@ def ddev(
                 app.display_success('Success! Please see `ddev config`.')
         except OSError:  # no cov
             app.abort(
-                f'Unable to create config file located at `{str(app.config_file.path)}`. Please check your permissions.'
+                f'Unable to create config file located at `{str(app.config_file.global_path)}`.'
+                'Please check your permissions.'
             )
+
+    if app.verbose:
+        if app.config_file.overrides_available():
+            app.display_info('Local override config file found. Values from this file will override global values.')
+
     if org is not None:
         app.config.org = org
 

ddev/src/ddev/cli/application.py

@@ -9,7 +9,7 @@
 
 from ddev.cli.terminal import Terminal
 from ddev.config.constants import AppEnvVars, ConfigEnvVars, VerbosityLevels
-from ddev.config.file import ConfigFile, RootConfig
+from ddev.config.file import ConfigFileWithOverrides, RootConfig
 from ddev.repo.core import Repository
 from ddev.utils.fs import Path
 from ddev.utils.github import GitHubManager
@@ -22,7 +22,7 @@ def __init__(self, exit_func, *args, **kwargs):
         self.platform = Platform(self.output)
         self.__exit_func = exit_func
 
-        self.config_file = ConfigFile()
+        self.config_file = ConfigFileWithOverrides()
         self.quiet = self.verbosity < VerbosityLevels.INFO
         self.verbose = self.verbosity > VerbosityLevels.INFO
 
@@ -35,7 +35,7 @@ def __init__(self, exit_func, *args, **kwargs):
 
     @property
     def config(self) -> RootConfig:
-        return self.config_file.model
+        return self.config_file.combined_model
 
     @property
     def repo(self) -> Repository:

ddev/src/ddev/cli/config/__init__.py

@@ -7,6 +7,7 @@
 from ddev.cli.config.edit import edit
 from ddev.cli.config.explore import explore
 from ddev.cli.config.find import find
+from ddev.cli.config.override import override
 from ddev.cli.config.restore import restore
 from ddev.cli.config.set import set_value
 from ddev.cli.config.show import show
@@ -23,3 +24,4 @@ def config():
 config.add_command(restore)
 config.add_command(set_value)
 config.add_command(show)
+config.add_command(override)

ddev/src/ddev/cli/config/edit.py

@@ -1,11 +1,25 @@
 # (C) Datadog, Inc. 2024-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 import click
 
+from ddev.config.file import DDEV_TOML
+
+if TYPE_CHECKING:
+    from ddev.cli.application import Application
+
 
 @click.command(short_help='Edit the config file with your default editor')
+@click.option('--overrides', is_flag=True, help=f'Edit the local config file ({DDEV_TOML})')
 @click.pass_obj
-def edit(app):
+def edit(app: Application, overrides: bool):
     """Edit the config file with your default editor."""
-    click.edit(filename=str(app.config_file.path))
+    if overrides and not app.config_file.overrides_available():
+        app.abort('No local config file found.')
+
+    file_to_edit = app.config_file.overrides_path if overrides else app.config_file.path
+    click.edit(filename=str(file_to_edit))

ddev/src/ddev/cli/config/find.py

@@ -4,8 +4,10 @@
 import click
 
 
-@click.command(short_help='Show the location of the config file')
+@click.command(short_help="Show the location of the config file")
 @click.pass_obj
 def find(app):
     """Show the location of the config file."""
     app.display(str(app.config_file.path))
+    if app.config_file.overrides_available():
+        app.output(f"----- Overrides applied from {app.config_file.pretty_overrides_path}", style="yellow")

ddev/src/ddev/cli/config/override.py

@@ -0,0 +1,95 @@
+# (C) Datadog, Inc. 2025-present
+# All rights reserved
+# Licensed under a 3-clause BSD style license (see LICENSE)
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import click
+
+if TYPE_CHECKING:
+    from ddev.cli.application import Application
+
+
+def repo_to_override(app: Application) -> str:
+    from ddev.utils.metadata import (
+        InvalidMetadataError,
+        PyProjectNotFoundError,
+        RepoNotFoundError,
+        ValidRepo,
+        pyproject_metadata,
+    )
+
+    try:
+        metadata = pyproject_metadata()
+        if metadata is None:
+            raise RepoNotFoundError()
+        repo = metadata.repo.value
+    except (PyProjectNotFoundError, RepoNotFoundError):
+        app.display_error(
+            "The current repo could not be inferred. Either this is not a repository or the root of "
+            "the repo is missing the ddev tool configuration in its pyproject.toml file."
+        )
+
+        repo = app.prompt(
+            "What repo are you trying to override? ",
+            type=click.Choice([item.value for item in ValidRepo]),
+            show_choices=True,
+        )
+    except InvalidMetadataError as e:
+        from rich.markup import escape
+
+        # Ensure escaping to avoid rich reading the table name as style markup
+        app.display_error(escape(str(e)))
+        app.abort()
+    except Exception as e:
+        app.display_error(f"An unexpected error occurred: {e}")
+        app.abort()
+
+    return repo
+
+
+@click.command()
+@click.pass_obj
+def override(app: Application):
+    """
+    Overrides the repo configuration with a `.ddev.toml` file in the current working directory.
+
+    The command tries to identify the repo you are in by reading the `repo` field in the `[tool.ddev]` table in
+    the `pyproject.toml` file located at the root of your git repository.
+
+    If the current directory is not part of a git repository, the repository root does not have a `pyproject.toml`
+    file, or the file exists but has no `[tool.ddev]` table, you will be prompted to specify which repo
+    configuration to override.
+    """
+    from rich.syntax import Syntax
+
+    from ddev.config.file import DDEV_TOML, RootConfig, deep_merge_with_list_handling
+    from ddev.config.utils import scrub_config
+    from ddev.utils.fs import Path
+    from ddev.utils.toml import dumps_toml_data
+
+    app.config_file.overrides_path = Path.cwd() / DDEV_TOML
+    repo = repo_to_override(app)
+
+    local_repo_config = {
+        "repo": repo,
+        "repos": {repo: str(app.config_file.overrides_path.resolve().parent)},
+    }
+
+    if app.config_file.overrides_path.exists():
+        app.display_info("Local config file already exists. Updating...")
+        local_config = app.config_file.overrides_model.raw_data
+        config = deep_merge_with_list_handling(local_config, local_repo_config)
+    else:
+        config = local_repo_config
+
+    app.config_file.overrides_model = RootConfig(config)
+    app.config_file.update()
+
+    app.display_success(f"Local repo configuration added in {app.config_file.pretty_overrides_path}\n")
+    app.display("Local config content:")
+    scrub_config(app.config_file.overrides_model.raw_data)
+    app.output(
+        Syntax(dumps_toml_data(app.config_file.overrides_model.raw_data).rstrip(), "toml", background_color="default")
+    )

ddev/src/ddev/cli/config/restore.py

@@ -1,12 +1,26 @@
 # (C) Datadog, Inc. 2024-present
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 import click
 
+if TYPE_CHECKING:
+    from ddev.cli.application import Application
+
 
 @click.command(short_help='Restore the config file to default settings')
 @click.pass_obj
-def restore(app):
+def restore(app: Application):
     """Restore the config file to default settings."""
     app.config_file.restore()
     app.display_success('Settings were successfully restored.')
+    if app.config_file.overrides_available():
+        delete_overrides = click.confirm(
+            f"Overrides file found in '{app.config_file.overrides_path}'. Do you want to delete it?"
+        )
+        if delete_overrides:
+            app.config_file.overrides_path.unlink()
+            app.display_success('Overrides deleted.')