Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8edfc2a
ignore arguments
daniel-sanche Oct 13, 2020
3279e8c
updated pubsub to use requests
daniel-sanche Oct 13, 2020
35e844a
fixed lint issues
daniel-sanche Oct 13, 2020
5fe8f35
pulled in kokoro changes from autosynth branch
daniel-sanche Oct 13, 2020
1baba7a
added decrypt-secrets script
daniel-sanche Oct 13, 2020
1358e73
added testing dir
daniel-sanche Oct 13, 2020
ba4464a
added empty snippets dir
daniel-sanche Oct 13, 2020
323ff90
check if samples directory exists
daniel-sanche Oct 13, 2020
160ea80
echo before upload
daniel-sanche Oct 13, 2020
0da6ac6
removed python 2.7 tests
daniel-sanche Oct 13, 2020
a5e4af7
added back 2.7 unit tests
daniel-sanche Oct 13, 2020
b7eb5d9
comment out upload
daniel-sanche Oct 13, 2020
4233e95
moved comment
daniel-sanche Oct 13, 2020
d46057b
print env
daniel-sanche Oct 14, 2020
8795c02
removed env print
daniel-sanche Oct 15, 2020
4e9debd
added trampolinerc
daniel-sanche Oct 15, 2020
6b2cc10
pulled in test-samples from upstream
daniel-sanche Oct 15, 2020
5491715
brought in changes from #66
daniel-sanche Oct 15, 2020
56d7b53
removed python 2 references
daniel-sanche Oct 15, 2020
3a79a38
use latest pubsub
daniel-sanche Oct 15, 2020
2c042b8
use upstream nox file
daniel-sanche Oct 15, 2020
febf103
removed default dependencies
daniel-sanche Oct 16, 2020
54dc30f
removed Python 2 from setup
daniel-sanche Oct 21, 2020
e73942c
renamed dependency field
daniel-sanche Oct 26, 2020
e2bced2
Merge branch 'master' into replace-noxfile
daniel-sanche Oct 26, 2020
91cd986
use autogenerated noxfile
daniel-sanche Oct 26, 2020
23451aa
ran blacken
daniel-sanche Oct 26, 2020
55c10ce
Merge branch 'master' into replace-noxfile
daniel-sanche Oct 27, 2020
8029e5a
changed cover limit to match other libraries
daniel-sanche Oct 27, 2020
7dcbd14
Merge branch 'replace-noxfile' of github.com:Daniel-Sanche/python-log…
daniel-sanche Oct 27, 2020
0e3917a
Merge branch 'master' into replace-noxfile
daniel-sanche Oct 27, 2020
af33451
blacken noxfile
daniel-sanche Oct 27, 2020
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
5 changes: 1 addition & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,7 @@
intersphinx_mapping = {
"python": ("http://python.readthedocs.org/en/latest/", None),
"google-auth": ("https://google-auth.readthedocs.io/en/stable", None),
"google.api_core": (
"https://googleapis.dev/python/google-api-core/latest/",
None,
),
"google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None,),
"grpc": ("https://grpc.io/grpc/python/", None),
}

Expand Down
75 changes: 20 additions & 55 deletions google/cloud/logging_v2/gapic/config_service_v2_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
from google.protobuf import field_mask_pb2


_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
"google-cloud-logging",
).version
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-logging",).version


class ConfigServiceV2Client(object):
Expand Down Expand Up @@ -79,8 +77,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):
def billing_path(cls, billing_account):
"""Return a fully-qualified billing string."""
return google.api_core.path_template.expand(
"billingAccounts/{billing_account}",
billing_account=billing_account,
"billingAccounts/{billing_account}", billing_account=billing_account,
)

@classmethod
Expand Down Expand Up @@ -113,10 +110,7 @@ def exclusion_path(cls, project, exclusion):
@classmethod
def folder_path(cls, folder):
"""Return a fully-qualified folder string."""
return google.api_core.path_template.expand(
"folders/{folder}",
folder=folder,
)
return google.api_core.path_template.expand("folders/{folder}", folder=folder,)

