fix some comments

Author: vjripoll

agent-control/src/agent_control/version_updater/on_host.rs

@@ -136,7 +136,7 @@ where
                 version: new_version,
                 public_key_url: Some(self.pub_key_url.clone()),
             },
-            postdownload: None,
+            post_download_hook: None,
         }
     }
 }

agent-control/src/agent_type/definition.rs

@@ -328,7 +328,7 @@ pub fn include_packages_variables(
         let package_data = PackageData {
             id: package_id.to_string(),
             oci: package.download.oci.clone(),
-            postdownload: package.postdownload.clone(),
+            post_download_hook: package.post_download_hook.clone(),
         };
         let path =
             get_package_path(Path::new(remote_dir), &agent_id, &package_data).map_err(|e| {

agent-control/src/agent_type/runtime_config/on_host.rs

@@ -169,7 +169,7 @@ mod tests {
                     )),
                 },
             },
-            postdownload: None,
+            post_download_hook: None,
         };
 
         let expected_packages = HashMap::from([

agent-control/src/agent_type/runtime_config/on_host/package.rs

@@ -15,9 +15,9 @@ pub mod rendered;
 pub(super) struct Package {
     /// Download defines the supported repository sources for the packages.
     pub download: Download,
-    /// Postdownload script to execute after downloading and extracting the package.
+    /// Post-download hook script to execute after downloading and extracting the package.
     /// All validations, checks, and installation steps should go here.
-    pub postdownload: Option<Postdownload>,
+    pub post_download_hook: Option<PostDownloadHook>,
 }
 
 pub type PackageID = String;
@@ -40,36 +40,32 @@ pub struct Oci {
 }
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
-pub struct Postdownload {
-    /// Arguments where first element is the command/executable (e.g., "bash", "sh", "python3"),
-    /// second element is the script path, followed by additional arguments.
-    /// Example: ["bash", "postdownload.sh", "--verbose"]
+pub struct PostDownloadHook {
+    /// Absolute path to the command/executable (e.g., "/bin/bash", "/usr/bin/python3").
+    /// This is the interpreter or tool that will execute the script.
+    pub path: TemplateableValue<String>,
+
+    /// Arguments passed to the command. First element should be the script path (absolute),
+    /// followed by additional arguments for the script.
+    /// Example: ["install.sh", "--check-dependencies", "--verbose"]
     pub args: Vec<TemplateableValue<String>>,
 
     /// Environmental variables passed to the process.
     #[serde(default)]
     pub env: HashMap<String, TemplateableValue<String>>,
-
-    /// Maximum time to wait for the script to complete.
-    #[serde(default = "default_postdownload_timeout")]
-    pub timeout: TemplateableValue<String>,
-}
-
-fn default_postdownload_timeout() -> TemplateableValue<String> {
-    TemplateableValue::new("300s".to_string())
 }
 
 impl Templateable for Package {
     type Output = rendered::Package;
     fn template_with(self, variables: &Variables) -> Result<Self::Output, AgentTypeError> {
-        let postdownload = self
-            .postdownload
+        let post_download_hook = self
+            .post_download_hook
             .map(|pd| pd.template_with(variables))
             .transpose()?;
 
         Ok(Self::Output {
             download: self.download.template_with(variables)?,
-            postdownload,
+            post_download_hook,
         })
     }
 }
@@ -116,21 +112,20 @@ impl Templateable for Oci {
     }
 }
 
-impl Templateable for Postdownload {
-    type Output = rendered::Postdownload;
+impl Templateable for PostDownloadHook {
+    type Output = rendered::PostDownloadHook;
     fn template_with(self, variables: &Variables) -> Result<Self::Output, AgentTypeError> {
-        let timeout_str = self.timeout.template_with(variables)?;
+        let path = self.path.template_with(variables)?;
 
         let args: Vec<String> = self
             .args
             .into_iter()
             .map(|arg| arg.template_with(variables))
             .collect::<Result<Vec<String>, AgentTypeError>>()?;
 
-        if args.len() < 2 {
+        if args.is_empty() {
             return Err(AgentTypeError::OCIReferenceParsingError(
-                "postdownload args must have at least 2 elements: command and script path"
-                    .to_string(),
+                "post_download_hook args must have at least 1 element: the script path".to_string(),
             ));
         }
 
@@ -140,11 +135,7 @@ impl Templateable for Postdownload {
             .map(|(k, v)| v.template_with(variables).map(|templated| (k, templated)))
             .collect::<Result<HashMap<_, _>, AgentTypeError>>()?;
 
-        let timeout = duration_str::parse(&timeout_str).map_err(|err| {
-            AgentTypeError::OCIReferenceParsingError(format!("invalid timeout format: {err}"))
-        })?;
-
-        Ok(Self::Output { args, env, timeout })
+        Ok(Self::Output { path, args, env })
     }
 }
 

agent-control/src/agent_type/runtime_config/on_host/package/rendered.rs

@@ -1,7 +1,7 @@
 use oci_client::Reference;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::{fmt::Display, str::FromStr, time::Duration};
+use std::{fmt::Display, str::FromStr};
 use url::Url;
 
 use crate::agent_control::config::Registry;
@@ -13,8 +13,8 @@ const TAG_TOTAL_LENGTH_MAX: usize = 128;
 pub struct Package {
     /// Download defines the supported repository sources for the packages.
     pub download: Download,
-    /// Postdownload script to execute after downloading and extracting the package.
-    pub postdownload: Option<Postdownload>,
+    /// Post-download hook script to execute after downloading and extracting the package.
+    pub post_download_hook: Option<PostDownloadHook>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -31,15 +31,14 @@ pub struct Oci {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct Postdownload {
-    /// Arguments where first element is the command/executable, second element is script path,
-    /// followed by additional arguments.
-    /// Example: ["bash", "postdownload.sh", "--verbose"]
+pub struct PostDownloadHook {
+    /// Absolute path to the command/executable (e.g., "/bin/bash", "/usr/bin/python3")
+    pub path: String,
+    /// Arguments where first element is the script path, followed by additional arguments.
+    /// Example: ["install.sh", "--check-dependencies", "--verbose"]
     pub args: Vec<String>,
     /// Environmental variables
     pub env: HashMap<String, String>,
-    /// Timeout duration
-    pub timeout: Duration,
 }
 
 const DEFAULT_TAG: &str = "latest";

agent-control/src/package.rs

@@ -1,3 +1,3 @@
 pub mod manager;
 pub mod oci;
-pub mod postdownload_executor;
+pub mod post_download_hook_executor;

agent-control/src/package/manager.rs

@@ -1,6 +1,6 @@
 //! This module manages package operations such as installation, removal, and updates.
 use crate::agent_control::agent_id::AgentID;
-use crate::agent_type::runtime_config::on_host::package::rendered::{Oci, Postdownload};
+use crate::agent_type::runtime_config::on_host::package::rendered::{Oci, PostDownloadHook};
 use crate::package::oci::package_manager::OCIPackageManagerError;
 use std::path::PathBuf;
 
@@ -9,7 +9,7 @@ use std::path::PathBuf;
 pub struct PackageData {
     pub id: String, // same type as the packages map on an agent type definition
     pub oci: Oci,
-    pub postdownload: Option<Postdownload>,
+    pub post_download_hook: Option<PostDownloadHook>,
 }
 
 /// Information about an installed package

agent-control/src/package/oci/downloader.rs

@@ -168,6 +168,7 @@ pub mod tests {
                 version: Version::from_str(VERSION).unwrap(),
                 public_key_url,
             },
+            post_download_hook: None,
         }
     }
 

agent-control/src/package/oci/package_manager.rs

@@ -404,6 +404,7 @@ mod tests {
                 .unwrap(),
                 public_key_url: None,
             },
+            post_download_hook: None,
         }
     }
 
@@ -419,6 +420,7 @@ mod tests {
                 version: Version::from_str(version).unwrap(),
                 public_key_url: None,
             },
+            post_download_hook: None,
         }
     }