cumulusci-plus 5.0.35__py3-none-any.whl → 5.0.45__py3-none-any.whl

cumulusci/tasks/salesforce/insert_record.py

@@ -1,6 +1,6 @@
 from cumulusci.core.exceptions import SalesforceException
-from cumulusci.core.utils import process_bool_arg, process_list_of_pairs_dict_arg
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
+from cumulusci.utils.options import CCIOptions, Field, MappingOption
 
 
 class InsertRecord(BaseSalesforceApiTask):
@@ -10,31 +10,30 @@ class InsertRecord(BaseSalesforceApiTask):
         cci task run insert_record --org dev -o object PermissionSet -o values Name:HardDelete,PermissionsBulkApiHardDelete:true
     """
 
-    task_options = {
-        "object": {"description": "An sObject type to insert", "required": True},
-        "values": {
-            "description": "Field names and values in the format 'aa:bb,cc:dd', or a YAML dict in cumulusci.yml.",
-            "required": True,
-        },
-        "tooling": {"description": "If True, use the Tooling API instead of REST API."},
-    }
+    class Options(CCIOptions):
+        object: str = Field(..., description="An sObject type to insert")
+        values: MappingOption = Field(
+            ...,
+            description="Field names and values in the format 'aa:bb,cc:dd', or a YAML dict in cumulusci.yml.",
+        )
+        tooling: bool = Field(
+            False, description="If True, use the Tooling API instead of REST API."
+        )
 
-    def _init_options(self, kwargs):
-        super()._init_options(kwargs)
-        self.values = process_list_of_pairs_dict_arg(self.options["values"])
-        self.object = self.options["object"]
-        self.use_tooling = process_bool_arg(self.options.get("tooling", False))
+    parsed_options: Options
 
     def _run_task(self):
-        api = self.sf if not self.use_tooling else self.tooling
-        object_handler = getattr(api, self.object)
+        api = self.sf if not self.parsed_options.tooling else self.tooling
+        object_handler = getattr(api, self.parsed_options.object)
 
-        rc = object_handler.create(self.values)
+        rc = object_handler.create(self.parsed_options.values)
         if rc["success"]:
-            self.logger.info(f"{self.object} record inserted: {rc['id']}")
+            self.logger.info(
+                f"{self.parsed_options.object} record inserted: {rc['id']}"
+            )
         else:
             # this will probably never execute, due to simple_salesforce throwing
             # an exception, but just in case:
             raise SalesforceException(
-                f"Could not insert {self.object} record : {rc['errors']}"
+                f"Could not insert {self.parsed_options.object} record : {rc['errors']}"
             )

cumulusci/tasks/salesforce/tests/test_enable_prediction.py

@@ -60,11 +60,12 @@ def mock_oauth():
                 "IsSandbox": False,
                 "InstanceName": "NA149",
                 "NamespacePrefix": None,
+                "Name": "Test Org",
             },
         )
         rsps.add(
             "GET",
-            url="https://test-dev-ed.my.salesforce.com/services/data/v63.0/tooling/query/?q=SELECT%20SubscriberPackage.Id,%20SubscriberPackage.Name,%20SubscriberPackage.NamespacePrefix,%20SubscriberPackageVersionId%20FROM%20InstalledSubscriberPackage",
+            url=f"https://test-dev-ed.my.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling/query/?q=SELECT%20SubscriberPackage.Id,%20SubscriberPackage.Name,%20SubscriberPackage.NamespacePrefix,%20SubscriberPackageVersionId%20FROM%20InstalledSubscriberPackage",
             json={"records": []},
             status=200,
         )
@@ -187,6 +188,7 @@ def test_run_task__namespaced_org(mock_oauth, task):
             "IsSandbox": False,
             "InstanceName": "NA149",
             "NamespacePrefix": "foo",
+            "Name": "Test Org",
         },
     )
 
@@ -203,7 +205,7 @@ def test_run_task__managed_org(mock_oauth, task):
 
     mock_oauth.remove(
         "GET",
-        url="https://test-dev-ed.my.salesforce.com/services/data/v63.0/tooling/query/?q=SELECT%20SubscriberPackage.Id,%20SubscriberPackage.Name,%20SubscriberPackage.NamespacePrefix,%20SubscriberPackageVersionId%20FROM%20InstalledSubscriberPackage",
+        url=f"https://test-dev-ed.my.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling/query/?q=SELECT%20SubscriberPackage.Id,%20SubscriberPackage.Name,%20SubscriberPackage.NamespacePrefix,%20SubscriberPackageVersionId%20FROM%20InstalledSubscriberPackage",
     )
 
     mock_oauth.add(