update the grpc path for checksum

Author: v-pratap

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

@@ -851,6 +851,15 @@ Status Finalize(google::storage::v2::WriteObjectRequest& write_request,
                            Merge(std::move(hashes), hash_function.Finish()));
 }
 
+Status Finalize(google::storage::v2::WriteObjectRequest& write_request,
+                grpc::WriteOptions& options,
+                storage::internal::HashValues hashes) {
+  write_request.set_finish_write(true);
+  options.set_last_message();
+  return FinalizeChecksums(*write_request.mutable_object_checksums(),
+                           std::move(hashes));
+}
+
 Status Finalize(google::storage::v2::BidiWriteObjectRequest& write_request,
                 grpc::WriteOptions& options,
                 storage::internal::HashFunction& hash_function,
@@ -879,8 +888,11 @@ Status MaybeFinalize(google::storage::v2::WriteObjectRequest& write_request,
                      bool chunk_has_more) {
   if (!chunk_has_more) options.set_last_message();
   if (!request.last_chunk() || chunk_has_more) return {};
-  return Finalize(write_request, options, request.hash_function(),
-                  request.known_object_hashes());
+  if (request.hash_function_ptr()) {
+    return Finalize(write_request, options, request.hash_function(),
+                    request.known_object_hashes());
+  }
+  return Finalize(write_request, options, request.known_object_hashes());
 }
 
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END

google/cloud/storage/internal/grpc/object_request_parser.h

@@ -87,6 +87,10 @@ Status Finalize(google::storage::v2::WriteObjectRequest& write_request,
                 storage::internal::HashFunction& hash_function,
                 storage::internal::HashValues = {});
 
+Status Finalize(google::storage::v2::WriteObjectRequest& write_request,
+                grpc::WriteOptions& options,
+                storage::internal::HashValues hashes);
+
 Status Finalize(google::storage::v2::BidiWriteObjectRequest& write_request,
                 grpc::WriteOptions& options,
                 storage::internal::HashFunction& hash_function,

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

@@ -630,7 +630,9 @@ StatusOr<storage::internal::QueryResumableUploadResponse> GrpcStub::UploadChunk(
     auto& data = *proto_request.mutable_checksummed_data();
     SetMutableContent(data, splitter.Next());
     data.set_crc32c(Crc32c(GetContent(data)));
-    request.hash_function().Update(offset, GetContent(data), data.crc32c());
+    if (request.hash_function_ptr()) {
+      request.hash_function().Update(offset, GetContent(data), data.crc32c());
+    }
     offset += GetContent(data).size();
 
     auto wopts = grpc::WriteOptions();

google/cloud/storage/internal/object_requests.cc

@@ -533,7 +533,10 @@ UploadChunkRequest UploadChunkRequest::RemainingChunk(
 HashValues FinishHashes(UploadChunkRequest const& request) {
   // Prefer the hashes provided via *Value options in the request. If those
   // are not set, use the computed hashes from the data.
-  return Merge(request.known_object_hashes(), request.hash_function().Finish());
+  if (auto hf = request.hash_function_ptr()) {
+    return Merge(request.known_object_hashes(), hf->Finish());
+  }
+  return request.known_object_hashes();
 }
 
 std::ostream& operator<<(std::ostream& os, UploadChunkRequest const& r) {

google/cloud/storage/tests/object_checksum_integration_test.cc

@@ -131,6 +131,15 @@ TEST_F(ObjectChecksumIntegrationTest, WriteObjectDefault) {
   auto client = MakeIntegrationTestClient();
   auto object_name = MakeRandomObjectName();
 
+  auto create = client.CreateBucket(
+        bucket_name_, storage::BucketMetadata{}.set_location("us-west4")
+                                              .set_storage_class("STANDARD"));
+    if (!create && create.status().code() != StatusCode::kAlreadyExists) {
+      GTEST_FAIL() << "cannot create bucket: " << create.status();
+    } else {
+      std::cout << "Bucket successfully created." << std::endl;
+    }
+
   auto os = client.WriteObject(bucket_name_, object_name, DisableMD5Hash(true),
                                IfGenerationMatch(0));
   os << LoremIpsum();
@@ -322,8 +331,10 @@ TEST_F(ObjectChecksumIntegrationTest, WriteObjectWithIncorrectChecksumValue) {
   auto meta = os.metadata();
   EXPECT_THAT(meta, Not(IsOk()));
 
-  // The server returns FAILED_PRECONDITION (412) for checksum mismatches during
-  // finalization
+  if(UsingGrpc()) {
+    EXPECT_THAT(meta, StatusIs(StatusCode::kInvalidArgument));
+    return;
+  }
   EXPECT_THAT(meta, StatusIs(StatusCode::kFailedPrecondition));
 }