Adding an "init" script that run before client setup, to be used as a…

… way to prepare a token for API that require a 2 step login

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kuberest"
-version = "1.1.5"
+version = "1.2.0"
 authors = ["Sébastien Huss <[email protected]>"]
 edition = "2021"
 default-run = "controller"

charts/kuberest/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: kuberest
 description: Allow to Control remote REST api endpoints from the confort of your cluster
 type: application
-version: "1.1.5"
-appVersion: "1.1.5"
+version: "1.2.0"
+appVersion: "1.2.0"

deploy/crd/crd.yaml

@@ -102,6 +102,10 @@ spec:
                 required:
                 - baseurl
                 type: object
+              init:
+                description: A rhai pre-script to setup some complex variables before client setup
+                nullable: true
+                type: string
               inputs:
                 description: List input source for Handlebars renders
                 items:
@@ -413,6 +417,7 @@ spec:
                       - InputMissing
                       - InputFailed
                       - TemplateFailed
+                      - InitScriptFailed
                       - PreScriptFailed
                       - PostScriptFailed
                       - TeardownScriptFailed

deploy/operator/deployment.yaml

@@ -8,7 +8,7 @@ metadata:
   labels:
     app: kuberest
     app.kubernetes.io/name: kuberest
-    app.kubernetes.io/version: "1.1.5"
+    app.kubernetes.io/version: "1.2.0"
   namespace: default
 automountServiceAccountToken: true
 ---
@@ -102,7 +102,7 @@ metadata:
   labels:
     app: kuberest
     app.kubernetes.io/name: kuberest
-    app.kubernetes.io/version: "1.1.5"
+    app.kubernetes.io/version: "1.2.0"
 spec:
   type: ClusterIP
   ports:
@@ -122,7 +122,7 @@ metadata:
   labels:
     app: kuberest
     app.kubernetes.io/name: kuberest
-    app.kubernetes.io/version: "1.1.5"
+    app.kubernetes.io/version: "1.2.0"
 spec:
   replicas: 1
   selector:
@@ -140,7 +140,7 @@ spec:
         {}
       containers:
       - name: kuberest
-        image: sebt3/kuberest:1.1.5
+        image: sebt3/kuberest:1.2.0
         imagePullPolicy: IfNotPresent
         securityContext:
           {}

src/httphandler.rs

