Respect service type in environment and pipeline variable patching, add dry run

src/clap_app.rs

@@ -71,7 +71,8 @@ pub async fn init_cli() {
                         "🚀 Patching environment variables from input file {}\n",
                         input
                     );
-                    set_env_vars_from_file(input, &mut cm_client, cli.ci_mode).await;
+                    set_env_vars_from_file(input, &mut cm_client, cli.ci_mode, cli.dry_run_mode)
+                        .await;
                     process::exit(0);
                 }
             }
@@ -206,7 +207,13 @@ pub async fn init_cli() {
             {
                 if let PipelineVarsCommands::Set { input } = &pipeline_vars_command {
                     println!("🚀 Patching pipeline variables from input file {}\n", input);
-                    set_pipeline_vars_from_file(input, &mut cm_client, cli.ci_mode).await;
+                    set_pipeline_vars_from_file(
+                        input,
+                        &mut cm_client,
+                        cli.ci_mode,
+                        cli.dry_run_mode,
+                    )
+                    .await;
                     process::exit(0);
                 }
             }

src/clap_models.rs

@@ -35,6 +35,10 @@ pub struct Cli {
     #[clap(long = "ci", global = true, action = ArgAction::SetTrue )]
     pub ci_mode: bool,
 
+    /// Only log but to not apply any changes
+    #[clap(long = "dry-run", global = true, action = ArgAction::SetTrue )]
+    pub dry_run_mode: bool,
+
     #[clap(subcommand)]
     pub command: Option<Commands>,
 }

src/models.rs

@@ -1,5 +1,6 @@
 use chrono::NaiveDate;
 use serde::{Deserialize, Serialize};
+use std::fmt;
 use strum_macros::{EnumString, IntoStaticStr};
 
 // Common models used across multiple modules
@@ -30,29 +31,42 @@ pub struct DomainConfig {
 #[derive(Debug, Deserialize, Serialize)]
 pub struct EnvironmentsConfig {
     pub id: u32,
-    pub variables: Vec<Variable>,
+    pub variables: Vec<EnvironmentVariable>,
     pub domains: Option<Vec<DomainConfig>>,
 }
 
 /// Model for a pipeline's ID and all its variables that will be read from the configuration YAML
 #[derive(Debug, Deserialize, Serialize)]
 pub struct PipelinesConfig {
     pub id: u32,
-    pub variables: Vec<Variable>,
+    pub variables: Vec<PipelineVariable>,
 }
 
 /// Model for all information about a Cloud Manager environment variable
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct Variable {
+pub struct PipelineVariable {
     pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub value: Option<String>,
     #[serde(rename(deserialize = "type", serialize = "type"))]
     pub variable_type: VariableType,
+    #[serde(default = "PipelineVariableServiceType::default")]
+    pub service: PipelineVariableServiceType,
+}
+
+/// Model for all information about a Cloud Manager environment variable
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct EnvironmentVariable {
+    pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub service: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub value: Option<String>,
+    #[serde(rename(deserialize = "type", serialize = "type"))]
+    pub variable_type: VariableType,
+    #[serde(
+        default = "EnvironmentVariableServiceType::default",
+        skip_serializing_if = "env_var_service_type_is_default"
+    )]
+    pub service: EnvironmentVariableServiceType,
 }
 
 /// Possible types that a variable can have
@@ -63,6 +77,51 @@ pub enum VariableType {
     SecretString,
 }
 
+/// Possible service types that an environment variable can have
+#[derive(Clone, Debug, Deserialize, Serialize, IntoStaticStr, EnumString, PartialEq, Eq)]
+#[strum(serialize_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
+pub enum EnvironmentVariableServiceType {
+    All,
+    Author,
+    Publish,
+    Preview,
+}
+
+impl fmt::Display for EnvironmentVariableServiceType {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "{}", format!("{:?}", self).to_lowercase())
+    }
+}
+fn env_var_service_type_is_default(t: &EnvironmentVariableServiceType) -> bool {
+    *t == EnvironmentVariableServiceType::All
+}
+
+impl EnvironmentVariableServiceType {
+    fn default() -> Self {
+        EnvironmentVariableServiceType::All
+    }
+}
+/// Possible service types that an environment variable can have
+#[derive(Clone, Debug, Deserialize, Serialize, IntoStaticStr, EnumString, PartialEq, Eq)]
+#[strum(serialize_all = "lowercase")]
+#[serde(rename_all = "lowercase")]
+pub enum PipelineVariableServiceType {
+    Build,
+}
+
+impl fmt::Display for crate::models::PipelineVariableServiceType {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "{}", format!("{:?}", self).to_lowercase())
+    }
+}
+
+impl PipelineVariableServiceType {
+    fn default() -> Self {
+        PipelineVariableServiceType::Build
+    }
+}
+
 /// Model for the necessary JWT claims to retrieve an Adobe access token
 #[derive(Deserialize, Serialize)]
 pub struct JwtClaims {
@@ -139,15 +198,28 @@ pub struct Environment {
 
 /// Struct to serialize the response of requesting /api/program/{id}/environment/{id}/variables
 #[derive(Debug, Deserialize, Serialize)]
-pub struct VariablesResponse {
+pub struct EnvironmentVariablesResponse {
     #[serde(rename(deserialize = "_embedded", serialize = "_embedded"))]
-    pub variables_list: VariablesList,
+    pub variables_list: EnvironmentVariablesList,
+}
+
+/// Struct to serialize the response of requesting /api/program/{id}/environment/{id}/variables
+#[derive(Debug, Deserialize, Serialize)]
+pub struct PipelineVariablesResponse {
+    #[serde(rename(deserialize = "_embedded", serialize = "_embedded"))]
+    pub variables_list: PipelineVariablesList,
+}
+
+/// Struct that holds a list of variables
+#[derive(Debug, Deserialize, Serialize)]
+pub struct EnvironmentVariablesList {
+    pub variables: Vec<EnvironmentVariable>,
 }
 
 /// Struct that holds a list of variables
 #[derive(Debug, Deserialize, Serialize)]
-pub struct VariablesList {
-    pub variables: Vec<Variable>,
+pub struct PipelineVariablesList {
+    pub variables: Vec<PipelineVariable>,
 }
 
 // Models for representing Cloud Manager pipelines and descendant objects