impl(storage): add AsyncDeleteObject() to stubs (#9115)

coryan · web-flow · commit 9d62df789857 · 2022-05-31T19:52:11.000-04:00
diff --git a/generator/generator_config.textproto b/generator/generator_config.textproto
@@ -1190,6 +1190,7 @@ service {
   omit_connection: true
   omit_stub_factory: true
   gen_async_rpcs: [
+    "DeleteObject",
     "ReadObject"
   ]
   omitted_rpcs: [
diff --git a/google/cloud/storage/internal/storage_auth_decorator.cc b/google/cloud/storage/internal/storage_auth_decorator.cc
@@ -241,6 +241,21 @@ StatusOr<google::storage::v2::HmacKeyMetadata> StorageAuth::UpdateHmacKey(
   return child_->UpdateHmacKey(context, request);
 }
 
+future<Status> StorageAuth::AsyncDeleteObject(
+    google::cloud::CompletionQueue& cq,
+    std::unique_ptr<grpc::ClientContext> context,
+    google::storage::v2::DeleteObjectRequest const& request) {
+  auto child = child_;
+  return auth_->AsyncConfigureContext(std::move(context))
+      .then([cq, child,
+             request](future<StatusOr<std::unique_ptr<grpc::ClientContext>>>
+                          f) mutable {
+        auto context = f.get();
+        if (!context) return make_ready_future(std::move(context).status());
+        return child->AsyncDeleteObject(cq, *std::move(context), request);
+      });
+}
+
 std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
     google::storage::v2::ReadObjectResponse>>
 StorageAuth::AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_auth_decorator.h b/google/cloud/storage/internal/storage_auth_decorator.h
@@ -142,6 +142,11 @@ class StorageAuth : public StorageStub {
       grpc::ClientContext& context,
       google::storage::v2::UpdateHmacKeyRequest const& request) override;
 
+  future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) override;
+
   std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_logging_decorator.cc b/google/cloud/storage/internal/storage_logging_decorator.cc
@@ -337,6 +337,19 @@ StatusOr<google::storage::v2::HmacKeyMetadata> StorageLogging::UpdateHmacKey(
       context, request, __func__, tracing_options_);
 }
 
+future<Status> StorageLogging::AsyncDeleteObject(
+    google::cloud::CompletionQueue& cq,
+    std::unique_ptr<grpc::ClientContext> context,
+    google::storage::v2::DeleteObjectRequest const& request) {
+  return google::cloud::internal::LogWrapper(
+      [this](google::cloud::CompletionQueue& cq,
+             std::unique_ptr<grpc::ClientContext> context,
+             google::storage::v2::DeleteObjectRequest const& request) {
+        return child_->AsyncDeleteObject(cq, std::move(context), request);
+      },
+      cq, std::move(context), request, __func__, tracing_options_);
+}
+
 std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
     google::storage::v2::ReadObjectResponse>>
 StorageLogging::AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_logging_decorator.h b/google/cloud/storage/internal/storage_logging_decorator.h
@@ -142,6 +142,11 @@ class StorageLogging : public StorageStub {
       grpc::ClientContext& context,
       google::storage::v2::UpdateHmacKeyRequest const& request) override;
 
+  future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) override;
+
   std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_metadata_decorator.cc b/google/cloud/storage/internal/storage_metadata_decorator.cc
@@ -218,6 +218,14 @@ StatusOr<google::storage::v2::HmacKeyMetadata> StorageMetadata::UpdateHmacKey(
   return child_->UpdateHmacKey(context, request);
 }
 
+future<Status> StorageMetadata::AsyncDeleteObject(
+    google::cloud::CompletionQueue& cq,
+    std::unique_ptr<grpc::ClientContext> context,
+    google::storage::v2::DeleteObjectRequest const& request) {
+  SetMetadata(*context);
+  return child_->AsyncDeleteObject(cq, std::move(context), request);
+}
+
 std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
     google::storage::v2::ReadObjectResponse>>
 StorageMetadata::AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_metadata_decorator.h b/google/cloud/storage/internal/storage_metadata_decorator.h
@@ -138,6 +138,11 @@ class StorageMetadata : public StorageStub {
       grpc::ClientContext& context,
       google::storage::v2::UpdateHmacKeyRequest const& request) override;
 
+  future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) override;
+
   std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_round_robin.cc b/google/cloud/storage/internal/storage_round_robin.cc
@@ -181,6 +181,13 @@ StatusOr<google::storage::v2::HmacKeyMetadata> StorageRoundRobin::UpdateHmacKey(
   return Child()->UpdateHmacKey(context, request);
 }
 
+future<Status> StorageRoundRobin::AsyncDeleteObject(
+    google::cloud::CompletionQueue& cq,
+    std::unique_ptr<grpc::ClientContext> context,
+    google::storage::v2::DeleteObjectRequest const& request) {
+  return Child()->AsyncDeleteObject(cq, std::move(context), request);
+}
+
 std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
     google::storage::v2::ReadObjectResponse>>
 StorageRoundRobin::AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_round_robin.h b/google/cloud/storage/internal/storage_round_robin.h
