Merge branch 'main' into feature/listcomponents

SFDO-Tooling · Jan 29, 2024 · 802031e · 802031e
2 parents 97fc0af + d4ff1e8
commit 802031e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/cumulusci/core/sfdx.py b/cumulusci/core/sfdx.py
@@ -52,7 +52,7 @@ def sfdx(
         stdout=sarge.Capture(buffer_size=-1) if capture_output else None,
         stderr=sarge.Capture(buffer_size=-1) if capture_output else None,
         shell=True,
-        env={**env, "SFDX_DISABLE_TELEMETRY": "true"},
+        env={**env, "SFDX_TOOL": "CCI"},
     )
     p.run()
     if capture_output:

diff --git a/cumulusci/tasks/preflight/permsets.py b/cumulusci/tasks/preflight/permsets.py
@@ -5,16 +5,16 @@ class GetPermissionSetAssignments(BaseSalesforceApiTask):
     def _run_task(self):
         query = f"SELECT PermissionSet.Name,PermissionSetGroupId FROM PermissionSetAssignment WHERE AssigneeId = '{self.org_config.user_id}'"
 
-        self.permsets = []
+        self.return_values = []
         for result in self.sf.query_all(query)["records"]:
-            if result["PermissionSet"]["Name"] not in self.permsets:
-                self.permsets.append(result["PermissionSet"]["Name"])
+            if result["PermissionSet"]["Name"] not in self.return_values:
+                self.return_values.append(result["PermissionSet"]["Name"])
 
             if result["PermissionSetGroupId"] is not None:
                 psg_query = f"SELECT PermissionSet.Name from PermissionSetGroupComponent where PermissionSetGroupId = '{result['PermissionSetGroupId']}'"
                 for psg_result in self.sf.query_all(psg_query)["records"]:
-                    if psg_result["PermissionSet"]["Name"] not in self.permsets:
-                        self.permsets.append(psg_result["PermissionSet"]["Name"])
+                    if psg_result["PermissionSet"]["Name"] not in self.return_values:
+                        self.return_values.append(psg_result["PermissionSet"]["Name"])
 
-        permsets_str = "\n".join(self.permsets)
+        permsets_str = "\n".join(self.return_values)
         self.logger.info(f"Found permission sets assigned:\n{permsets_str}")
diff --git a/cumulusci/tasks/preflight/tests/test_permset_preflights.py b/cumulusci/tasks/preflight/tests/test_permset_preflights.py
@@ -43,9 +43,8 @@ def test_assigned_permset_preflight(self):
             },
         ]
         task()
-
         task._init_api.return_value.query_all.assert_called()
-        assert task.permsets == [
+        assert task.return_values == [
             "DocumentChecklist",
             "EinsteinAnalyticsPlusAdmin",
             "CustomerExperienceAnalyticsAdmin",