Add IDs to common objects

  fixes [sc-12241]

Author: dwdozier

Cargo.lock

@@ -79,6 +79,7 @@ subprocess = "0.1"
 tempfile = "3.2.0"
 termcolor = "1.1"
 urlencoding = "2.1.0"
+url = "2.2.2"
 version-compare = "0.1.0"
 webbrowser = "0.8.3"
 is-terminal = "0.4.9"

Cargo.toml

@@ -37,6 +37,7 @@ pub struct ParameterDetails {
 impl ParameterDetails {
     pub fn get_property(&self, property_name: &str) -> String {
         match property_name {
+            "id" => self.id.clone(),
             "name" => self.key.clone(),
             "value" => self.value.clone(),
             "type" => self.param_type.clone(),

src/database/parameter_details.rs

@@ -27,6 +27,7 @@ pub struct UserDetails {
 impl UserDetails {
     pub fn get_property(&self, property_name: &str) -> String {
         match property_name {
+            "id" => self.id.clone(),
             "name" => self.name.clone(),
             "type" => self.account_type.clone(),
             "email" => match self.account_type.as_str() {

src/database/user_details.rs

@@ -61,14 +61,14 @@ fn proc_env_list(
         println!("{}", list.join("\n"));
     } else {
         let mut table = Table::new("environment");
-        let mut hdr = vec!["Name", "Parent", "Description"];
+        let mut hdr = vec!["ID", "Name", "Parent", "Description"];
         if show_times {
             hdr.push("Created At");
             hdr.push("Modified At");
         }
         table.set_header(&hdr);
         for entry in details {
-            let mut row = vec![entry.name, entry.parent_name, entry.description];
+            let mut row = vec![entry.id, entry.name, entry.parent_name, entry.description];
             if show_times {
                 row.push(entry.created_at);
                 row.push(entry.modified_at);
@@ -219,7 +219,14 @@ fn proc_env_tag_list(
             println!("{}", list.join("\n"))
         } else {
             let mut table = Table::new("environment-tags");
-            let hdr = vec!["Name", "Timestamp", "Description", "Immutable"];
+            let hdr = vec![
+                "ID",
+                "Name",
+                "Timestamp",
+                "Description",
+                "Immutable",
+                "Environment_ID",
+            ];
             // if show_usage {
             //     hdr.push("Last User");
             //     hdr.push("Last Time");
@@ -228,10 +235,12 @@ fn proc_env_tag_list(
             table.set_header(&hdr);
             for entry in tags {
                 let row = vec![
+                    entry.id,
                     entry.name,
                     entry.timestamp,
                     entry.description,
                     entry.immutable.map(|i| i.to_string()).unwrap_or_default(),
+                    env_id.clone(),
                 ];
                 // if show_usage {
                 //     row.push(entry.last_use_user);

src/environments.rs

@@ -655,7 +655,7 @@ fn proc_param_list(
     } else if show_rules {
         // NOTE: do NOT worry about errors, since we're only concerned with params (not values)
         let mut table = Table::new("parameter");
-        let mut hdr = vec!["Name", "Param Type", "Rule Type", "Constraint"];
+        let mut hdr = vec!["ID", "Name", "Param Type", "Rule Type", "Constraint"];
         if show_times {
             hdr.push("Created At");
             hdr.push("Modified At");
@@ -685,16 +685,17 @@ fn proc_param_list(
 
         // setup the table headers and properties
         if show_external {
-            hdr = vec!["Name", "FQN", "JMES"];
-            properties = vec!["name", "fqn", "jmes-path"];
+            hdr = vec!["ID", "Name", "FQN", "JMES"];
+            properties = vec!["id", "name", "fqn", "jmes-path"];
         } else if show_evaluated {
-            hdr = vec!["Name", "Value", "Raw"];
-            properties = vec!["name", "value", "raw"];
+            hdr = vec!["ID", "Name", "Value", "Raw"];
+            properties = vec!["id", "name", "value", "raw"];
         } else if show_parents || show_children {
-            hdr = vec!["Name", "Value", "Project"];
-            properties = vec!["name", "value", "project-name"];
+            hdr = vec!["ID", "Name", "Value", "Project"];
+            properties = vec!["id", "name", "value", "project-name"];
         } else {
             hdr = vec![
+                "ID",
                 "Name",
                 "Value",
                 "Source",
@@ -705,6 +706,7 @@ fn proc_param_list(
                 "Description",
             ];
             properties = vec![
+                "id",
                 "name",
                 "value",
                 "environment",

src/parameters.rs

@@ -6,8 +6,8 @@ use crate::cli::{
 use crate::database::{OpenApiConfig, ProjectDetails, Projects};
 use crate::table::Table;
 use crate::utils::{
-    error_message, parse_key_value_pairs, user_confirm, warn_missing_subcommand, warning_message,
-    DEL_CONFIRM,
+    error_message, get_uuid_from_url, parse_key_value_pairs, user_confirm, warn_missing_subcommand,
+    warning_message, DEL_CONFIRM,
 };
 use clap::ArgMatches;
 use color_eyre::eyre::Result;
@@ -60,14 +60,20 @@ fn proc_proj_list(
         println!("{}", list.join("\n"));
     } else {
         let mut table = Table::new("project");
-        let mut hdr = vec!["Name", "Parent", "Description"];
+        let mut hdr = vec!["ID", "Name", "Parent", "Parent_ID", "Description"];
         if show_times {
             hdr.push("Created At");
             hdr.push("Modified At");
         }
         table.set_header(&hdr);
         for entry in details {
-            let mut row = vec![entry.name, entry.parent_name, entry.description];
+            let mut row = vec![
+                entry.id,
+                entry.name,
+                entry.parent_name,
+                get_uuid_from_url(&entry.parent_url.clone()),
+                entry.description,
+            ];
             if show_times {
                 row.push(entry.created_at);
                 row.push(entry.modified_at);

src/projects.rs

@@ -108,8 +108,8 @@ fn proc_users_list(
             .collect::<Vec<String>>();
         println!("{}", list.join("\n"))
     } else {
-        let mut hdr = vec!["Name", "Type", "Role", "Email", "Description"];
-        let mut properties = vec!["name", "type", "role", "email", "description"];
+        let mut hdr = vec!["ID", "Name", "Type", "Role", "Email", "Description"];
+        let mut properties = vec!["id", "name", "type", "role", "email", "description"];
         if show_times {
             hdr.push("Created At");
             hdr.push("Modified At");

src/users.rs

@@ -8,6 +8,7 @@ use std::fmt::Formatter;
 use std::io::{stdin, stdout, Write};
 use std::str;
 use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
+use url::Url;
 
 // The `DEL_CONFIRM` is the default value for delete confirmation across different types
 pub const DEL_CONFIRM: Option<bool> = Some(false);
@@ -214,6 +215,23 @@ pub fn parse_tag(input: Option<&str>) -> Option<String> {
     }
 }
 
+pub fn get_uuid_from_url(url: &str) -> String {
+    if let Ok(url) = Url::parse(url) {
+        let path_segments: Vec<_> = url.path_segments().unwrap().collect();
+        if let Some(uuid_segment) = path_segments.get(3) {
+            if uuid_segment.len() == 36 {
+                uuid_segment.to_string()
+            } else {
+                "".to_string()
+            }
+        } else {
+            "".to_string()
+        }
+    } else {
+        "".to_string()
+    }
+}
+
 /// Return the default value of a type according to the `Default` trait.
 ///
 /// The type to return is inferred from context; this is equivalent to