Fix Firebase Release initialization from API response data (#473)

Author: priitlatt

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -14,13 +14,13 @@ repos:
       - id: black
         language_version: python3.11
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.12.10
     hooks:
       - id: ruff
         args: [ --fix ]
       - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.0
+    rev: v1.17.1
     hooks:
       - id: mypy
         additional_dependencies:

CHANGELOG.md

@@ -1,6 +1,12 @@
 Version 0.60.0
 -------------
 
+**Bugfixes**
+- Fix action `firebase-app-distribution-debug get-latest-build-version` by supporting new `updateTime` and `expireTime` timestamps for releases. [PR #473](https://github.com/codemagic-ci-cd/cli-tools/pull/473)
+
+Version 0.60.0
+-------------
+
 This release contains changes from [PR #469](https://github.com/codemagic-ci-cd/cli-tools/pull/469).
 
 **Features**

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemagic-cli-tools"
-version = "0.60.0"
+version = "0.60.1"
 description = "CLI tools used in Codemagic builds"
 readme = "README.md"
 authors = [

src/codemagic/__version__.py

@@ -1,5 +1,5 @@
 __title__ = "codemagic-cli-tools"
 __description__ = "CLI tools used in Codemagic builds"
-__version__ = "0.60.0.dev"
+__version__ = "0.60.1.dev"
 __url__ = "https://github.com/codemagic-ci-cd/cli-tools"
 __licence__ = "GNU General Public License v3.0"

src/codemagic/google/resources/firebase/release.py

@@ -4,6 +4,7 @@
 from datetime import datetime
 from datetime import timezone
 from typing import Optional
+from typing import overload
 
 from codemagic.google.resources import Resource
 
@@ -24,9 +25,32 @@ class Release(Resource):
     testingUri: str
     binaryDownloadUri: str
     releaseNotes: Optional[ReleaseNotes] = None
+    updateTime: Optional[datetime] = None
+    expireTime: Optional[datetime] = None
 
     def __post_init__(self):
-        if isinstance(self.createTime, str):
-            self.createTime = datetime.fromisoformat(self.createTime.rstrip("Z")).replace(tzinfo=timezone.utc)
+        self.createTime = self._parse_datetime(self.createTime)
+        self.updateTime = self._parse_datetime(self.updateTime)
+        self.expireTime = self._parse_datetime(self.expireTime)
         if isinstance(self.releaseNotes, dict):
             self.releaseNotes = ReleaseNotes(self.releaseNotes["text"])
+
+    @classmethod
+    @overload
+    def _parse_datetime(cls, timestamp: str) -> datetime: ...
+
+    @classmethod
+    @overload
+    def _parse_datetime(cls, timestamp: datetime) -> datetime: ...
+
+    @classmethod
+    @overload
+    def _parse_datetime(cls, timestamp: None) -> None: ...
+
+    @classmethod
+    def _parse_datetime(cls, timestamp: str | datetime | None) -> datetime | None:
+        if isinstance(timestamp, datetime):
+            return timestamp
+        elif isinstance(timestamp, str):
+            return datetime.fromisoformat(timestamp.rstrip("Z")).replace(tzinfo=timezone.utc)
+        return None

src/codemagic/google/resources/resource.py

@@ -1,15 +1,50 @@
 from __future__ import annotations
 
+import dataclasses
 import enum
 import re
-from typing import Any
-from typing import Tuple
+from abc import ABCMeta
+from typing import TYPE_CHECKING
 
 from codemagic.models import DictSerializable
 from codemagic.models import JsonSerializable
+from codemagic.models import JsonSerializableMeta
+from codemagic.utilities import log
 
+if TYPE_CHECKING:
+    from typing import Any
+    from typing import Dict
+    from typing import Mapping
+    from typing import Tuple
+    from typing import Type
+    from typing import TypeVar
+
+    R = TypeVar("R", bound="Resource")
+
+
+class ResourceAbcMeta(JsonSerializableMeta, ABCMeta):
+    pass
+
+
+@dataclasses.dataclass
+class Resource(DictSerializable, JsonSerializable, metaclass=ResourceAbcMeta):
+    @classmethod
+    def _get_defined_fields(cls, given_fields: Mapping[str, Any]) -> Dict[str, Any]:
+        logger = log.get_logger(cls, log_to_stream=False)
+        defined_fields = {f.name for f in dataclasses.fields(cls)}
+        fields = {}
+        for field_name, field_value in given_fields.items():
+            if field_name in defined_fields:
+                fields[field_name] = field_value
+            else:
+                logger.warning("Unknown field %r for resource %s", field_name, cls.__name__)
+        return fields
+
+    @classmethod
+    def from_api_response(cls: Type[R], api_response: Mapping[str, Any]) -> R:
+        defined_fields = cls._get_defined_fields(api_response)
+        return cls(**defined_fields)
 
-class Resource(DictSerializable, JsonSerializable):
     @staticmethod
     def _format_attribute_name(name: str) -> str:
         name = re.sub(r"([a-z])([A-Z])", r"\1 \2", name)

src/codemagic/google/services/firebase/releases_service.py

@@ -67,4 +67,4 @@ def list(
             next_page_token = response["nextPageToken"]
 
         self._logger.debug("Listed %d Firebase releases for app %r", len(firebase_releases[:limit]), app_id)
-        return [Release(**cast(dict, firebase_release)) for firebase_release in firebase_releases[:limit]]
+        return [Release.from_api_response(firebase_release) for firebase_release in firebase_releases[:limit]]

tests/google/resources/firebase/test_release.py

@@ -22,6 +22,9 @@ def test_release_string_representation(api_firebase_release: dict):
         Testing URI: https://appdistribution.firebase.google.com/testerapps/1:146661841143:android:a8d456e0c8b5e71bd11bf2/releases/78ruoe1t1uvr8
         Binary download URI: https://firebaseappdistribution.googleapis.com/app-binary-downloads/projects/146661841143/apps/1:146661841143:android:a8d456e0c8b5e71bd11bf2/releases/78ruoe1t1uvr8/binaries/fcdd844be2bd504ae7bb9d672731ddbfcd89c1419a9aa746a0bb6f67d3a1429d/app.apk?token=token
         Release notes:
-            Text: My release notes""",
+            Text: My release notes
+        Update time: 2025-08-25T07:04:39.166957+00:00
+        Expire time: 2026-01-22T07:04:23.208387+00:00
+        """,
     ).strip()
     assert str(release) == expected

tests/google/resources/mocks/firebase_release.json

@@ -8,5 +8,7 @@
     "binaryDownloadUri": "https://firebaseappdistribution.googleapis.com/app-binary-downloads/projects/146661841143/apps/1:146661841143:android:a8d456e0c8b5e71bd11bf2/releases/78ruoe1t1uvr8/binaries/fcdd844be2bd504ae7bb9d672731ddbfcd89c1419a9aa746a0bb6f67d3a1429d/app.apk?token=token",
     "releaseNotes": {
         "text": "My release notes"
-    }
+    },
+    "updateTime": "2025-08-25T07:04:39.166957+00:00",
+    "expireTime": "2026-01-22T07:04:23.208387+00:00"
 }

tests/google/resources/test_resource.py

@@ -0,0 +1,28 @@
+import dataclasses
+from unittest import mock
+
+import pytest
+
+from codemagic.google.resources import Resource
+
+
+@pytest.fixture
+def mock_logger():
+    mock_logger = mock.MagicMock()
+    with mock.patch("codemagic.utilities.log.get_logger", return_value=mock_logger):
+        yield mock_logger
+
+
+def test_from_api_response(mock_logger: mock.MagicMock):
+    @dataclasses.dataclass
+    class MyGoogleResource(Resource):
+        field: str
+
+    resource = MyGoogleResource.from_api_response(
+        {
+            "field": "value",
+            "undefined": 100,
+        },
+    )
+    assert resource == MyGoogleResource(field="value")
+    mock_logger.warning.assert_called_once_with("Unknown field %r for resource %s", "undefined", "MyGoogleResource")