cumulusci 5.0.0.dev1__tar.gz → 5.0.0.dev3__tar.gz

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci
-Version: 5.0.0.dev1
+Version: 5.0.0.dev3
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/SFDO-Tooling/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html

cumulusci-5.0.0.dev3/cumulusci/__about__.py

@@ -0,0 +1 @@
+__version__ = "5.0.0.dev3"

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/cumulusci.yml

@@ -1496,7 +1496,7 @@ project:
         namespace:
         install_class:
         uninstall_class:
-        api_version: "66.0"
+        api_version: "67.0"
     git:
         default_branch: master
         prefix_feature: feature/

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/salesforce_api/rest_deploy.py

@@ -9,6 +9,11 @@ from typing import List, Union
 
 import requests
 
+from cumulusci.salesforce_api.exceptions import (
+    MetadataApiError,
+    MetadataComponentFailure,
+)
+
 PARENT_DIR_NAME = "metadata"
 
 
@@ -83,6 +88,10 @@ class RestDeploy:
             self.task.logger.error(
                 f"Deployment request failed with status code {response.status_code}"
             )
+            raise MetadataApiError(
+                f"Deployment request failed with status code {response.status_code}",
+                response,
+            )
 
     # Set the purge_on_delete attribute based on org type
     def _set_purge_on_delete(self, purge_on_delete):
@@ -112,10 +121,14 @@ class RestDeploy:
             if response_json["deployResult"]["status"] not in ["InProgress", "Pending"]:
                 # Handle the case when status has Failed
                 if response_json["deployResult"]["status"] == "Failed":
+                    error_log = ""
                     for failure in response_json["deployResult"]["details"][
                         "componentFailures"
                     ]:
-                        self.task.logger.error(self._construct_error_message(failure))
+                        error_message = self._construct_error_message(failure)
+                        self.task.logger.error(error_message)
+                        error_log += error_message + "\n"
+                    raise MetadataComponentFailure(error_log, response)
                 return
             time.sleep(5)
 

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/salesforce_api/tests/test_rest_deploy.py

@@ -4,6 +4,12 @@ import unittest
 import zipfile
 from unittest.mock import MagicMock, Mock, call, patch
 
+import pytest
+
+from cumulusci.salesforce_api.exceptions import (
+    MetadataApiError,
+    MetadataComponentFailure,
+)
 from cumulusci.salesforce_api.rest_deploy import RestDeploy
 from cumulusci.tests.util import CURRENT_SF_API_VERSION
 
@@ -90,15 +96,14 @@ class TestRestDeploy(unittest.TestCase):
         deployer = RestDeploy(
             self.mock_task, self.mock_zip, False, False, "NoTestRun", []
         )
-        deployer()
+        with pytest.raises(MetadataApiError) as excinfo:
+            deployer()
 
-        # Assertions to verify log messages
+        assert "500" in str(excinfo.value)
         assert (
             call("Deployment request failed with status code 500")
             in self.mock_logger.error.call_args_list
         )
-
-        # Assertions to verify API Calls
         mock_post.assert_called_once()
 
     # Test for deployment success but deploy status failure
@@ -142,9 +147,11 @@ class TestRestDeploy(unittest.TestCase):
         deployer = RestDeploy(
             self.mock_task, self.mock_zip, False, False, "NoTestRun", []
         )
-        deployer()
+        with pytest.raises(MetadataComponentFailure) as excinfo:
+            deployer()
 
-        # Assertions to verify log messages
+        assert "someproblem1" in str(excinfo.value)
+        assert "someproblem2" in str(excinfo.value)
         assert (
             call("Deployment request successful")
             in self.mock_logger.info.call_args_list
@@ -160,20 +167,17 @@ class TestRestDeploy(unittest.TestCase):
             in self.mock_logger.error.call_args_list
         )
 
-        # Assertions to verify API Calls
-        expected_get_calls = [
-            call(
-                f"https://example.com/services/data/v{CURRENT_SF_API_VERSION}/metadata/deployRequest/dummy_id?includeDetails=true",
-                headers={"Authorization": "Bearer dummy_token"},
-            ),
-            call(
-                f"https://example.com/services/data/v{CURRENT_SF_API_VERSION}/metadata/deployRequest/dummy_id?includeDetails=true",
-                headers={"Authorization": "Bearer dummy_token"},
-            ),
-        ]
-
         mock_post.assert_called_once()
-        mock_get.assert_has_calls(expected_get_calls, any_order=True)
+        mock_get.assert_has_calls(
+            [
+                call(
+                    f"https://example.com/services/data/v{CURRENT_SF_API_VERSION}/metadata/deployRequest/dummy_id?includeDetails=true",
+                    headers={"Authorization": "Bearer dummy_token"},
+                ),
+            ]
+            * 2,
+            any_order=True,
+        )
 
     # Test case for a deployment with a pending status
     @patch("requests.post")

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/schema/cumulusci.jsonschema.json

@@ -421,7 +421,7 @@
                 },
                 "namespaced": {
                     "title": "Namespaced",
-                    "type": "string"
+                    "type": "boolean"
                 },
                 "setup_flow": {
                     "title": "Setup Flow",

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/tasks/salesforce/update_profile.py

@@ -288,9 +288,11 @@ class ProfileGrantAllAccess(MetadataSingleEntityTransformTask, BaseSalesforceApi
                 # Look for page layout definitions in the record type
                 found_layout = False
                 for elem in tree.findall("layoutAssignments"):
-                    if elem.find("recordType").text == rt["record_type"]:
-                        elem.layout.text = layout_option
-                        found_layout = True
+                    record_type_elem = elem.find("recordType")
+                    if record_type_elem:
+                        if record_type_elem.text == rt["record_type"]:
+                            elem.layout.text = layout_option
+                            found_layout = True
 
                 if not found_layout:
                     assignment = tree.append(tag="layoutAssignments")

{cumulusci-5.0.0.dev1 → cumulusci-5.0.0.dev3}/cumulusci/utils/yaml/cumulusci_yml.py

@@ -147,7 +147,7 @@ class Project(CCIDictModel):
 class ScratchOrg(CCIDictModel):
     config_file: Path = None
     days: int = None
-    namespaced: str = None
+    namespaced: bool = None
     setup_flow: str = None
     noancestors: bool = None
     release: Literal["preview", "previous"] = None

cumulusci-5.0.0.dev1/cumulusci/__about__.py

@@ -1 +0,0 @@
-__version__ = "5.0.0.dev1"