From 31bcae6f5a8fe17f0eebec68009986837f90732c Mon Sep 17 00:00:00 2001 From: Evan Krall Date: Wed, 21 Oct 2020 16:22:14 -0700 Subject: [PATCH] Have status API return full-length git SHAs in active_shas for marathon apps, to be consistent with kubernetes. PAASTA-17026 --- paasta_tools/api/views/instance.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paasta_tools/api/views/instance.py b/paasta_tools/api/views/instance.py index 20e2834743..ca72e2fabd 100644 --- a/paasta_tools/api/views/instance.py +++ b/paasta_tools/api/views/instance.py @@ -69,6 +69,7 @@ from paasta_tools.mesos_tools import select_tasks_by_id from paasta_tools.mesos_tools import TaskNotFound from paasta_tools.utils import calculate_tail_lines +from paasta_tools.utils import get_git_sha_from_dockerurl from paasta_tools.utils import NoConfigurationForServiceError from paasta_tools.utils import NoDockerImageError from paasta_tools.utils import TimeoutError @@ -212,9 +213,8 @@ def get_active_shas_for_marathon_apps( ) -> Set[Tuple[str, str]]: ret = set() for (app, client) in marathon_apps_with_clients: - _, _, git_sha, config_sha = marathon_tools.deformat_job_id(app.id) - if git_sha.startswith("git"): - git_sha = git_sha[len("git") :] + git_sha = get_git_sha_from_dockerurl(app.container.docker.image, long=True) + _, _, _, config_sha = marathon_tools.deformat_job_id(app.id) if config_sha.startswith("config"): config_sha = config_sha[len("config") :] ret.add((git_sha, config_sha))