Add aws-smithy-wasm crate with WASI http client

CHANGELOG.next.toml

@@ -11,8 +11,20 @@
 # meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
 # author = "rcoh"
 
+[[aws-sdk-rust]]
+message = "The MSRV has been increase to 1.74.1"
+references = ["smithy-rs#3410"]
+meta = { "bug" = false, "breaking" = false, tada = false }
+author = "rcoh"
+
 [[aws-sdk-rust]]
 message = "EKS Pod Identity is now supported as part of the default ECS credential provider."
 references = ["smithy-rs#3416"]
 meta = { "breaking" = false, "bug" = false, "tada" = true }
 author = "jackkleeman"
+
+[[smithy-rs]]
+message = "Add aws-smithy-wasm crate to enable SDK use in wasi compliant environments"
+references = ["smithy-rs#2087", "smithy-rs#2520", "smithy-rs#3409"]
+meta = { "breaking" = false, "tada" = true, "bug" = false, "target" = "client"}
+author = "landonxjames"

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

@@ -1,7 +1,10 @@
 [package]
 name = "aws-config"
 version = "0.0.0-smithy-rs-head"
-authors = ["AWS Rust SDK Team <aws-sdk-rust@amazon.com>", "Russell Cohen <rcoh@amazon.com>"]
+authors = [
+ "AWS Rust SDK Team <aws-sdk-rust@amazon.com>",
+ "Russell Cohen <rcoh@amazon.com>",
+]
 description = "AWS SDK config and credential provider implementations."
 edition = "2021"
 exclude = ["test-data/*", "integration-tests/*"]

aws/sdk/integration-tests/.gitignore

@@ -1,2 +1,3 @@
 Cargo.lock
 target/
+webassembly/src/bindings.rs

aws/sdk/integration-tests/test.sh

@@ -11,6 +11,12 @@ for f in *; do
  echo
  echo "Testing ${f}..."
  echo "###############"
- cargo test --manifest-path "${f}/Cargo.toml" --all-features
+ if [ "$f" != "webassembly" ]; then
+ cargo test --manifest-path "${f}/Cargo.toml" --all-features
+ else
+ # The webassembly tests use a custom runner set in config.toml that
+ # is not picked up when running the tests outside of the package
+ cd webassembly && cargo component test --all-features --all-targets && cd ..
+ fi
  fi
 done

aws/sdk/integration-tests/webassembly/.cargo/config.toml

@@ -3,3 +3,9 @@ target = "wasm32-wasi"
 
 [target.wasm32-wasi]
 rustflags = ["-C", "opt-level=1"]
+runner = [
+ "wasmtime",
+ "-C", "cache=n",
+ "-S", "preview2=y",
+ "-S", "http=y"
+]

aws/sdk/integration-tests/webassembly/Cargo.toml

@@ -2,7 +2,9 @@
 [package]
 name = "webassembly"
 version = "0.1.0"
