collect_deps: Make project names clearer Bug: b/522852278 Change-Id: I149acb6cafaeb53c2a78def76b839c859445db1b Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/428292
diff --git a/recipes/collect_deps.py b/recipes/collect_deps.py index bece122..8d5624a 100644 --- a/recipes/collect_deps.py +++ b/recipes/collect_deps.py
@@ -16,6 +16,7 @@ from __future__ import annotations import json +import urllib.parse from collections.abc import Iterator from google.protobuf import json_format @@ -131,9 +132,10 @@ project_name = builder_name if remote: - project_name = remote.split('/')[-1] - if project_name.endswith('.git'): - project_name = project_name[:-4] + parsed = urllib.parse.urlparse(remote) + netloc = parsed.netloc.removesuffix('.googlesource.com') + path = parsed.path.removesuffix('.git') + project_name = f'{netloc}{path}' for dep in deps: deps_map.setdefault(dep, []).append(project_name) @@ -229,15 +231,15 @@ post_process.PropertyEquals, 'deps_map', { - 'pw_analog': ['project-a'], - 'pw_assert': ['project-a'], + 'pw_analog': ['pigweed/project-a'], + 'pw_assert': ['pigweed/project-a'], }, ), api.post_check( - post_process.MustRun, 'dependencies.pw_analog.project-a' + post_process.MustRun, 'dependencies.pw_analog.pigweed/project-a' ), api.post_check( - post_process.MustRun, 'dependencies.pw_assert.project-a' + post_process.MustRun, 'dependencies.pw_assert.pigweed/project-a' ), api.post_check( post_process.SummaryMarkdown, @@ -292,8 +294,8 @@ post_process.PropertyEquals, 'deps_map', { - 'pw_analog': ['project-a'], - 'pw_assert': ['project-a'], + 'pw_analog': ['pigweed/project-a'], + 'pw_assert': ['pigweed/project-a'], }, ), api.post_process(post_process.DropExpectation), @@ -337,8 +339,8 @@ post_process.PropertyEquals, 'deps_map', { - 'pw_analog': ['project-a'], - 'pw_assert': ['project-a', 'project-c-deps'], + 'pw_analog': ['pigweed/project-a'], + 'pw_assert': ['pigweed/project-a', 'project-c-deps'], 'pw_log': ['project-c-deps'], }, ), @@ -402,8 +404,8 @@ post_process.PropertyEquals, 'deps_map', { - 'pw_analog': ['proj1'], - 'pw_assert': ['proj2'], + 'pw_analog': ['pigweed/proj1'], + 'pw_assert': ['pigweed/proj2'], }, ), api.post_process(post_process.DropExpectation),