chore: upgrade gapic-generator-python to 0.42.2 (#82)

This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/357ba1e3-340b-4549-88d1-5f455d8f12d1/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 361662015 Source-Link: googleapis/googleapis@28a5919 PiperOrigin-RevId: 359562873 Source-Link: googleapis/googleapis@07932bb PiperOrigin-RevId: 355923884 Source-Link: googleapis/googleapis@5e3dace
googleapis · Mar 22, 2021 · c67c36c · c67c36c
1 parent dc7b419
commit c67c36c
Show file tree

Hide file tree

Showing 7 changed files with 441 additions and 48 deletions.
diff --git a/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py b/google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py
@@ -111,8 +111,36 @@ class ReservationServiceAsyncClient:
         ReservationServiceClient.parse_common_location_path
     )
 
-    from_service_account_info = ReservationServiceClient.from_service_account_info
-    from_service_account_file = ReservationServiceClient.from_service_account_file
+    @classmethod
+    def from_service_account_info(cls, info: dict, *args, **kwargs):
+        """Creates an instance of this client using the provided credentials info.
+
+        Args:
+            info (dict): The service account private key info.
+            args: Additional arguments to pass to the constructor.
+            kwargs: Additional arguments to pass to the constructor.
+
+        Returns:
+            ReservationServiceAsyncClient: The constructed client.
+        """
+        return ReservationServiceClient.from_service_account_info.__func__(ReservationServiceAsyncClient, info, *args, **kwargs)  # type: ignore
+
+    @classmethod
+    def from_service_account_file(cls, filename: str, *args, **kwargs):
+        """Creates an instance of this client using the provided credentials
+        file.
+
+        Args:
+            filename (str): The path to the service account private key json
+                file.
+            args: Additional arguments to pass to the constructor.
+            kwargs: Additional arguments to pass to the constructor.
+
+        Returns:
+            ReservationServiceAsyncClient: The constructed client.
+        """
+        return ReservationServiceClient.from_service_account_file.__func__(ReservationServiceAsyncClient, filename, *args, **kwargs)  # type: ignore
+
     from_service_account_json = from_service_account_file
 
     @property

