diff options
| -rw-r--r-- | buildscripts/blackduck_hub.py | 15 | ||||
| -rw-r--r-- | etc/pip/components/resmoke.req | 2 | ||||
| -rw-r--r-- | etc/third_party_components.yml | 18 |
3 files changed, 19 insertions, 16 deletions
diff --git a/buildscripts/blackduck_hub.py b/buildscripts/blackduck_hub.py index 76d768920a0..fb7f5eeeac2 100644 --- a/buildscripts/blackduck_hub.py +++ b/buildscripts/blackduck_hub.py @@ -547,7 +547,9 @@ def _query_blackduck(): LOGGER.info("Getting version components from blackduck") bom_components = hub.get_version_components(version) - components = [Component.parse(hub, comp) for comp in bom_components["items"]] + components = [ + Component.parse(hub, comp) for comp in bom_components["items"] if comp['ignored'] is False + ] BLACKDUCK_PROJECT_URL = version["_meta"]["href"] @@ -654,17 +656,17 @@ def _get_default(list1, idx, default): class TableWriter: """Generate an ASCII table that summarizes the results of all the reports generated.""" - def __init__(self, headers: [str]): + def __init__(self, headers: List[str]): """Init writer.""" self._headers = headers self._rows = [] - def add_row(self, row: [str]): + def add_row(self, row: List[str]): """Add a row to the table.""" self._rows.append(row) @staticmethod - def _write_row(col_sizes: [int], row: [str], writer: io.StringIO): + def _write_row(col_sizes: List[int], row: List[str], writer: io.StringIO): writer.write("|") for idx, row_value in enumerate(row): writer.write(" ") @@ -707,7 +709,7 @@ class TableData: self._rows[col].append(value) - def write(self, headers: [str], writer: io.StringIO): + def write(self, headers: List[str], writer: io.StringIO): """Write table data as nice prettty table to writer.""" tw = TableWriter(headers) @@ -1120,7 +1122,8 @@ class Analyzer: # Rather then constantly have to supress this in Black Duck itself which will generate false positives # We filter ourself our of the list of components. self.black_duck_components = [ - comp for comp in self.black_duck_components if not comp.name == "MongoDB" + comp for comp in self.black_duck_components + if not (comp.name == "MongoDB" or comp.name == "WiredTiger") ] # Remove duplicate Black Duck components. We only care about the component with highest version number diff --git a/etc/pip/components/resmoke.req b/etc/pip/components/resmoke.req index 27c87f80f35..d3d4c55507e 100644 --- a/etc/pip/components/resmoke.req +++ b/etc/pip/components/resmoke.req @@ -10,5 +10,5 @@ ocspbuilder == 0.10.2 grpcio == 1.37.0; platform_machine == "x86_64" or platform_machine == "aarch64" or platform_machine == "arm64" grpcio-tools == 1.37.0; platform_machine == "x86_64" or platform_machine == "aarch64" or platform_machine == "arm64" googleapis-common-protos == 1.53.0 -blackduck == 0.0.51 +blackduck == 1.0.1 PyGithub == 1.53 diff --git a/etc/third_party_components.yml b/etc/third_party_components.yml index 62b94e73677..551ecb54eb5 100644 --- a/etc/third_party_components.yml +++ b/etc/third_party_components.yml @@ -105,7 +105,7 @@ components: is_test_only: true team_owner: "Wiredtiger" - fmt: + fmtlib/fmt: homepage_url: https://fmt.dev open_hub_url: https://www.openhub.net/p/fmtlib_fmt release_monitoring_id: 11526 @@ -154,6 +154,14 @@ components: team_owner: "Execution" # Note: IntelRDFPMathLib exists in Black Duck, but not OpenHub + jbeder/yaml-cpp: + homepage_url: https://github.com/jbeder/yaml-cpp + open_hub_url: https://www.openhub.net/p/jbeder_yaml-cpp + release_monitoring_id: 5284 + local_directory_path: src/third_party/yaml-cpp-0.6.2 + team_owner: "Security" + upgrade_suppression: TODO SERVER-48258 + JSON-Schema-Test-Suite: homepage_url: https://github.com/json-schema-org/JSON-Schema-Test-Suite open_hub_url: https://www.openhub.net/p/json-schema-test-suite @@ -320,14 +328,6 @@ components: is_test_only: true team_owner: "Wiredtiger" - yaml-cpp: - homepage_url: https://github.com/jbeder/yaml-cpp - open_hub_url: https://www.openhub.net/p/jbeder_yaml-cpp - release_monitoring_id: 5284 - local_directory_path: src/third_party/yaml-cpp-0.6.2 - team_owner: "Security" - upgrade_suppression: TODO SERVER-48258 - yhirose/cpp-peglib: homepage_url: https://github.com/yhirose/cpp-peglib open_hub_url: N/A |