cumulusci 3.61.0.dev2__tar.gz → 3.61.0.dev3__tar.gz

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cumulusci
-Version: 3.61.0.dev2
+Version: 3.61.0.dev3
 Summary: Build and release tools for Salesforce developers
 Home-page: https://github.com/SFDO-Tooling/CumulusCI
 Author: Salesforce.org

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/salesforce_api/package_zip.py

@@ -307,8 +307,8 @@ class MetadataPackageZipBuilder(BasePackageZipBuilder):
             Package = metadata_tree.parse(package_xml)
             for mdtype in (
                 "FeatureParameterInteger",
-                "FeatureParameterString",
                 "FeatureParameterBoolean",
+                "FeatureParameterDate",
             ):
                 section = Package.find("types", name=mdtype)
                 if section is not None:

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/schema/cumulusci.jsonschema.json

@@ -388,6 +388,10 @@
                     "default": "mdapi",
                     "enum": ["sfdx", "mdapi"],
                     "type": "string"
+                },
+                "custom": {
+                    "title": "Custom",
+                    "type": "object"
                 }
             },
             "additionalProperties": false

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/tasks/salesforce/org_settings.py

@@ -25,6 +25,7 @@ class DeployOrgSettings(Deploy):
     task_options = {
         "definition_file": {"description": "sfdx scratch org definition file"},
         "settings": {"description": "A dict of settings to apply"},
+        "object_settings": {"description": "A dict of objectSettings to apply"},
         "api_version": {"description": "API version used to deploy the settings"},
     }
 
@@ -38,21 +39,24 @@ class DeployOrgSettings(Deploy):
 
     def _run_task(self):
         settings = {}
+        object_settings = {}
         if self.options.get("definition_file"):
             with open(self.options["definition_file"], "r") as f:
                 scratch_org_definition = json.load(f)
                 settings = scratch_org_definition.get("settings", {})
+                object_settings = scratch_org_definition.get("objectSettings", {})
 
         dictmerge(settings, self.options.get("settings", {}))
+        dictmerge(object_settings, self.options.get("object_settings", {}))
 
-        if not settings:
+        if not settings and not object_settings:
             self.logger.info("No settings provided to deploy.")
             return
 
         api_version = (
             self.options.get("api_version") or self.org_config.latest_api_version
         )
-        with build_settings_package(settings, None, api_version) as path:
+        with build_settings_package(settings, object_settings, api_version) as path:
             self.options["path"] = path
             return super()._run_task()
 

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/tasks/salesforce/tests/test_org_settings.py

@@ -76,6 +76,50 @@ class TestDeployOrgSettings:
 </OtherSettings>"""
         )
 
+    def test_run_task__json_only__with_org_settings(self):
+        with temporary_dir() as d:
+            with open("dev.json", "w") as f:
+                json.dump(
+                    {
+                        "settings": {
+                            "orgPreferenceSettings": {"s1DesktopEnabled": True},
+                            "otherSettings": {
+                                "nested": {
+                                    "boolValue": True,
+                                    "stringValue": "string",
+                                },
+                            },
+                        },
+                        "objectSettings": {"foo__c": {"sharingModel": "Private"}},
+                    },
+                    f,
+                )
+            path = os.path.join(d, "dev.json")
+            task_options = {"definition_file": path, "api_version": "48.0"}
+            task = create_task(DeployOrgSettings, task_options)
+            task.api_class = Mock()
+            task()
+
+        package_zip = task.api_class.call_args[0][1]
+        zf = zipfile.ZipFile(io.BytesIO(base64.b64decode(package_zip)), "r")
+        # The context manager's output is tested separately, below.
+        assert (
+            readtext(zf, "package.xml")
+            == """<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types>
+        <members>Foo__c</members>
+        <name>CustomObject</name>
+    </types>
+    <types>
+        <members>OrgPreference</members>
+        <members>Other</members>
+        <name>Settings</name>
+    </types>
+    <version>48.0</version>
+</Package>"""
+        )
+
     def test_run_task__settings_only(self):
         settings = {
             "orgPreferenceSettings": {"s1DesktopEnabled": True},

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/utils/yaml/cumulusci_yml.py

@@ -140,6 +140,7 @@ class Project(CCIDictModel):
     dependencies: List[Dict[str, str]] = None  # TODO
     dependency_resolutions: DependencyResolutions = None
     source_format: Literal["sfdx", "mdapi"] = "mdapi"
+    custom: Dict = None
 
 
 class ScratchOrg(CCIDictModel):
@@ -275,7 +276,10 @@ def _log_yaml_errors(logger, errors: List[ErrorDict]):
         logger.warning("  %s\n    %s", loc, error["msg"])
     if not has_shown_yaml_error_message:
         logger.error(
-            "NOTE: These warnings may become errors in future versions of CumulusCI."
+            "NOTE: These warnings will become errors on Sept 30, 2022.\n\n"
+            "If you need to put non-standard data in your CumulusCI file "
+            "(for some form of project-specific setting), put it in "
+            "the `project: custom:` section of `cumulusci.yml` ."
         )
         logger.error(
             "If you think your YAML has no error, please report the bug to the CumulusCI team."

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci/utils/yaml/tests/test_cumulusci_yml.py

@@ -173,6 +173,29 @@ class TestCumulusciYml:
         assert not caplog.text, caplog.text
         assert out == {}
 
+    def test_custom(self, caplog):
+        yaml = """project:
+                    custom:
+                        foo: X
+                        bar:
+                            - a
+                            - b
+                            - c
+                        baz:
+                            a: aa
+                            b: bb
+                            c: cc
+"""
+        cciyml = cci_safe_load(StringIO(yaml))
+        assert not caplog.text
+        assert cciyml["project"]["custom"]["foo"] == "X"
+        assert cciyml["project"]["custom"]["bar"] == ["a", "b", "c"]
+        assert cciyml["project"]["custom"]["baz"] == {
+            "a": "aa",
+            "b": "bb",
+            "c": "cc",
+        }
+
 
 @pytest.fixture
 def cci_yml_file():

cumulusci-3.61.0.dev3/cumulusci/version.txt

@@ -0,0 +1 @@
+3.61.0.dev3

{cumulusci-3.61.0.dev2 → cumulusci-3.61.0.dev3}/cumulusci.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cumulusci
-Version: 3.61.0.dev2
+Version: 3.61.0.dev3
 Summary: Build and release tools for Salesforce developers
 Home-page: https://github.com/SFDO-Tooling/CumulusCI
 Author: Salesforce.org

cumulusci-3.61.0.dev2/cumulusci/version.txt

@@ -1 +0,0 @@
-3.61.0.dev2