fix: Add async context manager return types (#545)

* fix: Add async context manager return types chore: Mock return_value should not populate oneof message fields chore: Support snippet generation for services that only support REST transport chore: Update gapic-generator-python to v1.11.0 PiperOrigin-RevId: 545430278 Source-Link: googleapis/googleapis@601b532 Source-Link: googleapis/googleapis-gen@b3f18d0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjNmMThkMGY2NTYwYTg1NTAyMmZkMDU4ODY1ZTc2MjA0NzlkN2FmOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Jul 4, 2023 · bc030de · bc030de
1 parent ec0b868
commit bc030de
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 61 deletions.
diff --git a/...cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py b/...cloud-monitoring/google/cloud/monitoring_v3/services/alert_policy_service/async_client.py
@@ -868,7 +868,7 @@ async def sample_update_alert_policy():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "AlertPolicyServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py b/...google-cloud-monitoring/google/cloud/monitoring_v3/services/group_service/async_client.py
@@ -1017,7 +1017,7 @@ async def sample_list_group_members():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "GroupServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...oogle-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py b/...oogle-cloud-monitoring/google/cloud/monitoring_v3/services/metric_service/async_client.py
@@ -1386,7 +1386,7 @@ async def sample_create_service_time_series():
             metadata=metadata,
         )
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "MetricServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...nitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py b/...nitoring/google/cloud/monitoring_v3/services/notification_channel_service/async_client.py
@@ -1519,7 +1519,7 @@ async def sample_verify_notification_channel():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "NotificationChannelServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py b/...google-cloud-monitoring/google/cloud/monitoring_v3/services/query_service/async_client.py
@@ -304,7 +304,7 @@ async def sample_query_time_series():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "QueryServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py b/...monitoring/google/cloud/monitoring_v3/services/service_monitoring_service/async_client.py
@@ -1416,7 +1416,7 @@ async def sample_delete_service_level_objective():
             metadata=metadata,
         )
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "ServiceMonitoringServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...oogle-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py b/...oogle-cloud-monitoring/google/cloud/monitoring_v3/services/snooze_service/async_client.py
@@ -763,7 +763,7 @@ async def sample_update_snooze():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "SnoozeServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py b/...cloud-monitoring/google/cloud/monitoring_v3/services/uptime_check_service/async_client.py
@@ -921,7 +921,7 @@ async def sample_list_uptime_check_ips():
         # Done; return the response.
         return response
 
-    async def __aenter__(self):
+    async def __aenter__(self) -> "UptimeCheckServiceAsyncClient":
         return self
 
     async def __aexit__(self, exc_type, exc, tb):

