🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Author: gcf-owl-bot[bot]

google/cloud/errorreporting_v1beta1/services/error_group_service/client.py

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 from collections import OrderedDict
+from http import HTTPStatus
+import json
 import logging as std_logging
 import os
 import re
@@ -478,6 +480,33 @@ def _validate_universe_domain(self):
         # NOTE (b/349488459): universe validation is disabled until further notice.
         return True
 
+    def _add_cred_info_for_auth_errors(
+        self, error: core_exceptions.GoogleAPICallError
+    ) -> None:
+        """Adds credential info string to error details for 401/403/404 errors.
+
+        Args:
+            error (google.api_core.exceptions.GoogleAPICallError): The error to add the cred info.
+        """
+        if error.code not in [
+            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
+            HTTPStatus.NOT_FOUND,
+        ]:
+            return
+
+        cred = self._transport._credentials
+
+        # get_cred_info is only available in google-auth>=2.35.0
+        if not hasattr(cred, "get_cred_info"):
+            return
+
+        # ignore the type check since pypy test fails when get_cred_info
+        # is not available
+        cred_info = cred.get_cred_info()  # type: ignore
+        if cred_info and hasattr(error._details, "append"):
+            error._details.append(json.dumps(cred_info))
+
     @property
     def api_endpoint(self):
         """Return the API endpoint used by the client instance.

google/cloud/errorreporting_v1beta1/services/error_group_service/transports/rest.py

@@ -114,12 +114,35 @@ def pre_get_group(
     def post_get_group(self, response: common.ErrorGroup) -> common.ErrorGroup:
         """Post-rpc interceptor for get_group
 
-        Override in a subclass to manipulate the response
+        DEPRECATED. Please use the `post_get_group_with_metadata`
+        interceptor instead.
+
+        Override in a subclass to read or manipulate the response
         after it is returned by the ErrorGroupService server but before
-        it is returned to user code.
+        it is returned to user code. This `post_get_group` interceptor runs
+        before the `post_get_group_with_metadata` interceptor.
         """
         return response
 
+    def post_get_group_with_metadata(
+        self,
+        response: common.ErrorGroup,
+        metadata: Sequence[Tuple[str, Union[str, bytes]]],
+    ) -> Tuple[common.ErrorGroup, Sequence[Tuple[str, Union[str, bytes]]]]:
+        """Post-rpc interceptor for get_group
+
+        Override in a subclass to read or manipulate the response or metadata after it
+        is returned by the ErrorGroupService server but before it is returned to user code.
+
+        We recommend only using this `post_get_group_with_metadata`
+        interceptor in new development instead of the `post_get_group` interceptor.
+        When both interceptors are used, this `post_get_group_with_metadata` interceptor runs after the
+        `post_get_group` interceptor. The (possibly modified) response returned by
+        `post_get_group` will be passed to
+        `post_get_group_with_metadata`.
+        """
+        return response, metadata
+
     def pre_update_group(
         self,
         request: error_group_service.UpdateGroupRequest,
@@ -137,12 +160,35 @@ def pre_update_group(
     def post_update_group(self, response: common.ErrorGroup) -> common.ErrorGroup:
         """Post-rpc interceptor for update_group
 
-        Override in a subclass to manipulate the response
+        DEPRECATED. Please use the `post_update_group_with_metadata`
+        interceptor instead.
+
+        Override in a subclass to read or manipulate the response
         after it is returned by the ErrorGroupService server but before
