chore(gapic): update goldens to match generator output

Author: chalmerlowe

packages/gapic-generator/tests/integration/goldens/asset/tests/unit/gapic/asset_v1/test_asset_service.py

@@ -13,60 +13,62 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import asyncio
-import json
-import math
 import os
-from collections.abc import AsyncIterable, Iterable, Mapping, Sequence
+import asyncio
 from unittest import mock
 from unittest.mock import AsyncMock
 
 import grpc
+from grpc.experimental import aio
+from collections.abc import Iterable, AsyncIterable
+from google.protobuf import json_format
+import json
+import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
-from google.protobuf import json_format
-from grpc.experimental import aio
-from proto.marshal.rules import wrappers
 from proto.marshal.rules.dates import DurationRule, TimestampRule
-from requests import PreparedRequest, Request, Response
+from proto.marshal.rules import wrappers
+from requests import Response
+from requests import Request, PreparedRequest
 from requests.sessions import Session
+from google.protobuf import json_format
 
 try:
     from google.auth.aio import credentials as ga_credentials_async
     HAS_GOOGLE_AUTH_AIO = True
 except ImportError: # pragma: NO COVER
     HAS_GOOGLE_AUTH_AIO = False
 
+from google.api_core import client_options
+from google.api_core import exceptions as core_exceptions
+from google.api_core import future
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers
+from google.api_core import grpc_helpers_async
+from google.api_core import operation
+from google.api_core import operations_v1
+from google.api_core import path_template
+from google.api_core import retry as retries
+from google.auth import credentials as ga_credentials
+from google.auth.exceptions import MutualTLSChannelError
+from google.cloud.asset_v1.services.asset_service import AssetServiceAsyncClient
+from google.cloud.asset_v1.services.asset_service import AssetServiceClient
+from google.cloud.asset_v1.services.asset_service import pagers
+from google.cloud.asset_v1.services.asset_service import transports
+from google.cloud.asset_v1.types import asset_service
+from google.cloud.asset_v1.types import assets
+from google.longrunning import operations_pb2 # type: ignore
+from google.oauth2 import service_account
 import google.api_core.operation_async as operation_async  # type: ignore
 import google.auth
 import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
 import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
 import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
 import google.rpc.status_pb2 as status_pb2  # type: ignore
 import google.type.expr_pb2 as expr_pb2  # type: ignore
