Skip to content

Commit 4554ede

Browse files
authored
Merge pull request #40 from rockspore/create-pull-request/patch-6a1c88d
Automated fix for refs/heads/alts-token-fetcher
2 parents 6a1c88d + 8d2c1a4 commit 4554ede

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/core/tsi/alts/handshaker/alts_handshaker_client.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,10 @@ static grpc_byte_buffer* get_serialized_start_client(
544544
if (token_fetcher != nullptr) {
545545
access_token = token_fetcher->GetToken();
546546
if (!access_token.ok()) {
547-
LOG_EVERY_N_SEC(ERROR, 60) << "Failed to get token from the token fetcher "
548-
"in client start handshake: "
549-
<< access_token.status();
547+
LOG_EVERY_N_SEC(ERROR, 60)
548+
<< "Failed to get token from the token fetcher "
549+
"in client start handshake: "
550+
<< access_token.status();
550551
return nullptr;
551552
}
552553
grpc_gcp_StartClientHandshakeReq_set_access_token(

test/core/tsi/alts/handshaker/alts_handshaker_client_test.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@ void DestroyConfig(alts_handshaker_client_test_config* config) {
455455

456456
class FakeTokenFetcher : public grpc::alts::TokenFetcher {
457457
public:
458-
explicit FakeTokenFetcher(absl::Status error = absl::OkStatus()) : error_(std::move(error)) {}
458+
explicit FakeTokenFetcher(absl::Status error = absl::OkStatus())
459+
: error_(std::move(error)) {}
459460
~FakeTokenFetcher() override = default;
460461

461462
absl::StatusOr<std::string> GetToken() override {
@@ -677,7 +678,8 @@ static void tsi_cb_assert_tsi_internal_error(
677678
TEST(AltsHandshakerClientTest, ScheduleRequestWithTokenFailureTest) {
678679
// Initialization.
679680
std::shared_ptr<FakeTokenFetcher> token_fetcher =
680-
std::make_shared<FakeTokenFetcher>(absl::InternalError("failed to get a token"));
681+
std::make_shared<FakeTokenFetcher>(
682+
absl::InternalError("failed to get a token"));
681683
alts_handshaker_client_test_config* config = CreateConfig(token_fetcher);
682684
// Check client_start failure.
683685
alts_handshaker_client_set_grpc_caller_for_testing(config->client,

0 commit comments

Comments
 (0)