From 68b769ed7689571bb6f69edd75276c7af7b8b944 Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Fri, 26 Jan 2024 10:54:50 -0600 Subject: [PATCH 1/2] fix: re-enable telemetry, make CCI usage identifiable (#3728) 1. CLI team would like to not be missing all the CCI usage of the CLI when monitoring performance and making deprecation decisions 2. setting `SFDX_TOOL` makes it obvious which executions come from CCI. Useful for debugging/adoption Co-authored-by: James Estevez --- cumulusci/core/sfdx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cumulusci/core/sfdx.py b/cumulusci/core/sfdx.py index 87e6ae1e4f..d1c8fd01d7 100644 --- 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: From d4ff1e8f88499a23c9e7fdd146ecb05912ad2cb9 Mon Sep 17 00:00:00 2001 From: lakshmi2506 <141401869+lakshmi2506@users.noreply.github.com> Date: Mon, 29 Jan 2024 15:03:50 +0530 Subject: [PATCH 2/2] updated return_values for task get_assigned_permission_sets (#3736) [W-14910021](https://gus.lightning.force.com/lightning/r/ADM_Work__c/a07EE00001j2AULYA2/view) Retrieved list of assigned permission sets are assigned for the `task.return_values` to ensure the preflight check conditions are checked properly --- cumulusci/tasks/preflight/permsets.py | 12 ++++++------ .../tasks/preflight/tests/test_permset_preflights.py | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cumulusci/tasks/preflight/permsets.py b/cumulusci/tasks/preflight/permsets.py index c02ff93f9c..fe7adf39d8 100644 --- 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 index eded8f95f2..0963780936 100644 --- 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",