Modify enum values to avoid having a second mapping

Author: AAraKKe

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/src/ddev/cli/config/override.py

@@ -20,20 +20,11 @@ def repo_to_override(app: Application) -> str:
         pyproject_metadata,
     )
 
-    repos_map = {
-        ValidRepo.CORE: "core",
-        ValidRepo.EXTRAS: "extras",
-        ValidRepo.INTERNAL: "internal",
-        ValidRepo.AGENT: "agent",
-        ValidRepo.MARKETPLACE: "marketplace",
-        ValidRepo.INTEGRATIONS_INTERNAL_CORE: "integrations-internal-core",
-    }
-
     try:
         metadata = pyproject_metadata()
         if metadata is None:
             raise RepoNotFoundError()
-        repo = repos_map[metadata.repo]
+        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 "
@@ -42,7 +33,7 @@ def repo_to_override(app: Application) -> str:
 
         repo = app.prompt(
             "What repo are you trying to override? ",
-            type=click.Choice(list(repos_map.values())),
+            type=click.Choice([item.value for item in ValidRepo]),
             show_choices=True,
         )
     except InvalidMetadataError as e:

ddev/src/ddev/utils/metadata.py

@@ -10,10 +10,10 @@
 
 
 class ValidRepo(Enum):
-    CORE = "integrations-core"
-    EXTRAS = "integrations-extras"
-    INTERNAL = "integrations-internal"
-    AGENT = "datadog-agent"
+    CORE = "core"
+    EXTRAS = "extras"
+    INTERNAL = "internal"
+    AGENT = "agent"
     MARKETPLACE = "marketplace"
     INTEGRATIONS_INTERNAL_CORE = "integrations-internal-core"
 

ddev/tests/cli/config/test_override.py

@@ -16,7 +16,7 @@
 def repo_with_ddev_tool_config(repository_as_cwd: ClonedRepo) -> Generator[ClonedRepo, None, None]:
     pyproject_path = repository_as_cwd.path / "pyproject.toml"
     pyproject = load_toml_file(pyproject_path)
-    pyproject["tool"]["ddev"] = {"repo": "integrations-core"}
+    pyproject["tool"]["ddev"] = {"repo": "core"}
     dump_toml_data(pyproject, pyproject_path)
 
     yield repository_as_cwd
@@ -162,4 +162,4 @@ def test_misconfigured_pyproject_fails(
     result = ddev("config", "override")
     assert result.exit_code == 1
     assert "Invalid ddev metadata found in pyproject.toml" in result.output
-    assert "[tool.ddev.repo] is 'wrong-repo': Input should be 'integrations-core'" in result.output
+    assert "[tool.ddev.repo] is 'wrong-repo': Input should be 'core'" in result.output

pyproject.toml

@@ -110,7 +110,7 @@ ban-relative-imports = "all"
 "tests/models/config_models/deprecations.py" = ["E501"]
 
 [tool.ddev]
-repo = "integrations-core"
+repo = "core"
 
 [project]
 name = "integrations-core"