update users of rest library types

Author: scotthart

generator/integration_tests/tests/golden_thing_admin_rest_metadata_decorator_test.cc

@@ -312,7 +312,7 @@ TEST(ThingAdminRestMetadataDecoratorTest, DropDatabaseExplicitRoutingMatch) {
             EXPECT_THAT(context.GetHeader("x-goog-quota-user"), IsEmpty());
             EXPECT_THAT(context.GetHeader("x-server-timeout"), IsEmpty());
             EXPECT_THAT(
-                context.GetHeader("x-goog-request-params")[0],
+                context.GetHeader("x-goog-request-params").values().front(),
                 AllOf(
                     HasSubstr(std::string("project=projects%2Fmy_project")),
                     HasSubstr(std::string("instance=instances%2Fmy_instance")),

google/cloud/bigquery/v2/minimal/internal/log_wrapper.h

@@ -38,10 +38,11 @@ Result LogWrapper(Functor&& functor, rest_internal::RestContext& context,
                   TracingOptions const& options) {
   auto formatter = [options](std::string* out, auto const& header) {
     auto const* delim = options.single_line_mode() ? "&" : "\n";
-    absl::StrAppend(
-        out, " { name: \"", header.first, "\" value: \"",
-        internal::DebugString(absl::StrJoin(header.second, delim), options),
-        "\" }");
+    absl::StrAppend(out, " { name: \"", std::string_view{header.first},
+                    "\" value: \"",
+                    internal::DebugString(
+                        absl::StrJoin(header.second.values(), delim), options),
+                    "\" }");
   };
   GCP_LOG(DEBUG) << where << "() << "
                  << request.DebugString(request_name, options) << ", Context {"

google/cloud/bigquery/v2/minimal/internal/rest_stub_utils.h

@@ -48,7 +48,7 @@ StatusOr<rest_internal::RestRequest> PrepareRestRequest(
   if (!rest_context.headers().empty()) {
     for (auto const& h : rest_context.headers()) {
       if (!h.second.empty()) {
-        rest_request->AddHeader(h.first, absl::StrJoin(h.second, "&"));
+        rest_request->AddHeader(h.first, absl::StrJoin(h.second.values(), "&"));
       }
     }
   }

google/cloud/bigquery/v2/minimal/testing/metadata_test_utils.cc

@@ -30,13 +30,15 @@ static auto const kUserProject = "test-only-project";
 static auto const kQuotaUser = "test-quota-user";
 
 void VerifyMetadataContext(rest_internal::RestContext& context) {
-  EXPECT_THAT(context.GetHeader("x-goog-api-client"),
+  EXPECT_THAT(context.GetHeader("x-goog-api-client").values(),
               ElementsAre(internal::HandCraftedLibClientHeader()));
-  EXPECT_THAT(context.GetHeader("x-goog-request-params"), IsEmpty());
-  EXPECT_THAT(context.GetHeader("x-goog-user-project"),
+  EXPECT_THAT(context.GetHeader("x-goog-request-params").values(), IsEmpty());
+  EXPECT_THAT(context.GetHeader("x-goog-user-project").values(),
               ElementsAre(kUserProject));
-  EXPECT_THAT(context.GetHeader("x-goog-quota-user"), ElementsAre(kQuotaUser));
-  EXPECT_THAT(context.GetHeader("x-server-timeout"), ElementsAre("3.141"));
+  EXPECT_THAT(context.GetHeader("x-goog-quota-user").values(),
+              ElementsAre(kQuotaUser));
+  EXPECT_THAT(context.GetHeader("x-server-timeout").values(),
+              ElementsAre("3.141"));
 }
 
 Options GetMetadataOptions() {

google/cloud/internal/oauth2_minimal_iam_credentials_rest.cc

@@ -16,6 +16,7 @@
 #include "google/cloud/common_options.h"
 #include "google/cloud/internal/api_client_header.h"
 #include "google/cloud/internal/format_time_point.h"
+#include "google/cloud/internal/http_header.h"
 #include "google/cloud/internal/json_parsing.h"
 #include "google/cloud/internal/make_status.h"
 #include "google/cloud/internal/oauth2_credentials.h"
@@ -50,7 +51,7 @@ MinimalIamCredentialsRestStub::GenerateAccessToken(
   if (!auth_header) return std::move(auth_header).status();
 
   rest_internal::RestRequest rest_request;
-  rest_request.AddHeader(auth_header.value());
+  rest_request.AddHeader(rest_internal::HttpHeader(auth_header.value()));
   rest_request.AddHeader("Content-Type", "application/json");
   rest_request.SetPath(MakeRequestPath(request));
   nlohmann::json payload{

google/cloud/storage/internal/grpc/configure_client_context.cc

@@ -28,7 +28,7 @@ void AddIdempotencyToken(grpc::ClientContext& ctx,
   auto const& headers = context.headers();
   auto const l = headers.find(kIdempotencyTokenHeader);
   if (l != headers.end()) {
-    for (auto const& v : l->second) {
+    for (auto const& v : l->second.values()) {
       ctx.AddMetadata(kIdempotencyTokenHeader, v);
     }
   }

google/cloud/storage/internal/rest/stub_test.cc

@@ -178,12 +178,9 @@ TEST(RestStubTest, GlobalCustomHeadersAppearInRequestTest) {
                    google::cloud::rest_internal::RestRequest const& request) {
         auto const& headers = request.headers();
         EXPECT_THAT(headers,
-                    Contains(Pair("custom-header-1",
-                                  std::vector<std::string>{"value1"})));
+                    Contains(Pair("custom-header-1", ElementsAre("value1"))));
         EXPECT_THAT(headers,
-                    Contains(Pair("custom-header-2",
-                                  std::vector<std::string>{"value2"})));
-
+                    Contains(Pair("custom-header-2", ElementsAre("value2"))));
         return PermanentError();
       });
   auto stub = std::make_unique<RestStub>(global_opts, mock_client, mock_client);

google/cloud/storage/testing/retry_tests.cc

@@ -121,7 +121,8 @@ void CaptureIdempotencyToken(std::vector<std::string>& tokens,
   auto const& headers = context.headers();
   auto l = headers.find(kIdempotencyTokenHeader);
   if (l == headers.end()) return;
-  tokens.insert(tokens.end(), l->second.begin(), l->second.end());
+  auto values = l->second.values();
+  tokens.insert(tokens.end(), values.begin(), values.end());
 }
 
 void CaptureAuthorityOption(std::vector<std::string>& authority,

google/cloud/storage/tests/service_account_credentials_integration_test.cc

@@ -56,8 +56,8 @@ TEST_F(ServiceAccountCredentialsTest, UserInfoOAuth2) {
   auto factory = [c = sa_creds]() {
     auto authorization = c->GetToken(std::chrono::system_clock::now());
     if (!authorization) return rest_internal::RestRequest();
-    return rest_internal::RestRequest().AddHeader(
-        std::make_pair("Authorization", "Bearer " + authorization->token));
+    return rest_internal::RestRequest().AddHeader(rest_internal::HttpHeader(
+        "Authorization", "Bearer " + authorization->token));
   };
 
   auto response = RetryHttpGet(kUrl, factory);