Start changing golem cli

golemcloud · Jun 3, 2024 · 01d3ff7 · 01d3ff7
1 parent 0654c22
commit 01d3ff7
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 26 deletions.
diff --git a/golem-cli/src/clients/api_deployment.rs b/golem-cli/src/clients/api_deployment.rs
@@ -14,7 +14,7 @@
 
 use async_trait::async_trait;
 
-use golem_client::model::{ApiDeployment, ApiSite};
+use golem_client::model::{ApiDefinitionInfo, ApiDeployment, ApiSite};
 use tracing::info;
 
 use crate::model::{ApiDefinitionId, ApiDefinitionVersion, GolemError};
@@ -59,9 +59,13 @@ impl<C: golem_client::api::ApiDeploymentClient + Sync + Send> ApiDeploymentClien
                 .map_or("".to_string(), |s| format!("subdomain {}", s))
         );
 
-        let deployment = ApiDeployment {
-            api_definition_id: api_definition_id.0.to_string(),
+        let api_definition = ApiDefinitionInfo {
+            id: api_definition_id.0.to_string(),
             version: version.0.to_string(),
+        };
+
+        let deployment = ApiDeployment {
+            api_definitions: vec![api_definition],
             site: ApiSite {
                 host: host.to_string(),
                 subdomain,

diff --git a/golem-cli/src/model/text.rs b/golem-cli/src/model/text.rs
@@ -408,17 +408,19 @@ impl TextFormat for ScanCursor {
 
 impl TextFormat for ApiDeployment {
     fn print(&self) {
-        printdoc!(
-            "
-            API deployment on {} with definition {}/{}
-            ",
-            match &self.site.subdomain {
-                Some(subdomain) => format!("{}.{}", subdomain, self.site.host),
-                None => self.site.host.to_string(),
-            },
-            self.api_definition_id,
-            self.version,
-        );
+        for api_defs in self.api_definitions {
+            printdoc!(
+                "
+                API deployment on {} with definition {}/{}.
+                ",
+                match &self.site.subdomain {
+                    Some(subdomain) => format!("{}.{}", subdomain, self.site.host),
+                    None => self.site.host.to_string(),
+                },
+                api_defs.id,
+                api_defs.version,
+            );
+        }
     }
 }
 

diff --git a/golem-worker-service-base/src/api_definition/api_common.rs b/golem-worker-service-base/src/api_definition/api_common.rs
@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 use std::fmt::Display;
 
-use crate::service::api_definition::ApiDefinitionInfo;
+use crate::service::api_definition::ApiDefinitionIdWithVersion;
 use bincode::{Decode, Encode};
 use poem_openapi::NewType;
 use serde::{Deserialize, Serialize};
@@ -52,7 +52,7 @@ pub trait HasGolemWorkerBindings {
 )]
 pub struct ApiDeployment<Namespace> {
     pub namespace: Namespace,
-    pub api_definition_keys: Vec<ApiDefinitionInfo>,
+    pub api_definition_keys: Vec<ApiDefinitionIdWithVersion>,
     pub site: ApiSite,
 }
 

diff --git a/golem-worker-service-base/src/repo/api_deployment_repo.rs b/golem-worker-service-base/src/repo/api_deployment_repo.rs
@@ -13,7 +13,7 @@ use golem_common::redis::{RedisError, RedisPool};
 use tracing::{debug, info};
 
 use crate::repo::api_namespace::ApiNamespace;
-use crate::service::api_definition::ApiDefinitionInfo;
+use crate::service::api_definition::ApiDefinitionIdWithVersion;
 
 const API_DEFINITION_REDIS_NAMESPACE: &str = "apidefinition";
 
@@ -192,10 +192,10 @@ impl<Namespace: ApiNamespace> ApiDeploymentRepo<Namespace> for RedisApiDeploy {
 
         let mut api_definition_redis_values = vec![];
 
-        for api_key in &deployment.api_definition_keys {
+        for api_def_with_version in &deployment.api_definition_keys {
             let value = self
                 .pool
-                .serialize(api_key)
+                .serialize(api_def_with_version)
                 .map_err(|e| ApiDeploymentRepoError::Internal(anyhow::Error::msg(e)))?;
 
             api_definition_redis_values.push((1.0, value));
@@ -270,7 +270,7 @@ impl<Namespace: ApiNamespace> ApiDeploymentRepo<Namespace> for RedisApiDeploy {
         let mut api_definition_keys = Vec::new();
 
         for value in site_values {
-            let api_definition_key: Result<ApiDefinitionInfo, ApiDeploymentRepoError> = self
+            let api_definition_key: Result<ApiDefinitionIdWithVersion, ApiDeploymentRepoError> = self
                 .pool
                 .deserialize(&value)
                 .map_err(|e| ApiDeploymentRepoError::Internal(anyhow::Error::msg(e.to_string())));
@@ -420,7 +420,7 @@ mod tests {
         api_deployment_redis_key, api_deployments_redis_key,
     };
     use crate::repo::api_deployment_repo::{ApiDeploymentRepo, InMemoryDeployment};
-    use crate::service::api_definition::ApiDefinitionInfo;
+    use crate::service::api_definition::ApiDefinitionIdWithVersion;
 
     #[tokio::test]
     pub async fn test_in_memory_deploy() {
@@ -440,7 +440,7 @@ mod tests {
 
         let deployment = ApiDeployment {
             namespace: namespace.clone(),
-            api_definition_keys: vec![ApiDefinitionInfo {
+            api_definition_keys: vec![ApiDefinitionIdWithVersion {
                 id: api_definition_id.clone(),
                 version: version.clone(),
             }],

diff --git a/golem-worker-service-base/src/service/api_definition.rs b/golem-worker-service-base/src/service/api_definition.rs
@@ -83,7 +83,7 @@ pub struct ApiDefinitionKey<Namespace> {
 #[derive(
     Eq, Hash, PartialEq, Clone, Debug, serde::Deserialize, bincode::Encode, bincode::Decode,
 )]
-pub struct ApiDefinitionInfo {
+pub struct ApiDefinitionIdWithVersion {
     pub id: ApiDefinitionId,
     pub version: ApiVersion,
 }

diff --git a/golem-worker-service/src/api/deploy_api_definition.rs b/golem-worker-service/src/api/deploy_api_definition.rs
@@ -12,7 +12,7 @@ use tracing::log::info;
 
 use golem_worker_service_base::api::ApiDeployment;
 use golem_worker_service_base::api_definition;
-use golem_worker_service_base::service::api_definition::ApiDefinitionInfo;
+use golem_worker_service_base::service::api_definition::ApiDefinitionIdWithVersion;
 use golem_worker_service_base::service::api_deployment::ApiDeploymentService;
 
 pub struct ApiDeploymentApi {
@@ -35,11 +35,11 @@ impl ApiDeploymentApi {
         let api_definition_infos = payload
             .api_definitions
             .iter()
-            .map(|k| ApiDefinitionInfo {
+            .map(|k| ApiDefinitionIdWithVersion {
                 id: k.id.clone(),
                 version: k.version.clone(),
             })
-            .collect::<Vec<ApiDefinitionInfo>>();
+            .collect::<Vec<ApiDefinitionIdWithVersion>>();
 
         info!("Deploy API definitions at site: {}", payload.site);