Merge pull request #22 from molnett/preserve-order

fix: preserve order of env vars and secrets when (de)serializing
molnett · Mar 20, 2024 · b107277 · b107277
2 parents 7e538c2 + f90a8d6
commit b107277
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,11 +15,12 @@ dialoguer = { version = "0.10.4", features = ["fuzzy-select"] }
 difference = "2.0"
 dirs-next = "2.0.0"
 home = "0.5.5"
+indexmap = { version = "2.2.5", features = ["serde"] }
 oauth2 = "4.4.2"
 once_cell = "1.18.0"
 reqwest = { version = "0.11.20", features = ["json"] }
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.105"
+serde = { version = "1.0.197", features = ["derive"] }
+serde_json = { version = "1.0.114", features = ["preserve_order"] }
 serde_yaml = "0.9.25"
 tabled = "0.14.0"
 term = "0.7.0"

diff --git a/src/api/types.rs b/src/api/types.rs
@@ -1,5 +1,5 @@
 use std::fmt::{Display, Formatter, Result};
-use std::collections::HashMap;
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use tabled::Tabled;
 
@@ -47,7 +47,7 @@ pub struct Secret {
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
-pub struct DisplayHashMap(HashMap<String, String>);
+pub struct DisplayHashMap(IndexMap<String, String>);
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
 pub struct DisplayOption<T>(Option<T>);