-from google.api_core import (
-    client_options,
-    future,
-    gapic_v1,
-    grpc_helpers,
-    grpc_helpers_async,
-    operation,
-    operations_v1,
-    path_template,
-)
-from google.api_core import exceptions as core_exceptions
-from google.api_core import retry as retries
-from google.auth import credentials as ga_credentials
-from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.asset_v1.services.asset_service import (
-    AssetServiceAsyncClient,
-    AssetServiceClient,
-    pagers,
-    transports,
-)
-from google.cloud.asset_v1.types import asset_service, assets
-from google.longrunning import operations_pb2  # type: ignore
-from google.oauth2 import service_account
+
+
 
 CRED_INFO_JSON = {
     "credential_source": "/path/to/file",

packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_config_service_v2.py

@@ -13,55 +13,53 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import asyncio
-import json
-import math
 import os
-from collections.abc import Mapping, Sequence
+import asyncio
 from unittest import mock
 from unittest.mock import AsyncMock
 
 import grpc
+from grpc.experimental import aio
+import json
+import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
-from grpc.experimental import aio
-from proto.marshal.rules import wrappers
 from proto.marshal.rules.dates import DurationRule, TimestampRule
+from proto.marshal.rules import wrappers
 
 try:
     from google.auth.aio import credentials as ga_credentials_async
     HAS_GOOGLE_AUTH_AIO = True
 except ImportError: # pragma: NO COVER
     HAS_GOOGLE_AUTH_AIO = False
 
-import google.api_core.operation_async as operation_async  # type: ignore
-import google.auth
-import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
-import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
-import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
-from google.api_core import (
-    client_options,
-    future,
-    gapic_v1,
-    grpc_helpers,
-    grpc_helpers_async,
-    operation,
-    operations_v1,
-    path_template,
-)
+from google.api_core import client_options
 from google.api_core import exceptions as core_exceptions
+from google.api_core import future
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers
+from google.api_core import grpc_helpers_async
+from google.api_core import operation
+from google.api_core import operations_v1
+from google.api_core import path_template
 from google.api_core import retry as retries
 from google.auth import credentials as ga_credentials
 from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.logging_v2.services.config_service_v2 import (
-    ConfigServiceV2AsyncClient,
-    ConfigServiceV2Client,
-    pagers,
-    transports,
-)
+from google.cloud.logging_v2.services.config_service_v2 import ConfigServiceV2AsyncClient
+from google.cloud.logging_v2.services.config_service_v2 import ConfigServiceV2Client
+from google.cloud.logging_v2.services.config_service_v2 import pagers
+from google.cloud.logging_v2.services.config_service_v2 import transports
 from google.cloud.logging_v2.types import logging_config
-from google.longrunning import operations_pb2  # type: ignore
+from google.longrunning import operations_pb2 # type: ignore
 from google.oauth2 import service_account
+import google.api_core.operation_async as operation_async  # type: ignore
+import google.auth
+import google.protobuf.empty_pb2 as empty_pb2  # type: ignore
+import google.protobuf.field_mask_pb2 as field_mask_pb2  # type: ignore
+import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
+
+
 
 CRED_INFO_JSON = {
     "credential_source": "/path/to/file",

packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_logging_service_v2.py

@@ -13,27 +13,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import asyncio
-import json
-import math
 import os
-from collections.abc import Mapping, Sequence
+import asyncio
 from unittest import mock
 from unittest.mock import AsyncMock
 
 import grpc
+from grpc.experimental import aio
+import json
+import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
-from grpc.experimental import aio
-from proto.marshal.rules import wrappers
 from proto.marshal.rules.dates import DurationRule, TimestampRule
+from proto.marshal.rules import wrappers
 
 try:
     from google.auth.aio import credentials as ga_credentials_async
     HAS_GOOGLE_AUTH_AIO = True
 except ImportError: # pragma: NO COVER
     HAS_GOOGLE_AUTH_AIO = False
 
+from google.api_core import client_options
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers
+from google.api_core import grpc_helpers_async
+from google.api_core import path_template
+from google.api_core import retry as retries
+from google.auth import credentials as ga_credentials
+from google.auth.exceptions import MutualTLSChannelError
+from google.cloud.logging_v2.services.logging_service_v2 import LoggingServiceV2AsyncClient
+from google.cloud.logging_v2.services.logging_service_v2 import LoggingServiceV2Client
+from google.cloud.logging_v2.services.logging_service_v2 import pagers
+from google.cloud.logging_v2.services.logging_service_v2 import transports
+from google.cloud.logging_v2.types import log_entry
+from google.cloud.logging_v2.types import logging
+from google.longrunning import operations_pb2 # type: ignore
+from google.oauth2 import service_account
 import google.api.monitored_resource_pb2 as monitored_resource_pb2  # type: ignore
 import google.auth
 import google.logging.type.http_request_pb2 as http_request_pb2  # type: ignore
@@ -42,26 +59,8 @@
 import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
 import google.protobuf.struct_pb2 as struct_pb2  # type: ignore
 import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
-from google.api_core import (
-    client_options,
-    gapic_v1,
-    grpc_helpers,
-    grpc_helpers_async,
-    path_template,
-)
-from google.api_core import exceptions as core_exceptions
-from google.api_core import retry as retries
-from google.auth import credentials as ga_credentials
-from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.logging_v2.services.logging_service_v2 import (
-    LoggingServiceV2AsyncClient,
-    LoggingServiceV2Client,
-    pagers,
-    transports,
-)
-from google.cloud.logging_v2.types import log_entry, logging
-from google.longrunning import operations_pb2  # type: ignore
-from google.oauth2 import service_account
+
+
 
 CRED_INFO_JSON = {
     "credential_source": "/path/to/file",

packages/gapic-generator/tests/integration/goldens/logging/tests/unit/gapic/logging_v2/test_metrics_service_v2.py

@@ -13,54 +13,52 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import asyncio
-import json
-import math
 import os
-from collections.abc import Mapping, Sequence
+import asyncio
 from unittest import mock
 from unittest.mock import AsyncMock
 
 import grpc
+from grpc.experimental import aio
+import json
+import math
 import pytest
+from collections.abc import Sequence, Mapping
 from google.api_core import api_core_version
-from grpc.experimental import aio
-from proto.marshal.rules import wrappers
 from proto.marshal.rules.dates import DurationRule, TimestampRule
+from proto.marshal.rules import wrappers
 
 try:
     from google.auth.aio import credentials as ga_credentials_async
     HAS_GOOGLE_AUTH_AIO = True
 except ImportError: # pragma: NO COVER
     HAS_GOOGLE_AUTH_AIO = False
 
+from google.api_core import client_options
+from google.api_core import exceptions as core_exceptions
+from google.api_core import gapic_v1
+from google.api_core import grpc_helpers
+from google.api_core import grpc_helpers_async
+from google.api_core import path_template
+from google.api_core import retry as retries
+from google.auth import credentials as ga_credentials
+from google.auth.exceptions import MutualTLSChannelError
+from google.cloud.logging_v2.services.metrics_service_v2 import MetricsServiceV2AsyncClient
+from google.cloud.logging_v2.services.metrics_service_v2 import MetricsServiceV2Client
+from google.cloud.logging_v2.services.metrics_service_v2 import pagers
+from google.cloud.logging_v2.services.metrics_service_v2 import transports
+from google.cloud.logging_v2.types import logging_metrics
+from google.longrunning import operations_pb2 # type: ignore
+from google.oauth2 import service_account
 import google.api.distribution_pb2 as distribution_pb2  # type: ignore
 import google.api.label_pb2 as label_pb2  # type: ignore
 import google.api.launch_stage_pb2 as launch_stage_pb2  # type: ignore
 import google.api.metric_pb2 as metric_pb2  # type: ignore
 import google.auth
 import google.protobuf.duration_pb2 as duration_pb2  # type: ignore
 import google.protobuf.timestamp_pb2 as timestamp_pb2  # type: ignore
-from google.api_core import (
-    client_options,
-    gapic_v1,
-    grpc_helpers,
-    grpc_helpers_async,
-    path_template,
-)
-from google.api_core import exceptions as core_exceptions
-from google.api_core import retry as retries
-from google.auth import credentials as ga_credentials
-from google.auth.exceptions import MutualTLSChannelError
-from google.cloud.logging_v2.services.metrics_service_v2 import (
-    MetricsServiceV2AsyncClient,
-    MetricsServiceV2Client,
-    pagers,
-    transports,
-)
-from google.cloud.logging_v2.types import logging_metrics
-from google.longrunning import operations_pb2  # type: ignore
-from google.oauth2 import service_account
+
+
 
 CRED_INFO_JSON = {
     "credential_source": "/path/to/file",