Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(asset): undeprecate resource name helper methods, add 2.7 deprecation warning (via synth) #10036

Merged
merged 1 commit into from
Jan 8, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions asset/google/cloud/asset_v1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,23 @@


from __future__ import absolute_import
import sys
import warnings

from google.cloud.asset_v1 import types
from google.cloud.asset_v1.gapic import asset_service_client
from google.cloud.asset_v1.gapic import enums


if sys.version_info[:2] == (2, 7):
message = (
"A future version of this library will drop support for Python 2.7."
"More details about Python 2 support for Google Cloud Client Libraries"
"can be found at https://cloud.google.com/python/docs/python2-sunset/"
)
warnings.warn(message, DeprecationWarning)


class AssetServiceClient(asset_service_client.AssetServiceClient):
__doc__ = asset_service_client.AssetServiceClient.__doc__
enums = enums
Expand Down
14 changes: 2 additions & 12 deletions asset/google/cloud/asset_v1/gapic/asset_service_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,14 @@ def from_service_account_file(cls, filename, *args, **kwargs):

@classmethod
def feed_path(cls, project, feed):
"""DEPRECATED. Return a fully-qualified feed string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified feed string."""
return google.api_core.path_template.expand(
"projects/{project}/feeds/{feed}", project=project, feed=feed
)

@classmethod
def project_path(cls, project):
"""DEPRECATED. Return a fully-qualified project string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project string."""
return google.api_core.path_template.expand(
"projects/{project}", project=project
)
Expand Down
11 changes: 11 additions & 0 deletions asset/google/cloud/asset_v1beta1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,23 @@


from __future__ import absolute_import
import sys
import warnings

from google.cloud.asset_v1beta1 import types
from google.cloud.asset_v1beta1.gapic import asset_service_client
from google.cloud.asset_v1beta1.gapic import enums


if sys.version_info[:2] == (2, 7):
message = (
"A future version of this library will drop support for Python 2.7."
"More details about Python 2 support for Google Cloud Client Libraries"
"can be found at https://cloud.google.com/python/docs/python2-sunset/"
)
warnings.warn(message, DeprecationWarning)


class AssetServiceClient(asset_service_client.AssetServiceClient):
__doc__ = asset_service_client.AssetServiceClient.__doc__
enums = enums
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):

@classmethod
def project_path(cls, project):
"""DEPRECATED. Return a fully-qualified project string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project string."""
return google.api_core.path_template.expand(
"projects/{project}", project=project
)
Expand Down
11 changes: 11 additions & 0 deletions asset/google/cloud/asset_v1p2beta1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,23 @@


from __future__ import absolute_import
import sys
import warnings

from google.cloud.asset_v1p2beta1 import types
from google.cloud.asset_v1p2beta1.gapic import asset_service_client
from google.cloud.asset_v1p2beta1.gapic import enums


if sys.version_info[:2] == (2, 7):
message = (
"A future version of this library will drop support for Python 2.7."
"More details about Python 2 support for Google Cloud Client Libraries"
"can be found at https://cloud.google.com/python/docs/python2-sunset/"
)
warnings.warn(message, DeprecationWarning)


class AssetServiceClient(asset_service_client.AssetServiceClient):
__doc__ = asset_service_client.AssetServiceClient.__doc__
enums = enums
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):

@classmethod
def feed_path(cls, project, feed):
"""DEPRECATED. Return a fully-qualified feed string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified feed string."""
return google.api_core.path_template.expand(
"projects/{project}/feeds/{feed}", project=project, feed=feed
)
Expand Down
Loading