Skip to content

Commit e27e8b0

Browse files
coryancoryan
authored
cleanup(generator): use GeneratedLibClientHeader() (#12592)
1 parent 6611472 commit e27e8b0

405 files changed

Lines changed: 472 additions & 499 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ GoldenKitchenSinkMetadata::GoldenKitchenSinkMetadata(
4141
fixed_metadata_(std::move(fixed_metadata)),
4242
api_client_header_(
4343
api_client_header.empty()
44-
? google::cloud::internal::ApiClientHeader("generator")
44+
? google::cloud::internal::GeneratedLibClientHeader()
4545
: std::move(api_client_header)) {}
4646

4747
StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse>

‎generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ GoldenKitchenSinkRestMetadata::GoldenKitchenSinkRestMetadata(
3939
: child_(std::move(child)),
4040
api_client_header_(
4141
api_client_header.empty()
42-
? google::cloud::internal::ApiClientHeader("generator")
42+
? google::cloud::internal::GeneratedLibClientHeader()
4343
: std::move(api_client_header)) {}
4444

4545
StatusOr<google::test::admin::database::v1::GenerateAccessTokenResponse>

‎generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GoldenRestOnlyRestMetadata::GoldenRestOnlyRestMetadata(
3838
: child_(std::move(child)),
3939
api_client_header_(
4040
api_client_header.empty()
41-
? google::cloud::internal::ApiClientHeader("generator")
41+
? google::cloud::internal::GeneratedLibClientHeader()
4242
: std::move(api_client_header)) {}
4343

4444
Status

‎generator/integration_tests/golden/v1/internal/golden_thing_admin_metadata_decorator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ GoldenThingAdminMetadata::GoldenThingAdminMetadata(
4141
fixed_metadata_(std::move(fixed_metadata)),
4242
api_client_header_(
4343
api_client_header.empty()
44-
? google::cloud::internal::ApiClientHeader("generator")
44+
? google::cloud::internal::GeneratedLibClientHeader()
4545
: std::move(api_client_header)) {}
4646

4747
StatusOr<google::test::admin::database::v1::ListDatabasesResponse>

‎generator/integration_tests/golden/v1/internal/golden_thing_admin_rest_metadata_decorator.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ GoldenThingAdminRestMetadata::GoldenThingAdminRestMetadata(
3939
: child_(std::move(child)),
4040
api_client_header_(
4141
api_client_header.empty()
42-
? google::cloud::internal::ApiClientHeader("generator")
42+
? google::cloud::internal::GeneratedLibClientHeader()
4343
: std::move(api_client_header)) {}
4444

4545
StatusOr<google::test::admin::database::v1::ListDatabasesResponse>

‎generator/integration_tests/tests/golden_kitchen_sink_metadata_decorator_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class MetadataDecoratorTest : public ::testing::Test {
6060
google::protobuf::Message const& request) {
6161
return validate_metadata_fixture_.IsContextMDValid(
6262
context, method, request,
63-
google::cloud::internal::ApiClientHeader("generator"));
63+
google::cloud::internal::GeneratedLibClientHeader());
6464
}
6565

6666
std::multimap<std::string, std::string> GetMetadata(

‎generator/integration_tests/tests/golden_kitchen_sink_rest_metadata_decorator_test.cc‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ TEST(KitchenSinkRestMetadataDecoratorTest, GenerateAccessToken) {
112112
GenerateAccessTokenRequest const&) {
113113
EXPECT_THAT(
114114
context.GetHeader("x-goog-api-client"),
115-
Contains(google::cloud::internal::ApiClientHeader("generator")));
115+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
116116
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
117117
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
118118
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -134,9 +134,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, GenerateIdToken) {
134134
.WillOnce(
135135
[](rest_internal::RestContext& context,
136136
google::test::admin::database::v1::GenerateIdTokenRequest const&) {
137-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
138-
Contains(google::cloud::internal::ApiClientHeader(
139-
"generator")));
137+
EXPECT_THAT(
138+
context.GetHeader("x-goog-api-client"),
139+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
140140
EXPECT_THAT(context.GetHeader("x-goog-user-project"),
141141
Contains("test-user-project"));
142142
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
@@ -160,9 +160,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, WriteLogEntries) {
160160
.WillOnce(
161161
[](rest_internal::RestContext& context,
162162
google::test::admin::database::v1::WriteLogEntriesRequest const&) {
163-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
164-
Contains(google::cloud::internal::ApiClientHeader(
165-
"generator")));
163+
EXPECT_THAT(
164+
context.GetHeader("x-goog-api-client"),
165+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
166166
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
167167
EXPECT_THAT(context.GetHeader("x-goog-quota-user"),
168168
Contains("test-quota-user"));
@@ -186,7 +186,7 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ListLogs) {
186186
google::test::admin::database::v1::ListLogsRequest const&) {
187187
EXPECT_THAT(
188188
context.GetHeader("x-goog-api-client"),
189-
Contains(google::cloud::internal::ApiClientHeader("generator")));
189+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
190190
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
191191
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
192192
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -209,7 +209,7 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ListServiceAccountKeys) {
209209
ListServiceAccountKeysRequest const&) {
210210
EXPECT_THAT(
211211
context.GetHeader("x-goog-api-client"),
212-
Contains(google::cloud::internal::ApiClientHeader("generator")));
212+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
213213
EXPECT_THAT(context.GetHeader("x-goog-user-project"),
214214
Contains("test-user-project"));
215215
EXPECT_THAT(context.GetHeader("x-goog-quota-user"),
@@ -236,7 +236,7 @@ TEST(KitchenSinkRestMetadataDecoratorTest, DoNothing) {
236236
google::protobuf::Empty const&) {
237237
EXPECT_THAT(
238238
context.GetHeader("x-goog-api-client"),
239-
Contains(google::cloud::internal::ApiClientHeader("generator")));
239+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
240240
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
241241
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
242242
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -258,9 +258,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ExplicitRouting) {
258258
.WillOnce(
259259
[](rest_internal::RestContext& context,
260260
google::test::admin::database::v1::ExplicitRoutingRequest const&) {
261-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
262-
Contains(google::cloud::internal::ApiClientHeader(
263-
"generator")));
261+
EXPECT_THAT(
262+
context.GetHeader("x-goog-api-client"),
263+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
264264
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
265265
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
266266
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -291,9 +291,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest,
291291
.WillOnce(
292292
[](rest_internal::RestContext& context,
293293
google::test::admin::database::v1::ExplicitRoutingRequest const&) {
294-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
295-
Contains(google::cloud::internal::ApiClientHeader(
296-
"generator")));
294+
EXPECT_THAT(
295+
context.GetHeader("x-goog-api-client"),
296+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
297297
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
298298
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
299299
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -317,9 +317,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ExplicitRoutingNoRegexNeeded) {
317317
.WillOnce(
318318
[](rest_internal::RestContext& context,
319319
google::test::admin::database::v1::ExplicitRoutingRequest const&) {
320-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
321-
Contains(google::cloud::internal::ApiClientHeader(
322-
"generator")));
320+
EXPECT_THAT(
321+
context.GetHeader("x-goog-api-client"),
322+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
323323
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
324324
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
325325
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -344,9 +344,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, ExplicitRoutingNestedField) {
344344
.WillOnce(
345345
[](rest_internal::RestContext& context,
346346
google::test::admin::database::v1::ExplicitRoutingRequest const&) {
347-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
348-
Contains(google::cloud::internal::ApiClientHeader(
349-
"generator")));
347+
EXPECT_THAT(
348+
context.GetHeader("x-goog-api-client"),
349+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
350350
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
351351
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
352352
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
@@ -370,9 +370,9 @@ TEST(KitchenSinkRestMetadataDecoratorTest, UrlEncodeRoutingParam) {
370370
.WillOnce(
371371
[](rest_internal::RestContext& context,
372372
google::test::admin::database::v1::ExplicitRoutingRequest const&) {
373-
EXPECT_THAT(context.GetHeader("x-goog-api-client"),
374-
Contains(google::cloud::internal::ApiClientHeader(
375-
"generator")));
373+
EXPECT_THAT(
374+
context.GetHeader("x-goog-api-client"),
375+
Contains(google::cloud::internal::GeneratedLibClientHeader()));
376376
EXPECT_THAT(context.GetHeader("x-goog-user-project"), IsEmpty());
377377
EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
378378
EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());

‎generator/integration_tests/tests/golden_thing_admin_metadata_decorator_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class MetadataDecoratorTest : public ::testing::Test {
4949
google::protobuf::Message const& request) {
5050
return validate_metadata_fixture_.IsContextMDValid(
5151
context, method, request,
52-
google::cloud::internal::ApiClientHeader("generator"));
52+
google::cloud::internal::GeneratedLibClientHeader());
5353
}
5454

5555
void IsContextMDValid(grpc::ClientContext& context, std::string const& method,

0 commit comments

Comments
 (0)