-authors = ["Eduardo Rodrigues <16357187+eduardomourar@users.noreply.github.com>"]
+authors = [
+ "Eduardo Rodrigues <16357187+eduardomourar@users.noreply.github.com>",
+]
 description = """
 These tests ensure that things will fail (or not fail) as expected
 when target is set to wasm32-wasi for all SDK and runtime crates.
@@ -12,20 +14,34 @@ license = "Apache-2.0"
 repository = "https://github.com/smithy-lang/smithy-rs"
 publish = false
 
-[lib]
-crate-type = ["cdylib"]
 
+[features]
+default = ["test-util"]
+test-util = []
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-aws-config = { path = "../../build/aws-sdk/sdk/aws-config", default-features = false, features = ["rt-tokio", "behavior-version-latest"]}
+[target.'cfg(target_family = "wasm")'.dependencies]
+aws-config = { path = "../../build/aws-sdk/sdk/aws-config", default-features = false, features = [
+ "rt-tokio",
+ "behavior-version-latest"
+] }
 aws-credential-types = { path = "../../build/aws-sdk/sdk/aws-credential-types", features = ["hardcoded-credentials"] }
 aws-sdk-s3 = { path = "../../build/aws-sdk/sdk/s3", default-features = false }
 aws-smithy-http = { path = "../../build/aws-sdk/sdk/aws-smithy-http" }
 aws-smithy-runtime = { path = "../../build/aws-sdk/sdk/aws-smithy-runtime", features = ["client"] }
 aws-smithy-runtime-api = { path = "../../build/aws-sdk/sdk/aws-smithy-runtime-api", features = ["client"] }
 aws-smithy-types = { path = "../../build/aws-sdk/sdk/aws-smithy-types" }
-aws-types = { path = "../../build/aws-sdk/sdk/aws-types" }
-http = "0.2.8"
-tokio = { version = "1.24.2", features = ["macros", "rt"] }
-tower = "0.4.13"
+aws-smithy-wasm = { path = "../../build/aws-sdk/sdk/aws-smithy-wasm" }
+http = "0.2.9"
+tokio = { version = "1.32.0", features = ["macros", "rt"] }
+
+[target.'cfg(all(target_family = "wasm", target_os = "wasi"))'.dependencies]
+wit-bindgen = { version = "0.16.0", features = ["macros", "realloc"] }
+
+
+[lib]
+crate-type = ["cdylib"]
+
+# metadata used by cargo-component to identify which wit world to embed in the binary
+[package.metadata.component]
+package = "aws:component"

aws/sdk/integration-tests/webassembly/src/http_client.rs

@@ -0,0 +1,54 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+use aws_config::retry::RetryConfig;
+use aws_sdk_s3::operation::list_objects_v2::builders::ListObjectsV2FluentBuilder;
+use aws_sdk_s3::Client;
+use aws_smithy_types::timeout::TimeoutConfig;
+use aws_smithy_wasm::wasi::WasiHttpClientBuilder;
+
+pub(crate) async fn get_default_wasi_config() -> aws_config::SdkConfig {
+ let http_client = WasiHttpClientBuilder::new().build();
+ aws_config::from_env()
+ .region("us-east-2")
+ .timeout_config(TimeoutConfig::disabled())
+ .retry_config(RetryConfig::disabled())
+ .no_credentials()
+ .http_client(http_client)
+ .load()
+ .await
+}
+
+#[tokio::test]
+pub async fn test_default_config() {
+ let shared_config = get_default_wasi_config().await;
+ let client = aws_sdk_s3::Client::new(&shared_config);
+ assert_eq!(client.config().region().unwrap().to_string(), "us-east-2")
+}
+
+async fn s3_list_objects_operation() -> ListObjectsV2FluentBuilder {
+ let shared_config = get_default_wasi_config().await;
+ let client = Client::new(&shared_config);
+ let operation = client
+ .list_objects_v2()
+ .bucket("nara-national-archives-catalog")
+ .delimiter("/")
+ .prefix("authority-records/organization/")
+ .max_keys(5);
+
+ operation
+}
+
+// Test constructing an operation using an SdkConfig with a WASI http client
+// We do not send the request to keep these tests sandboxable, a full test of
+// the client is in the SDK canary.
+#[tokio::test]
+pub async fn test_operation_construction() {
+ let operation = s3_list_objects_operation().await;
+ assert_eq!(
+ operation.get_bucket(),
+ &Some("nara-national-archives-catalog".to_string())
+ );
+}

aws/sdk/integration-tests/webassembly/src/lib.rs

@@ -3,11 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-mod default_config;
-mod http;
-mod list_buckets;
+#![allow(dead_code)]
 
-#[tokio::main(flavor = "current_thread")]
-pub async fn main() {
- crate::list_buckets::s3_list_buckets().await
-}
+#[cfg(target_family = "wasm")]
+mod http_client;
+#[cfg(all(target_family = "wasm", target_os = "wasi"))]
+mod wasi;

aws/sdk/integration-tests/webassembly/src/wasi.rs

@@ -0,0 +1,32 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Needed for WASI-compliant environment as it expects specific functions
+// to be exported such as `cabi_realloc`, `_start`, etc.
+
+wit_bindgen::generate!({
+ inline: "
+ package aws:component;
+
+ interface run {
+ run: func() -> result;
+ }
+
+ world main {
+ export run;
+ }
+ ",
+ exports: {
+ "aws:component/run": Component
+ }
+});
+
+struct Component;
+
+impl exports::aws::component::run::Guest for Component {
+ fn run() -> Result<(), ()> {
+ Ok(())
+ }
+}

buildSrc/src/main/kotlin/CrateSet.kt

@@ -70,6 +70,7 @@ object CrateSet {
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-smithy-types-convert",
+ "aws-smithy-wasm",
  "aws-smithy-xml",
  ).map { Crate(it, version(it)) }
 

rust-runtime/Cargo.toml

@@ -18,6 +18,7 @@ members = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-smithy-types-convert",
+ "aws-smithy-wasm",
  "aws-smithy-mocks-experimental",
  "aws-smithy-xml",
 ]

rust-runtime/aws-smithy-wasm/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "aws-smithy-wasm"
+version = "0.1.0"
+authors = [
+ "AWS Rust SDK Team <aws-sdk-rust@amazon.com>",
+ "Eduardo Rodrigues <16357187+eduardomourar@users.noreply.github.com>",
+]
+description = "Smithy WebAssembly configuration for smithy-rs."
+edition = "2021"
+license = "Apache-2.0"
+repository = "https://github.com/awslabs/smithy-rs"
+
+[dependencies]
+aws-smithy-runtime-api = { path = "../aws-smithy-runtime-api", features = ["http-1x"]}
+aws-smithy-http = { path = "../aws-smithy-http" }
+aws-smithy-types = { path = "../aws-smithy-types" }
+bytes = "1"
+http = "1.0.0"
+tracing = "0.1.40"
+# Note the wasi crate will only build for target wasm32-wasi, but having a target
+# statement here breaks some of the CI tests, so we leave it with the rest of the deps
+wasi = "0.12.0+wasi-0.2.0"
+
+[package.metadata.docs.rs]
+all-features = true
+targets = ["x86_64-unknown-linux-gnu"]
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
+rustdoc-args = ["--cfg", "docsrs"]
+# End of docs.rs metadata