Merge pull request #87 from sam-berning/which-line-is-it-anyway

apiserver: fix incorrect error handling

Author: sam-berning

sources/api/apiserver/src/server/controller.rs

@@ -136,7 +136,7 @@ where
     let os = BottlerocketRelease::new().context(error::ReleaseDataSnafu)?;
 
     // Turn into a serde Value we can manipulate.
-    let val = serde_json::to_value(os).context(error::SettingsToJsonSnafu)?;
+    let val = serde_json::to_value(os).expect("struct to value can't fail");
 
     // Structs are Objects in serde_json, which have a map of field -> value inside.  We
     // destructure to get it by value, instead of as_object() which gives references.
@@ -366,7 +366,7 @@ pub(crate) fn set_settings<D: DataStore>(
     transaction: &str,
 ) -> Result<()> {
     trace!("Serializing Settings to write to data store");
-    let settings_json = serde_json::to_value(settings).expect("struct to value can't fail");
+    let settings_json = serde_json::to_value(settings).context(error::SettingsToJsonSnafu)?;
     let pairs = to_pairs_with_prefix("settings", &settings_json)
         .context(error::DataStoreSerializationSnafu { given: "Settings" })?;
     let pending = Committed::Pending {