cumulusci-plus 5.0.25__tar.gz → 5.0.27__tar.gz

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cumulusci-plus
-Version: 5.0.25
+Version: 5.0.27
 Summary: Build and release tools for Salesforce developers
 Project-URL: Homepage, https://github.com/jorgesolebur/CumulusCI
 Project-URL: Changelog, https://cumulusci.readthedocs.io/en/stable/history.html
@@ -55,6 +55,7 @@ Requires-Dist: sqlalchemy<2
 Requires-Dist: xmltodict
 Provides-Extra: select
 Requires-Dist: annoy; extra == 'select'
+Requires-Dist: boto3; extra == 'select'
 Requires-Dist: numpy; extra == 'select'
 Requires-Dist: pandas; extra == 'select'
 Requires-Dist: scikit-learn; extra == 'select'
@@ -128,17 +129,13 @@ license](https://github.com/SFDO-Tooling/CumulusCI/blob/main/LICENSE)
 and is not covered by the Salesforce Master Subscription Agreement.
 
 <!-- Changelog -->
-## v5.0.25 (2025-10-09)
-
+## v5.0.27 (2025-10-24)
 <!-- Release notes generated using configuration in .github/release.yml at main -->
 
 ## What's Changed
-
 ### Changes
+* Fix default secret provider to load from env when not set. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#103](https://github.com/jorgesolebur/CumulusCI/pull/103)
+* PM-2264 - Supporting env variables in when conditions in tasks by [@jorgesolebur](https://github.com/jorgesolebur) in [#102](https://github.com/jorgesolebur/CumulusCI/pull/102)
 
-- PM-2198 Add NAMESPACE injection in assign_permission_sets by [@jorgesolebur](https://github.com/jorgesolebur) in [#87](https://github.com/jorgesolebur/CumulusCI/pull/87)
-- Add update named credential and external credential tasks by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#89](https://github.com/jorgesolebur/CumulusCI/pull/89)
-- Fix external credential POST or PUT format. by [@rupeshjSFDC](https://github.com/rupeshjSFDC) in [#92](https://github.com/jorgesolebur/CumulusCI/pull/92)
-- PM-2203 Create a CCI task for CCI to wrap SFDMU and apply namespace token replacement before executing sf sfdmu run command by [@jorgesolebur](https://github.com/jorgesolebur) in [#88](https://github.com/jorgesolebur/CumulusCI/pull/88)
 
-**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.24...v5.0.25
+**Full Changelog**: https://github.com/jorgesolebur/CumulusCI/compare/v5.0.26...v5.0.27

cumulusci_plus-5.0.27/cumulusci/__about__.py

@@ -0,0 +1 @@
+__version__ = "5.0.27"

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/cli/tests/test_error.py

@@ -98,7 +98,9 @@ Environment Info: Rossian / x68_46
         )
         webbrowser_open.assert_called_once_with(expected_gist_url)
 
-    @pytest.mark.skipif(sys.version_info > (3, 11), reason="requires python3.10 or higher")
+    @pytest.mark.skipif(
+        sys.version_info > (3, 11), reason="requires python3.10 or higher"
+    )
     @mock.patch("cumulusci.cli.error.platform")
     @mock.patch("cumulusci.cli.error.sys")
     @mock.patch("cumulusci.cli.error.datetime")

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/core/flowrunner.py

@@ -53,6 +53,7 @@ Option values/overrides can be passed in at a number of levels, in increasing or
 
 import copy
 import logging
+import os
 from collections import defaultdict
 from operator import attrgetter
 from typing import (
@@ -543,6 +544,7 @@ class FlowCoordinator:
             self._jinja2_context = {
                 "project_config": project_config,
                 "org_config": org_config,
+                "env": dict(os.environ),
             }
             self._context_project_config = project_config
             self._context_org_config = org_config

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/core/github.py

@@ -189,7 +189,7 @@ def validate_service(options: dict, keychain) -> dict:
     server_domain = options.get("server_domain", None)
 
     gh = _determine_github_client(server_domain, {"token": token})
-    if type(gh) == GitHubEnterprise:
+    if isinstance(gh, GitHubEnterprise):
         validate_gh_enterprise(server_domain, keychain)
     try:
         authed_user = gh.me()

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/core/sfdx.py

@@ -14,10 +14,12 @@ import sarge
 
 # Fix for TextIOWrapper flush issue with sarge.Capture objects
 # Add flush method to sarge.Capture to prevent AttributeError during garbage collection
-if not hasattr(sarge.Capture, 'flush'):
+if not hasattr(sarge.Capture, "flush"):
+
     def _capture_flush(self):
         """No-op flush method for sarge.Capture compatibility with TextIOWrapper"""
         pass
+
     sarge.Capture.flush = _capture_flush
 
 from cumulusci.core.enums import StrEnum

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/core/tests/test_flowrunner.py

@@ -542,6 +542,106 @@ class TestSimpleTestFlowCoordinator(AbstractFlowCoordinatorTest):
         flow.run(self.org_config)
         assert len(flow.results) == 0
 
+    def test_run__when_condition_with_env_var_true(self):
+        """A flow step runs when env var condition evaluates to True"""
+        import os
+
+        with mock.patch.dict(os.environ, {"RUN_TASK": "true"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('RUN_TASK') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
+    def test_run__when_condition_with_env_var_false(self):
+        """A flow step is skipped when env var condition evaluates to False"""
+        import os
+
+        with mock.patch.dict(os.environ, {"RUN_TASK": "false"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('RUN_TASK') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 0
+
+    def test_run__when_condition_with_env_var_default(self):
+        """A flow step uses default value when env var is not set"""
+        import os
+
+        # Make sure the env var is not set
+        if "UNDEFINED_VAR" in os.environ:
+            del os.environ["UNDEFINED_VAR"]
+        flow_config = FlowConfig(
+            {
+                "steps": {
+                    1: {
+                        "task": "pass_name",
+                        "when": "env.get('UNDEFINED_VAR', 'default') == 'default'",
+                    }
+                }
+            }
+        )
+        flow = FlowCoordinator(self.project_config, flow_config)
+        flow.run(self.org_config)
+        assert len(flow.results) == 1
+
+    def test_run__when_condition_with_env_var_and_org_config(self):
+        """A flow step can combine env vars with org_config in when condition"""
+        import os
+
+        with mock.patch.dict(os.environ, {"DEPLOY_TO_SCRATCH": "true"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "org_config.scratch and env.get('DEPLOY_TO_SCRATCH') == 'true'",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            # Set org_config.scratch to True
+            self.org_config.config["scratch"] = True
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
+    def test_run__when_condition_with_missing_env_var_is_none(self):
+        """A flow step can check if env var exists using 'is not none'"""
+        import os
+
+        # Test when var is set
+        with mock.patch.dict(os.environ, {"MY_VAR": "value"}):
+            flow_config = FlowConfig(
+                {
+                    "steps": {
+                        1: {
+                            "task": "pass_name",
+                            "when": "env.get('MY_VAR') is not none",
+                        }
+                    }
+                }
+            )
+            flow = FlowCoordinator(self.project_config, flow_config)
+            flow.run(self.org_config)
+            assert len(flow.results) == 1
+
     def test_run__task_raises_exception_fail(self):
         """A flow aborts when a task raises an exception"""
 

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/cumulusci.yml

@@ -761,6 +761,14 @@ tasks:
         description: Get or set environment variables.
         class_path: cumulusci.tasks.utility.env_management.EnvManagement
         group: Utilities
+    secrets_to_dotenv:
+        description: Get all environment variables from a target JSON file and generates a .env file that can be used to set up the environment variables for the deployment
+        class_path: cumulusci.tasks.utility.secretsToEnv.SecretsToEnv
+        group: Utilities
+    directory_recreator:
+        description: Remove and recreate a directory
+        class_path: cumulusci.tasks.utility.directoryRecreator.DirectoryRecreator
+        group: Utilities
     download_extract:
         description: Downloads files and folders from a VCS repository.
         class_path: cumulusci.tasks.vcs.download_extract.DownloadExtract

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/robotframework/pageobjects/ObjectManagerPageObject.py

@@ -203,7 +203,7 @@ class ObjectManagerPage(BasePage):
 
             except Exception as e:
                 self.builtin.log(
-                    f"on try #{tries+1} we caught this error: {e}", "DEBUG"
+                    f"on try #{tries + 1} we caught this error: {e}", "DEBUG"
                 )
                 self.builtin.sleep("1 second")
                 last_error = e

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/salesforce_api/rest_deploy.py

@@ -138,7 +138,7 @@ class RestDeploy:
 
     # Construct an error message from deployment failure details
     def _construct_error_message(self, failure):
-        error_message = f"{str.upper(failure['problemType'])} in file {failure['fileName'][len(PARENT_DIR_NAME)+len('/'):]}: {failure['problem']}"
+        error_message = f"{str.upper(failure['problemType'])} in file {failure['fileName'][len(PARENT_DIR_NAME) + len('/'):]}: {failure['problem']}"
 
         if failure["lineNumber"] and failure["columnNumber"]:
             error_message += (

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/apex/anon.py

@@ -4,7 +4,7 @@ from cumulusci.core.exceptions import (
     SalesforceException,
     TaskOptionsError,
 )
-from cumulusci.core.utils import process_bool_arg, determine_managed_mode
+from cumulusci.core.utils import determine_managed_mode, process_bool_arg
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 from cumulusci.utils import in_directory, inject_namespace
 from cumulusci.utils.http.requests_utils import safe_json_from_response

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/apex/testrunner.py

@@ -10,7 +10,12 @@ from cumulusci.core.exceptions import (
     CumulusCIException,
     TaskOptionsError,
 )
-from cumulusci.core.utils import decode_to_unicode, process_bool_arg, process_list_arg, determine_managed_mode
+from cumulusci.core.utils import (
+    decode_to_unicode,
+    determine_managed_mode,
+    process_bool_arg,
+    process_list_arg,
+)
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 from cumulusci.utils.http.requests_utils import safe_json_from_response
 

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/bulkdata/extract.py

@@ -213,7 +213,6 @@ class ExtractData(SqlAlchemyMixin, BaseSalesforceApiTask):
             IsPersonAccount_index = columns.index(mapping.fields["IsPersonAccount"])
 
             def strip_name_field(record):
-                nonlocal Name_index, IsPersonAccount_index
                 if record[IsPersonAccount_index].lower() == "true":
                     record[Name_index] = ""
                 return record

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/bulkdata/tests/test_load.py

@@ -2715,8 +2715,6 @@ class TestLoadData:
         chunks_index = 0
 
         def fetchmany(batch_size):
-            nonlocal chunks_index
-
             assert 200 == batch_size
 
             # _generate_contact_id_map_for_person_accounts should break if fetchmany returns falsy.

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/bulkdata/tests/test_select_utils.py

@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 
 from cumulusci.tasks.bulkdata.select_utils import (
@@ -618,6 +620,10 @@ def test_vectorize_records_mixed_numerical_boolean_categorical():
     not PANDAS_AVAILABLE or not OPTIONAL_DEPENDENCIES_AVAILABLE,
     reason="requires optional dependencies for annoy",
 )
+@pytest.mark.skipif(
+    sys.platform == "darwin" and sys.version_info[:2] in [(3, 11), (3, 13)],
+    reason="Annoy library has known compatibility issues on macOS with Python 3.11 and 3.13",
+)
 def test_annoy_post_process():
     # Test data
     load_records = [["Alice", "Engineer"], ["Bob", "Doctor"]]

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/metadata_etl/base.py

@@ -7,7 +7,11 @@ from cumulusci.core.config import TaskConfig
 from cumulusci.core.enums import StrEnum
 from cumulusci.core.exceptions import CumulusCIException, TaskOptionsError
 from cumulusci.core.tasks import BaseSalesforceTask
-from cumulusci.core.utils import process_bool_arg, process_list_arg, determine_managed_mode
+from cumulusci.core.utils import (
+    determine_managed_mode,
+    process_bool_arg,
+    process_list_arg,
+)
 from cumulusci.salesforce_api.metadata import ApiRetrieveUnpackaged
 from cumulusci.tasks.metadata.package import PackageXmlGenerator
 from cumulusci.utils import inject_namespace
@@ -74,8 +78,8 @@ class BaseMetadataETLTask(BaseSalesforceTask, metaclass=ABCMeta):
                 self.options["namespaced_org"] or False
             )
         else:
-            self.options["namespaced_org"] = (
-                bool(namespace) and namespace == getattr(self.org_config, 'namespace', None)
+            self.options["namespaced_org"] = bool(namespace) and namespace == getattr(
+                self.org_config, "namespace", None
             )
 
     def _inject_namespace(self, text):

cumulusci_plus-5.0.27/cumulusci/tasks/push/README.md

@@ -0,0 +1,57 @@
+# Push Upgrade API Scripts
+
+These scripts are designed to work with the Salesforce Push Upgrade API (in Pilot in Winter 16) which exposes new objects via the Tooling API that allow interacting with push upgrades in a packaging org. The main purpose of these scripts is to use the Push Upgrade API to automate push upgrades through Jenkins.
+
+# push_api.py - Python Wrapper for Push Upgrade API
+
+This python file provides wrapper classes around the Tooling API objects and abstracts interaction with them and their related data to make writing scripts easier. All the other scripts in this directory use the SalesforcePushApi wrapper to interact with the Tooling API.
+
+Initializing the SalesforcePushApi wrapper can be done with the following python code:
+
+    push_api = SalesforcePushApi(sf_user, sf_pass, sf_serverurl)
+
+You can also pass two optional keyword args to the initialization to control the wrapper's behavior
+
+-   **lazy**: A list of objects that should be lazily looked up. Currently, the only implementations for this are 'jobs' and 'subscribers'. If either are included in the list, they will be looked up on demand when needed by a referenced object. For example, if you are querying all jobs and subscribers is not set to lazy, all subscribers will first be retrieved. If lazy is enabled, subscriber orgs will only be retrieved when trying to resolve references for a particular job. Generally, if you have a lot of subscribers and only expect your script to need to lookup a small number of them, enabling lazy for subscribers will reduce api calls and cause the script to run faster.
+
+-   **default_where**: A dictionary with Push Upgrade API objects as key and a value containing a SOQL WHERE clause statement which is applied to all queries against the object to effectively set the universe for a given object. For example:
+    default_where = {'PackageSubscriber': "OrgType = 'Sandbox'"}
+
+In the example above, the wrapper would never return a PackageSubscriber which is not a Sandbox org.
+
+# Push Scripts
+
+## Common Environment Variables
+
+The push scripts are all designed to receive their arguments via environment variables. The following are common amongst all of the Push Scripts
+
+-   **SF_USERNAME**: The Salesforce username for the packaging org
+-   **SF_PASSWORD**: The Salesforce password and security token for the packaging org
+-   **SF_SERVERURL**: The login url for the Salesforce packaging org.
+
+## get_version_id.py
+
+Takes a namespace and version string and looks up the given version. Returns the version's Salesforce Id.
+
+The script handles parsing the version number string into a SOQL query against the MetadataPackageVersion object with the correct MajorVersion, MinorVersion, PatchVersion, ReleaseState, and BuildNumber (i.e. Beta number).
+
+### Required Environment Variables
+
+-   **NAMESPACE**: The Package's namespace prefix
+-   **VERSION_NUMBER**: The version number string.
+
+## orgs_for_push.py
+
+Takes a MetadataPackageVersion Id and optionally a where clause to filter Subscribers and returns a list of OrgId's one per line which can be fed into the schedule_push.py script.
+
+### Required Environment Variables
+
+-   **VERSION**: The MetadataPackageVersion Id of the version you want to push upgrade. This is used to look for all users not on the version or a newer version
+
+### Optional Environment Variables
+
+-   **SUBSCRIBER_WHERE**: An extra filter to be applied to all Subscriber queries. For example, setting this to OrgType = 'Sandbox' would find all Sandbox orgs eligible for push upgrade to the specified version
+
+## failed_orgs_for_push.py
+
+Takes a PackagePushRequest Id and optionally a where clause to filter Subscribers and returns a list of OrgId's one per line for all orgs which failed the

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/release_notes/README.md

@@ -13,25 +13,25 @@ Start the section with `# Critical Changes` followed by your content
 For example:
 
     This won't be included
-    
+
     # Critical Changes
-    
+
     This will be included in Critical Changes
-    
+
 ## Changes
 
-The Changes section is where you should list off any changes worth highlight to users in the release notes.  This section should always include instructions for users for any post-upgrade tasks they need to perform to enable new functionality.  For example, users should be told to grant permissions and add new CustomFields to layouts.
+The Changes section is where you should list off any changes worth highlight to users in the release notes. This section should always include instructions for users for any post-upgrade tasks they need to perform to enable new functionality. For example, users should be told to grant permissions and add new CustomFields to layouts.
 
 Start the section with `# Changes` followed by your content
 
 For example:
 
     This won't be included
-    
+
     # Changes
-    
+
     This will be included in Changes
-    
+
 ## Issues Closed
 
 The Issues Closed section is where you should link to any closed issues that should be listed in the release notes.
@@ -41,9 +41,9 @@ Start the section with `# Changes` followed by your content
 For example:
 
     This won't be included
-    
+
     # Issues Closed
-    
+
     Fixes #102
     resolves #100
     This release closes #101
@@ -55,9 +55,9 @@ Would output:
     #100: Title of Issue 100
     #101: Title of Issue 101
     #102: Title of Issue 102
-    
+
 A few notes about how issues are parsed:
 
-* The parser uses the same format as Github: https://help.github.com/articles/closing-issues-via-commit-messages/
-* The parser searches for all issue numbers and sorts them by their integer value, looks up their title, and outputs a formatted line with the issue number and title for each issue.
-* The parser ignores everything else in the line that is not an issue number.  Anything that is not an issue number will not appear in the rendered release notes
+-   The parser uses the same format as Github: https://help.github.com/articles/closing-issues-via-commit-messages/
+-   The parser searches for all issue numbers and sorts them by their integer value, looks up their title, and outputs a formatted line with the issue number and title for each issue.
+-   The parser ignores everything else in the line that is not an issue number. Anything that is not an issue number will not appear in the rendered release notes

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/robotframework/tests/test_robotframework.py

@@ -826,7 +826,7 @@ class TestRobotPerformanceKeywords:
             elapsed_times.sort()
 
             assert elapsed_times[1:] == [53, 11655.9, 18000.0]
-            assert float(elapsed_times[0]) < 3
+            assert float(elapsed_times[0]) < 3 or float(elapsed_times[0]) <= 3.0
 
     def test_metrics(self):
         pattern = "Max_CPU_Percent: "

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/Deploy.py

@@ -12,7 +12,11 @@ from cumulusci.core.source_transforms.transforms import (
     SourceTransform,
     SourceTransformList,
 )
-from cumulusci.core.utils import process_bool_arg, process_list_arg, determine_managed_mode
+from cumulusci.core.utils import (
+    determine_managed_mode,
+    process_bool_arg,
+    process_list_arg,
+)
 from cumulusci.salesforce_api.metadata import ApiDeploy, ApiRetrieveUnpackaged
 from cumulusci.salesforce_api.package_zip import MetadataPackageZipBuilder
 from cumulusci.salesforce_api.rest_deploy import RestDeploy

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/composite.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from cumulusci.cli.ui import CliTable
 from cumulusci.core.exceptions import SalesforceException
-from cumulusci.core.utils import process_bool_arg, process_list_arg, determine_managed_mode
+from cumulusci.core.utils import determine_managed_mode, process_list_arg
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 from cumulusci.utils import inject_namespace
 

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/custom_settings_wait.py

@@ -3,7 +3,7 @@
 from simple_salesforce.exceptions import SalesforceError
 
 from cumulusci.core.exceptions import TaskOptionsError
-from cumulusci.core.utils import process_bool_arg, determine_managed_mode
+from cumulusci.core.utils import determine_managed_mode, process_bool_arg
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 
 

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/enable_prediction.py

@@ -1,7 +1,11 @@
 from simple_salesforce.exceptions import SalesforceError
 
 from cumulusci.core.exceptions import CumulusCIException
-from cumulusci.core.utils import process_bool_arg, process_list_arg, determine_managed_mode
+from cumulusci.core.utils import (
+    determine_managed_mode,
+    process_bool_arg,
+    process_list_arg,
+)
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 from cumulusci.utils import inject_namespace
 from cumulusci.utils.http.requests_utils import safe_json_from_response

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/sourcetracking.py

@@ -312,7 +312,7 @@ def retrieve_components(
                 "5",
                 "--ignore-conflicts",
             ]
-            
+
             # Only add --output-dir if output_dir was specified
             if output_dir:
                 sfdx_args.extend(["--output-dir", retrieve_target])

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/update_profile.py

@@ -231,28 +231,28 @@ class ProfileGrantAllAccess(MetadataSingleEntityTransformTask, BaseSalesforceApi
 
     def _strip_namespace_from_record_type(self, record_type):
         """Strip namespace prefix from record type string.
-        
+
         Converts 'namespace__Object__c.namespace__RecordType' to 'Object__c.RecordType'
         """
         if not self.options.get("namespace_inject"):
             return record_type
-            
+
         namespace = self.options["namespace_inject"]
         namespace_prefix = f"{namespace}__"
-        
+
         # Split on the dot to handle object and record type separately
         parts = record_type.split(".", 1)
         if len(parts) != 2:
             return record_type
-            
+
         object_name, record_type_name = parts
-        
+
         # Strip namespace prefix from both object and record type if present
         if object_name.startswith(namespace_prefix):
-            object_name = object_name[len(namespace_prefix):]
+            object_name = object_name[len(namespace_prefix) :]
         if record_type_name.startswith(namespace_prefix):
-            record_type_name = record_type_name[len(namespace_prefix):]
-            
+            record_type_name = record_type_name[len(namespace_prefix) :]
+
         return f"{object_name}.{record_type_name}"
 
     def _set_record_types(self, tree, api_name):
@@ -287,13 +287,17 @@ class ProfileGrantAllAccess(MetadataSingleEntityTransformTask, BaseSalesforceApi
             # Look for the recordTypeVisibilities element
             # First try with the original record type
             elem = tree.find("recordTypeVisibilities", recordType=rt["record_type"])
-            
-            # If not found and we're in a namespaced org, try with namespace stripped 
+
+            # If not found and we're in a namespaced org, try with namespace stripped
             # (since Salesforce may return without namespace in namespaced orgs)
             if elem is None and self.options.get("namespaced_org"):
-                record_type_without_namespace = self._strip_namespace_from_record_type(rt["record_type"])
-                elem = tree.find("recordTypeVisibilities", recordType=record_type_without_namespace)
-                
+                record_type_without_namespace = self._strip_namespace_from_record_type(
+                    rt["record_type"]
+                )
+                elem = tree.find(
+                    "recordTypeVisibilities", recordType=record_type_without_namespace
+                )
+
                 if elem is None:
                     raise TaskOptionsError(
                         f"Record Type {rt['record_type']} (or {record_type_without_namespace}) not found in retrieved {api_name}.profile"

{cumulusci_plus-5.0.25 → cumulusci_plus-5.0.27}/cumulusci/tasks/salesforce/users/permsets.py

@@ -2,7 +2,7 @@ import json
 
 from cumulusci.cli.ui import CliTable
 from cumulusci.core.exceptions import CumulusCIException
-from cumulusci.core.utils import process_list_arg, process_bool_arg, determine_managed_mode
+from cumulusci.core.utils import determine_managed_mode, process_list_arg
 from cumulusci.tasks.salesforce import BaseSalesforceApiTask
 from cumulusci.utils import inject_namespace
 
@@ -47,23 +47,23 @@ The managed mode and namespaced org detection is automatic based on the org cont
 
     def _init_namespace_injection(self):
         """Initialize namespace injection options for processing permission set names.
-        
+
         This automatically determines managed mode and namespaced org context based on:
         - Whether the package is installed in the org (managed mode)
         - Whether we're in a packaging org (namespaced org)
         """
         namespace = self.project_config.project__package__namespace
-        
+
         # Automatically determine managed mode based on org context
         managed = determine_managed_mode(
             self.options, self.project_config, self.org_config
         )
-        
+
         # Automatically determine if we're in a namespaced org (e.g., packaging org)
-        namespaced_org = (
-            bool(namespace) and namespace == getattr(self.org_config, "namespace", None)
+        namespaced_org = bool(namespace) and namespace == getattr(
+            self.org_config, "namespace", None
         )
-        
+
         # Store in options for use by inject_namespace
         self.options["namespace_inject"] = namespace
         self.options["managed"] = managed
@@ -87,7 +87,8 @@ The managed mode and namespaced org detection is automatic based on the org cont
             self._init_namespace_injection()
             # Process namespace tokens in api_names
             self.options["api_names"] = [
-                self._inject_namespace(api_name) for api_name in self.options["api_names"]
+                self._inject_namespace(api_name)
+                for api_name in self.options["api_names"]
             ]
 
         users = self._query_existing_assignments()
@@ -106,7 +107,13 @@ The managed mode and namespaced org detection is automatic based on the org cont
 
     def _needs_namespace_injection(self):
         """Check if namespace injection is needed based on presence of tokens in api_names."""
-        namespace_tokens = ["%%%NAMESPACE%%%", "%%%NAMESPACED_ORG%%%", "%%%NAMESPACE_OR_C%%%", "%%%NAMESPACED_ORG_OR_C%%%", "%%%NAMESPACE_DOT%%%"]
+        namespace_tokens = [
+            "%%%NAMESPACE%%%",
+            "%%%NAMESPACED_ORG%%%",
+            "%%%NAMESPACE_OR_C%%%",
+            "%%%NAMESPACED_ORG_OR_C%%%",
+            "%%%NAMESPACE_DOT%%%",
+        ]
         return any(
             any(token in api_name for token in namespace_tokens)
             for api_name in self.options["api_names"]