diff --git a/librarian.yaml b/librarian.yaml index 7c0eb430af62..e8210ec96dcd 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -2956,7 +2956,6 @@ libraries: - google/cloud/oslogin_v1/common/types - google/cloud/oslogin_v1/common/types/__init__.py - google/cloud/oslogin_v1/common/types/common.py - skip_generate: true python: opt_args_by_api: google/cloud/oslogin/v1: diff --git a/packages/google-cloud-os-login/.repo-metadata.json b/packages/google-cloud-os-login/.repo-metadata.json index 6eaca9fedd8c..44073acf1f41 100644 --- a/packages/google-cloud-os-login/.repo-metadata.json +++ b/packages/google-cloud-os-login/.repo-metadata.json @@ -1,16 +1,16 @@ { - "api_id": "oslogin.googleapis.com", - "api_shortname": "oslogin", - "client_documentation": "https://cloud.google.com/python/docs/reference/oslogin/latest", - "default_version": "v1", - "distribution_name": "google-cloud-os-login", - "issue_tracker": "https://issuetracker.google.com/savedsearches/559755", - "language": "python", - "library_type": "GAPIC_AUTO", - "name": "oslogin", - "name_pretty": "Google Cloud OS Login", - "product_documentation": "https://cloud.google.com/compute/docs/oslogin/", - "release_level": "stable", - "repo": "googleapis/google-cloud-python", - "requires_billing": true + "api_description": "You can use OS Login to manage access to your VM instances using IAM roles.", + "api_id": "oslogin.googleapis.com", + "api_shortname": "oslogin", + "client_documentation": "https://cloud.google.com/python/docs/reference/oslogin/latest", + "default_version": "v1", + "distribution_name": "google-cloud-os-login", + "issue_tracker": "https://issuetracker.google.com/savedsearches/559755", + "language": "python", + "library_type": "GAPIC_AUTO", + "name": "oslogin", + "name_pretty": "Google Cloud OS Login", + "product_documentation": "https://cloud.google.com/compute/docs/oslogin/", + "release_level": "stable", + "repo": "googleapis/google-cloud-python" } \ No newline at end of file diff --git a/packages/google-cloud-os-login/README.rst b/packages/google-cloud-os-login/README.rst index 40b0f34aba05..ceb9ef4baad8 100644 --- a/packages/google-cloud-os-login/README.rst +++ b/packages/google-cloud-os-login/README.rst @@ -3,7 +3,7 @@ Python Client for Google Cloud OS Login |stable| |pypi| |versions| -`Google Cloud OS Login`_: +`Google Cloud OS Login`_: You can use OS Login to manage access to your VM instances using IAM roles. - `Client Library Documentation`_ - `Product Documentation`_ diff --git a/packages/google-cloud-os-login/docs/README.rst b/packages/google-cloud-os-login/docs/README.rst index 40b0f34aba05..ceb9ef4baad8 100644 --- a/packages/google-cloud-os-login/docs/README.rst +++ b/packages/google-cloud-os-login/docs/README.rst @@ -3,7 +3,7 @@ Python Client for Google Cloud OS Login |stable| |pypi| |versions| -`Google Cloud OS Login`_: +`Google Cloud OS Login`_: You can use OS Login to manage access to your VM instances using IAM roles. - `Client Library Documentation`_ - `Product Documentation`_ diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py index 29f20cbd3a5a..2c20d0223743 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/async_client.py @@ -45,8 +45,8 @@ OptionalRetry = Union[retries.AsyncRetry, object, None] # type: ignore import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.oslogin_v1.common.types import common +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .client import OsLoginServiceClient diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py index 660bbe83725b..353bde94142a 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/client.py @@ -62,8 +62,8 @@ _LOGGER = std_logging.getLogger(__name__) import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore -from google.cloud.oslogin_v1.common.types import common +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .transports.base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py index f853cf10157b..86fdbf553c87 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/base.py @@ -24,10 +24,10 @@ from google.api_core import gapic_v1 from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.oauth2 import service_account # type: ignore from google.cloud.oslogin_v1 import gapic_version as package_version +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo( diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py index ef2b8a392bc7..c3ba1f6d689e 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc.py @@ -27,9 +27,9 @@ from google.api_core import gapic_v1, grpc_helpers from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.protobuf.json_format import MessageToJson +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py index ace1a50aedf9..a33746ca33b5 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/grpc_asyncio.py @@ -29,10 +29,10 @@ from google.api_core import retry_async as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.grpc import SslCredentials # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.protobuf.json_format import MessageToJson from grpc.experimental import aio # type: ignore +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py index 8d4a5f33a491..dbb126979a5a 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest.py @@ -26,10 +26,10 @@ from google.api_core import retry as retries from google.auth import credentials as ga_credentials # type: ignore from google.auth.transport.requests import AuthorizedSession # type: ignore -from google.cloud.oslogin_v1.common.types import common from google.protobuf import json_format from requests import __version__ as requests_version +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO as BASE_DEFAULT_CLIENT_INFO diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py index 42e72a780b9d..33cbee45af67 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/services/os_login_service/transports/rest_base.py @@ -19,9 +19,9 @@ import google.protobuf.empty_pb2 as empty_pb2 # type: ignore from google.api_core import gapic_v1, path_template -from google.cloud.oslogin_v1.common.types import common from google.protobuf import json_format +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.types import oslogin from .base import DEFAULT_CLIENT_INFO, OsLoginServiceTransport diff --git a/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py b/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py index 0a5ad23f2924..126e189de62a 100644 --- a/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py +++ b/packages/google-cloud-os-login/google/cloud/oslogin_v1/types/oslogin.py @@ -19,6 +19,7 @@ import google.protobuf.field_mask_pb2 as field_mask_pb2 # type: ignore import proto # type: ignore + from google.cloud.oslogin_v1.common.types import common __protobuf__ = proto.module( diff --git a/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py b/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py index bcff50f5f3ec..2aa92b2c69b8 100644 --- a/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py +++ b/packages/google-cloud-os-login/tests/unit/gapic/oslogin_v1/test_os_login_service.py @@ -56,9 +56,9 @@ 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.oslogin_v1.common.types import common from google.oauth2 import service_account +from google.cloud.oslogin_v1.common.types import common from google.cloud.oslogin_v1.services.os_login_service import ( OsLoginServiceAsyncClient, OsLoginServiceClient,