From 2643797f613a2b502b4730b02260e14d2fb128a6 Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul@quickwit.io>
Date: Thu, 11 Jan 2024 16:25:02 +0900
Subject: [PATCH] Adding GCS to release feature flags.

---
 quickwit/quickwit-cli/Cargo.toml                      |  9 ++++++---
 quickwit/quickwit-metastore/Cargo.toml                |  1 -
 quickwit/quickwit-storage/src/opendal_storage/base.rs | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml
index 02365717757..499a58b9b11 100644
--- a/quickwit/quickwit-cli/Cargo.toml
+++ b/quickwit/quickwit-cli/Cargo.toml
@@ -94,7 +94,8 @@ release-feature-set = [
   "quickwit-indexing/kinesis",
   "quickwit-indexing/pulsar",
   "quickwit-indexing/vrl",
-  "quickwit-metastore/azure",
+  "quickwit-storage/azure",
+  "quickwit-storage/gcs",
   "quickwit-metastore/postgres",
   "quickwit-doc-mapper/multilang",
 ]
@@ -105,7 +106,8 @@ release-feature-vendored-set = [
   "quickwit-indexing/pulsar",
   "quickwit-indexing/vrl",
   "quickwit-indexing/vendored-kafka",
-  "quickwit-metastore/azure",
+  "quickwit-storage/azure",
+  "quickwit-storage/gcs",
   "quickwit-metastore/postgres",
   "quickwit-doc-mapper/multilang",
 ]
@@ -116,7 +118,8 @@ release-macos-feature-vendored-set = [
   "quickwit-indexing/pulsar",
   "quickwit-indexing/vrl",
   "quickwit-indexing/vendored-kafka-macos",
-  "quickwit-metastore/azure",
+  "quickwit-storage/azure",
+  "quickwit-storage/gcs",
   "quickwit-metastore/postgres",
   "quickwit-doc-mapper/multilang",
 ]
diff --git a/quickwit/quickwit-metastore/Cargo.toml b/quickwit/quickwit-metastore/Cargo.toml
index b9b595ad403..27bffbfb6db 100644
--- a/quickwit/quickwit-metastore/Cargo.toml
+++ b/quickwit/quickwit-metastore/Cargo.toml
@@ -59,7 +59,6 @@ quickwit-doc-mapper = { workspace = true, features = ["testsuite"] }
 quickwit-storage = { workspace = true, features = ["testsuite"] }
 
 [features]
-azure = ["quickwit-storage/azure"]
 ci-test = []
 postgres = ["quickwit-proto/postgres", "sea-query", "sea-query-binder", "sqlx"]
 testsuite = ["mockall", "tempfile", "quickwit-config/testsuite"]
diff --git a/quickwit/quickwit-storage/src/opendal_storage/base.rs b/quickwit/quickwit-storage/src/opendal_storage/base.rs
index ae3276ea5bb..119ce960f88 100644
--- a/quickwit/quickwit-storage/src/opendal_storage/base.rs
+++ b/quickwit/quickwit-storage/src/opendal_storage/base.rs
@@ -19,7 +19,7 @@
 
 use std::fmt;
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use async_trait::async_trait;
 use bytesize::ByteSize;
@@ -29,8 +29,8 @@ use tokio::io::{AsyncRead, AsyncWriteExt};
 
 use crate::storage::SendableAsync;
 use crate::{
-    BulkDeleteError, DeleteFailure, OwnedBytes, PutPayload, Storage, StorageError,
-    StorageErrorKind, StorageResolverError, StorageResult,
+    BulkDeleteError, OwnedBytes, PutPayload, Storage, StorageError, StorageErrorKind,
+    StorageResolverError, StorageResult,
 };
 
 /// OpenDAL based storage implementation.
@@ -149,8 +149,8 @@ impl Storage for OpendalStorage {
                         let storage_error_kind = err.kind();
                         let storage_error: StorageError = err.into();
                         bulk_error.failures.insert(
-                            PathBuf::from(&path),
-                            DeleteFailure {
+                            path.to_path_buf(),
+                            crate::DeleteFailure {
                                 code: Some(storage_error_kind.to_string()),
                                 message: Some(storage_error.to_string()),
                                 error: Some(storage_error.clone()),