Merge pull request #81 from golemcloud/wasmtime-17

GOL-183 Upgrade to wasmtime 17.0 and the final WASI preview2

Author: vigoo

Cargo.lock

@@ -57,13 +57,14 @@ fred = { version = "8.0.0", features = ["metrics", "serde-json", "partial-tracin
 futures = "0.3"
 futures-core = "0.3.29"
 futures-util = "0.3.29"
-http = "0.2.11" # keep in sync with wasmtime
+golem-wasm-ast = "0.1.4"
+http = "1.0.0" # keep in sync with wasmtime
 humantime-serde = "1.1.1"
-hyper = { version = "=1.0.0-rc.3", features = ["full"] }
+hyper = { version = "1.0.1", features = ["full"] } # keep in sync with wasmtime
 iso8601-timestamp = "0.2.16"
 lazy_static = "1.4.0"
-poem = "1.3.59"
-poem-openapi = { version = "3.0.6", features = ["swagger-ui", "chrono", "time", "humantime", "uuid", "url", "websocket"] }
+poem = "2.0.0"
+poem-openapi = { version = "4.0.0", features = ["swagger-ui", "chrono", "time", "humantime", "uuid", "url", "websocket"] }
 prometheus = { version = "0.13.3", features = ["process"] }
 prost = "0.12.3"
 rustls = { version = "0.22.2" }

Cargo.toml

@@ -14,6 +14,7 @@ aws-config = { workspace = true }
 aws-sdk-s3 = { workspace = true }
 bigdecimal = "0.4.2"
 http = { workspace = true }
+http_02 = { package="http", version = "0.2.11" }
 hyper = { workspace = true }
 num-traits = "0.2"
 poem-openapi = { workspace = true }

golem-service-base/Cargo.toml

@@ -58,7 +58,7 @@ impl RoutingTableServiceDefault {
 #[async_trait]
 impl RoutingTableService for RoutingTableServiceDefault {
     async fn get_routing_table(&self) -> Result<RoutingTable, RoutingTableError> {
-        let uri: hyper::Uri = self.routing_table_config.url().to_string().parse().unwrap();
+        let uri: http_02::Uri = self.routing_table_config.url().to_string().parse().unwrap();
         self.cache
             .get_or_insert_simple(&(), || {
                 Box::pin(async move {

golem-service-base/src/routing_table.rs

@@ -16,7 +16,8 @@ pub struct WorkerExecutorClientsDefault {}
 #[async_trait]
 impl WorkerExecutorClients for WorkerExecutorClientsDefault {
     async fn lookup(&self, pod: &Pod) -> Result<WorkerExecutorClient<Channel>, String> {
-        let client = WorkerExecutorClient::connect(pod.uri())
+        let uri: http_02::Uri = pod.uri().to_string().parse().unwrap();
+        let client = WorkerExecutorClient::connect(uri)
             .await
             .map_err(|e| e.to_string())?;
         Ok(client)

golem-service-base/src/worker_executor_clients.rs

@@ -18,26 +18,26 @@ golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-service-base = { path = "../golem-service-base" }
 
+async-trait = { workspace = true }
+console-subscriber = { workspace = true }
+golem-wasm-ast = { workspace = true }
+mappable-rc = "0.1.1"
+figment = { workspace = true }
+futures-util = { workspace = true }
 poem = { workspace = true }
 poem-openapi = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "postgres", "uuid" , "migrate", "chrono"] }
+tap = "1.0.1"
 tonic = { workspace = true }
 tonic-health = { workspace = true }
 tonic-reflection = { workspace = true }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tokio-util = "0.7.10"
-futures-util = { workspace = true }
-sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "postgres", "uuid" , "migrate", "chrono"] }
-async-trait = { workspace = true }
-uuid = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-console-subscriber = { workspace = true }
-figment = { workspace = true }
-tap = "1.0.1"
-golem-wasm-ast = "0.1.2"
-mappable-rc = "0.1.1"
+uuid = { workspace = true }
 
 

golem-service/Cargo.toml

@@ -147,7 +147,10 @@ impl TemplateService for TemplateServiceDefault {
             versioned_template_id: versioned_template_id.clone(),
         };
 
-        info!("Pushing {:?}", user_template_id);
+        info!(
+            "Uploaded template {} version 0 with exports {:?}",
+            versioned_template_id.template_id, metadata.exports
+        );
 
         let template_size: i32 = data.len().try_into().map_err(|e| {
             TemplateError::internal(format!("Failed to convert data length: {}", e))
@@ -158,8 +161,6 @@ impl TemplateService for TemplateServiceDefault {
             self.upload_protected_template(&protected_template_id, data)
         )?;
 
-        info!("TemplateService create_template object store finished");
-
         let template = Template {
             template_name: template_name.clone(),
             template_size,
@@ -171,8 +172,6 @@ impl TemplateService for TemplateServiceDefault {
 
         self.template_repo.upsert(&template.clone().into()).await?;
 
-        info!("TemplateService create_template finished successfully");
-
         Ok(template)
     }
 
@@ -181,7 +180,7 @@ impl TemplateService for TemplateServiceDefault {
         template_id: &TemplateId,
         data: Vec<u8>,
     ) -> Result<Template, TemplateError> {
-        info!("Updating template {}", template_id.0);
+        info!("Updating template {}", template_id);
 
         let metadata = self.process_template(&data)?;
 
@@ -193,7 +192,10 @@ impl TemplateService for TemplateServiceDefault {
             .map(Template::next_version)
             .ok_or(TemplateError::UnknownTemplateId(template_id.clone()))?;
 
-        info!("Pushing {:?}", next_template.user_template_id);
+        info!(
+            "Uploaded template {} version {} with exports {:?}",
+            template_id, next_template.versioned_template_id.version, metadata.exports
+        );
 
         let template_size: i32 = data.len().try_into().map_err(|e| {
             TemplateError::internal(format!("Failed to convert data length: {}", e))
@@ -204,8 +206,6 @@ impl TemplateService for TemplateServiceDefault {
             self.upload_protected_template(&next_template.protected_template_id, data)
         )?;
 
-        info!("TemplateService update_template object store finished");
-
         let template = Template {
             template_size,
             metadata,

golem-service/src/service/template.rs

@@ -20,6 +20,7 @@ figment = { workspace = true }
 fred = { workspace = true }
 futures = { workspace = true }
 http = { workspace = true }
+http_02 = { package = "http", version = "0.2.11" }
 humantime-serde = { workspace = true }
 prometheus = { workspace = true }
 prost = { workspace = true }

golem-shard-manager/Cargo.toml

@@ -1,6 +1,6 @@
 use std::net::SocketAddr;
 
-use http::{Response, StatusCode};
+use http_02::{Response, StatusCode};
 use prometheus::{Encoder, Registry, TextEncoder};
 use tokio::task::JoinHandle;
 use warp::hyper::Body;