Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/core/openssh-sftp-client-0.…
Browse files Browse the repository at this point in the history
…15.2
  • Loading branch information
Zheaoli authored Dec 13, 2024
2 parents 739dd3a + 2ae71f5 commit a8feef2
Show file tree
Hide file tree
Showing 256 changed files with 7,261 additions and 2,604 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,6 @@ indent_size = 2

[*.{yaml,yml}]
indent_size = 2

[*.rb]
indent_size = 2
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ runs:
OPENDAL_S3_SECRET_ACCESS_KEY=demo
OPENDAL_S3_REGION=us-east-1
OPENDAL_S3_ENABLE_VERSIONING=true
OPENDAL_S3_DISABLE_WRITE_WITH_IF_MATCH=on
EOF
1 change: 1 addition & 0 deletions .github/services/s3/ceph_rados_s3/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ runs:
OPENDAL_S3_ACCESS_KEY_ID=demo
OPENDAL_S3_SECRET_ACCESS_KEY=demo
OPENDAL_S3_REGION=us-east-1
OPENDAL_S3_DISABLE_WRITE_WITH_IF_MATCH=on
EOF
4 changes: 2 additions & 2 deletions .github/services/s3/r2/disabled_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.

name: r2
description: 'Behavior test for Cloudflare R2. This service is sponsored by @Xuanwo.'
description: "Behavior test for Cloudflare R2. This service is sponsored by @Xuanwo."

runs:
using: "composite"
Expand All @@ -38,6 +38,6 @@ runs:
run: |
cat << EOF >> $GITHUB_ENV
OPENDAL_S3_REGION=auto
OPENDAL_S3_BATCH_MAX_OPERATIONS=700
OPENDAL_S3_DELETE_MAX_SIZE=700
OPENDAL_S3_DISABLE_STAT_WITH_OVERRIDE=true
EOF
2 changes: 1 addition & 1 deletion .github/workflows/ci_bin_oli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
branches:
- main
paths:
- "bin/oay/**"
- "bin/oli/**"
- "core/**"
- ".github/workflows/ci_bin_oli.yml"

Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/release_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@ jobs:
args: --release -o dist -i python3.10 --features=pyo3/extension-module,services-all
sccache: true
manylinux: auto
- name: Build free-threaded wheels
uses: PyO3/maturin-action@v1
with:
working-directory: "bindings/python"
target: "${{ matrix.target }}"
command: build
args: --release -o dist -i python3.13t --features=pyo3/extension-module,services-all
sccache: true
manylinux: auto
- name: Upload wheels
uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# IDE and editor
.vscode
.idea

.vscode
!.vscode/settings.json
**/target
**/vendor
dist/
Expand Down
11 changes: 11 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"rust-analyzer.cargo.allTargets": true,
"rust-analyzer.cargo.features": "all",
"rust-analyzer.linkedProjects": [
"${workspaceFolder}/core/Cargo.toml",
"${workspaceFolder}/bindings/python/Cargo.toml",
"${workspaceFolder}/bindings/java/Cargo.toml",
"${workspaceFolder}/bindings/nodejs/Cargo.toml",
],
"java.compile.nullAnalysis.mode": "automatic"
}
4 changes: 2 additions & 2 deletions bin/oay/Cargo.lock

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

8 changes: 4 additions & 4 deletions bin/ofs/Cargo.lock

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

2 changes: 1 addition & 1 deletion bin/ofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rust-version = "1.75"

[dependencies]
anyhow = "1"
clap = { version = "4.5.18", features = ["derive", "env"] }
clap = { version = "4.5.21", features = ["derive", "env"] }
env_logger = "0.11.2"
log = "0.4.21"
opendal = { version = "0.50.0", path = "../../core" }
Expand Down
77 changes: 72 additions & 5 deletions bin/oli/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/oli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ anyhow = "1"
clap = { version = "4", features = ["cargo", "string", "derive", "deprecated"] }
dirs = "5.0.1"
futures = "0.3"
indicatif = "0.17.9"
opendal = { version = "0.50.0", path = "../../core", features = [
# These are default features before v0.46. TODO: change to optional features
"services-azblob",
Expand Down
10 changes: 5 additions & 5 deletions bin/oli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cargo install oli --all-features
- `~/Library/Application Support/oli/config.toml` on macOS
- `C:\Users\<UserName>\AppData\Roaming\oli\config.toml` on Windows

The content of `config.toml` should be follow these pattern:
The content of `config.toml` should follow these pattern:

```toml
[profiles.<profile_name>]
Expand Down Expand Up @@ -72,17 +72,17 @@ For different services, you could find the configuration keys in the correspondi
### Example: use `oli` to upload file to AWS S3

```text
$ oli cp ./update-ecs-loadbalancer.json s3://update-ecs-loadbalancer.json
$ oli ls s3://
$ oli cp ./update-ecs-loadbalancer.json s3:/update-ecs-loadbalancer.json
$ oli ls s3:/
fleet.png
update-ecs-loadbalancer.json
```

### Example: use `oli` copy file from S3 to R2

```text
$ oli cp s3://fleet.png r2://fleet.png
$ oli ls r2://
$ oli cp s3:/fleet.png r2:/fleet.png
$ oli ls r2:/
fleet.png
```

Expand Down
4 changes: 4 additions & 0 deletions bin/oli/src/bin/oli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ async fn main() -> Result<()> {
let cmd: oli::commands::stat::StatCmd = clap::Parser::parse();
cmd.run().await?;
}
Some("omv") => {
let cmd: oli::commands::mv::MoveCmd = clap::Parser::parse();
cmd.run().await?;
}
Some(v) => {
println!("{v} is not supported")
}
Expand Down
1 change: 1 addition & 0 deletions bin/oli/src/commands/cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use crate::params::config::ConfigParams;
pub struct CatCmd {
#[command(flatten)]
pub config_params: ConfigParams,
/// In the form of `<profile>:/<path>`.
#[arg()]
pub target: String,
}
Expand Down
Loading

0 comments on commit a8feef2

Please sign in to comment.