Unverified Commit 65058d9d authored by Eduardo de Moura Rodrigues's avatar Eduardo de Moura Rodrigues Committed by GitHub
Browse files

feat: support compiling to webassembly (#2254) 



* feat(aws-config): define default feature for sso

* chore(aws): disable unused features

* chore(rust-runtime): disable unused features

* chore: add missing tokio fs feature

* chore: disable spawn blocking on wasm

* chore: fix sso feature

* chore: allow unused variables when not sso

* chore: remove unnecessary dependency filter for wasm

* chore: add integration test for wasm

* chore: ensure test-util feature is applied to dev dependencies

* chore: disable retry config

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* chore: simplify features as suggested

* chore: no default features for aws types

* chore: rename credentials-sso feature

* Revert "chore: simplify features as suggested"

This reverts commit d8fcf4912f4f169bc1a4edc37799508272c132a2.

* chore: set right name in default features

* chore: create smithy client test util in runtime types

* Update aws/rust-runtime/aws-types/Cargo.toml

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* Update aws/rust-runtime/aws-inlineable/Cargo.toml

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* Update aws/rust-runtime/aws-config/src/profile/credentials/exec.rs

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* Update aws/rust-runtime/aws-config/src/profile/credentials/exec.rs

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* Update aws/rust-runtime/aws-config/src/profile/credentials/exec.rs

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* Update aws/rust-runtime/aws-config/src/lib.rs

Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>

* chore: use hardcoded credentials feature

* chore: make wasm example for s3 instead

* chore: fix formatting

* chore: fix kotlin formatting

* chore: fix kotlin unit tests

* chore: use timeout config from smithy types

* chore: move tests into main file

* chore: add vscode setttings to target wasi by default

* chore: fix test-util feature for smithy client

* chore: separate adapter into own module

* chore: fix test with no default features

* Fix typo

* Update changelog

* Check compilation of `aws-config` against `wasm32` in CI

* Fix Dockerfile issue and use correct cargo-wasi command

* Small Dockerfile fix

* Add missing `tar` binary to Docker image

---------

Co-authored-by: default avatarEduardo Rodrigues <eduardomourar@users.noreply.github.com>
Co-authored-by: default avatarJohn DiSanti <johndisanti@gmail.com>
Co-authored-by: default avatarJohn DiSanti <jdisanti@amazon.com>
Co-authored-by: default avatarRussell Cohen <rcoh@amazon.com>
parent 9a77a8c1

CHANGELOG.next.toml

+12 −0
Original line number Diff line number Diff line
@@ -24,6 +24,18 @@ meta = { "breaking" = false, "tada" = false, "bug" = true, "target" = "all"} 
author = "jdisanti"



[[aws-sdk-rust]]

message = "The AWS SDK now compiles for the `wasm32-unknown-unknown` and `wasm32-wasi` targets when no default features are enabled. WebAssembly is not officially supported yet, but this is a great first step towards it!"

references = ["smithy-rs#2254"]

meta = { "breaking" = false, "tada" = true, "bug" = false }

author = "eduardomourar"



[[smithy-rs]]

message = "Clients now compile for the `wasm32-unknown-unknown` and `wasm32-wasi` targets when no default features are enabled. WebAssembly is not officially supported yet, but this is a great first step towards it!"

references = ["smithy-rs#2254"]

meta = { "breaking" = false, "tada" = true, "bug" = false, "target" = "client"}

author = "eduardomourar"



[[smithy-rs]]

message = "Streaming operations now emit the request ID at the `debug` log level like their non-streaming counterparts."

references = ["smithy-rs#2495"]

meta = { "breaking" = false, "tada" = false, "bug" = true }

aws/rust-runtime/aws-config/Cargo.toml

+8 −7
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ client-hyper = ["aws-smithy-client/client-hyper"] 
rustls = ["aws-smithy-client/rustls"]

native-tls = ["aws-smithy-client/native-tls"]

rt-tokio = ["aws-smithy-async/rt-tokio", "tokio/rt"]

credentials-sso = ["dep:aws-sdk-sso", "dep:ring", "dep:hex", "dep:zeroize"]



default = ["client-hyper", "rustls", "rt-tokio"]

default = ["client-hyper", "rustls", "rt-tokio", "credentials-sso"]



[dependencies]

aws-credential-types = { path = "../../sdk/build/aws-sdk/sdk/aws-credential-types" }

aws-http = { path = "../../sdk/build/aws-sdk/sdk/aws-http" }

aws-sdk-sso = { path = "../../sdk/build/aws-sdk/sdk/sso", default-features = false }

aws-sdk-sts = { path = "../../sdk/build/aws-sdk/sdk/sts", default-features = false }

aws-smithy-async = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-async" }

aws-smithy-client = { path = "../../sdk/build/aws-sdk/sdk/aws-smithy-client", default-features = false }
@@ -33,11 +33,6 @@ time = { version = "0.3.4", features = ["parsing"] } 
tokio = { version = "1.13.1", features = ["sync"] }

tracing = { version = "0.1" }



# implementation detail of SSO credential caching

ring = "0.16"

hex = "0.4.3"

zeroize = "1"



# implementation detail of IMDS credentials provider

fastrand = "1"
@@ -45,6 +40,12 @@ bytes = "1.1.0" 
http = "0.2.4"

tower = { version = "0.4.8" }



# implementation detail of SSO credential caching

aws-sdk-sso = { path = "../../sdk/build/aws-sdk/sdk/sso", default-features = false, optional = true }

ring = { version = "0.16", optional = true }

hex = { version = "0.4.3", optional = true }

zeroize = { version = "1", optional = true }



[dev-dependencies]

futures-util = { version = "0.3.16", default-features = false }

tracing-test = "0.2.1"

aws/rust-runtime/aws-config/src/default_provider/credentials.rs

+2 −0
Original line number Diff line number Diff line
@@ -298,7 +298,9 @@ mod test { 
    make_test!(ecs_credentials);

    make_test!(ecs_credentials_invalid_profile);



    #[cfg(feature = "credentials-sso")]

    make_test!(sso_assume_role);

    #[cfg(feature = "credentials-sso")]

    make_test!(sso_no_token_file);



    #[tokio::test]

aws/rust-runtime/aws-config/src/default_provider/timeout_config.rs

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 */



use crate::provider_config::ProviderConfig;

use aws_sdk_sso::config::timeout::TimeoutConfig;

use aws_smithy_types::timeout::TimeoutConfig;

use std::time::Duration;



const SDK_DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_millis(3100);

aws/rust-runtime/aws-config/src/ecs.rs

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ async fn validate_full_uri( 
    }

}



#[cfg(not(feature = "rt-tokio"))]

#[cfg(any(not(feature = "rt-tokio"), target_family = "wasm"))]

fn tokio_dns() -> Option<DnsService> {

    None

}
@@ -426,7 +426,7 @@ fn tokio_dns() -> Option<DnsService> { 
/// DNS resolver that uses tokio::spawn_blocking

///

/// DNS resolution is required to validate that provided URIs point to the loopback interface

#[cfg(feature = "rt-tokio")]

#[cfg(all(feature = "rt-tokio", not(target_family = "wasm")))]

fn tokio_dns() -> Option<DnsService> {

    use aws_smithy_client::erase::boxclone::BoxFuture;

    use std::io::ErrorKind;