feat(GCS+gRPC): implement DeleteDefaultObjectAcl() (#9473)

coryan · web-flow · commit a30eb8bba89c · 2022-07-13T21:45:39.000-07:00
diff --git a/google/cloud/storage/internal/grpc_client.cc b/google/cloud/storage/internal/grpc_client.cc
@@ -874,8 +874,27 @@ StatusOr<ObjectAccessControl> GrpcClient::CreateDefaultObjectAcl(
 }
 
 StatusOr<EmptyResponse> GrpcClient::DeleteDefaultObjectAcl(
-    DeleteDefaultObjectAclRequest const&) {
-  return Status(StatusCode::kUnimplemented, __func__);
+    DeleteDefaultObjectAclRequest const& request) {
+  auto get_request = GetBucketMetadataRequest(request.bucket_name());
+  request.ForEachOption(CopyCommonOptions(get_request));
+  auto updater = [&request](std::vector<ObjectAccessControl> acl)
+      -> StatusOr<std::vector<ObjectAccessControl>> {
+    auto i = std::remove_if(acl.begin(), acl.end(),
+                            [&](ObjectAccessControl const& entry) {
+                              return entry.entity() == request.entity();
+                            });
+    if (i == acl.end()) {
+      return Status(StatusCode::kNotFound,
+                    "the entity <" + request.entity() +
+                        "> is not present in the ACL for bucket " +
+                        request.bucket_name());
+    }
+    acl.erase(i, acl.end());
+    return acl;
+  };
+  auto response = ModifyDefaultAccessControl(get_request, updater);
+  if (!response) return std::move(response).status();
+  return EmptyResponse{};
 }
 
 StatusOr<ObjectAccessControl> GrpcClient::GetDefaultObjectAcl(
diff --git a/google/cloud/storage/internal/grpc_client_test.cc b/google/cloud/storage/internal/grpc_client_test.cc
@@ -1583,6 +1583,72 @@ TEST_F(GrpcClientTest, CreateDefaultObjectAclPatchFails) {
   EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable));
 }
 
+TEST_F(GrpcClientTest, DeleteDefaultObjectAclFailure) {
+  auto mock = std::make_shared<testing::MockStorageStub>();
+  EXPECT_CALL(*mock, GetBucket)
+      .WillOnce([this](grpc::ClientContext& context,
+                       v2::GetBucketRequest const& request) {
+        auto metadata = GetMetadata(context);
+        EXPECT_THAT(metadata, UnorderedElementsAre(
+                                  Pair("x-goog-quota-user", "test-quota-user"),
+                                  Pair("x-goog-fieldmask", "field1,field2")));
+        EXPECT_THAT(request.name(), "projects/_/buckets/test-bucket-name");
+        return PermanentError();
+      });
+
+  auto client = CreateTestClient(mock);
+  auto response = client->DeleteDefaultObjectAcl(
+      DeleteDefaultObjectAclRequest("test-bucket-name", "test-entity1")
+          .set_multiple_options(Fields("field1,field2"),
+                                QuotaUser("test-quota-user"),
+                                UserProject("test-user-project")));
+  EXPECT_EQ(response.status(), PermanentError());
+}
+
+TEST_F(GrpcClientTest, DeleteDefaultObjectAclPatchFails) {
+  auto mock = std::make_shared<testing::MockStorageStub>();
+  EXPECT_CALL(*mock, GetBucket)
+      .WillOnce([&](grpc::ClientContext&, v2::GetBucketRequest const&) {
+        v2::Bucket response;
+        EXPECT_TRUE(TextFormat::ParseFromString(kBucketProtoText, &response));
+        return response;
+      });
+  EXPECT_CALL(*mock, UpdateBucket)
+      .WillOnce([](grpc::ClientContext&,
+                   v2::UpdateBucketRequest const& request) {
+        EXPECT_EQ(request.bucket().name(), "projects/_/buckets/test-bucket-id");
+        auto expected = v2::ObjectAccessControl();
+        expected.set_entity("test-entity4");
+        expected.set_role("test-role4");
+        EXPECT_THAT(request.bucket().default_object_acl(),
+                    ElementsAre(IsProtoEqual(expected)));
+        EXPECT_THAT(request.update_mask().paths(),
+                    ElementsAre("default_object_acl"));
+        return Status(StatusCode::kFailedPrecondition, "conflict");
+      });
+
+  auto client = CreateTestClient(mock);
+  auto response = client->DeleteDefaultObjectAcl(
+      DeleteDefaultObjectAclRequest("test-bucket-id", "test-entity3"));
+  EXPECT_THAT(response, StatusIs(StatusCode::kUnavailable));
+}
+
+TEST_F(GrpcClientTest, DeleteDefaultObjectAclNotFound) {
+  auto mock = std::make_shared<testing::MockStorageStub>();
+  EXPECT_CALL(*mock, GetBucket)
+      .WillOnce([&](grpc::ClientContext&, v2::GetBucketRequest const&) {
+        v2::Bucket response;
+        EXPECT_TRUE(TextFormat::ParseFromString(kBucketProtoText, &response));
+        return response;
+      });
+  EXPECT_CALL(*mock, UpdateBucket).Times(0);
+
+  auto client = CreateTestClient(mock);
+  auto response = client->DeleteDefaultObjectAcl(
+      DeleteDefaultObjectAclRequest("test-bucket-id", "test-not-found"));
+  EXPECT_THAT(response, StatusIs(StatusCode::kNotFound));
+}
+
 TEST_F(GrpcClientTest, GetServiceAccount) {
   auto mock = std::make_shared<testing::MockStorageStub>();
   EXPECT_CALL(*mock, GetServiceAccount)
diff --git a/google/cloud/storage/tests/grpc_default_object_acl_integration_test.cc b/google/cloud/storage/tests/grpc_default_object_acl_integration_test.cc
@@ -105,6 +105,14 @@ TEST_F(GrpcDefaultObjectAclIntegrationTest, AclCRUD) {
   ASSERT_STATUS_OK(c2);
   EXPECT_EQ(*create_acl, *c2);
 
+  auto delete_acl = client->DeleteDefaultObjectAcl(bucket_name, viewers);
+  ASSERT_STATUS_OK(delete_acl);
+
+  current_acl = client->ListDefaultObjectAcl(bucket_name);
+  ASSERT_STATUS_OK(current_acl);
+  EXPECT_THAT(AclEntityNames(*current_acl),
+              Not(Contains(create_acl->entity())));
+
   auto status = client->DeleteBucket(bucket_name);
   ASSERT_STATUS_OK(status);
 }