diff --git a/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py b/google/cloud/bigquery_reservation_v1/services/reservation_service/client.py
@@ -1465,9 +1465,8 @@ def merge_capacity_commitments(
 
             if parent is not None:
                 request.parent = parent
-
-            if capacity_commitment_ids:
-                request.capacity_commitment_ids.extend(capacity_commitment_ids)
+            if capacity_commitment_ids is not None:
+                request.capacity_commitment_ids = capacity_commitment_ids
 
         # Wrap the RPC method; this adds retry and timeout information,
         # and friendly error handling.

diff --git a/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py b/google/cloud/bigquery_reservation_v1/services/reservation_service/pagers.py
@@ -15,7 +15,16 @@
 # limitations under the License.
 #
 
-from typing import Any, AsyncIterable, Awaitable, Callable, Iterable, Sequence, Tuple
+from typing import (
+    Any,
+    AsyncIterable,
+    Awaitable,
+    Callable,
+    Iterable,
+    Sequence,
+    Tuple,
+    Optional,
+)
 
 from google.cloud.bigquery_reservation_v1.types import reservation
 

diff --git a/google/cloud/bigquery_reservation_v1/types/__init__.py b/google/cloud/bigquery_reservation_v1/types/__init__.py
@@ -16,63 +16,63 @@
 #
 
 from .reservation import (
-    Reservation,
+    Assignment,
+    BiReservation,
     CapacityCommitment,
+    CreateAssignmentRequest,
+    CreateCapacityCommitmentRequest,
     CreateReservationRequest,
-    ListReservationsRequest,
-    ListReservationsResponse,
-    GetReservationRequest,
+    DeleteAssignmentRequest,
+    DeleteCapacityCommitmentRequest,
     DeleteReservationRequest,
-    UpdateReservationRequest,
-    CreateCapacityCommitmentRequest,
-    ListCapacityCommitmentsRequest,
-    ListCapacityCommitmentsResponse,
+    GetBiReservationRequest,
     GetCapacityCommitmentRequest,
-    DeleteCapacityCommitmentRequest,
-    UpdateCapacityCommitmentRequest,
-    SplitCapacityCommitmentRequest,
-    SplitCapacityCommitmentResponse,
-    MergeCapacityCommitmentsRequest,
-    Assignment,
-    CreateAssignmentRequest,
+    GetReservationRequest,
     ListAssignmentsRequest,
     ListAssignmentsResponse,
-    DeleteAssignmentRequest,
+    ListCapacityCommitmentsRequest,
+    ListCapacityCommitmentsResponse,
+    ListReservationsRequest,
+    ListReservationsResponse,
+    MergeCapacityCommitmentsRequest,
+    MoveAssignmentRequest,
+    Reservation,
     SearchAssignmentsRequest,
     SearchAssignmentsResponse,
-    MoveAssignmentRequest,
-    BiReservation,
-    GetBiReservationRequest,
+    SplitCapacityCommitmentRequest,
+    SplitCapacityCommitmentResponse,
     UpdateBiReservationRequest,
+    UpdateCapacityCommitmentRequest,
+    UpdateReservationRequest,
 )
 
 __all__ = (
-    "Reservation",
+    "Assignment",
+    "BiReservation",
     "CapacityCommitment",
+    "CreateAssignmentRequest",
+    "CreateCapacityCommitmentRequest",
     "CreateReservationRequest",
-    "ListReservationsRequest",
-    "ListReservationsResponse",
-    "GetReservationRequest",
+    "DeleteAssignmentRequest",
+    "DeleteCapacityCommitmentRequest",
     "DeleteReservationRequest",
-    "UpdateReservationRequest",
-    "CreateCapacityCommitmentRequest",
-    "ListCapacityCommitmentsRequest",
-    "ListCapacityCommitmentsResponse",
+    "GetBiReservationRequest",
     "GetCapacityCommitmentRequest",
-    "DeleteCapacityCommitmentRequest",
-    "UpdateCapacityCommitmentRequest",
-    "SplitCapacityCommitmentRequest",
-    "SplitCapacityCommitmentResponse",
-    "MergeCapacityCommitmentsRequest",
-    "Assignment",
-    "CreateAssignmentRequest",
+    "GetReservationRequest",
     "ListAssignmentsRequest",
     "ListAssignmentsResponse",
-    "DeleteAssignmentRequest",
+    "ListCapacityCommitmentsRequest",
+    "ListCapacityCommitmentsResponse",
+    "ListReservationsRequest",
+    "ListReservationsResponse",
+    "MergeCapacityCommitmentsRequest",
+    "MoveAssignmentRequest",
+    "Reservation",
     "SearchAssignmentsRequest",
     "SearchAssignmentsResponse",
-    "MoveAssignmentRequest",
-    "BiReservation",
-    "GetBiReservationRequest",
+    "SplitCapacityCommitmentRequest",
+    "SplitCapacityCommitmentResponse",
     "UpdateBiReservationRequest",
+    "UpdateCapacityCommitmentRequest",
+    "UpdateReservationRequest",
 )
diff --git a/synth.metadata b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "20712b8fe95001b312f62c6c5f33e3e3ec92cfaf",
-        "internalRef": "354996675"
+        "sha": "28a591963253d52ce3a25a918cafbdd9928de8cf",
+        "internalRef": "361662015"
       }
     },
     {

diff --git a/tests/unit/gapic/bigquery_reservation_v1/__init__.py b/tests/unit/gapic/bigquery_reservation_v1/__init__.py
@@ -1 +1,16 @@
+# -*- coding: utf-8 -*-
 
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#