-        it is returned to user code.
+        it is returned to user code. This `post_update_group` interceptor runs
+        before the `post_update_group_with_metadata` interceptor.
         """
         return response
 
+    def post_update_group_with_metadata(
+        self,
+        response: common.ErrorGroup,
+        metadata: Sequence[Tuple[str, Union[str, bytes]]],
+    ) -> Tuple[common.ErrorGroup, Sequence[Tuple[str, Union[str, bytes]]]]:
+        """Post-rpc interceptor for update_group
+
+        Override in a subclass to read or manipulate the response or metadata after it
+        is returned by the ErrorGroupService server but before it is returned to user code.
+
+        We recommend only using this `post_update_group_with_metadata`
+        interceptor in new development instead of the `post_update_group` interceptor.
+        When both interceptors are used, this `post_update_group_with_metadata` interceptor runs after the
+        `post_update_group` interceptor. The (possibly modified) response returned by
+        `post_update_group` will be passed to
+        `post_update_group_with_metadata`.
+        """
+        return response, metadata
+
 
 @dataclasses.dataclass
 class ErrorGroupServiceRestStub:
@@ -350,6 +396,10 @@ def __call__(
             json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
 
             resp = self._interceptor.post_get_group(resp)
+            response_metadata = [(k, str(v)) for k, v in response.headers.items()]
+            resp, _ = self._interceptor.post_get_group_with_metadata(
+                resp, response_metadata
+            )
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
                 logging.DEBUG
             ):  # pragma: NO COVER
@@ -499,6 +549,10 @@ def __call__(
             json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
 
             resp = self._interceptor.post_update_group(resp)
+            response_metadata = [(k, str(v)) for k, v in response.headers.items()]
+            resp, _ = self._interceptor.post_update_group_with_metadata(
+                resp, response_metadata
+            )
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
                 logging.DEBUG
             ):  # pragma: NO COVER

google/cloud/errorreporting_v1beta1/services/error_stats_service/client.py

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 from collections import OrderedDict
+from http import HTTPStatus
+import json
 import logging as std_logging
 import os
 import re
@@ -481,6 +483,33 @@ def _validate_universe_domain(self):
         # NOTE (b/349488459): universe validation is disabled until further notice.
         return True
 
+    def _add_cred_info_for_auth_errors(
+        self, error: core_exceptions.GoogleAPICallError
+    ) -> None:
+        """Adds credential info string to error details for 401/403/404 errors.
+
+        Args:
+            error (google.api_core.exceptions.GoogleAPICallError): The error to add the cred info.
+        """
+        if error.code not in [
+            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
+            HTTPStatus.NOT_FOUND,
+        ]:
+            return
+
+        cred = self._transport._credentials
+
+        # get_cred_info is only available in google-auth>=2.35.0
+        if not hasattr(cred, "get_cred_info"):
+            return
+
+        # ignore the type check since pypy test fails when get_cred_info
+        # is not available
+        cred_info = cred.get_cred_info()  # type: ignore
+        if cred_info and hasattr(error._details, "append"):
+            error._details.append(json.dumps(cred_info))
+
     @property
     def api_endpoint(self):
         """Return the API endpoint used by the client instance.

google/cloud/errorreporting_v1beta1/services/error_stats_service/transports/rest.py

@@ -123,12 +123,38 @@ def post_delete_events(
     ) -> error_stats_service.DeleteEventsResponse:
         """Post-rpc interceptor for delete_events
 
-        Override in a subclass to manipulate the response
+        DEPRECATED. Please use the `post_delete_events_with_metadata`
+        interceptor instead.
+
+        Override in a subclass to read or manipulate the response
         after it is returned by the ErrorStatsService server but before
-        it is returned to user code.
+        it is returned to user code. This `post_delete_events` interceptor runs
+        before the `post_delete_events_with_metadata` interceptor.
         """
         return response
 
