Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 127 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions bin/oay/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
oay.toml
10 changes: 8 additions & 2 deletions bin/oay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ version.workspace = true

[dependencies]
anyhow = "1"
axum = "0.6"
chrono = "0.4.24"
clap = { version = "4", features = ["cargo", "string"] }
dirs = "5.0.0"
env_logger = "0.10"
futures = "0.3"
log = "0.4"
opendal.workspace = true
quick-xml = { version = "0.27", features = ["serialize", "overlapped-lists"] }
serde = { version = "1", features = ["derive"] }
tokio = { version = "1.27", features = [
"fs",
Expand All @@ -45,4 +46,9 @@ tokio = { version = "1.27", features = [
"io-std",
] }
toml = "0.7.3"
tower = "0.4"
tower-http = { version = "0.4", features = ["trace"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
url = "2.3.1"
uuid = { version = "1", features = ["v4", "fast-rng"] }
4 changes: 4 additions & 0 deletions bin/oay/README.md
Comment thread
suyanhanx marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ Allow users to access different storage backend through their preferred APIs.
## Status

Our first milestone is to provide S3 APIs.

### S3 API

Only `list_object_v2` with `start_after` is supported.
9 changes: 9 additions & 0 deletions bin/oay/oay.toml.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[backend]
type = "s3"

access_key_id = "access_key_id"
secret_access_key = "secret_access_key"
Comment thread
suyanhanx marked this conversation as resolved.

[frontends.s3]
enable = true
addr = "127.0.0.1:2000"
29 changes: 28 additions & 1 deletion bin/oay/src/bin/oay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,37 @@
// under the License.

use anyhow::Result;
use oay::services::S3Service;
use oay::Config;
use opendal::services::Memory;
use opendal::Operator;
use std::sync::Arc;
use tracing_subscriber::{fmt, prelude::*, EnvFilter};

#[tokio::main]
async fn main() -> Result<()> {
println!("Hello, world!");
tracing_subscriber::registry()
.with(fmt::layer().pretty())
.with(EnvFilter::from_default_env())
.init();

let cfg: Config = Config {
backend: oay::BackendConfig {
typ: "memory".to_string(),
Comment thread
Xuanwo marked this conversation as resolved.
},
frontends: oay::FrontendsConfig {
s3: oay::S3Config {
enable: true,
addr: "127.0.0.1:3000".to_string(),
},
},
};

let op = Operator::new(Memory::default())?.finish();

let s3 = S3Service::new(Arc::new(cfg), op);

s3.serve().await?;

Ok(())
}
42 changes: 42 additions & 0 deletions bin/oay/src/config.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

use serde::Deserialize;
use serde::Serialize;

#[derive(Serialize, Deserialize)]
pub struct Config {
pub backend: BackendConfig,
pub frontends: FrontendsConfig,
}

#[derive(Serialize, Deserialize)]
pub struct BackendConfig {
#[serde(rename = "type")]
pub typ: String,
Comment thread
Xuanwo marked this conversation as resolved.
}

#[derive(Serialize, Deserialize)]
pub struct FrontendsConfig {
pub s3: S3Config,
}

#[derive(Serialize, Deserialize)]
pub struct S3Config {
pub enable: bool,
pub addr: String,
Comment thread
Xuanwo marked this conversation as resolved.
}
5 changes: 5 additions & 0 deletions bin/oay/lib.rs → bin/oay/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

pub mod services;

mod config;
pub use config::*;
19 changes: 19 additions & 0 deletions bin/oay/src/services/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

mod s3;
pub use s3::S3Service;
19 changes: 19 additions & 0 deletions bin/oay/src/services/s3/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

mod service;
pub use service::*;
Loading