Clean up AgentStatus

pinterest · Feb 26, 2025 · 72eb2de · 72eb2de
1 parent e364b00
commit 72eb2de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 83 deletions.
diff --git a/deploy-agent/deployd/types/agent_status.py b/deploy-agent/deployd/types/agent_status.py
diff --git a/deploy-agent/deployd/types/ping_report.py b/deploy-agent/deployd/types/ping_report.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from deployd.types.agent_status import AgentStatus
-
 
 class PingReport(object):
     def __init__(self, jsonValue=None) -> None:
@@ -38,12 +36,7 @@ def __init__(self, jsonValue=None) -> None:
             self.deployId = jsonValue.get("deployId")
             self.envId = jsonValue.get("envId")
             self.deployStage = jsonValue.get("deployStage")
-
-            if isinstance(jsonValue.get("status"), int):
-                self.status = AgentStatus._VALUES_TO_NAMES[jsonValue.get("status")]
-            else:
-                self.status = jsonValue.get("status")
-
+            self.status = jsonValue.get("status")
             self.envName = jsonValue.get("envName")
             self.stageName = jsonValue.get("stageName")
             self.stageType = jsonValue.get("stageType")

diff --git a/deploy-agent/deployd/types/ping_request.py b/deploy-agent/deployd/types/ping_request.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import json
-from deployd.types.agent_status import AgentStatus
 
 
 class PingRequest(object):
@@ -77,12 +76,7 @@ def to_json(self):
             ping_report["deployId"] = report.deployId
             ping_report["envId"] = report.envId
             ping_report["deployStage"] = report.deployStage
-
-            if isinstance(report.status, int):
-                ping_report["agentStatus"] = AgentStatus._VALUES_TO_NAMES[report.status]
-            else:
-                ping_report["agentStatus"] = report.status
-
+            ping_report["agentStatus"] = report.status
             ping_report["errorCode"] = report.errorCode
             ping_report["errorMessage"] = report.errorMessage
             ping_report["failCount"] = report.failCount

diff --git a/deploy-agent/tests/unit/deploy/types/test_ping_report.py b/deploy-agent/tests/unit/deploy/types/test_ping_report.py
@@ -1,4 +1,4 @@
-from deployd.common.types import DeployStage
+from deployd.common.types import AgentStatus, DeployStage
 from deployd.types.ping_report import PingReport
 import unittest
 
@@ -8,7 +8,7 @@ def test_init_enums(self):
         report = PingReport(
             jsonValue={
                 "deployStage": DeployStage.UNKNOWN,
-                "status": 0,
+                "status": AgentStatus.SUCCEEDED,
             }
         )
         self.assertEqual(report.deployStage, "UNKNOWN")
@@ -17,7 +17,7 @@ def test_init_enums(self):
         report = PingReport(
             jsonValue={
                 "deployStage": DeployStage.STOPPED,
-                "status": 7,
+                "status": AgentStatus.TOO_MANY_RETRY,
             }
         )
         self.assertEqual(report.deployStage, "STOPPED")

diff --git a/deploy-agent/tests/unit/deploy/types/test_ping_request.py b/deploy-agent/tests/unit/deploy/types/test_ping_request.py
@@ -1,4 +1,4 @@
-from deployd.common.types import DeployStage
+from deployd.common.types import AgentStatus, DeployStage
 from deployd.types.ping_request import PingRequest
 from deployd.types.ping_report import PingReport
 import unittest
@@ -10,7 +10,7 @@ def test_to_json_enums(self):
             PingReport(
                 {
                     "deployStage": DeployStage.POST_RESTART,
-                    "status": 4,
+                    "status": AgentStatus.SCRIPT_FAILED,
                 }
             ),
             PingReport(