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

Logging: Add routing header to method metadata (via synth). #7598

Merged
merged 1 commit into from
Apr 1, 2019
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
131 changes: 131 additions & 0 deletions logging/google/cloud/logging_v2/gapic/config_service_v2_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import google.api_core.gapic_v1.client_info
import google.api_core.gapic_v1.config
import google.api_core.gapic_v1.method
import google.api_core.gapic_v1.routing_header
import google.api_core.grpc_helpers
import google.api_core.page_iterator
import google.api_core.path_template
Expand Down Expand Up @@ -280,6 +281,19 @@ def list_sinks(
request = logging_config_pb2.ListSinksRequest(
parent=parent, page_size=page_size
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

iterator = google.api_core.page_iterator.GRPCIterator(
client=None,
method=functools.partial(
Expand Down Expand Up @@ -356,6 +370,19 @@ def get_sink(
)

request = logging_config_pb2.GetSinkRequest(sink_name=sink_name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("sink_name", sink_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["get_sink"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -448,6 +475,19 @@ def create_sink(
request = logging_config_pb2.CreateSinkRequest(
parent=parent, sink=sink, unique_writer_identity=unique_writer_identity
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["create_sink"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -561,6 +601,19 @@ def update_sink(
unique_writer_identity=unique_writer_identity,
update_mask=update_mask,
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("sink_name", sink_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["update_sink"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -625,6 +678,19 @@ def delete_sink(
)

request = logging_config_pb2.DeleteSinkRequest(sink_name=sink_name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("sink_name", sink_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

self._inner_api_calls["delete_sink"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -711,6 +777,19 @@ def list_exclusions(
request = logging_config_pb2.ListExclusionsRequest(
parent=parent, page_size=page_size
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

iterator = google.api_core.page_iterator.GRPCIterator(
client=None,
method=functools.partial(
Expand Down Expand Up @@ -787,6 +866,19 @@ def get_exclusion(
)

request = logging_config_pb2.GetExclusionRequest(name=name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("name", name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["get_exclusion"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -866,6 +958,19 @@ def create_exclusion(
request = logging_config_pb2.CreateExclusionRequest(
parent=parent, exclusion=exclusion
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["create_exclusion"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -956,6 +1061,19 @@ def update_exclusion(
request = logging_config_pb2.UpdateExclusionRequest(
name=name, exclusion=exclusion, update_mask=update_mask
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("name", name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["update_exclusion"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -1018,6 +1136,19 @@ def delete_exclusion(
)

request = logging_config_pb2.DeleteExclusionRequest(name=name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("name", name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

self._inner_api_calls["delete_exclusion"](
request, retry=retry, timeout=timeout, metadata=metadata
)
27 changes: 27 additions & 0 deletions logging/google/cloud/logging_v2/gapic/logging_service_v2_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import google.api_core.gapic_v1.client_info
import google.api_core.gapic_v1.config
import google.api_core.gapic_v1.method
import google.api_core.gapic_v1.routing_header
import google.api_core.grpc_helpers
import google.api_core.page_iterator
import google.api_core.path_template
Expand Down Expand Up @@ -247,6 +248,19 @@ def delete_log(
)

request = logging_pb2.DeleteLogRequest(log_name=log_name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("log_name", log_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

self._inner_api_calls["delete_log"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -700,6 +714,19 @@ def list_logs(
)

request = logging_pb2.ListLogsRequest(parent=parent, page_size=page_size)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

iterator = google.api_core.page_iterator.GRPCIterator(
client=None,
method=functools.partial(
Expand Down
66 changes: 66 additions & 0 deletions logging/google/cloud/logging_v2/gapic/metrics_service_v2_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import google.api_core.gapic_v1.client_info
import google.api_core.gapic_v1.config
import google.api_core.gapic_v1.method
import google.api_core.gapic_v1.routing_header
import google.api_core.grpc_helpers
import google.api_core.page_iterator
import google.api_core.path_template
Expand Down Expand Up @@ -267,6 +268,19 @@ def list_log_metrics(
request = logging_metrics_pb2.ListLogMetricsRequest(
parent=parent, page_size=page_size
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

iterator = google.api_core.page_iterator.GRPCIterator(
client=None,
method=functools.partial(
Expand Down Expand Up @@ -338,6 +352,19 @@ def get_log_metric(
)

request = logging_metrics_pb2.GetLogMetricRequest(metric_name=metric_name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("metric_name", metric_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["get_log_metric"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -411,6 +438,19 @@ def create_log_metric(
request = logging_metrics_pb2.CreateLogMetricRequest(
parent=parent, metric=metric
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("parent", parent)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["create_log_metric"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -485,6 +525,19 @@ def update_log_metric(
request = logging_metrics_pb2.UpdateLogMetricRequest(
metric_name=metric_name, metric=metric
)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("metric_name", metric_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

return self._inner_api_calls["update_log_metric"](
request, retry=retry, timeout=timeout, metadata=metadata
)
Expand Down Expand Up @@ -542,6 +595,19 @@ def delete_log_metric(
)

request = logging_metrics_pb2.DeleteLogMetricRequest(metric_name=metric_name)
if metadata is None:
metadata = []
metadata = list(metadata)
try:
routing_header = [("metric_name", metric_name)]
except AttributeError:
pass
else:
routing_metadata = google.api_core.gapic_v1.routing_header.to_grpc_metadata(
routing_header
)
metadata.append(routing_metadata)

self._inner_api_calls["delete_log_metric"](
request, retry=retry, timeout=timeout, metadata=metadata
)
12 changes: 6 additions & 6 deletions logging/synth.metadata
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"updateTime": "2019-02-26T13:20:43.903128Z",
"updateTime": "2019-03-28T12:19:01.156618Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.16.14",
"dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7"
"version": "0.16.20",
"dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "29f098cb03a9983cc9cb15993de5da64419046f2",
"internalRef": "235621085"
"sha": "6a84b3267b0a95e922608b9891219075047eee29",
"internalRef": "240640999"
}
},
{
"template": {
"name": "python_library",
"origin": "synthtool.gcp",
"version": "2019.1.16"
"version": "2019.2.26"
}
}
],
Expand Down