From ea591729d7b8b802b91e3d21ba91488efa7419d5 Mon Sep 17 00:00:00 2001
From: JesusPerez <jpl@jesusperez.pro>
Date: Thu, 23 Sep 2021 12:32:15 +0100
Subject: [PATCH] chore: add cache_items & get_cloud_check

---
 src/clouds/on_clouds.rs | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/clouds/on_clouds.rs b/src/clouds/on_clouds.rs
index 61103e1..3c22121 100644
--- a/src/clouds/on_clouds.rs
+++ b/src/clouds/on_clouds.rs
@@ -621,14 +621,14 @@ pub async fn on_cloud_req(reqname: &str,env_cloud: &Cloud,reqenv: &ReqEnv,req_ts
 		create_cloud_config(reqname,req_tsksrvcs,reqenv,entries,cloud).await
 	}
 }
-pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str, tsksrvcs: &str) -> Result<()> {
+pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str) -> Result<()> {
 	let debug = envmnt::get_isize("DEBUG",0); 
 	if debug > 0 {
 		println!("cloud cache {} ... {:?} ",reqname,chrono::Utc::now());
 	}
 	let config = reqenv.config();
-	let lock_path = format!("{}/{}_{}.{}",&config.cache_lock_path,&reqname,&tsksrvcs.replace(",","_"),&config.cache_lock_ext);
-	let output_path = format!("{}/{}_{}.json",&config.cache_path,&reqname,&tsksrvcs.replace(",","_"));
+	let lock_path = format!("{}/{}_{}.{}",&config.cache_lock_path,&reqname,&config.cache_items.replace(",","_"),&config.cache_lock_ext);
+	let output_path = format!("{}/{}_{}.json",&config.cache_path,&reqname,&config.cache_items.replace(",","_"));
 	if Path::new(&lock_path).exists() {
 		if envmnt::get_or(format!("LAST_CACHE_{}",&output_path),"") != "" {
 			if debug > 0 {
@@ -643,7 +643,7 @@ pub async fn get_cloud_cache_req(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, r
 	// println!("Lock NOT found {} ",&lock_path);
 	let now = chrono::Utc::now().timestamp();
 	envmnt::set(format!("LAST_CACHE_{}",&output_path), format!("{}",&now));
-	let result = on_cloud_req(&reqname_job,&cloud,&reqenv,tsksrvcs,"","*").await;
+	let result = on_cloud_req(&reqname_job,&cloud,&reqenv,&config.cache_items,"","*").await;
   if Path::new(&output_path).exists() {
     fs::remove_file(&output_path)?;
   }
@@ -658,7 +658,7 @@ pub async fn make_cloud_cache(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
 	if envmnt::get_isize("DEBUG",0) > 0 {
 	  println!("Making cloud cache {:?} ... ",chrono::Utc::now());
 	}
-  get_cloud_cache_req(reqenv,cloud, "config", "config_job", "monitor,resources,liveness,provision").await.unwrap_or_else(|e| println!("Error cache config: {}",e));
+  get_cloud_cache_req(reqenv, cloud, "config", "config_job").await.unwrap_or_else(|e| println!("Error cache config: {}",e));
 	Ok(())
 }
 pub async fn run_clouds_check(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
@@ -681,4 +681,29 @@ pub async fn run_clouds_check(reqenv: &ReqEnv,cloud: &Cloud) -> Result<()> {
     println!("{}: [cloud check] -> {}\n",&now,&output_path);
 	}
 	Ok(())
+}
+// pub async fn get_cloud_check(reqenv: &ReqEnv,cloud: &Cloud, reqname: &str, reqname_job: &str) -> Result<()> {
+pub async fn get_cloud_check(reqenv: &ReqEnv) -> String {
+	let debug = envmnt::get_isize("DEBUG",0); 
+	if debug > 0 {
+		println!("cloud check ... {:?} ",chrono::Utc::now());
+	}
+	let config = reqenv.config();
+	let output_path = format!("{}/clouds.json",&config.check_path);
+	let output_data = fs::read_to_string(&output_path).with_context(|| format!("Failed to read json check 'outut_path' from {}", &output_path))
+		.unwrap_or_else(|e| { 
+			eprintln!("read file {}: {}",&output_path,e);
+			String::from("")
+	});
+	output_data
+	// let result = on_cloud_req(&reqname_job,&cloud,&reqenv,&config.cache_items,"","*").await;
+  // if Path::new(&output_path).exists() {
+  //   fs::remove_file(&output_path)?;
+  // }
+  // let mut file = OpenOptions::new().write(true).create(true).open(&output_path)?;
+  // file.write_all(result.as_bytes())?;
+  // if debug > 0 {
+ 	// 	println!("{}: [cloud check] -> {}\n",&now,&output_path);
+	// }
+	// Ok(())
 }
\ No newline at end of file