Skip to content
This repository has been archived by the owner on Nov 29, 2023. It is now read-only.

fix!: update package names to avoid conflict with google-cloud-bigquery #27

Merged
merged 3 commits into from Oct 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -1,6 +1,6 @@
Services for Google Cloud Bigquery Connection v1 API
====================================================

.. automodule:: google.cloud.bigquery.connection_v1.services.connection_service
.. automodule:: google.cloud.bigquery_connection_v1.services.connection_service
:members:
:inherited-members:
@@ -1,6 +1,6 @@
Types for Google Cloud Bigquery Connection v1 API
=================================================

.. automodule:: google.cloud.bigquery.connection_v1.types
.. automodule:: google.cloud.bigquery_connection_v1.types
:members:
:show-inheritance:
4 changes: 2 additions & 2 deletions docs/index.rst
Expand Up @@ -6,8 +6,8 @@ API Reference
.. toctree::
:maxdepth: 2

connection_v1/services
connection_v1/types
bigquery_connection_v1/services
bigquery_connection_v1/types

Changelog
---------
Expand Down
Expand Up @@ -15,23 +15,23 @@
# limitations under the License.
#

from google.cloud.bigquery.connection_v1.services.connection_service.async_client import (
from google.cloud.bigquery_connection_v1.services.connection_service.async_client import (
ConnectionServiceAsyncClient,
)
from google.cloud.bigquery.connection_v1.services.connection_service.client import (
from google.cloud.bigquery_connection_v1.services.connection_service.client import (
ConnectionServiceClient,
)
from google.cloud.bigquery.connection_v1.types.connection import AwsCrossAccountRole
from google.cloud.bigquery.connection_v1.types.connection import AwsProperties
from google.cloud.bigquery.connection_v1.types.connection import CloudSqlCredential
from google.cloud.bigquery.connection_v1.types.connection import CloudSqlProperties
from google.cloud.bigquery.connection_v1.types.connection import Connection
from google.cloud.bigquery.connection_v1.types.connection import CreateConnectionRequest
from google.cloud.bigquery.connection_v1.types.connection import DeleteConnectionRequest
from google.cloud.bigquery.connection_v1.types.connection import GetConnectionRequest
from google.cloud.bigquery.connection_v1.types.connection import ListConnectionsRequest
from google.cloud.bigquery.connection_v1.types.connection import ListConnectionsResponse
from google.cloud.bigquery.connection_v1.types.connection import UpdateConnectionRequest
from google.cloud.bigquery_connection_v1.types.connection import AwsCrossAccountRole
from google.cloud.bigquery_connection_v1.types.connection import AwsProperties
from google.cloud.bigquery_connection_v1.types.connection import CloudSqlCredential
from google.cloud.bigquery_connection_v1.types.connection import CloudSqlProperties
from google.cloud.bigquery_connection_v1.types.connection import Connection
from google.cloud.bigquery_connection_v1.types.connection import CreateConnectionRequest
from google.cloud.bigquery_connection_v1.types.connection import DeleteConnectionRequest
from google.cloud.bigquery_connection_v1.types.connection import GetConnectionRequest
from google.cloud.bigquery_connection_v1.types.connection import ListConnectionsRequest
from google.cloud.bigquery_connection_v1.types.connection import ListConnectionsResponse
from google.cloud.bigquery_connection_v1.types.connection import UpdateConnectionRequest

__all__ = (
"AwsCrossAccountRole",
Expand Down
Expand Up @@ -28,9 +28,9 @@
from google.auth import credentials # type: ignore
from google.oauth2 import service_account # type: ignore

from google.cloud.bigquery.connection_v1.services.connection_service import pagers
from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.services.connection_service import pagers
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
from google.protobuf import field_mask_pb2 as field_mask # type: ignore
Expand Down
Expand Up @@ -32,9 +32,9 @@
from google.auth.exceptions import MutualTLSChannelError # type: ignore
from google.oauth2 import service_account # type: ignore

from google.cloud.bigquery.connection_v1.services.connection_service import pagers
from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.services.connection_service import pagers
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
from google.protobuf import field_mask_pb2 as field_mask # type: ignore
Expand Down
Expand Up @@ -17,7 +17,7 @@

from typing import Any, AsyncIterable, Awaitable, Callable, Iterable, Sequence, Tuple

from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection


class ListConnectionsPager:
Expand Down
Expand Up @@ -25,8 +25,8 @@
from google.api_core import retry as retries # type: ignore
from google.auth import credentials # type: ignore

from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
from google.protobuf import empty_pb2 as empty # type: ignore
Expand Down
Expand Up @@ -26,8 +26,8 @@

import grpc # type: ignore

from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
from google.protobuf import empty_pb2 as empty # type: ignore
Expand Down
Expand Up @@ -27,8 +27,8 @@
import grpc # type: ignore
from grpc.experimental import aio # type: ignore

from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
from google.protobuf import empty_pb2 as empty # type: ignore
Expand Down
Expand Up @@ -38,7 +38,7 @@ def partition(
return results[1], results[0]


class connectionCallTransformer(cst.CSTTransformer):
class bigquery_connectionCallTransformer(cst.CSTTransformer):
CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata')
METHOD_TO_PARAMS: Dict[str, Tuple[str]] = {
'create_connection': ('parent', 'connection', 'connection_id', ),
Expand Down Expand Up @@ -98,7 +98,7 @@ def fix_files(
in_dir: pathlib.Path,
out_dir: pathlib.Path,
*,
transformer=connectionCallTransformer(),
transformer=bigquery_connectionCallTransformer(),
):
"""Duplicate the input dir to the output dir, fixing file method calls.

Expand Down Expand Up @@ -131,7 +131,7 @@ def fix_files(

if __name__ == '__main__':
parser = argparse.ArgumentParser(
description="""Fix up source that uses the connection client library.
description="""Fix up source that uses the bigquery_connection client library.

The existing sources are NOT overwritten but are copied to output_dir with changes made.

Expand Down
44 changes: 22 additions & 22 deletions synth.metadata
Expand Up @@ -11,8 +11,8 @@
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "07d41a7e5cade45aba6f0d277c89722b48f2c956",
"internalRef": "339292950"
"sha": "ae77417a40098bf64d04047760153f47daf2975f",
"internalRef": "339505822"
}
},
{
Expand Down Expand Up @@ -92,30 +92,30 @@
"MANIFEST.in",
"docs/_static/custom.css",
"docs/_templates/layout.html",
"docs/bigquery_connection_v1/services.rst",
"docs/bigquery_connection_v1/types.rst",
"docs/conf.py",
"docs/connection_v1/services.rst",
"docs/connection_v1/types.rst",
"docs/multiprocessing.rst",
"google/cloud/bigquery/connection/__init__.py",
"google/cloud/bigquery/connection/py.typed",
"google/cloud/bigquery/connection_v1/__init__.py",
"google/cloud/bigquery/connection_v1/py.typed",
"google/cloud/bigquery/connection_v1/services/__init__.py",
"google/cloud/bigquery/connection_v1/services/connection_service/__init__.py",
"google/cloud/bigquery/connection_v1/services/connection_service/async_client.py",
"google/cloud/bigquery/connection_v1/services/connection_service/client.py",
"google/cloud/bigquery/connection_v1/services/connection_service/pagers.py",
"google/cloud/bigquery/connection_v1/services/connection_service/transports/__init__.py",
"google/cloud/bigquery/connection_v1/services/connection_service/transports/base.py",
"google/cloud/bigquery/connection_v1/services/connection_service/transports/grpc.py",
"google/cloud/bigquery/connection_v1/services/connection_service/transports/grpc_asyncio.py",
"google/cloud/bigquery/connection_v1/types/__init__.py",
"google/cloud/bigquery/connection_v1/types/connection.py",
"google/cloud/bigquery_connection/__init__.py",
"google/cloud/bigquery_connection/py.typed",
"google/cloud/bigquery_connection_v1/__init__.py",
"google/cloud/bigquery_connection_v1/py.typed",
"google/cloud/bigquery_connection_v1/services/__init__.py",
"google/cloud/bigquery_connection_v1/services/connection_service/__init__.py",
"google/cloud/bigquery_connection_v1/services/connection_service/async_client.py",
"google/cloud/bigquery_connection_v1/services/connection_service/client.py",
"google/cloud/bigquery_connection_v1/services/connection_service/pagers.py",
"google/cloud/bigquery_connection_v1/services/connection_service/transports/__init__.py",
"google/cloud/bigquery_connection_v1/services/connection_service/transports/base.py",
"google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc.py",
"google/cloud/bigquery_connection_v1/services/connection_service/transports/grpc_asyncio.py",
"google/cloud/bigquery_connection_v1/types/__init__.py",
"google/cloud/bigquery_connection_v1/types/connection.py",
"mypy.ini",
"noxfile.py",
"renovate.json",
"scripts/decrypt-secrets.sh",
"scripts/fixup_connection_v1_keywords.py",
"scripts/fixup_bigquery_connection_v1_keywords.py",
"scripts/readme-gen/readme_gen.py",
"scripts/readme-gen/templates/README.tmpl.rst",
"scripts/readme-gen/templates/auth.tmpl.rst",
Expand All @@ -124,7 +124,7 @@
"scripts/readme-gen/templates/install_portaudio.tmpl.rst",
"setup.cfg",
"testing/.gitignore",
"tests/unit/gapic/connection_v1/__init__.py",
"tests/unit/gapic/connection_v1/test_connection_service.py"
"tests/unit/gapic/bigquery_connection_v1/__init__.py",
"tests/unit/gapic/bigquery_connection_v1/test_connection_service.py"
]
}
Expand Up @@ -32,16 +32,16 @@
from google.api_core import grpc_helpers_async
from google.auth import credentials
from google.auth.exceptions import MutualTLSChannelError
from google.cloud.bigquery.connection_v1.services.connection_service import (
from google.cloud.bigquery_connection_v1.services.connection_service import (
ConnectionServiceAsyncClient,
)
from google.cloud.bigquery.connection_v1.services.connection_service import (
from google.cloud.bigquery_connection_v1.services.connection_service import (
ConnectionServiceClient,
)
from google.cloud.bigquery.connection_v1.services.connection_service import pagers
from google.cloud.bigquery.connection_v1.services.connection_service import transports
from google.cloud.bigquery.connection_v1.types import connection
from google.cloud.bigquery.connection_v1.types import connection as gcbc_connection
from google.cloud.bigquery_connection_v1.services.connection_service import pagers
from google.cloud.bigquery_connection_v1.services.connection_service import transports
from google.cloud.bigquery_connection_v1.types import connection
from google.cloud.bigquery_connection_v1.types import connection as gcbc_connection
from google.iam.v1 import iam_policy_pb2 as iam_policy # type: ignore
from google.iam.v1 import options_pb2 as options # type: ignore
from google.iam.v1 import policy_pb2 as policy # type: ignore
Expand Down Expand Up @@ -441,7 +441,7 @@ def test_connection_service_client_client_options_credentials_file(

def test_connection_service_client_client_options_from_dict():
with mock.patch(
"google.cloud.bigquery.connection_v1.services.connection_service.transports.ConnectionServiceGrpcTransport.__init__"
"google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceGrpcTransport.__init__"
) as grpc_transport:
grpc_transport.return_value = None
client = ConnectionServiceClient(
Expand Down Expand Up @@ -2517,7 +2517,7 @@ def test_connection_service_base_transport_error():
def test_connection_service_base_transport():
# Instantiate the base transport.
with mock.patch(
"google.cloud.bigquery.connection_v1.services.connection_service.transports.ConnectionServiceTransport.__init__"
"google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport.__init__"
) as Transport:
Transport.return_value = None
transport = transports.ConnectionServiceTransport(
Expand Down Expand Up @@ -2546,7 +2546,7 @@ def test_connection_service_base_transport_with_credentials_file():
with mock.patch.object(
auth, "load_credentials_from_file"
) as load_creds, mock.patch(
"google.cloud.bigquery.connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages"
"google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages"
) as Transport:
Transport.return_value = None
load_creds.return_value = (credentials.AnonymousCredentials(), None)
Expand All @@ -2566,7 +2566,7 @@ def test_connection_service_base_transport_with_credentials_file():
def test_connection_service_base_transport_with_adc():
# Test the default credentials are used if credentials and credentials_file are None.
with mock.patch.object(auth, "default") as adc, mock.patch(
"google.cloud.bigquery.connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages"
"google.cloud.bigquery_connection_v1.services.connection_service.transports.ConnectionServiceTransport._prep_wrapped_messages"
) as Transport:
Transport.return_value = None
adc.return_value = (credentials.AnonymousCredentials(), None)
Expand Down