Skip to content

Commit 6b973b4

Browse files
committed
interop: update templates/MODULE.bazel.inja, CMakeLists.txt, gRPC-C++.podspec, and format Python interop files
1 parent f7c25e6 commit 6b973b4

7 files changed

Lines changed: 63 additions & 51 deletions

File tree

CMakeLists.txt

Lines changed: 26 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gRPC-C++.podspec

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/python/grpcio_tests/tests/interop/_secure_intraop_test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def tearDown(self):
7474
class SecureInteropWithSyncPrivateKeyOffloadingTest(
7575
_intraop_test_case.IntraopTestCase, unittest.TestCase
7676
):
77-
7877
def setUp(self):
7978
self.server = test_common.test_server()
8079
test_pb2_grpc.add_TestServiceServicer_to_server(
@@ -119,7 +118,6 @@ def tearDown(self):
119118
class SecureInteropWithAsyncPrivateKeyOffloadingTest(
120119
_intraop_test_case.IntraopTestCase, unittest.TestCase
121120
):
122-
123121
def setUp(self):
124122
self.server = test_common.test_server()
125123
test_pb2_grpc.add_TestServiceServicer_to_server(

src/python/grpcio_tests/tests/interop/client.py

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ def parse_interop_client_args(argv):
8484
type=str,
8585
help="the server host to which to claim to connect",
8686
)
87-
parser.add_argument("--oauth_scope", type=str, help="scope for OAuth tokens")
87+
parser.add_argument(
88+
"--oauth_scope", type=str, help="scope for OAuth tokens"
89+
)
8890
parser.add_argument(
8991
"--default_service_account",
9092
type=str,
@@ -170,10 +172,14 @@ def get_secure_channel_parameters(args):
170172
request=google_auth.transport.requests.Request(),
171173
)
172174
)
173-
channel_credentials = grpc.compute_engine_channel_credentials(call_creds)
175+
channel_credentials = grpc.compute_engine_channel_credentials(
176+
call_creds
177+
)
174178
else:
175179
raise ValueError(
176-
"Unknown credentials type '{}'".format(args.custom_credentials_type)
180+
"Unknown credentials type '{}'".format(
181+
args.custom_credentials_type
182+
)
177183
)
178184
elif args.use_tls:
179185
if args.use_test_ca:
@@ -215,7 +221,9 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
215221
sent_span_name = f"Sent.{full_method}"
216222
attempt_span_name = f"Attempt.{full_method}"
217223

218-
sent_span = self._tracer.start_span(sent_span_name, kind=trace.SpanKind.CLIENT)
224+
sent_span = self._tracer.start_span(
225+
sent_span_name, kind=trace.SpanKind.CLIENT
226+
)
219227
sent_ctx = trace.set_span_in_context(sent_span)
220228
attempt_span = self._tracer.start_span(
221229
attempt_span_name, kind=trace.SpanKind.CLIENT, context=sent_ctx
@@ -254,7 +262,11 @@ def intercept_unary_unary(self, continuation, client_call_details, request):
254262
def _create_channel(args):
255263
target = "{}:{}".format(args.server_host, args.server_port)
256264

257-
if args.use_tls or args.use_alts or args.custom_credentials_type is not None:
265+
if (
266+
args.use_tls
267+
or args.use_alts
268+
or args.custom_credentials_type is not None
269+
):
258270
channel_credentials, options = get_secure_channel_parameters(args)
259271
channel = grpc.secure_channel(target, channel_credentials, options)
260272
else:
@@ -264,7 +276,9 @@ def _create_channel(args):
264276
from tests.interop import otel_interop_helper
265277

266278
_, tracer = otel_interop_helper.init_tracer_provider()
267-
channel = grpc.intercept_channel(channel, _OTelClientInterceptor(tracer))
279+
channel = grpc.intercept_channel(
280+
channel, _OTelClientInterceptor(tracer)
281+
)
268282

269283
return channel
270284

src/python/grpcio_tests/tests/interop/otel_interop_helper.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,16 @@ def intercept_service(self, continuation, handler_call_details):
192192
traceparent_header = None
193193
for k, v in handler_call_details.invocation_metadata:
194194
k_str = (
195-
k.decode("ascii", errors="ignore") if isinstance(k, bytes) else str(k)
195+
k.decode("ascii", errors="ignore")
196+
if isinstance(k, bytes)
197+
else str(k)
196198
)
197199
if k_str.lower() == "grpc-trace-bin":
198200
trace_bin_header = v
199201
elif k_str.lower() == "traceparent":
200-
traceparent_header = v if isinstance(v, str) else v.decode("latin1")
202+
traceparent_header = (
203+
v if isinstance(v, str) else v.decode("latin1")
204+
)
201205

202206
parent_ctx = None
203207
trace_id, parent_span_id, is_sampled = None, None, False
@@ -235,7 +239,9 @@ def intercept_service(self, continuation, handler_call_details):
235239
span_name, kind=trace.SpanKind.SERVER, context=ctx
236240
)
237241
else:
238-
server_span = self._tracer.start_span(span_name, kind=trace.SpanKind.SERVER)
242+
server_span = self._tracer.start_span(
243+
span_name, kind=trace.SpanKind.SERVER
244+
)
239245

240246
server_span.add_event("Inbound message")
241247

0 commit comments

Comments
 (0)