Skip to content

Commit

Permalink
Sync dev/1.0.0 with main (#89)
Browse files Browse the repository at this point in the history
* build: Sync  with eclipse-zenoh/zenoh@75aa273 from 2024-05-15 (#77)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* build: Sync  with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#78)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* fix: removing #[tokio::main] macro from create_bucket (#79)

* fix: removing #[tokio::main] macro from create_bucket

* refactor: manually spawning runtime if dynamic loaded

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>

* fix: workaroud for calling create buket in a tokio runtime context

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>

* chore: make clippy happy

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>

* chore: addressing comments

Signed-off-by: Gabriele Baldoni <gabriele.baldoni@gmail.com>

---------

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>
Signed-off-by: Gabriele Baldoni <gabriele.baldoni@gmail.com>

* build: Sync  with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#80)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* build: Sync  with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#81)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* build: Sync  with eclipse-zenoh/zenoh@009f666 from 2024-05-30 (#83)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* build: Sync  with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#84)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* fix(runtime): fixing crash when dropping runtime not created in static (#85)

Signed-off-by: Gabriele Baldoni <gabriele.baldoni@gmail.com>

* build: Sync  with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#86)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

* fix: cargo deb fails to build package (#87)

license-file uses a 2-element array with a location of the license file
and the amount of lines to skip at the top.

* build: Sync  with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#88)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

---------

Signed-off-by: gabrik <gabriele.baldoni@gmail.com>
Signed-off-by: Gabriele Baldoni <gabriele.baldoni@gmail.com>
Co-authored-by: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
Co-authored-by: Gabriele Baldoni <gabrik@users.noreply.github.com>
Co-authored-by: Diogo Matsubara <diogo.matsubara@pm.me>
  • Loading branch information
5 people authored Jun 11, 2024
1 parent 9a58f00 commit 5b957ae
Show file tree
Hide file tree
Showing 5 changed files with 186 additions and 112 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ jobs:

- name: Clippy
run: cargo clippy --all-targets -- --deny warnings

- name: Clippy no-default-features
run: cargo clippy --no-default-features --all-targets -- --deny warnings

- name: Build
run: cargo build --verbose --all-targets
Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock

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

54 changes: 29 additions & 25 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,37 @@
# ZettaScale Zenoh Team, <zenoh@zettascale.tech>
#
[package]
name = "zenoh-backend-s3"
version = "0.11.0-dev"
repository = "https://github.com/eclipse-zenoh/zenoh-backend-s3"
homepage = "http://zenoh.io"
authors = [
"kydos <angelo@icorsaro.net>",
"Julien Enoch <julien@enoch.fr>",
"Olivier Hécart <olivier.hecart@zettascale.tech>",
"Luca Cominardi <luca.cominardi@zettascale.tech>",
"Darius Maitia <darius@zettascale.tech>",
"Darius Maitia <darius@zettascale.tech>",
"Julien Enoch <julien@enoch.fr>",
"Luca Cominardi <luca.cominardi@zettascale.tech>",
"Olivier Hécart <olivier.hecart@zettascale.tech>",
"kydos <angelo@icorsaro.net>",
]
categories = ["database", "network-programming"]
description = "Backend for Zenoh using AWS S3 API"
edition = "2021"
homepage = "http://zenoh.io"
license = "EPL-2.0 OR Apache-2.0"
categories = ["network-programming", "database"]
description = "Backend for Zenoh using AWS S3 API"
name = "zenoh-backend-s3"
repository = "https://github.com/eclipse-zenoh/zenoh-backend-s3"
version = "0.11.0-dev"

[lib]
name = "zenoh_backend_s3"
crate-type = ["cdylib", "rlib"]
name = "zenoh_backend_s3"

[features]
stats = ["zenoh/stats"]
dynamic_plugin = []
default = ["dynamic_plugin"]
dynamic_plugin = []
stats = ["zenoh/stats"]

[dependencies]
async-rustls = "0.4.0"
async-std = { version = "=1.12.0", default-features = false, features = ["unstable", "tokio1"] }
async-std = { version = "=1.12.0", default-features = false, features = [
"tokio1",
"unstable",
] }
async-trait = "0.1.66"
aws-config = "0.51.0"
aws-sdk-s3 = "0.21.0"
Expand All @@ -55,29 +58,30 @@ rustls-pemfile = "2.0.0"
rustls-pki-types = "1.1.0"
serde = "1.0.154"
serde_json = "1.0.94"
tracing = "0.1"
tokio = { version = "1.26.0", features = ["full"] }
tracing = "0.1"
uhlc = "0.5.2"
webpki = "0.22.0"
webpki-roots = "0.25"
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable"] }
zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [
"unstable",
] }
zenoh-buffers = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-codec = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-collections = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-core = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-keyexpr = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-plugin-trait = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }

zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
zenoh_backend_traits = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
[build-dependencies]
rustc_version = "0.4.0"

[package.metadata.deb]
name = "zenoh-backend-s3"
maintainer = "zenoh-dev@eclipse.org"
copyright = "2022 ZettaScale Technology"
section = "net"
license-file = ["LICENSE", "0"]
depends = "zenoh-plugin-storage-manager (=0.11.0-dev-1)"
license-file = ["LICENSE", "0"]
maintainer = "zenoh-dev@eclipse.org"
name = "zenoh-backend-s3"
section = "net"
1 change: 0 additions & 1 deletion src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ impl S3Client {
/// - Ok(Some(None)) in case the `reuse_bucket` parameter is true and the bucket already exists
/// and is owned by you
/// - Error in any other case
#[tokio::main]
pub async fn create_bucket(&self, reuse_bucket: bool) -> ZResult<Option<CreateBucketOutput>> {
let constraint = self
.region
Expand Down
Loading

0 comments on commit 5b957ae

Please sign in to comment.