Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use rustls for delta checkpoint lambda #842

Merged
merged 1 commit into from
Sep 26, 2022
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
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,12 @@ jobs:
- name: Start emulated services
run: docker-compose up -d

- name: Run tests
- name: Run tests with default ssl
run: |
cargo test --features integration_test,azure,s3,gcs,datafusion-ext
- name: Run tests with rustls
run: |
cargo test --features integration_test,s3-rustls,datafusion-ext

paruqet2_test:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions aws/delta-checkpoint/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ tokio-stream = { version = "0", features = ["fs"] }
[dependencies.deltalake]
path = "../../rust"
version = "0"
features = ["s3"]
features = ["s3-rustls"]

[dev-dependencies]
rusoto_core = "0.48"
rusoto_core = { version = "0.48", default-features = false, features = ["rustls"] }
rusoto_credential = "0.48"
rusoto_s3 = "0.48"
rusoto_s3 = { version = "0.48", default-features = false, features = ["rustls"] }

[[bin]]
name = "bootstrap"
Expand Down
19 changes: 10 additions & 9 deletions rust/tests/integration_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,31 @@ use std::collections::HashMap;

#[tokio::test]
#[serial]
async fn test_commit_tables_local() -> TestResult {
Ok(commit_tables(StorageIntegration::Local).await?)
async fn test_commit_tables_local() {
commit_tables(StorageIntegration::Local).await.unwrap();
}

#[cfg(any(feature = "s3", feature = "s3-rustls"))]
// rustls doesn't support http scheme, so we are skipping the test when s3-rustls is enabled.
#[cfg(feature = "s3")]
#[tokio::test]
#[serial]
async fn test_commit_tables_aws() -> TestResult {
async fn test_commit_tables_aws() {
std::env::set_var("AWS_S3_LOCKING_PROVIDER", "dynamodb");
Ok(commit_tables(StorageIntegration::Amazon).await?)
commit_tables(StorageIntegration::Amazon).await.unwrap();
}

#[cfg(feature = "azure")]
#[tokio::test]
#[serial]
async fn test_commit_tables_azure() -> TestResult {
Ok(commit_tables(StorageIntegration::Microsoft).await?)
async fn test_commit_tables_azure() {
commit_tables(StorageIntegration::Microsoft).await.unwrap();
}

#[cfg(feature = "gcs")]
#[tokio::test]
#[serial]
async fn test_commit_tables_gcp() -> TestResult {
Ok(commit_tables(StorageIntegration::Google).await?)
async fn test_commit_tables_gcp() {
commit_tables(StorageIntegration::Google).await.unwrap();
}

#[cfg(any(feature = "s3", feature = "s3-rustls"))]
Expand Down
3 changes: 2 additions & 1 deletion rust/tests/integration_concurrent_writes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ async fn test_concurrent_writes_local() -> TestResult {
Ok(())
}

#[cfg(any(feature = "s3", feature = "s3-rustls"))]
// rustls doesn't support http scheme, so we are skipping the test when s3-rustls is enabled.
#[cfg(feature = "s3")]
#[tokio::test]
async fn concurrent_writes_s3() -> TestResult {
test_concurrent_writes(StorageIntegration::Amazon).await?;
Expand Down
3 changes: 2 additions & 1 deletion rust/tests/integration_object_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ async fn test_object_store_azure() -> TestResult {
Ok(())
}

#[cfg(any(feature = "s3", feature = "s3-rustls"))]
// rustls doesn't support http scheme, so we are skipping the test when s3-rustls is enabled.
#[cfg(feature = "s3")]
#[tokio::test]
#[serial]
async fn test_object_store_aws() -> TestResult {
Expand Down