Update remaining references from 'conversions' to 'keyEvents'

Author: jradcliff

Diff for: CONTRIBUTING.md

@@ -69,7 +69,7 @@ nox -s lint blacken
     export GA_TEST_ACCOUNT_ID=
     export GA_TEST_WEB_DATA_STREAM_ID=
     export GA_TEST_WEB_DATA_SECRET_ID=
-    export GA_TEST_CONVERSION_EVENT_ID=
+    export GA_TEST_KEY_EVENT_ID=
     export GA_TEST_ACCOUNT_ACCESS_BINDING_ID=
     export GA_TEST_PROPERTY_ACCESS_BINDING_ID=
     ```

Diff for: google-analytics-admin/accounts_search_change_history_events.py

@@ -20,7 +20,7 @@
 See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/accounts/searchChangeHistoryEvents
 for more information.
 """
-# [START analyticsadmin_properties_conversion_events_create]
+# [START analyticsadmin_properties_key_events_create]
 from datetime import datetime, timedelta
 
 from google.analytics.admin import (
@@ -107,8 +107,8 @@ def print_resource(resource):
         print("  DisplayVideo360AdvertiserLink resource")
     elif resource.display_video_360_advertiser_link_proposal:
         print("  DisplayVideo360AdvertiserLinkProposal resource")
-    elif resource.conversion_event:
-        print("  ConversionEvent resource")
+    elif resource.key_event:
+        print("  KeyEvent resource")
     elif resource.measurement_protocol_secret:
         print("  MeasurementProtocolSecret resource")
     elif resource.custom_dimension:
@@ -123,7 +123,7 @@ def print_resource(resource):
     print()
 
 
-# [END analyticsadmin_properties_conversion_events_create]
+# [END analyticsadmin_properties_key_events_create]
 
 if __name__ == "__main__":
     run_sample()

Diff for: google-analytics-admin/noxfile_config.py

@@ -34,8 +34,6 @@
         "GA_TEST_WEB_DATA_SECRET_ID": os.getenv(
             "GA_TEST_WEB_DATA_SECRET_ID", "2994983412"
         ),
-        "GA_TEST_CONVERSION_EVENT_ID": os.getenv(
-            "GA_TEST_CONVERSION_EVENT_ID", "2719963095"
-        ),
+        "GA_TEST_KEY_EVENT_ID": os.getenv("GA_TEST_KEY_EVENT_ID", "2719963095"),
     },
 }

Diff for: google-analytics-admin/properties_conversion_events_create.py renamed to google-analytics-admin/properties_key_events_create.py

@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Analytics Admin API sample application which creates a conversion
+"""Google Analytics Admin API sample application which creates a key
 event for the Google Analytics 4 property.
 
-See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.conversionEvents/create
+See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.keyEvents/create
 for more information.
 """
-# [START analyticsadmin_properties_conversion_events_create]
+# [START analyticsadmin_properties_key_events_create]
 from google.analytics.admin import AnalyticsAdminServiceClient
-from google.analytics.admin_v1alpha import ConversionEvent
+from google.analytics.admin_v1alpha import KeyEvent
 
 
 def run_sample():
@@ -37,33 +37,33 @@ def run_sample():
     #  property ID (e.g. "123456") before running the sample.
     property_id = "YOUR-GA4-PROPERTY-ID"
 
-    create_conversion_event(property_id)
+    create_key_event(property_id)
 
 
-def create_conversion_event(property_id: str, transport: str = None):
+def create_key_event(property_id: str, transport: str = None):
     """
-    Creates a conversion event for the Google Analytics 4 property.
+    Creates a key event for the Google Analytics 4 property.
 
     Args:
         property_id(str): The Google Analytics Property ID.
         transport(str): The transport to use. For example, "grpc"
             or "rest". If set to None, a transport is chosen automatically.
     """
     client = AnalyticsAdminServiceClient(transport=transport)
-    conversion_event = client.create_conversion_event(
+    key_event = client.create_key_event(
         parent=f"properties/{property_id}",
-        conversion_event=ConversionEvent(event_name="test_purchase"),
+        key_event=KeyEvent(event_name="test_purchase"),
     )
 
     print("Result:")
-    print(f"Resource name: {conversion_event.name}")
-    print(f"Event name: {conversion_event.event_name}")
-    print(f"Create time: {conversion_event.create_time}")
-    print(f"Deletable: {conversion_event.deletable}")
-    print(f"Custom: {conversion_event.custom}")
+    print(f"Resource name: {key_event.name}")
+    print(f"Event name: {key_event.event_name}")
+    print(f"Create time: {key_event.create_time}")
+    print(f"Deletable: {key_event.deletable}")
+    print(f"Custom: {key_event.custom}")
 
 
-# [END analyticsadmin_properties_conversion_events_create]
+# [END analyticsadmin_properties_key_events_create]
 
 if __name__ == "__main__":
     run_sample()

Diff for: google-analytics-admin/properties_conversion_events_create_test.py renamed to google-analytics-admin/properties_key_events_create_test.py

@@ -14,17 +14,17 @@
 
 import pytest
 
-import properties_conversion_events_create
+import properties_key_events_create
 
 FAKE_PROPERTY_ID = "1"
 
 
-def test_properties_conversion_events_create():
+def test_properties_key_events_create():
     transports = ["grpc", "rest"]
     for transport in transports:
         # This test ensures that the call is valid and reaches the server, even
         # though the operation does not succeed due to permission error.
         with pytest.raises(Exception, match="The caller does not have permission"):
-            properties_conversion_events_create.create_conversion_event(
+            properties_key_events_create.create_key_event(
                 FAKE_PROPERTY_ID, transport=transport
             )

Diff for: google-analytics-admin/properties_conversion_events_delete.py renamed to google-analytics-admin/properties_key_events_delete.py

@@ -14,14 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Analytics Admin API sample application which deletes a conversion
+"""Google Analytics Admin API sample application which deletes a key
 event for the Google Analytics 4 property.
 
 
-See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.conversionEvents/delete
+See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.keyEvents/delete
 for more information.
 """
-# [START analyticsadmin_properties_conversion_events_delete]
+# [START analyticsadmin_properties_key_events_delete]
 from google.analytics.admin import AnalyticsAdminServiceClient
 
 
@@ -37,33 +37,29 @@ def run_sample():
     #  property ID (e.g. "123456") before running the sample.
     property_id = "YOUR-GA4-PROPERTY-ID"
 
-    # TODO(developer): Replace this variable with your conversion event ID
+    # TODO(developer): Replace this variable with your key event ID
     #  (e.g. "123456") before running the sample.
-    conversion_event_id = "YOUR-CONVERSION-EVENT-ID"
+    key_event_id = "YOUR-KEY-EVENT-ID"
 
-    delete_conversion_event(property_id, conversion_event_id)
+    delete_key_event(property_id, key_event_id)
 
 
-def delete_conversion_event(
-    property_id: str, conversion_event_id: str, transport: str = None
-):
+def delete_key_event(property_id: str, key_event_id: str, transport: str = None):
     """
-    Deletes the conversion event for the Google Analytics 4 property.
+    Deletes the key event for the Google Analytics 4 property.
 
     Args:
         property_id(str): The Google Analytics Property ID.
-        conversion_event_id(str): The conversion event ID
+        key_event_id(str): The key event ID
         transport(str): The transport to use. For example, "grpc"
             or "rest". If set to None, a transport is chosen automatically.
     """
     client = AnalyticsAdminServiceClient(transport=transport)
-    client.delete_conversion_event(
-        name=f"properties/{property_id}/conversionEvents/{conversion_event_id}"
-    )
-    print("Conversion event deleted")
+    client.delete_key_event(name=f"properties/{property_id}/keyEvents/{key_event_id}")
+    print("Key event deleted")
 
 
-# [END analyticsadmin_properties_conversion_events_delete]
+# [END analyticsadmin_properties_key_events_delete]
 
 
 if __name__ == "__main__":

Diff for: google-analytics-admin/properties_conversion_events_delete_test.py renamed to google-analytics-admin/properties_key_events_delete_test.py

@@ -14,18 +14,18 @@
 
 import pytest
 
-import properties_conversion_events_delete
+import properties_key_events_delete
 
 FAKE_PROPERTY_ID = "1"
-FAKE_CONVERSION_EVENT_ID = "1"
+FAKE_KEY_EVENT_ID = "1"
 
 
-def test_properties_conversion_events_delete():
+def test_properties_key_events_delete():
     transports = ["grpc", "rest"]
     for transport in transports:
         # This test ensures that the call is valid and reaches the server, even
         # though the operation does not succeed due to permission error.
         with pytest.raises(Exception, match="The caller does not have permission"):
-            properties_conversion_events_delete.delete_conversion_event(
-                FAKE_PROPERTY_ID, FAKE_CONVERSION_EVENT_ID, transport=transport
+            properties_key_events_delete.delete_key_event(
+                FAKE_PROPERTY_ID, FAKE_KEY_EVENT_ID, transport=transport
             )

Diff for: google-analytics-admin/properties_conversion_events_get.py renamed to google-analytics-admin/properties_key_events_get.py

@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Analytics Admin API sample application which prints the conversion
+"""Google Analytics Admin API sample application which prints the key
 event details.
 
-See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.conversionEvents/get
+See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.keyEvents/get
 for more information.
 """
-# [START analyticsadmin_properties_conversion_events_get]
+# [START analyticsadmin_properties_key_events_get]
 from google.analytics.admin import AnalyticsAdminServiceClient
 
 
@@ -30,38 +30,36 @@ def run_sample():
     #  property ID (e.g. "123456") before running the sample.
     property_id = "YOUR-GA4-PROPERTY-ID"
 
-    # TODO(developer): Replace this variable with your conversion event ID
+    # TODO(developer): Replace this variable with your key event ID
     #  (e.g. "123456") before running the sample.
-    conversion_event_id = "YOUR-CONVERSION-EVENT-ID"
+    key_event_id = "YOUR-KEY-EVENT-ID"
 
-    get_conversion_event(property_id, conversion_event_id)
+    get_key_event(property_id, key_event_id)
 
 
-def get_conversion_event(
-    property_id: str, conversion_event_id: str, transport: str = None
-):
+def get_key_event(property_id: str, key_event_id: str, transport: str = None):
     """
-    Retrieves the details for the conversion event.
+    Retrieves the details for the key event.
     Args:
         property_id(str): The Google Analytics Property ID.
-        conversion_event_id(str): The conversion event ID
+        key_event_id(str): The key event ID
         transport(str): The transport to use. For example, "grpc"
             or "rest". If set to None, a transport is chosen automatically.
     """
     client = AnalyticsAdminServiceClient(transport=transport)
-    conversion_event = client.get_conversion_event(
-        name=f"properties/{property_id}/conversionEvents/{conversion_event_id}"
+    key_event = client.get_key_event(
+        name=f"properties/{property_id}/keyEvents/{key_event_id}"
     )
 
     print("Result:")
-    print(f"Resource name: {conversion_event.name}")
-    print(f"Event name: {conversion_event.event_name}")
-    print(f"Create time: {conversion_event.create_time}")
-    print(f"Deletable: {conversion_event.deletable}")
-    print(f"Custom: {conversion_event.custom}")
+    print(f"Resource name: {key_event.name}")
+    print(f"Event name: {key_event.event_name}")
+    print(f"Create time: {key_event.create_time}")
+    print(f"Deletable: {key_event.deletable}")
+    print(f"Custom: {key_event.custom}")
 
 
-# [END analyticsadmin_properties_conversion_events_get]
+# [END analyticsadmin_properties_key_events_get]
 
 
 if __name__ == "__main__":

Diff for: google-analytics-admin/properties_conversion_events_get_test.py renamed to google-analytics-admin/properties_key_events_get_test.py

@@ -14,17 +14,17 @@
 
 import os
 
-import properties_conversion_events_get
+import properties_key_events_get
 
 TEST_PROPERTY_ID = os.getenv("GA_TEST_PROPERTY_ID")
-TEST_CONVERSION_EVENT_ID = os.getenv("GA_TEST_CONVERSION_EVENT_ID")
+TEST_KEY_EVENT_ID = os.getenv("GA_TEST_KEY_EVENT_ID")
 
 
-def test_properties_conversion_events_get(capsys):
+def test_properties_key_events_get(capsys):
     transports = ["grpc", "rest"]
     for transport in transports:
-        properties_conversion_events_get.get_conversion_event(
-            TEST_PROPERTY_ID, TEST_CONVERSION_EVENT_ID, transport=transport
+        properties_key_events_get.get_key_event(
+            TEST_PROPERTY_ID, TEST_KEY_EVENT_ID, transport=transport
         )
         out, _ = capsys.readouterr()
         assert "Result" in out

Diff for: google-analytics-admin/properties_conversion_events_list.py renamed to google-analytics-admin/properties_key_events_list.py

@@ -14,13 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Google Analytics Admin API sample application which lists conversion events
+"""Google Analytics Admin API sample application which lists key events
 for the Google Analytics 4 property.
 
-See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.conversionEvents/list
+See https://developers.google.com/analytics/devguides/config/admin/v1/rest/v1alpha/properties.keyEvents/list
 for more information.
 """
-# [START analyticsadmin_properties_conversion_events_list]
+# [START analyticsadmin_properties_key_events_list]
 from google.analytics.admin import AnalyticsAdminServiceClient
 
 
@@ -30,32 +30,32 @@ def run_sample():
     #  property ID (e.g. "123456") before running the sample.
     property_id = "YOUR-GA4-PROPERTY-ID"
 
-    list_conversion_events(property_id)
+    list_key_events(property_id)
 
 
-def list_conversion_events(property_id: str, transport: str = None):
+def list_key_events(property_id: str, transport: str = None):
     """
-    Lists conversion events for the Google Analytics 4 property.
+    Lists key events for the Google Analytics 4 property.
 
     Args:
         property_id(str): The Google Analytics Property ID.
         transport(str): The transport to use. For example, "grpc"
             or "rest". If set to None, a transport is chosen automatically.
     """
     client = AnalyticsAdminServiceClient(transport=transport)
-    results = client.list_conversion_events(parent=f"properties/{property_id}")
+    results = client.list_key_events(parent=f"properties/{property_id}")
 
     print("Result:")
-    for conversion_event in results:
-        print(f"Resource name: {conversion_event.name}")
-        print(f"Event name: {conversion_event.event_name}")
-        print(f"Create time: {conversion_event.create_time}")
-        print(f"Deletable: {conversion_event.deletable}")
-        print(f"Custom: {conversion_event.custom}")
+    for key_event in results:
+        print(f"Resource name: {key_event.name}")
+        print(f"Event name: {key_event.event_name}")
+        print(f"Create time: {key_event.create_time}")
+        print(f"Deletable: {key_event.deletable}")
+        print(f"Custom: {key_event.custom}")
         print()
 
 
-# [END analyticsadmin_properties_conversion_events_list]
+# [END analyticsadmin_properties_key_events_list]
 
 
 if __name__ == "__main__":

Diff for: google-analytics-admin/properties_conversion_events_list_test.py renamed to google-analytics-admin/properties_key_events_list_test.py

@@ -14,15 +14,15 @@
 
 import os
 
-import properties_conversion_events_list
+import properties_key_events_list
 
 TEST_PROPERTY_ID = os.getenv("GA_TEST_PROPERTY_ID")
 
 
-def test_properties_conversion_events_list(capsys):
+def test_properties_key_events_list(capsys):
     transports = ["grpc", "rest"]
     for transport in transports:
-        properties_conversion_events_list.list_conversion_events(
+        properties_key_events_list.list_key_events(
             TEST_PROPERTY_ID, transport=transport
         )
         out, _ = capsys.readouterr()

Diff for: google-analytics-admin/requirements.txt

@@ -1,2 +1,2 @@
-google-analytics-admin==0.21.0
-google-auth-oauthlib==1.1.0
+google-analytics-admin==0.23.0
+google-auth-oauthlib==1.1.0