Skip to content

Commit

Permalink
Replace azure sdk with custom implementation (#2509)
Browse files Browse the repository at this point in the history
* feat: remove azure SDK

* chore: remove httpdate crate

* chore: some clippy

* chore: include sas keys in builder

* chore: cleanup credential a bit

* feat: azure client credential auth with custom impl

* fix: remove local test

* feat: add cache to ClientSecretOAuthProvider

* chore: fmt

* chore: cleanup

* fix: remove unwraps

* chore: cleanup Cargo.toml

* fix: fix azure multipart requests

* feat: create builder from environment

* Apply suggestions from code review

Co-authored-by: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>

* fix: address PR comments

* fix: service principal auth & multipart

* fix: appen sas query pairs to copy url

* Update object_store/src/azure/client.rs

Co-authored-by: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>

* Fix SAS token escaping in CopyRequest

Co-authored-by: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>
Co-authored-by: Raphael Taylor-Davies <r.taylordavies@googlemail.com>
  • Loading branch information
3 people committed Aug 24, 2022
1 parent f11fc1f commit d36f072
Show file tree
Hide file tree
Showing 13 changed files with 1,836 additions and 943 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/object_store.yml
Expand Up @@ -129,4 +129,4 @@ jobs:
OBJECT_STORE_AWS_ENDPOINT: http://localstack:4566
run: |
# run tests
cargo test -p object_store --features=aws,azure,azure_test,gcp
cargo test -p object_store --features=aws,azure,gcp
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -13,4 +13,7 @@ parquet/data.parquet
.githubchangeloggenerator.cache.log
justfile
.prettierignore
.env
.env
# local azurite file
__azurite*
__blobstorage__
35 changes: 15 additions & 20 deletions object_store/Cargo.toml
Expand Up @@ -30,38 +30,33 @@ all-features = true

[dependencies] # In alphabetical order
async-trait = "0.1.53"
# Microsoft Azure Blob storage integration
azure_core = { version = "0.4", optional = true, default-features = false, features = ["enable_reqwest_rustls"] }
azure_identity = { version = "0.5", optional = true, default-features = false, features = ["enable_reqwest_rustls"]}
azure_storage = { version = "0.5", optional = true, default-features = false, features = ["enable_reqwest_rustls"]}
azure_storage_blobs = { version = "0.5", optional = true, default-features = false, features = ["enable_reqwest_rustls"] }
bytes = "1.0"
chrono = { version = "0.4", default-features = false, features = ["clock"] }
# Google Cloud Storage integration
futures = "0.3"
serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
serde_json = { version = "1.0", default-features = false, optional = true }
quick-xml = { version = "0.23.0", features = ["serialize"], optional = true }
rustls-pemfile = { version = "1.0", default-features = false, optional = true }
ring = { version = "0.16", default-features = false, features = ["std"], optional = true }
base64 = { version = "0.13", default-features = false, optional = true }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }
itertools = "0.10.1"
parking_lot = { version = "0.12" }
percent-encoding = "2.1"
snafu = "0.7"
tokio = { version = "1.18", features = ["sync", "macros", "parking_lot", "rt-multi-thread", "time", "io-util"] }
tracing = { version = "0.1" }
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"], optional = true }
parking_lot = { version = "0.12" }
# Filesystem integration
url = "2.2"
walkdir = "2"

# Cloud storage support
base64 = { version = "0.13", default-features = false, optional = true }
quick-xml = { version = "0.23.0", features = ["serialize"], optional = true }
serde = { version = "1.0", default-features = false, features = ["derive"], optional = true }
serde_json = { version = "1.0", default-features = false, optional = true }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true }
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"], optional = true }
ring = { version = "0.16", default-features = false, features = ["std"], optional = true }
rustls-pemfile = { version = "1.0", default-features = false, optional = true }

[features]
azure = ["azure_core", "azure_storage_blobs", "azure_storage", "reqwest", "azure_identity"]
azure_test = ["azure", "azure_core/azurite_workaround", "azure_storage/azurite_workaround", "azure_storage_blobs/azurite_workaround"]
gcp = ["serde", "serde_json", "quick-xml", "reqwest", "reqwest/json", "reqwest/stream", "chrono/serde", "rustls-pemfile", "base64", "rand", "ring"]
aws = ["serde", "serde_json", "quick-xml", "reqwest", "reqwest/json", "reqwest/stream", "chrono/serde", "rustls-pemfile", "base64", "rand", "ring"]
cloud = ["serde", "serde_json", "quick-xml", "reqwest", "reqwest/json", "reqwest/stream", "chrono/serde", "rustls-pemfile", "base64", "rand", "ring"]
azure = ["cloud"]
gcp = ["cloud"]
aws = ["cloud"]

[dev-dependencies] # In alphabetical order
dotenv = "0.15.0"
Expand Down
6 changes: 1 addition & 5 deletions object_store/src/aws/credential.rs
Expand Up @@ -17,6 +17,7 @@

use crate::client::retry::RetryExt;
use crate::client::token::{TemporaryToken, TokenCache};
use crate::util::hmac_sha256;
use crate::{Result, RetryConfig};
use bytes::Buf;
use chrono::{DateTime, Utc};
Expand Down Expand Up @@ -188,11 +189,6 @@ impl CredentialExt for RequestBuilder {
}
}

fn hmac_sha256(secret: impl AsRef<[u8]>, bytes: impl AsRef<[u8]>) -> ring::hmac::Tag {
let key = ring::hmac::Key::new(ring::hmac::HMAC_SHA256, secret.as_ref());
ring::hmac::sign(&key, bytes.as_ref())
}

/// Computes the SHA256 digest of `body` returned as a hex encoded string
fn hex_digest(bytes: &[u8]) -> String {
let digest = ring::digest::digest(&ring::digest::SHA256, bytes);
Expand Down

0 comments on commit d36f072

Please sign in to comment.