@@ -134,6 +134,11 @@ class StorageRoundRobin : public StorageStub {
       grpc::ClientContext& context,
       google::storage::v2::UpdateHmacKeyRequest const& request) override;
 
+  future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) override;
+
   std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_round_robin_test.cc b/google/cloud/storage/internal/storage_round_robin_test.cc
@@ -27,6 +27,7 @@ namespace {
 
 using ::google::cloud::storage::testing::MockStorageStub;
 using ::google::cloud::testing_util::StatusIs;
+using ::testing::ByMove;
 using ::testing::InSequence;
 using ::testing::Return;
 
@@ -557,6 +558,30 @@ TEST(StorageRoundRobinTest, UpdateHmacKey) {
   }
 }
 
+TEST(StorageRoundRobinTest, AsyncDeleteObject) {
+  auto mocks = MakeMocks();
+  InSequence sequence;
+  for (int i = 0; i != kRepeats; ++i) {
+    for (auto& m : mocks) {
+      EXPECT_CALL(*m, AsyncDeleteObject)
+          .WillOnce(Return(ByMove(make_ready_future(
+              Status(StatusCode::kPermissionDenied, "uh-oh")))));
+    }
+  }
+
+  StorageRoundRobin under_test(AsPlainStubs(mocks));
+  google::cloud::CompletionQueue cq;
+  for (size_t i = 0; i != kRepeats * mocks.size(); ++i) {
+    google::storage::v2::DeleteObjectRequest request;
+    auto response =
+        under_test
+            .AsyncDeleteObject(cq, absl::make_unique<grpc::ClientContext>(),
+                               request)
+            .get();
+    EXPECT_THAT(response, StatusIs(StatusCode::kPermissionDenied));
+  }
+}
+
 TEST(StorageRoundRobinTest, AsyncReadObject) {
   auto mocks = MakeMocks();
   InSequence sequence;
diff --git a/google/cloud/storage/internal/storage_stub.cc b/google/cloud/storage/internal/storage_stub.cc
@@ -323,6 +323,23 @@ DefaultStorageStub::UpdateHmacKey(
   return response;
 }
 
+future<Status> DefaultStorageStub::AsyncDeleteObject(
+    google::cloud::CompletionQueue& cq,
+    std::unique_ptr<grpc::ClientContext> context,
+    google::storage::v2::DeleteObjectRequest const& request) {
+  return cq
+      .MakeUnaryRpc(
+          [this](grpc::ClientContext* context,
+                 google::storage::v2::DeleteObjectRequest const& request,
+                 grpc::CompletionQueue* cq) {
+            return grpc_stub_->AsyncDeleteObject(context, request, cq);
+          },
+          request, std::move(context))
+      .then([](future<StatusOr<google::protobuf::Empty>> f) {
+        return f.get().status();
+      });
+}
+
 std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
     google::storage::v2::ReadObjectResponse>>
 DefaultStorageStub::AsyncReadObject(
diff --git a/google/cloud/storage/internal/storage_stub.h b/google/cloud/storage/internal/storage_stub.h
@@ -143,6 +143,11 @@ class StorageStub {
       grpc::ClientContext& context,
       google::storage::v2::UpdateHmacKeyRequest const& request) = 0;
 
+  virtual future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) = 0;
+
   virtual std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(google::cloud::CompletionQueue const& cq,
@@ -260,6 +265,11 @@ class DefaultStorageStub : public StorageStub {
       grpc::ClientContext& client_context,
       google::storage::v2::UpdateHmacKeyRequest const& request) override;
 
+  future<Status> AsyncDeleteObject(
+      google::cloud::CompletionQueue& cq,
+      std::unique_ptr<grpc::ClientContext> context,
+      google::storage::v2::DeleteObjectRequest const& request) override;
+
   std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
       google::storage::v2::ReadObjectResponse>>
   AsyncReadObject(
diff --git a/google/cloud/storage/testing/mock_storage_stub.h b/google/cloud/storage/testing/mock_storage_stub.h
@@ -130,6 +130,11 @@ class MockStorageStub : public storage_internal::StorageStub {
               (grpc::ClientContext&,
                google::storage::v2::UpdateHmacKeyRequest const&),
               (override));
+  MOCK_METHOD(future<Status>, AsyncDeleteObject,
+              (google::cloud::CompletionQueue&,
+               std::unique_ptr<grpc::ClientContext>,
+               google::storage::v2::DeleteObjectRequest const&),
+              (override));
   MOCK_METHOD(std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
                   google::storage::v2::ReadObjectResponse>>,
               AsyncReadObject,

Original file line number	Diff line number	Diff line change
`@@ -1190,6 +1190,7 @@ service {`
`1190`	`1190`	`omit_connection: true`
`1191`	`1191`	`omit_stub_factory: true`
`1192`	`1192`	`gen_async_rpcs: [`
	`1193`	`+ "DeleteObject",`
`1193`	`1194`	`"ReadObject"`
`1194`	`1195`	`]`
`1195`	`1196`	`omitted_rpcs: [`