@classmethod
def folder_exclusion_path(cls, folder, exclusion):
Expand All @@ -131,17 +125,14 @@ def folder_exclusion_path(cls, folder, exclusion):
def folder_sink_path(cls, folder, sink):
"""Return a fully-qualified folder_sink string."""
return google.api_core.path_template.expand(
"folders/{folder}/sinks/{sink}",
folder=folder,
sink=sink,
"folders/{folder}/sinks/{sink}", folder=folder, sink=sink,
)

@classmethod
def organization_path(cls, organization):
"""Return a fully-qualified organization string."""
return google.api_core.path_template.expand(
"organizations/{organization}",
organization=organization,
"organizations/{organization}", organization=organization,
)

@classmethod
Expand All @@ -166,17 +157,14 @@ def organization_sink_path(cls, organization, sink):
def project_path(cls, project):
"""Return a fully-qualified project string."""
return google.api_core.path_template.expand(
"projects/{project}",
project=project,
"projects/{project}", project=project,
)

@classmethod
def sink_path(cls, project, sink):
"""Return a fully-qualified sink string."""
return google.api_core.path_template.expand(
"projects/{project}/sinks/{sink}",
project=project,
sink=sink,
"projects/{project}/sinks/{sink}", project=project, sink=sink,
)

def __init__(
Expand Down Expand Up @@ -265,12 +253,8 @@ def __init__(
)
self.transport = transport
else:
self.transport = (
config_service_v2_grpc_transport.ConfigServiceV2GrpcTransport(
address=api_endpoint,
channel=channel,
credentials=credentials,
)
self.transport = config_service_v2_grpc_transport.ConfigServiceV2GrpcTransport(
address=api_endpoint, channel=channel, credentials=credentials,
)

if client_info is None:
Expand Down Expand Up @@ -376,8 +360,7 @@ def list_sinks(
)

request = logging_config_pb2.ListSinksRequest(
parent=parent,
page_size=page_size,
parent=parent, page_size=page_size,
)
if metadata is None:
metadata = []
Expand Down Expand Up @@ -467,9 +450,7 @@ def get_sink(
client_info=self._client_info,
)

request = logging_config_pb2.GetSinkRequest(
sink_name=sink_name,
)
request = logging_config_pb2.GetSinkRequest(sink_name=sink_name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -573,9 +554,7 @@ def create_sink(
)

request = logging_config_pb2.CreateSinkRequest(
parent=parent,
sink=sink,
unique_writer_identity=unique_writer_identity,
parent=parent, sink=sink, unique_writer_identity=unique_writer_identity,
)
if metadata is None:
metadata = []
Expand Down Expand Up @@ -780,9 +759,7 @@ def delete_sink(
client_info=self._client_info,
)

request = logging_config_pb2.DeleteSinkRequest(
sink_name=sink_name,
)
request = logging_config_pb2.DeleteSinkRequest(sink_name=sink_name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -880,8 +857,7 @@ def list_exclusions(
)

request = logging_config_pb2.ListExclusionsRequest(
parent=parent,
page_size=page_size,
parent=parent, page_size=page_size,
)
if metadata is None:
metadata = []
Expand Down Expand Up @@ -971,9 +947,7 @@ def get_exclusion(
client_info=self._client_info,
)

request = logging_config_pb2.GetExclusionRequest(
name=name,
)
request = logging_config_pb2.GetExclusionRequest(name=name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -1064,8 +1038,7 @@ def create_exclusion(
)

request = logging_config_pb2.CreateExclusionRequest(
parent=parent,
exclusion=exclusion,
parent=parent, exclusion=exclusion,
)
if metadata is None:
metadata = []
Expand Down Expand Up @@ -1169,9 +1142,7 @@ def update_exclusion(
)

request = logging_config_pb2.UpdateExclusionRequest(
name=name,
exclusion=exclusion,
update_mask=update_mask,
name=name, exclusion=exclusion, update_mask=update_mask,
)
if metadata is None:
metadata = []
Expand Down Expand Up @@ -1247,9 +1218,7 @@ def delete_exclusion(
client_info=self._client_info,
)

request = logging_config_pb2.DeleteExclusionRequest(
name=name,
)
request = logging_config_pb2.DeleteExclusionRequest(name=name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -1337,9 +1306,7 @@ def get_cmek_settings(
client_info=self._client_info,
)

request = logging_config_pb2.GetCmekSettingsRequest(
name=name,
)
request = logging_config_pb2.GetCmekSettingsRequest(name=name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -1455,9 +1422,7 @@ def update_cmek_settings(
)

request = logging_config_pb2.UpdateCmekSettingsRequest(
name=name,
cmek_settings=cmek_settings,
update_mask=update_mask,
name=name, cmek_settings=cmek_settings, update_mask=update_mask,
)
if metadata is None:
metadata = []
Expand Down
43 changes: 11 additions & 32 deletions google/cloud/logging_v2/gapic/logging_service_v2_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@
from google.protobuf import field_mask_pb2


_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution(
"google-cloud-logging",
).version
_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-logging",).version


class LoggingServiceV2Client(object):
Expand Down Expand Up @@ -83,8 +81,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):
def billing_path(cls, billing_account):
"""Return a fully-qualified billing string."""
return google.api_core.path_template.expand(
"billingAccounts/{billing_account}",
billing_account=billing_account,
"billingAccounts/{billing_account}", billing_account=billing_account,
)

@classmethod
Expand All @@ -99,35 +96,27 @@ def billing_log_path(cls, billing_account, log):
@classmethod
def folder_path(cls, folder):
"""Return a fully-qualified folder string."""
return google.api_core.path_template.expand(
"folders/{folder}",
folder=folder,
)
return google.api_core.path_template.expand("folders/{folder}", folder=folder,)

@classmethod
def folder_log_path(cls, folder, log):
"""Return a fully-qualified folder_log string."""
return google.api_core.path_template.expand(
"folders/{folder}/logs/{log}",
folder=folder,
log=log,
"folders/{folder}/logs/{log}", folder=folder, log=log,
)

@classmethod
def log_path(cls, project, log):
"""Return a fully-qualified log string."""
return google.api_core.path_template.expand(
"projects/{project}/logs/{log}",
project=project,
log=log,
"projects/{project}/logs/{log}", project=project, log=log,
)

@classmethod
def organization_path(cls, organization):
"""Return a fully-qualified organization string."""
return google.api_core.path_template.expand(
"organizations/{organization}",
organization=organization,
"organizations/{organization}", organization=organization,
)

@classmethod
Expand All @@ -143,8 +132,7 @@ def organization_log_path(cls, organization, log):
def project_path(cls, project):
"""Return a fully-qualified project string."""
return google.api_core.path_template.expand(
"projects/{project}",
project=project,
"projects/{project}", project=project,
)

def __init__(
Expand Down Expand Up @@ -233,12 +221,8 @@ def __init__(
)
self.transport = transport
else:
self.transport = (
logging_service_v2_grpc_transport.LoggingServiceV2GrpcTransport(
address=api_endpoint,
channel=channel,
credentials=credentials,
)
self.transport = logging_service_v2_grpc_transport.LoggingServiceV2GrpcTransport(
address=api_endpoint, channel=channel, credentials=credentials,
)

if client_info is None:
Expand Down Expand Up @@ -327,9 +311,7 @@ def delete_log(
client_info=self._client_info,
)

request = logging_pb2.DeleteLogRequest(
log_name=log_name,
)
request = logging_pb2.DeleteLogRequest(log_name=log_name,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down Expand Up @@ -794,10 +776,7 @@ def list_logs(
client_info=self._client_info,
)

request = logging_pb2.ListLogsRequest(
parent=parent,
page_size=page_size,
)
request = logging_pb2.ListLogsRequest(parent=parent, page_size=page_size,)
if metadata is None:
metadata = []
metadata = list(metadata)
Expand Down
Loading