Merge branch 'main' into refs

andrzejressel · Apr 3, 2024 · 20090dc · 20090dc
2 parents 10cf11f + 2ae2d06
commit 20090dc
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 305 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,16 +45,16 @@ futures = "0.3.30"
 lazy_static = "1.4.0"
 once_cell = "1.19.0"
 bitflags = "2.5.0"
-wit-bindgen = "0.23.0"
-wit-bindgen-rt = "0.23.0"
+wit-bindgen = "0.24.0"
+wit-bindgen-rt = "0.24.0"
 rmp = "0.8.12"
 rmp-serde = "1.1.2"
 rmpv = "1.0.1"
 serde = { version = "1.0.197", features = ["derive"] }
 tonic = { version = "0.11.0", default-features = false }
 serde_json = "1.0.115"
-wasmtime = "19.0.0"
-wasmtime-wasi = "19.0.0"
+wasmtime = "19.0.1"
+wasmtime-wasi = "19.0.1"
 tonic-build = "0.11.0"
 async-trait = "0.1.79"
 tonic-web = "0.11.0"
@@ -64,7 +64,7 @@ log4rs = "1.3.0"
 tokio = { version = "1.37.0", features = ["sync", "macros", "io-util", "rt", "time"] }
 clap = { version = "4.5.4", features = ["derive"] }
 regex = "1.10.4"
-syn = { version = "2.0.57", features = ["full"] }
+syn = { version = "2.0.58", features = ["full"] }
 quote = "1.0.35"
 proc-macro2 = "1.0.79"
 assert_cmd = "2.0.14"

diff --git a/cargo-pulumi/tests/fixtures/example/common/Cargo.toml b/cargo-pulumi/tests/fixtures/example/common/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen-rt = "0.22.0"
+wit-bindgen-rt = "0.24.0"
 
 [package.metadata.component]
 target = { path = "../service.wit",  world = "common" }
diff --git a/cargo-pulumi/tests/fixtures/example/common_lib/Cargo.toml b/cargo-pulumi/tests/fixtures/example/common_lib/Cargo.toml
@@ -9,4 +9,4 @@ related_crate = "common"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-wit-bindgen = "0.22.0"
+wit-bindgen = "0.24.0"
diff --git a/cargo-pulumi/tests/fixtures/example/main/Cargo.toml b/cargo-pulumi/tests/fixtures/example/main/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen-rt = "0.22.0"
+wit-bindgen-rt = "0.24.0"
 provider_a_lib = { path = "../provider_a_lib" }
 common_lib = { path = "../common_lib" }
 

diff --git a/cargo-pulumi/tests/fixtures/example/provider_a/Cargo.toml b/cargo-pulumi/tests/fixtures/example/provider_a/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-wit-bindgen-rt = "0.22.0"
+wit-bindgen-rt = "0.24.0"
 common_lib = { path = "../common_lib" }
 
 [package.metadata.component]

diff --git a/cargo-pulumi/tests/fixtures/example/provider_a_lib/Cargo.toml b/cargo-pulumi/tests/fixtures/example/provider_a_lib/Cargo.toml
@@ -9,4 +9,4 @@ related_crate = "provider_a"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/referen
 
 [dependencies]
-wit-bindgen = "0.22.0"
+wit-bindgen = "0.24.0"
diff --git a/pulumi-language-wasm/go.mod b/pulumi-language-wasm/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.4
 	github.com/pkg/errors v0.9.1
 	github.com/pulumi/pulumi/sdk/v3 v3.112.0
-	google.golang.org/grpc v1.62.1
+	google.golang.org/grpc v1.63.0
 	google.golang.org/protobuf v1.33.0
 )
 
@@ -85,7 +85,7 @@ require (
 	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/frand v1.4.2 // indirect

diff --git a/pulumi-language-wasm/go.sum b/pulumi-language-wasm/go.sum
@@ -537,10 +537,14 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
 google.golang.org/grpc v1.57.2 h1:uw37EN34aMFFXB2QPW7Tq6tdTbind1GpRxw5aOX3a5k=
 google.golang.org/grpc v1.57.2/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
 google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
 google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
+google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=

diff --git a/pulumi_wasm/src/lib.rs b/pulumi_wasm/src/lib.rs
@@ -250,34 +250,6 @@ impl function_reverse_callback::Guest for Component {
     }
 }
 
-fn protoc_to_messagepack(value: prost_types::Value) -> Value {
-    info!("Converting protoc value [{value:?}] to messagepack value");
-
-    let kind = match value.kind {
-        None => {
-            error!("Kind is none");
-            unreachable!("Kind is none")
-        }
-        Some(ref k) => k,
-    };
-
-    let result = match kind {
-        // Kind::NullValue(_) => todo!(),
-        Kind::NumberValue(n) => Value::F64(*n),
-        Kind::StringValue(s) => Value::String(Utf8String::from(s.clone())),
-        Kind::BoolValue(b) => Value::Boolean(*b),
-        // Kind::StructValue(_) => todo!(),
-        // Kind::ListValue(_) => todo!(),
-        _ => {
-            error!("Cannot convert protoc [{value:?}] to messagepack");
-            todo!()
-        }
-    };
-
-    info!("Result: [{result:?}]");
-    result
-}
-
 fn protoc_object_to_messagepack_map(
     o: prost_types::Struct,
     schema: HashMap<String, msgpack_protobuf_converter::Type>,

diff --git a/pulumi_wasm_generator/tests/input/Cargo.toml b/pulumi_wasm_generator/tests/input/Cargo.toml
@@ -10,8 +10,8 @@ members = [
 ]
 
 [workspace.dependencies]
-wit-bindgen-rt = "0.22.0"
-wit-bindgen = "0.22.0"
+wit-bindgen-rt = "0.24.0"
+wit-bindgen = "0.24.0"
 automod = "1.0.14"
 wasm_common = { path = "../../../../wasm_common" }
 pulumi_wasm_rust = { path = "../../../../pulumi_wasm_rust" }