Landonxjames/wasm tests (#4477)

Author: landonxjames

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

@@ -1,16 +1,19 @@
 [build]
-target = ["wasm32-unknown-unknown", "wasm32-wasip1"]
+target = ["wasm32-unknown-unknown", "wasm32-wasip2"]
 
-[target.wasm32-wasi]
-rustflags = ["-C", "opt-level=1"]
+[target.wasm32-wasip2]
 runner = [
     "wasmtime",
     "-C", "cache=n",
     "-S", "preview2=y",
     "-S", "http=y"
 ]
 
-# Requires for getrandom crate to compile
-# https://docs.rs/getrandom/0.3.3/getrandom/#webassembly-support
+
 [target.wasm32-unknown-unknown]
+# Required for getrandom crate to compile
+# https://docs.rs/getrandom/0.3.3/getrandom/#webassembly-support
 rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
+runner = [
+    "./run-wasm32-unknown-unknown.sh",
+]

aws/sdk/integration-tests/webassembly/.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "rust-analyzer.cargo.target": "wasm32-wasip1"
+  "rust-analyzer.cargo.target": "wasm32-wasip2"
 }

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

@@ -14,34 +14,27 @@ license = "Apache-2.0"
 repository = "https://github.com/smithy-lang/smithy-rs"
 publish = false
 
-
-[features]
-default = ["test-util"]
-test-util = []
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [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-async = { path = "../../build/aws-sdk/sdk/aws-smithy-async", default-features = false, features = ["test-util", "rt-tokio"] }
 aws-smithy-http = { path = "../../build/aws-sdk/sdk/aws-smithy-http" }
+aws-smithy-http-client = { path = "../../build/aws-sdk/sdk/aws-smithy-http-client", default-features = false, features = ["test-util"] }
 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-smithy-wasm = { path = "../../build/aws-sdk/sdk/aws-smithy-wasm" }
-http = "0.2.9"
+http-1x = { package = "http", version = "1" }
 tokio = { version = "1.32.0", features = ["macros", "rt"] }
 # getrandom is a transitive dependency, but requires the wasm_js feature to compile for wasm
 # also requires a compiler flag which is set in .cargo/config.toml
 # https://docs.rs/getrandom/0.3.3/getrandom/#webassembly-support
 getrandom = {version="0.3.3", features = ["wasm_js"]}
 
-[target.'cfg(all(target_family = "wasm", target_env = "p1"))'.dependencies]
-wit-bindgen = { version = "0.16.0", features = ["macros", "realloc"] }
-
 [lib]
 crate-type = ["cdylib"]
 

aws/sdk/integration-tests/webassembly/run-wasm32-unknown-unknown.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+wasmtime --invoke main -D logging=y -D debug-info=y -D address-map=y "$@" 0 0

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

@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#![allow(dead_code)]
+#![cfg(target_family = "wasm")]
 
-#[cfg(target_family = "wasm")]
-mod http_client;
-#[cfg(all(target_family = "wasm", target_env = "p1"))]
-mod wasi;
+// Note the tests here are not gated since they should pass successfully in both
+// wasm32-unknown-unknown and wasm32-wasip2
+mod wasm32_unknown_unknown;
+
+#[cfg(all(target_arch = "wasm32", target_env = "p2"))]
+mod wasm32_wasip2;