diff --git a/Cargo.lock b/Cargo.lock index 62440b0bf..75b8abeff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8164,9 +8164,8 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "s3s" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf5572ca9bae5fd92d4e5a3e934c73793ab743bcbc761cd5e86a622c2a5e98a" +version = "0.14.0-dev" +source = "git+https://github.com/s3s-project/s3s?rev=2fa67f48764a0d80f304304d34c3f978e0fdacf5#2fa67f48764a0d80f304304d34c3f978e0fdacf5" dependencies = [ "arc-swap", "arrayvec", diff --git a/Cargo.toml b/Cargo.toml index 5c237d00f..9820f95c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -235,7 +235,7 @@ rumqttc = { version = "0.25.1" } rustix = { version = "1.1.4", features = ["fs"] } rust-embed = { version = "8.11.0" } rustc-hash = { version = "2.1.1" } -s3s = { version = "0.13.0", features = ["minio"] } +s3s = { git = "https://github.com/s3s-project/s3s", rev = "2fa67f48764a0d80f304304d34c3f978e0fdacf5", features = ["minio"] } serial_test = "3.4.0" shadow-rs = { version = "1.7.0", default-features = false } siphasher = "1.0.2" diff --git a/crates/obs/src/telemetry/otel.rs b/crates/obs/src/telemetry/otel.rs index 89bfe5d6a..c6cc1c476 100644 --- a/crates/obs/src/telemetry/otel.rs +++ b/crates/obs/src/telemetry/otel.rs @@ -51,7 +51,7 @@ use opentelemetry_sdk::{ }; use rustfs_config::{ APP_NAME, DEFAULT_OBS_LOG_STDOUT_ENABLED, DEFAULT_OBS_LOGS_EXPORT_ENABLED, DEFAULT_OBS_METRICS_EXPORT_ENABLED, - DEFAULT_OBS_PROFILING_EXPORT_ENABLED, DEFAULT_OBS_TRACES_EXPORT_ENABLED, METER_INTERVAL, SAMPLE_RATIO, + DEFAULT_OBS_TRACES_EXPORT_ENABLED, METER_INTERVAL, SAMPLE_RATIO, }; use std::{io::IsTerminal, time::Duration}; use tracing::info; @@ -324,7 +324,7 @@ fn init_profiler(config: &OtelConfig) -> Option return Err(s3_error!(NotImplemented)), + CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)), CopySource::Bucket { bucket: ref src_bucket, key: ref src_key, diff --git a/rustfs/src/app/object_usecase.rs b/rustfs/src/app/object_usecase.rs index ec00a58fd..118d6ad46 100644 --- a/rustfs/src/app/object_usecase.rs +++ b/rustfs/src/app/object_usecase.rs @@ -1962,6 +1962,7 @@ impl DefaultObjectUsecase { } = req.input.clone(); let (src_bucket, src_key, version_id) = match copy_source { CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)), + CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)), CopySource::Bucket { ref bucket, ref key, diff --git a/rustfs/src/storage/access.rs b/rustfs/src/storage/access.rs index e66360ccd..41e146532 100644 --- a/rustfs/src/storage/access.rs +++ b/rustfs/src/storage/access.rs @@ -431,6 +431,7 @@ impl S3Access for FS { { let (src_bucket, src_key, version_id) = match &req.input.copy_source { CopySource::AccessPoint { .. } => return Err(s3_error!(NotImplemented)), + CopySource::Outpost { .. } => return Err(s3_error!(NotImplemented)), CopySource::Bucket { bucket, key, version_id } => { (bucket.to_string(), key.to_string(), version_id.as_ref().map(|v| v.to_string())) }