keep backwards compat for grpc messages

mschuwalow · mschuwalow · commit 625786aa0dcc · 2024-11-09T00:50:50.000+01:00
diff --git a/golem-api-grpc/proto/golem/apidefinition/api_definition.proto b/golem-api-grpc/proto/golem/apidefinition/api_definition.proto
@@ -65,7 +65,7 @@ message WorkerBinding {
   optional golem.rib.Expr worker_name = 2;
   golem.rib.Expr response = 3;
   optional golem.rib.Expr idempotency_key = 4;
-  WorkerBindingType type = 5;
+  optional WorkerBindingType type = 5;
 }
 
 message CompiledWorkerBinding {
@@ -80,7 +80,7 @@ message CompiledWorkerBinding {
   optional golem.rib.RibByteCode compiled_idempotency_key_expr = 9;
   optional golem.rib.RibInputType idempotency_key_rib_input = 10;
   optional golem.rib.WorkerFunctionsInRib worker_functions_in_response = 11;
-  WorkerBindingType type = 12;
+  optional WorkerBindingType type = 12;
 }
 
 enum WorkerBindingType {
diff --git a/golem-worker-service-base/src/api/register_api_definition_api.rs b/golem-worker-service-base/src/api/register_api_definition_api.rs
@@ -490,7 +490,7 @@ impl TryFrom<crate::worker_binding::GolemWorkerBinding> for grpc_apidefinition::
             worker_name,
             idempotency_key,
             response,
-            r#type: r#type.into(),
+            r#type: Some(r#type.into()),
         };
 
         Ok(result)
@@ -516,15 +516,19 @@ impl TryFrom<grpc_apidefinition::WorkerBinding> for crate::worker_binding::Golem
             None
         };
 
-        let r#type = grpc_apidefinition::WorkerBindingType::try_from(value.r#type)
-            .map_err(|e| format!("Failed to convert WorkerBindingType: {}", e))?;
+        let r#type = value
+            .r#type
+            .map(grpc_apidefinition::WorkerBindingType::try_from)
+            .transpose()
+            .map_err(|e| format!("Failed to convert WorkerBindingType: {}", e))?
+            .map_or(WorkerBindingType::default(), WorkerBindingType::from);
 
         let result = crate::worker_binding::GolemWorkerBinding {
             component_id,
             worker_name,
             idempotency_key,
             response,
-            worker_binding_type: r#type.into(),
+            worker_binding_type: r#type,
         };
 
         Ok(result)
diff --git a/golem-worker-service-base/src/worker_binding/compiled_golem_worker_binding.rs b/golem-worker-service-base/src/worker_binding/compiled_golem_worker_binding.rs
@@ -202,18 +202,19 @@ impl TryFrom<golem_api_grpc::proto::golem::apidefinition::CompiledWorkerBinding>
             worker_calls,
         };
 
-        let worker_binding_type: golem_api_grpc::proto::golem::apidefinition::WorkerBindingType =
-            value
-                .r#type
-                .try_into()
-                .map_err(|_| "Invalid worker binding type".to_string())?;
+        let worker_binding_type = value
+            .r#type
+            .map(golem_api_grpc::proto::golem::apidefinition::WorkerBindingType::try_from)
+            .transpose()
+            .map_err(|_| "Invalid worker binding type".to_string())?
+            .map_or(WorkerBindingType::default(), WorkerBindingType::from);
 
         Ok(CompiledGolemWorkerBinding {
             component_id,
             worker_name_compiled,
             idempotency_key_compiled,
             response_compiled,
-            worker_binding_type: worker_binding_type.into(),
+            worker_binding_type,
         })
     }
 }
@@ -267,7 +268,7 @@ impl TryFrom<CompiledGolemWorkerBinding>
                 compiled_response_expr,
                 response_rib_input,
                 worker_functions_in_response,
-                r#type: r#type.into(),
+                r#type: Some(r#type.into()),
             },
         )
     }
