Assign option keys only if available in tasks.

Author: rupeshjSFDC

cumulusci/tasks/salesforce/assign_ps_psg.py

@@ -118,13 +118,13 @@ class Options(CCIOptions):
                 "Permission Set API names. Supports JSON, YAML, or command line format."
             ),
         )
-        namespace: str = Field(
+        namespace_inject: str = Field(
             None,
             description="Namespace to use for Permission Set names. If not provided, the namespace from the project config will be used.",
         )
         managed: bool = Field(
             None,
-            description="Whether the org is managed. If not provided, the managed mode will be determined based on the org config.",
+            description="Whether the deployment is managed. If not provided, the managed mode will be determined based on the org config.",
         )
         fail_on_error: bool = Field(
             False,
@@ -136,19 +136,22 @@ class Options(CCIOptions):
     def _init_options(self, kwargs):
         super()._init_options(kwargs)
 
-        if self.parsed_options.namespace is None:
-            self.parsed_options.namespace = (
+        if self.parsed_options.namespace_inject is None:
+            self.parsed_options.namespace_inject = (
                 self.project_config.project__package__namespace
             )
+
         if self.parsed_options.managed is None:
             self.parsed_options.managed = determine_managed_mode(
                 self.parsed_options, self.project_config, self.org_config
             )
+
         self.namespaced_org = bool(
-            self.parsed_options.namespace
-        ) and self.parsed_options.namespace == getattr(
+            self.parsed_options.namespace_inject
+        ) and self.parsed_options.namespace_inject == getattr(
             self.org_config, "namespace", None
         )
+
         self.psg_names_sanitized = {}
         self.ps_names_sanitized = {}
 
@@ -263,9 +266,10 @@ def _process_namespaces(self, names: List[str]):
             _, name_processed = inject_namespace(
                 "",
                 name,
-                namespace=self.parsed_options.namespace,
+                namespace=self.parsed_options.namespace_inject,
                 managed=self.parsed_options.managed,
                 namespaced_org=self.namespaced_org,
+                logger=self.logger,
             )
             names_processed[name] = name_processed
         return names_processed
@@ -277,7 +281,7 @@ def _build_name_conditions(self, names: List[str], field_name: str = "Name"):
         )  # Maps (original_name, namespace_prefix) tuple back to original name
         for name in names:
             # Check if name contains namespace prefix (format: namespace__Name)
-            if "__" in name and self.parsed_options.namespace:
+            if "__" in name and self.parsed_options.namespace_inject:
                 parts = name.split("__", 1)
                 if len(parts) == 2:
                     ns_prefix, ps_name = parts

cumulusci/tasks/salesforce/tests/test_assign_ps_psg.py

@@ -96,10 +96,10 @@ def test_init_options_with_namespace(self):
             AssignPermissionSetToPermissionSetGroup,
             {
                 "assignments": {"PSG1": ["PS1"]},
-                "namespace": "test_namespace",
+                "namespace_inject": "test_namespace",
             },
         )
-        assert task.parsed_options.namespace == "test_namespace"
+        assert task.parsed_options.namespace_inject == "test_namespace"
 
     def test_init_options_without_namespace(self):
         """Test _init_options without namespace (uses project config)"""
@@ -109,7 +109,7 @@ def test_init_options_without_namespace(self):
         )
         task.project_config.project__package__namespace = "project_namespace"
         task._init_options({})
-        assert task.parsed_options.namespace == "project_namespace"
+        assert task.parsed_options.namespace_inject == "project_namespace"
 
     def test_init_options_with_managed(self):
         """Test _init_options with managed flag"""
@@ -141,7 +141,7 @@ def test_init_options_namespaced_org(self):
             AssignPermissionSetToPermissionSetGroup,
             {
                 "assignments": {"PSG1": ["PS1"]},
-                "namespace": "test_namespace",
+                "namespace_inject": "test_namespace",
             },
         )
         task.org_config.namespace = "test_namespace"
@@ -154,7 +154,7 @@ def test_init_options_non_namespaced_org(self):
             AssignPermissionSetToPermissionSetGroup,
             {
                 "assignments": {"PSG1": ["PS1"]},
-                "namespace": "test_namespace",
+                "namespace_inject": "test_namespace",
             },
         )
         task.org_config.namespace = "different_namespace"
@@ -430,7 +430,7 @@ def test_get_permission_set_group_ids_with_namespace(self):
         """Test _get_permission_set_group_ids with namespace"""
         task = create_task(
             AssignPermissionSetToPermissionSetGroup,
-            {"assignments": {"NS__PSG1": ["PS1"]}, "namespace": "NS"},
+            {"assignments": {"NS__PSG1": ["PS1"]}, "namespace_inject": "NS"},
         )
         task._init_options({})
         task._init_task()
@@ -547,7 +547,7 @@ def test_get_permission_set_ids_with_namespace(self):
         """Test _get_permission_set_ids with namespace"""
         task = create_task(
             AssignPermissionSetToPermissionSetGroup,
-            {"assignments": {"PSG1": ["NS__PS1"]}, "namespace": "NS"},
+            {"assignments": {"PSG1": ["NS__PS1"]}, "namespace_inject": "NS"},
         )
         task._init_options({})
         task._init_task()
@@ -596,7 +596,7 @@ def test_process_namespaces(self):
         ):
             task = create_task(
                 AssignPermissionSetToPermissionSetGroup,
-                {"assignments": {"PSG1": ["PS1"]}, "namespace": "NS"},
+                {"assignments": {"PSG1": ["PS1"]}, "namespace_inject": "NS"},
             )
             task._init_options({})
             result = task._process_namespaces(["PS1"])
@@ -618,7 +618,7 @@ def test_build_name_conditions_with_namespace(self):
         """Test _build_name_conditions with namespace"""
         task = create_task(
             AssignPermissionSetToPermissionSetGroup,
-            {"assignments": {"PSG1": ["NS__PS1"]}, "namespace": "NS"},
+            {"assignments": {"PSG1": ["NS__PS1"]}, "namespace_inject": "NS"},
         )
         task._init_options({})
         conditions, mapping = task._build_name_conditions(["NS__PS1"])

cumulusci/utils/__init__.py

@@ -781,11 +781,12 @@ def get_tasks_with_options(project_config, frozen_options: frozenset):
     coordinator_opts = {}
     options = dict(frozen_options)
     for task_config in project_config.list_tasks():
-        if any(
-            key in options.keys()
-            for key in project_config.get_task(task_config["name"])
-            .get_class()
-            .task_options.keys()
-        ):
-            coordinator_opts[task_config["name"]] = options
+        task_keys = (
+            project_config.get_task(task_config["name"]).get_class().task_options.keys()
+        )
+        if any(key in options.keys() for key in task_keys):
+            # only assign options that are actually used by the task. This is to avoid passing options that are not used by the task.
+            coordinator_opts[task_config["name"]] = {
+                key: options[key] for key in options.keys() if key in task_keys
+            }
     return coordinator_opts