diff --git a/...gle-cloud-monitoring/samples/generated_samples/snippet_metadata_google.monitoring.v3.json b/...gle-cloud-monitoring/samples/generated_samples/snippet_metadata_google.monitoring.v3.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-monitoring",
-    "version": "2.15.0"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_alert_policy_service.py
@@ -1150,9 +1150,11 @@ async def test_list_alert_policies_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_alert_policies(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_group_service.py
@@ -1088,9 +1088,11 @@ async def test_list_groups_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_groups(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -2500,9 +2502,11 @@ async def test_list_group_members_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_group_members(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_metric_service.py
@@ -1137,9 +1137,11 @@ async def test_list_monitored_resource_descriptors_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_monitored_resource_descriptors(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -1843,9 +1845,11 @@ async def test_list_metric_descriptors_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_metric_descriptors(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -3100,9 +3104,11 @@ async def test_list_time_series_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_time_series(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/...ogle-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py b/...ogle-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_notification_channel_service.py
@@ -1181,9 +1181,11 @@ async def test_list_notification_channel_descriptors_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_notification_channel_descriptors(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -1895,9 +1897,11 @@ async def test_list_notification_channels_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_notification_channels(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_query_service.py
@@ -1020,9 +1020,11 @@ async def test_query_time_series_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.query_time_series(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/...google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py b/...google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_service_monitoring_service.py
@@ -746,7 +746,6 @@ def test_create_service(request_type, transport: str = "grpc"):
         call.return_value = gm_service.Service(
             name="name_value",
             display_name="display_name_value",
-            custom=None,
         )
         response = client.create_service(request)
 
@@ -989,7 +988,6 @@ def test_get_service(request_type, transport: str = "grpc"):
         call.return_value = service.Service(
             name="name_value",
             display_name="display_name_value",
-            custom=None,
         )
         response = client.get_service(request)
 
@@ -1611,9 +1609,11 @@ async def test_list_services_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_services(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -1642,7 +1642,6 @@ def test_update_service(request_type, transport: str = "grpc"):
         call.return_value = gm_service.Service(
             name="name_value",
             display_name="display_name_value",
-            custom=None,
         )
         response = client.update_service(request)
 
@@ -2098,7 +2097,7 @@ def test_create_service_level_objective(request_type, transport: str = "grpc"):
             name="name_value",
             display_name="display_name_value",
             goal=0.419,
-            rolling_period=duration_pb2.Duration(seconds=751),
+            calendar_period=calendar_period_pb2.CalendarPeriod.DAY,
         )
         response = client.create_service_level_objective(request)
 
@@ -2364,7 +2363,7 @@ def test_get_service_level_objective(request_type, transport: str = "grpc"):
             name="name_value",
             display_name="display_name_value",
             goal=0.419,
-            rolling_period=duration_pb2.Duration(seconds=751),
+            calendar_period=calendar_period_pb2.CalendarPeriod.DAY,
         )
         response = client.get_service_level_objective(request)
 
@@ -3029,9 +3028,11 @@ async def test_list_service_level_objectives_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_service_level_objectives(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -3063,7 +3064,7 @@ def test_update_service_level_objective(request_type, transport: str = "grpc"):
             name="name_value",
             display_name="display_name_value",
             goal=0.419,
-            rolling_period=duration_pb2.Duration(seconds=751),
+            calendar_period=calendar_period_pb2.CalendarPeriod.DAY,
         )
         response = client.update_service_level_objective(request)
 

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_snooze_service.py
@@ -1343,9 +1343,11 @@ async def test_list_snoozes_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_snoozes(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token

diff --git a/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py b/packages/google-cloud-monitoring/tests/unit/gapic/monitoring_v3/test_uptime_check_service.py
@@ -1146,9 +1146,11 @@ async def test_list_uptime_check_configs_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_uptime_check_configs(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token
@@ -1182,12 +1184,6 @@ def test_get_uptime_check_config(request_type, transport: str = "grpc"):
             checker_type=uptime.UptimeCheckConfig.CheckerType.STATIC_IP_CHECKERS,
             selected_regions=[uptime.UptimeCheckRegion.USA],
             is_internal=True,
-            monitored_resource=monitored_resource_pb2.MonitoredResource(
-                type="type_value"
-            ),
-            http_check=uptime.UptimeCheckConfig.HttpCheck(
-                request_method=uptime.UptimeCheckConfig.HttpCheck.RequestMethod.GET
-            ),
         )
         response = client.get_uptime_check_config(request)
 
@@ -1455,12 +1451,6 @@ def test_create_uptime_check_config(request_type, transport: str = "grpc"):
             checker_type=uptime.UptimeCheckConfig.CheckerType.STATIC_IP_CHECKERS,
             selected_regions=[uptime.UptimeCheckRegion.USA],
             is_internal=True,
-            monitored_resource=monitored_resource_pb2.MonitoredResource(
-                type="type_value"
-            ),
-            http_check=uptime.UptimeCheckConfig.HttpCheck(
-                request_method=uptime.UptimeCheckConfig.HttpCheck.RequestMethod.GET
-            ),
         )
         response = client.create_uptime_check_config(request)
 
@@ -1738,12 +1728,6 @@ def test_update_uptime_check_config(request_type, transport: str = "grpc"):
             checker_type=uptime.UptimeCheckConfig.CheckerType.STATIC_IP_CHECKERS,
             selected_regions=[uptime.UptimeCheckRegion.USA],
             is_internal=True,
-            monitored_resource=monitored_resource_pb2.MonitoredResource(
-                type="type_value"
-            ),
-            http_check=uptime.UptimeCheckConfig.HttpCheck(
-                request_method=uptime.UptimeCheckConfig.HttpCheck.RequestMethod.GET
-            ),
         )
         response = client.update_uptime_check_config(request)
 
@@ -2499,9 +2483,11 @@ async def test_list_uptime_check_ips_async_pages():
             RuntimeError,
         )
         pages = []
-        async for page_ in (
+        # Workaround issue in python 3.9 related to code coverage by adding `# pragma: no branch`
+        # See https://github.com/googleapis/gapic-generator-python/pull/1174#issuecomment-1025132372
+        async for page_ in (  # pragma: no branch
             await client.list_uptime_check_ips(request={})
-        ).pages:  # pragma: no branch
+        ).pages:
             pages.append(page_)
         for page_, token in zip(pages, ["abc", "def", "ghi", ""]):
             assert page_.raw_page.next_page_token == token