chore: use gapic-generator-python 0.62.1 (#187)

- [ ] Regenerate this pull request now.

fix: resolve DuplicateCredentialArgs error when using credentials_file

committer: parthea
PiperOrigin-RevId: 425964861

Source-Link: googleapis/googleapis@84b1a5a

Source-Link: googleapis/googleapis-gen@4fb761b
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZiNzYxYmJkODUwNmFjMTU2ZjQ5YmFjNWYxODMwNmFhOGViM2FhOCJ9

Author: gcf-owl-bot[bot]

packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/async_client.py

@@ -160,8 +160,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,

packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/client.py

@@ -205,8 +205,11 @@ def __init__(
         if not self._grpc_channel:
             self._grpc_channel = type(self).create_channel(
                 self._host,
+                # use the credentials which are saved
                 credentials=self._credentials,
-                credentials_file=credentials_file,
+                # Set ``credentials_file`` to ``None`` here as
+                # the credentials that we saved earlier should be used.
+                credentials_file=None,
                 scopes=self._scopes,
                 ssl_credentials=self._ssl_channel_credentials,
                 quota_project_id=quota_project_id,

packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc.py

@@ -202,8 +202,8 @@ class DeleteAccountRequest(proto.Message):
 
     Attributes:
         name (str):
-            Required. The name of the Account to soft-
-            elete. Format: accounts/{account}
+            Required. The name of the Account to
+            soft-delete. Format: accounts/{account}
             Example: "accounts/100".
     """
 

packages/google-analytics-admin/google/analytics/admin_v1alpha/services/analytics_admin_service/transports/grpc_asyncio.py

@@ -1221,8 +1221,8 @@ class CustomDimension(proto.Message):
             Required. Immutable. Tagging parameter name
             for this custom dimension.
             If this is a user-scoped dimension, then this is
-            the user property name. If this is an event-
-            scoped dimension, then this is the event
+            the user property name. If this is an
+            event-scoped dimension, then this is the event
             parameter name.
 
             May only contain alphanumeric and underscore

packages/google-analytics-admin/google/analytics/admin_v1alpha/types/analytics_admin.py

@@ -535,25 +535,28 @@ def test_analytics_admin_service_client_client_options_scopes(
 
 
 @pytest.mark.parametrize(
-    "client_class,transport_class,transport_name",
+    "client_class,transport_class,transport_name,grpc_helpers",
     [
         (
             AnalyticsAdminServiceClient,
             transports.AnalyticsAdminServiceGrpcTransport,
             "grpc",
+            grpc_helpers,
         ),
         (
             AnalyticsAdminServiceAsyncClient,
             transports.AnalyticsAdminServiceGrpcAsyncIOTransport,
             "grpc_asyncio",
+            grpc_helpers_async,
         ),
     ],
 )
 def test_analytics_admin_service_client_client_options_credentials_file(
-    client_class, transport_class, transport_name
+    client_class, transport_class, transport_name, grpc_helpers
 ):
     # Check the case credentials file is provided.
     options = client_options.ClientOptions(credentials_file="credentials.json")
+
     with mock.patch.object(transport_class, "__init__") as patched:
         patched.return_value = None
         client = client_class(client_options=options, transport=transport_name)
@@ -589,6 +592,77 @@ def test_analytics_admin_service_client_client_options_from_dict():
         )
 
 
+@pytest.mark.parametrize(
+    "client_class,transport_class,transport_name,grpc_helpers",
+    [
+        (
+            AnalyticsAdminServiceClient,
+            transports.AnalyticsAdminServiceGrpcTransport,
+            "grpc",
+            grpc_helpers,
+        ),
+        (
+            AnalyticsAdminServiceAsyncClient,
+            transports.AnalyticsAdminServiceGrpcAsyncIOTransport,
+            "grpc_asyncio",
+            grpc_helpers_async,
+        ),
+    ],
+)
+def test_analytics_admin_service_client_create_channel_credentials_file(
+    client_class, transport_class, transport_name, grpc_helpers
+):
+    # Check the case credentials file is provided.
+    options = client_options.ClientOptions(credentials_file="credentials.json")
+
+    with mock.patch.object(transport_class, "__init__") as patched:
+        patched.return_value = None
+        client = client_class(client_options=options, transport=transport_name)
+        patched.assert_called_once_with(
+            credentials=None,
+            credentials_file="credentials.json",
+            host=client.DEFAULT_ENDPOINT,
+            scopes=None,
+            client_cert_source_for_mtls=None,
+            quota_project_id=None,
+            client_info=transports.base.DEFAULT_CLIENT_INFO,
+            always_use_jwt_access=True,
+        )
+
+    # test that the credentials from file are saved and used as the credentials.
+    with mock.patch.object(
+        google.auth, "load_credentials_from_file", autospec=True
+    ) as load_creds, mock.patch.object(
+        google.auth, "default", autospec=True
+    ) as adc, mock.patch.object(
+        grpc_helpers, "create_channel"
+    ) as create_channel:
+        creds = ga_credentials.AnonymousCredentials()
+        file_creds = ga_credentials.AnonymousCredentials()
+        load_creds.return_value = (file_creds, None)
+        adc.return_value = (creds, None)
+        client = client_class(client_options=options, transport=transport_name)
+        create_channel.assert_called_with(
+            "analyticsadmin.googleapis.com:443",
+            credentials=file_creds,
+            credentials_file=None,
+            quota_project_id=None,
+            default_scopes=(
+                "https://www.googleapis.com/auth/analytics.edit",
+                "https://www.googleapis.com/auth/analytics.manage.users",
+                "https://www.googleapis.com/auth/analytics.manage.users.readonly",
+                "https://www.googleapis.com/auth/analytics.readonly",
+            ),
+            scopes=None,
+            default_host="analyticsadmin.googleapis.com",
+            ssl_credentials=None,
+            options=[
+                ("grpc.max_send_message_length", -1),
+                ("grpc.max_receive_message_length", -1),
+            ],
+        )
+
+
 @pytest.mark.parametrize("request_type", [analytics_admin.GetAccountRequest, dict,])
 def test_get_account(request_type, transport: str = "grpc"):
     client = AnalyticsAdminServiceClient(