Merge pull request #2164 from golemcloud/wit-renames

Renames (worker to agent) and more comments in WIT

Author: vigoo

.github/workflows/ci.yaml

@@ -100,8 +100,6 @@ jobs:
           - name: group1
           - name: group2
           - name: group3
-          - name: group4
-          - name: group5
     name: worker-tests-${{ matrix.group.name }}
     steps:
       - name: Checkout

Makefile.toml

@@ -148,21 +148,15 @@ array_push ${components} http-client
 array_push ${components} ifs-update
 array_push ${components} ifs-update-inside-exported-function
 array_push ${components} invocation-context
-array_push ${components} js-1
-array_push ${components} js-4
 array_push ${components} key-value-service
 array_push ${components} networking
 array_push ${components} oplog-processor
 array_push ${components} promise
-array_push ${components} python-http-client
 array_push ${components} rdbms-service
 array_push ${components} rpc
 array_push ${components} runtime-service
 array_push ${components} scheduled-invocation
 array_push ${components} shopping-cart
-array_push ${components} tinygo-wasi
-array_push ${components} tinygo-wasi-http
-array_push ${components} ts-rpc
 array_push ${components} update-test-env-var
 array_push ${components} update-test-v2-11
 array_push ${components} update-test-v3-11

cli/golem-cli/src/wasm_rpc_stubgen/rust.rs

@@ -56,11 +56,11 @@ pub fn generate_stub_source(def: &StubDefinition) -> anyhow::Result<()> {
         let struct_fns: Vec<TokenStream> = if entity.is_resource() {
             vec![quote! {
                 pub fn from_remote_handle(uri: golem_rust::wasm_rpc::Uri, id: u64) -> Self {
-                    let worker_id: golem_rust::wasm_rpc::WorkerId = uri.clone().try_into().expect(
-                        &format!("Invalid worker uri in remote resource handle: {}", uri.value)
+                    let agent_id: golem_rust::wasm_rpc::AgentId = uri.clone().try_into().expect(
+                        &format!("Invalid agent uri in remote resource handle: {}", uri.value)
                     );
                     Self {
-                        rpc: WasmRpc::new(&worker_id),
+                        rpc: WasmRpc::new(&agent_id),
                         id,
                         uri,
                     }
@@ -247,20 +247,20 @@ pub fn generate_stub_source(def: &StubDefinition) -> anyhow::Result<()> {
             let component_name = def.config.component_name.as_str();
 
             quote! {
-                fn new(worker_name: String) -> Self {
+                fn new(agent_id: String) -> Self {
                     let component_name = #component_name;
-                    let worker_id = golem_rust::bindings::golem::api::host::resolve_worker_id(component_name, &worker_name).expect(
-                        &format!("Failed to resolve worker id: {}/{}", component_name, worker_name)
+                    let agent_id = golem_rust::bindings::golem::api::host::resolve_agent_id(component_name, &agent_id).expect(
+                        &format!("Failed to resolve agent id: {}/{}", component_name, agent_id)
                     );
                     Self {
-                        rpc: WasmRpc::new(&worker_id)
+                        rpc: WasmRpc::new(&agent_id)
                     }
                 }
 
-                fn custom(worker_id: golem_rust::wasm_rpc::WorkerId) -> crate::bindings::exports::#root_ns::#root_name::#stub_interface_name::#interface_name {
+                fn custom(agent_id: golem_rust::wasm_rpc::AgentId) -> crate::bindings::exports::#root_ns::#root_name::#stub_interface_name::#interface_name {
                     crate::bindings::exports::#root_ns::#root_name::#stub_interface_name::#interface_name::new(
                         Self {
-                            rpc: WasmRpc::new(&worker_id)
+                            rpc: WasmRpc::new(&agent_id)
                         }
                     )
                 }
@@ -385,9 +385,9 @@ fn generate_function_stub_source(
     }
 
     if mode == FunctionMode::Constructor {
-        params.push(quote! { wasm_rpc_worker_name: String });
+        params.push(quote! { wasm_rpc_agent_id: String });
     } else if mode == FunctionMode::CustomConstructor {
-        params.push(quote! { wasm_rpc_worker_id: golem_rust::wasm_rpc::WorkerId });
+        params.push(quote! { wasm_rpc_agent_id: golem_rust::wasm_rpc::AgentId });
     } else if mode == FunctionMode::Method {
         input_values.push(quote! {
             WitValue::builder().handle(self.uri.clone(), self.id)
@@ -463,14 +463,14 @@ fn generate_function_stub_source(
     let init = if mode == FunctionMode::Constructor {
         quote! {
             let component_name = #component_name;
-            let worker_id = golem_rust::bindings::golem::api::host::resolve_worker_id(component_name, &wasm_rpc_worker_name).expect(
-                &format!("Failed to resolve worker id: {}/{}", component_name, wasm_rpc_worker_name)
+            let agent_id = golem_rust::bindings::golem::api::host::resolve_agent_id(component_name, &wasm_rpc_agent_id).expect(
+                &format!("Failed to resolve agent id: {}/{}", component_name, wasm_rpc_agent_id)
             );
-            let rpc = WasmRpc::new(&worker_id);
+            let rpc = WasmRpc::new(&agent_id);
         }
     } else if mode == FunctionMode::CustomConstructor {
         quote! {
-            let rpc = WasmRpc::new(&wasm_rpc_worker_id);
+            let rpc = WasmRpc::new(&wasm_rpc_agent_id);
         }
     } else {
         quote! {}

cli/golem-cli/src/wasm_rpc_stubgen/wit_generate.rs

@@ -87,8 +87,8 @@ pub fn generate_client_package_from_stub_def(def: &StubDefinition) -> anyhow::Re
         );
         stub_interface.use_type(
             format!("golem:rpc/types@{GOLEM_RPC_WIT_VERSION}"),
-            "worker-id",
-            Some(Ident::new("golem-rpc-worker-id")),
+            "agent-id",
+            Some(Ident::new("golem-rpc-agent-id")),
         );
         stub_interface.use_type(
             format!("golem:rpc/types@{GOLEM_RPC_WIT_VERSION}"),
@@ -124,7 +124,7 @@ pub fn generate_client_package_from_stub_def(def: &StubDefinition) -> anyhow::Re
                 let mut params = entity.constructor_params().to_encoder(def)?;
                 params
                     .items_mut()
-                    .insert(0, (Ident::new("worker-name"), Type::String));
+                    .insert(0, (Ident::new("agent-id"), Type::String));
                 constructor.set_params(params);
                 stub_functions.push(constructor);
             }
@@ -135,8 +135,8 @@ pub fn generate_client_package_from_stub_def(def: &StubDefinition) -> anyhow::Re
                 params.items_mut().insert(
                     0,
                     (
-                        Ident::new("worker-id"),
-                        Type::Named(Ident::new("golem-rpc-worker-id")),
+                        Ident::new("agent-id"),
+                        Type::Named(Ident::new("golem-rpc-agent-id")),
                     ),
                 );
                 custom_constructor.set_params(params);