codemagic-cli-tools 0.51.1__tar.gz → 0.52.0__tar.gz

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemagic-cli-tools
-Version: 0.51.1
+Version: 0.52.0
 Summary: CLI tools used in Codemagic builds
 Home-page: https://github.com/codemagic-ci-cd/cli-tools
 License: GPL-3.0-or-later

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/pyproject.toml

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

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/__version__.py

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

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/__version__.py-e

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

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/apple/resources/resource.py

@@ -355,3 +355,6 @@ class Resource(LinkedResourceData, metaclass=PrettyNameAbcMeta):
             value = self._format_attribute_value(attribute_name, value)
             s += f"\n{name}: {value}"
         return s
+
+    def __repr__(self):
+        return f'<{self.__class__.__name__}: "{self.id}">'

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/tools/app_store_connect/abstract_base_action.py

@@ -334,6 +334,7 @@ class AbstractBaseAction(
     def expire_build_submitted_for_review(
         self,
         application_id: ResourceId,
+        platform: Optional[Platform] = None,
         should_print: bool = False,
     ) -> Optional[Build]:
         from .action_groups import AppsActionGroup
@@ -439,6 +440,7 @@ class AbstractBaseAction(
         processing_state: Optional[BuildProcessingState] = None,
         beta_review_state: Optional[Union[BetaReviewState, Sequence[BetaReviewState]]] = None,
         build_version_number: Optional[int] = None,
+        platform: Optional[Platform] = None,
         should_print: bool = True,
     ) -> List[Build]:
         from .action_groups import BuildsActionGroup

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/tools/app_store_connect/action_groups/apps_action_group.py

@@ -28,6 +28,7 @@ from ..arguments import AppStoreVersionArgument
 from ..arguments import ArgumentGroups
 from ..arguments import BuildArgument
 from ..arguments import BundleIdArgument
+from ..arguments import CommonArgument
 from ..arguments import ReviewSubmissionArgument
 
 if TYPE_CHECKING:
@@ -197,11 +198,13 @@ class AppsActionGroup(AbstractBaseAction, metaclass=ABCMeta):
     @cli.action(
         "expire-build-submitted-for-review",
         AppArgument.APPLICATION_ID_RESOURCE_ID,
+        CommonArgument.PLATFORM,
         action_group=AppStoreConnectActionGroup.APPS,
     )
     def expire_build_submitted_for_review(
         self,
         application_id: ResourceId,
+        platform: Optional[Platform] = None,
         should_print: bool = False,
     ) -> Optional[Build]:
         """
@@ -217,6 +220,7 @@ class AppsActionGroup(AbstractBaseAction, metaclass=ABCMeta):
             application_id=application_id,
             not_expired=True,
             beta_review_state=states_to_cancel,
+            platform=platform,
             should_print=should_print,
         )
         try:

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/tools/app_store_connect/action_groups/builds_action_group.py

@@ -22,6 +22,7 @@ from codemagic.apple.resources import Locale
 from codemagic.apple.resources import PreReleaseVersion
 from codemagic.apple.resources import ResourceId
 from codemagic.apple.resources.enums import BetaReviewState
+from codemagic.apple.resources.enums import Platform
 from codemagic.cli import Argument
 from codemagic.cli import Colors
 
@@ -76,6 +77,7 @@ class BuildsActionGroup(AbstractBaseAction, metaclass=ABCMeta):
         processing_state: Optional[BuildProcessingState] = None,
         beta_review_state: Optional[Union[BetaReviewState, Sequence[BetaReviewState]]] = None,
         build_version_number: Optional[int] = None,
+        platform: Optional[Platform] = None,
         should_print: bool = True,
     ) -> List[Build]:
         """
@@ -95,6 +97,7 @@ class BuildsActionGroup(AbstractBaseAction, metaclass=ABCMeta):
             beta_app_review_submission_beta_review_state=beta_review_state,
             version=build_version_number,
             pre_release_version_version=pre_release_version,
+            pre_release_version_platform=platform,
         )
         return self._list_resources(
             builds_filter,

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/tools/app_store_connect/actions/submit_to_testflight_action.py

@@ -56,8 +56,13 @@ class SubmitToTestFlightAction(AbstractBaseAction, metaclass=ABCMeta):
             build = self.wait_until_build_is_processed(build, max_processing_minutes)
 
         if expire_build_submitted_for_review:
+            pre_release_version = self.api_client.builds.read_pre_release_version(build)
             self.logger.info(Colors.BLUE("\nExpire previous build before creating submission"))
-            self.expire_build_submitted_for_review(application_id=app.id, should_print=False)
+            self.expire_build_submitted_for_review(
+                application_id=app.id,
+                platform=pre_release_version.attributes.platform if pre_release_version else None,
+                should_print=False,
+            )
 
         return self.create_beta_app_review_submission(build.id)
 

{codemagic_cli_tools-0.51.1 → codemagic_cli_tools-0.52.0}/src/codemagic/tools/app_store_connect/arguments.py

@@ -1612,6 +1612,7 @@ class ArgumentGroups:
         BuildArgument.NOT_EXPIRED,
         BuildArgument.PRE_RELEASE_VERSION,
         BuildArgument.PROCESSING_STATE,
+        CommonArgument.PLATFORM,
     )
     PACKAGE_UPLOAD_ARGUMENTS = (
         PublishArgument.ENABLE_PACKAGE_VALIDATION,

codemagic_cli_tools-0.52.0/src/codemagic/tools/google_play/argument_types.py

@@ -0,0 +1,18 @@
+import json
+
+from codemagic import cli
+
+
+class CredentialsArgument(cli.EnvironmentArgumentValue[str]):
+    environment_variable_key = "GCLOUD_SERVICE_ACCOUNT_CREDENTIALS"
+
+    @classmethod
+    def _is_valid(cls, value: str) -> bool:
+        try:
+            decoded = json.loads(value)
+            return decoded["type"] == "service_account"
+        except (ValueError, TypeError, KeyError):
+            # ValueError - Call to json.loads fails
+            # TypeError - Decoded object is not subscriptable, i.e. not a dictionary
+            # KeyError - Key "type" is missing from decoded dictionary
+            return False

codemagic_cli_tools-0.52.0/tests/tools/google_play/test_argument_types.py

@@ -0,0 +1,35 @@
+import pytest
+from codemagic.tools.google_play.argument_types import CredentialsArgument
+
+
+def test_valid_google_play_credentials():
+    argument_value = r"""{
+        "type": "service_account",
+        "project_id": "project-id",
+        "private_key_id": "private-key-id",
+        "private_key": "-----BEGIN PRIVATE KEY-----\n...\n-----END PRIVATE KEY-----\n",
+        "client_email": "codemagic@project-id.iam.gserviceaccount.com",
+        "client_id": "client-id",
+        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        "token_uri": "https://oauth2.googleapis.com/token",
+        "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/project-id.iam.gserviceaccount.com"
+    }"""
+    assert CredentialsArgument._is_valid(argument_value)
+
+
+@pytest.mark.parametrize(
+    "argument_value",
+    (
+        "{}",
+        "1",
+        '"lorem ipsum"',
+        "[]",
+        "[1, 2, 3]",
+        '{"type": "private_key"}',
+        "{",
+        '"uncompleted string',
+    ),
+)
+def test_invalid_google_play_credentials(argument_value: str):
+    assert CredentialsArgument._is_valid(argument_value) is False

codemagic_cli_tools-0.51.1/src/codemagic/tools/google_play/argument_types.py

@@ -1,16 +0,0 @@
-import json
-
-from codemagic import cli
-
-
-class CredentialsArgument(cli.EnvironmentArgumentValue[str]):
-    environment_variable_key = "GCLOUD_SERVICE_ACCOUNT_CREDENTIALS"
-
-    @classmethod
-    def _is_valid(cls, value: str) -> bool:
-        try:
-            json_content = json.loads(value)
-        except json.decoder.JSONDecodeError:
-            return False
-        else:
-            return json_content.get("type") == "service_account"