+    def post_delete_events_with_metadata(
+        self,
+        response: error_stats_service.DeleteEventsResponse,
+        metadata: Sequence[Tuple[str, Union[str, bytes]]],
+    ) -> Tuple[
+        error_stats_service.DeleteEventsResponse,
+        Sequence[Tuple[str, Union[str, bytes]]],
+    ]:
+        """Post-rpc interceptor for delete_events
+
+        Override in a subclass to read or manipulate the response or metadata after it
+        is returned by the ErrorStatsService server but before it is returned to user code.
+
+        We recommend only using this `post_delete_events_with_metadata`
+        interceptor in new development instead of the `post_delete_events` interceptor.
+        When both interceptors are used, this `post_delete_events_with_metadata` interceptor runs after the
+        `post_delete_events` interceptor. The (possibly modified) response returned by
+        `post_delete_events` will be passed to
+        `post_delete_events_with_metadata`.
+        """
+        return response, metadata
+
     def pre_list_events(
         self,
         request: error_stats_service.ListEventsRequest,
@@ -148,12 +174,37 @@ def post_list_events(
     ) -> error_stats_service.ListEventsResponse:
         """Post-rpc interceptor for list_events
 
-        Override in a subclass to manipulate the response
+        DEPRECATED. Please use the `post_list_events_with_metadata`
+        interceptor instead.
+
+        Override in a subclass to read or manipulate the response
         after it is returned by the ErrorStatsService server but before
-        it is returned to user code.
+        it is returned to user code. This `post_list_events` interceptor runs
+        before the `post_list_events_with_metadata` interceptor.
         """
         return response
 
+    def post_list_events_with_metadata(
+        self,
+        response: error_stats_service.ListEventsResponse,
+        metadata: Sequence[Tuple[str, Union[str, bytes]]],
+    ) -> Tuple[
+        error_stats_service.ListEventsResponse, Sequence[Tuple[str, Union[str, bytes]]]
+    ]:
+        """Post-rpc interceptor for list_events
+
+        Override in a subclass to read or manipulate the response or metadata after it
+        is returned by the ErrorStatsService server but before it is returned to user code.
+
+        We recommend only using this `post_list_events_with_metadata`
+        interceptor in new development instead of the `post_list_events` interceptor.
+        When both interceptors are used, this `post_list_events_with_metadata` interceptor runs after the
+        `post_list_events` interceptor. The (possibly modified) response returned by
+        `post_list_events` will be passed to
+        `post_list_events_with_metadata`.
+        """
+        return response, metadata
+
     def pre_list_group_stats(
         self,
         request: error_stats_service.ListGroupStatsRequest,
@@ -174,12 +225,38 @@ def post_list_group_stats(
     ) -> error_stats_service.ListGroupStatsResponse:
         """Post-rpc interceptor for list_group_stats
 
-        Override in a subclass to manipulate the response
+        DEPRECATED. Please use the `post_list_group_stats_with_metadata`
+        interceptor instead.
+
+        Override in a subclass to read or manipulate the response
         after it is returned by the ErrorStatsService server but before
-        it is returned to user code.
+        it is returned to user code. This `post_list_group_stats` interceptor runs
+        before the `post_list_group_stats_with_metadata` interceptor.
         """
         return response
 
+    def post_list_group_stats_with_metadata(
+        self,
+        response: error_stats_service.ListGroupStatsResponse,
+        metadata: Sequence[Tuple[str, Union[str, bytes]]],
+    ) -> Tuple[
+        error_stats_service.ListGroupStatsResponse,
+        Sequence[Tuple[str, Union[str, bytes]]],
+    ]:
+        """Post-rpc interceptor for list_group_stats
+
+        Override in a subclass to read or manipulate the response or metadata after it
+        is returned by the ErrorStatsService server but before it is returned to user code.
+
+        We recommend only using this `post_list_group_stats_with_metadata`
+        interceptor in new development instead of the `post_list_group_stats` interceptor.
+        When both interceptors are used, this `post_list_group_stats_with_metadata` interceptor runs after the
+        `post_list_group_stats` interceptor. The (possibly modified) response returned by
+        `post_list_group_stats` will be passed to
+        `post_list_group_stats_with_metadata`.
+        """
+        return response, metadata
+
 
 @dataclasses.dataclass
 class ErrorStatsServiceRestStub:
@@ -387,6 +464,10 @@ def __call__(
             json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
 
             resp = self._interceptor.post_delete_events(resp)
+            response_metadata = [(k, str(v)) for k, v in response.headers.items()]
+            resp, _ = self._interceptor.post_delete_events_with_metadata(
+                resp, response_metadata
+            )
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
                 logging.DEBUG
             ):  # pragma: NO COVER
@@ -532,6 +613,10 @@ def __call__(
             json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
 
             resp = self._interceptor.post_list_events(resp)
+            response_metadata = [(k, str(v)) for k, v in response.headers.items()]
+            resp, _ = self._interceptor.post_list_events_with_metadata(
+                resp, response_metadata
+            )
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
                 logging.DEBUG
             ):  # pragma: NO COVER
@@ -679,6 +764,10 @@ def __call__(
             json_format.Parse(response.content, pb_resp, ignore_unknown_fields=True)
 
             resp = self._interceptor.post_list_group_stats(resp)
+            response_metadata = [(k, str(v)) for k, v in response.headers.items()]
+            resp, _ = self._interceptor.post_list_group_stats_with_metadata(
+                resp, response_metadata
+            )
             if CLIENT_LOGGING_SUPPORTED and _LOGGER.isEnabledFor(
                 logging.DEBUG
             ):  # pragma: NO COVER

google/cloud/errorreporting_v1beta1/services/report_errors_service/client.py

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 from collections import OrderedDict
+from http import HTTPStatus
+import json
 import logging as std_logging
 import os
 import re
@@ -460,6 +462,33 @@ def _validate_universe_domain(self):
         # NOTE (b/349488459): universe validation is disabled until further notice.
         return True
 
+    def _add_cred_info_for_auth_errors(
+        self, error: core_exceptions.GoogleAPICallError
+    ) -> None:
+        """Adds credential info string to error details for 401/403/404 errors.
+
+        Args:
+            error (google.api_core.exceptions.GoogleAPICallError): The error to add the cred info.
+        """
+        if error.code not in [
+            HTTPStatus.UNAUTHORIZED,
+            HTTPStatus.FORBIDDEN,
+            HTTPStatus.NOT_FOUND,
+        ]:
+            return
+
+        cred = self._transport._credentials
+
+        # get_cred_info is only available in google-auth>=2.35.0
+        if not hasattr(cred, "get_cred_info"):
+            return
+
+        # ignore the type check since pypy test fails when get_cred_info
+        # is not available
+        cred_info = cred.get_cred_info()  # type: ignore
+        if cred_info and hasattr(error._details, "append"):
+            error._details.append(json.dumps(cred_info))
+
     @property
     def api_endpoint(self):
         """Return the API endpoint used by the client instance.