Apply suggestions from code review

Co-authored-by: Michal Bocek <[email protected]>

convert2rhel/breadcrumbs.py

@@ -210,10 +210,11 @@ def _save_rhsm_facts(self):
         utils.write_json_object_to_file(path=RHSM_CUSTOM_FACTS_FILE, data=data)
 
     def print_data_collection(self):
-        """Print information about telemetry and ask for acknowledgement."""
+        """Print information about data collection and ask for acknowledgement."""
         loggerinst.info(
-            "The convert2rhel utility uploads the following data about the system conversion"
-            " to Red Hat servers for the purpose of the utility usage analysis:\n"
+            "The convert2rhel utility generates a /etc/rhsm/facts/convert2rhel.fact file that contains the below data"
+            " about the system conversion. The subscription-manager then uploads the data to the server the system is"
+            " registered to.\n"
             "- The Convert2RHEL command as executed\n"
             "- The Convert2RHEL RPM version and GPG signature\n"
             "- Success or failure status of the conversion\n"

convert2rhel/main.py

@@ -239,8 +239,7 @@ def perform_boilerplate():
     loggerinst.task("Prepare: Show Red Hat software EULA")
     show_eula()
 
-    # Telemetry warning
-    loggerinst.task("Prepare: Inform about telemetry")
+    loggerinst.task("Prepare: Inform about data collection")
     breadcrumbs.breadcrumbs.print_data_collection()
 
 

tests/integration/tier0/non-destructive/basic-sanity-checks/test_basic_sanity_checks.py

@@ -280,7 +280,7 @@ def test_data_collection_acknowledgement(shell, convert2rhel):
     shell(f"rm -f {CONVERT2RHEL_FACTS_FILE}")
 
     with convert2rhel("--debug") as c2r:
-        assert c2r.expect("Prepare: Inform about telemetry", timeout=300) == 0
+        assert c2r.expect("Prepare: Inform about data collection", timeout=300) == 0
         assert (
             c2r.expect("The convert2rhel utility uploads the following data about the system conversion", timeout=300)
             == 0

tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py

@@ -184,8 +184,8 @@ def test_validation_packages_with_in_name_period(shell, convert2rhel, packages_w
             env.str("RHSM_POOL"),
         )
     ) as c2r:
-        # Swallow the telemetry warning
-        assert c2r.expect("Prepare: Inform about telemetry", timeout=300) == 0
+        # Swallow the data collection warning
+        assert c2r.expect("Prepare: Inform about data collection", timeout=300) == 0
         assert (
             c2r.expect("The convert2rhel utility uploads the following data about the system conversion", timeout=300)
             == 0