@@ -676,12 +676,9 @@ impl RestClient {
         path: &str,
         key: &str,
         input: &Value,
-        use_slash: bool,
     ) -> Result<Value, Error> {
         let full_path = if key.is_empty() {
             path.to_string()
-        } else if use_slash {
-            format!("{path}/{key}/")
         } else {
             format!("{path}/{key}")
         };

src/restendpoint.rs

@@ -249,6 +249,7 @@ pub enum ConditionsType {
     InputMissing,
     InputFailed,
     TemplateFailed,
+    InitScriptFailed,
     PreScriptFailed,
     PostScriptFailed,
     TeardownScriptFailed,
@@ -309,6 +310,10 @@ impl ApplicationCondition {
         )
     }
 
+    pub fn init_script_failed(message: &str) -> ApplicationCondition {
+        ApplicationCondition::new(message, ConditionsStatus::True, ConditionsType::InitScriptFailed)
+    }
+
     pub fn pre_script_failed(message: &str) -> ApplicationCondition {
         ApplicationCondition::new(message, ConditionsStatus::True, ConditionsType::PreScriptFailed)
     }
@@ -455,6 +460,8 @@ pub struct RestEndPointSpec {
     pub templates: Option<Vec<TemplateItem>>,
     /// List input source for Handlebars renders
     pub inputs: Option<Vec<InputItem>>,
+    /// A rhai pre-script to setup some complex variables before client setup
+    pub init: Option<String>,
     /// Define the how the client should connect to the API endpoint(s)
     pub client: WebClient,
     /// A rhai pre-script to setup some complex variables
@@ -824,6 +831,45 @@ impl RestEndPoint {
         rhai.set_dynamic("input", &values["input"]);
         rhai.set_dynamic("values", &values);
 
+        // Run the init script
+        if let Some(script) = self.spec.init.clone() {
+            let cnd = conditions.clone();
+            values["init"] = rhai.eval(&script).unwrap_or_else(|e| {
+                conditions.push(ApplicationCondition::init_script_failed(&format!("{e:?}")));
+                json!({})
+            });
+            // Validate that init-script went Ok
+            if cnd
+                .iter()
+                .any(|c| c.condition_type != ConditionsType::InputMissing)
+            {
+                let msg = "Init-script failed";
+                Self::publish_warning(
+                    &recorder,
+                    String::from(msg),
+                    format!("Found {} error(s) running the init-script", conditions.len()),
+                    String::from("fail"),
+                )
+                .await?;
+                conditions.push(ApplicationCondition::not_ready(msg));
+                let new_status = Patch::Apply(json!({
+                    "apiVersion": "kuberest.solidite.fr/v1",
+                    "kind": "RestEndPoint",
+                    "status": RestEndPointStatus { conditions, generation: self.metadata.generation.unwrap_or(1), owned: self.owned(), owned_target: self.owned_target() }
+                }));
+                let ps = PatchParams::apply(RESTPATH_FINALIZER).force();
+                let _o = restendpoints
+                    .patch_status(&name, &ps, &new_status)
+                    .await
+                    .map_err(Error::KubeError)?;
+                return Ok(Action::requeue(Duration::from_secs(
+                    self.spec.check_frequency.unwrap_or(15 * 60),
+                )));
+            }
+        }
+        rhai.set_dynamic("init", &values["init"]);
+        rhai.set_dynamic("values", &values);
+
         // Setup the httpClient
         let mut rest = RestClient::new(&template!(
             self.spec.client.baseurl.clone().as_str(),
@@ -1056,7 +1102,6 @@ impl RestEndPoint {
                                         path.as_str(),
                                         &myself.key,
                                         &vals,
-                                        group.key_use_slash.unwrap_or(false),
                                     )
                                     .unwrap_or_else(|e| {
                                         giveup = if let Error::MethodFailed(_, code, _) = e {
@@ -1739,6 +1784,45 @@ impl RestEndPoint {
             }
             rhai.set_dynamic("input", &values["input"]);
             rhai.set_dynamic("values", &values);
+
+            // Run the init script
+            if let Some(script) = self.spec.init.clone() {
+                let cnd = conditions.clone();
+                values["init"] = rhai.eval(&script).unwrap_or_else(|e| {
+                    conditions.push(ApplicationCondition::init_script_failed(&format!("{e:?}")));
+                    json!({})
+                });
+                // Validate that init-script went Ok
+                if cnd
+                    .iter()
+                    .any(|c| c.condition_type != ConditionsType::InputMissing)
+                {
+                    let msg = "Init-script failed";
+                    Self::publish_warning(
+                        &recorder,
+                        String::from(msg),
+                        format!("Found {} error(s) running the init-script", conditions.len()),
+                        String::from("fail"),
+                    )
+                    .await?;
+                    conditions.push(ApplicationCondition::not_ready(msg));
+                    let new_status = Patch::Apply(json!({
+                        "apiVersion": "kuberest.solidite.fr/v1",
+                        "kind": "RestEndPoint",
+                        "status": RestEndPointStatus { conditions, generation: self.metadata.generation.unwrap_or(1), owned: self.owned(), owned_target: self.owned_target() }
+                    }));
+                    let ps = PatchParams::apply(RESTPATH_FINALIZER).force();
+                    let _o = restendpoints
+                        .patch_status(&name, &ps, &new_status)
+                        .await
+                        .map_err(Error::KubeError)?;
+                    return Ok(Action::requeue(Duration::from_secs(
+                        self.spec.check_frequency.unwrap_or(15 * 60),
+                    )));
+                }
+            }
+            rhai.set_dynamic("init", &values["init"]);
+            rhai.set_dynamic("values", &values);
         }
 
         // Setup the httpClient