Merge pull request #3989 from Yelp/u/jfong/fix_paasta_status_bouncest…

…atus Fix backwards "Bouncing to" status
Yelp · Dec 2, 2024 · f715cd8 · f715cd8
2 parents f65acaf + 095823b
commit f715cd8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/paasta_tools/cli/cmds/status.py b/paasta_tools/cli/cmds/status.py
@@ -1100,7 +1100,9 @@ def get_instance_state(status: InstanceStatusKubernetesV2) -> str:
             else:
                 return PaastaColors.green("Running")
         else:
-            versions = sorted(status.versions, key=lambda x: x.create_timestamp)
+            versions = sorted(
+                status.versions, key=lambda x: x.create_timestamp, reverse=True
+            )
             git_shas = {r.git_sha for r in versions}
             config_shas = {r.config_sha for r in versions}
             bouncing_to = []

diff --git a/tests/cli/test_cmds_status.py b/tests/cli/test_cmds_status.py
@@ -1820,8 +1820,10 @@ def test_running(self, mock_kubernetes_status_v2):
         assert remove_ansi_escape_sequences(instance_state) == "Running"
 
     def test_bouncing(self, mock_kubernetes_status_v2):
+        old_version = mock_kubernetes_status_v2.versions[0]
         new_version = paastamodels.KubernetesVersion(
-            create_timestamp=1.0,
+            # ensure creation is after current version
+            create_timestamp=old_version.create_timestamp + 1000,
             git_sha="bbb111",
             config_sha="config111",
             ready_replicas=0,
@@ -1832,9 +1834,29 @@ def test_bouncing(self, mock_kubernetes_status_v2):
         instance_state = remove_ansi_escape_sequences(instance_state)
         assert instance_state == "Bouncing to bbb111, config111"
 
+    def test_bouncing_ordering(self, mock_kubernetes_status_v2):
+        old_version = mock_kubernetes_status_v2.versions[0]
+        new_version = paastamodels.KubernetesVersion(
+            # ensure creation is _before_ current version
+            create_timestamp=old_version.create_timestamp - 1000,
+            git_sha="bbb111",
+            config_sha="config111",
+            ready_replicas=0,
+        )
+        mock_kubernetes_status_v2.versions.append(new_version)
+
+        instance_state = get_instance_state(mock_kubernetes_status_v2)
+        instance_state = remove_ansi_escape_sequences(instance_state)
+        assert instance_state != "Bouncing to bbb111, config111"
+        assert (
+            instance_state
+            == f"Bouncing to {old_version.git_sha[:8]}, {old_version.config_sha}"
+        )
+
     def test_bouncing_git_sha_change_only(self, mock_kubernetes_status_v2):
+        old_version = mock_kubernetes_status_v2.versions[0]
         new_version = paastamodels.KubernetesVersion(
-            create_timestamp=1.0,
+            create_timestamp=old_version.create_timestamp + 1000,
             git_sha="bbb111",
             config_sha=mock_kubernetes_status_v2.versions[0].config_sha,
             ready_replicas=0,