Skip to content

Commit b76c5f5

Browse files
authored
[MINPROC-2319] remove the integration exception mapper (DataDog#20697)
* remove the integration exception mapper * changelog * changelog * remove exception mapper * changelog * fmt * fmt
1 parent 51baca5 commit b76c5f5

4 files changed

Lines changed: 2 additions & 20 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[MINPROC-2319] remove the integration exception mapper

datadog_checks_dev/datadog_checks/dev/tooling/manifest_utils.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
"ddev",
2020
]
2121

22-
# The manifest.json file can contain the source_type_name field that the validation uses to validate different parts
23-
# of the integration. For example Zabbix was renamed to Zabbix (Community Version) in the manifest.json file, so we
24-
# need to map it back to Zabbix for validations to pass.
25-
EXCEPTION_MAPPER = {
26-
'Zabbix (Community Version)': 'Zabbix',
27-
'Scalr (Community Version)': 'Scalr',
28-
'Zscaler (Community Version)': 'Zscaler',
29-
}
30-
3122

3223
class Manifest:
3324
"""
@@ -149,7 +140,6 @@ def get_path(self, path):
149140

150141
def get_display_name(self):
151142
display_name = self._manifest_json.get_path("/assets/integration/source_type_name")
152-
display_name = EXCEPTION_MAPPER.get(display_name, display_name)
153143
return display_name
154144

155145
def get_app_id(self):

ddev/changelog.d/20697.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[MINPROC-2319] remove the integration exception mapper

ddev/src/ddev/integration/core.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,6 @@
1616
from ddev.integration.manifest import Manifest
1717
from ddev.repo.config import RepositoryConfig
1818

19-
# The manifest.json file can contain the source_type_name field that the validation uses to validate different parts
20-
# of the integration. Zabbix was renamed to Zabbix (Community Version) in the manifest.json file, so we need to map
21-
# it back to Zabbix for validations to pass
22-
EXCEPTION_MAPPER = {
23-
'Zabbix (Community Version)': 'Zabbix',
24-
'Scalr (Community Version)': 'Scalr',
25-
'Zscaler (Community Version)': 'Zscaler',
26-
}
27-
2819

2920
class Integration:
3021
def __init__(self, path: Path, repo_path: Path, repo_config: RepositoryConfig):
@@ -104,7 +95,6 @@ def display_name(self) -> str:
10495
@cached_property
10596
def normalized_display_name(self) -> str:
10697
display_name = self.manifest.get('/assets/integration/source_type_name', self.name)
107-
display_name = EXCEPTION_MAPPER.get(display_name, display_name)
10898
normalized_integration = re.sub("[^0-9A-Za-z-]", "_", display_name)
10999
normalized_integration = re.sub("_+", "_", normalized_integration)
110100
normalized_integration = normalized_integration.strip("_")

0 commit comments

Comments
 (0)