*: cleanup redundant code imported from Afterburn

src/main.rs

@@ -1,20 +1,9 @@
 //! Telemetry service for FCOS.
 
-extern crate base64;
 #[macro_use]
 extern crate error_chain;
-extern crate openssh_keys;
-extern crate openssl;
-#[macro_use]
 extern crate serde_derive;
-extern crate serde;
-extern crate serde_json;
-extern crate serde_xml_rs;
-#[macro_use]
 extern crate slog;
-extern crate slog_async;
-extern crate slog_term;
-#[macro_use]
 extern crate slog_scope;
 
 #[cfg(test)]
@@ -24,14 +13,13 @@ extern crate mockito;
 mod config;
 /// `Minimal` Agent identity.
 mod minimal;
-/// Provider metadata
-mod providers;
 /// Generic retrying function
-mod retry;
+// mod retry;
 /// A library for consistent and reliable error handling
 mod errors;
 /// rpm-ostree client.
 mod rpm_ostree;
+mod util;
 
 use clap::{Arg, crate_authors, crate_description, crate_name, crate_version};
 use config::inputs;

src/minimal/instance_type.rs

@@ -0,0 +1,9 @@
+//! Cloud instance type parsing - utility functions
+
+/// Call Afterburn to retrieve metadata from cloud providers
+pub(crate) fn fetch_metadata() -> Fallible<String>
+where
+    T: AsRef<str>,
+{
+
+}

src/minimal/mod.rs

@@ -2,7 +2,6 @@ mod platform;
 mod os_release;
 
 use crate::config::inputs;
-use crate::errors::*;
 use crate::rpm_ostree;
 use failure::{Fallible, ResultExt};
 use serde::Serialize;
@@ -41,7 +40,7 @@ impl Identity {
 
     /// Try to fetch default data
     pub fn try_default(level: &str) -> Fallible<Self> {
-        let platform = platform::read_id(KERNEL_ARGS_FILE)?;
+        let platform = platform::get_platform(KERNEL_ARGS_FILE)?;
         let original_os_version = os_release::read_original_os_version(OS_ALEPH_VERSION_FILE)?;
         let current_os_version = rpm_ostree::booted()?.version;
 

src/minimal/os_release.rs

@@ -1,8 +1,7 @@
 //! OS version parsing - utility functions
 
-use failure::{bail, format_err, Fallible, ResultExt};
-use std::io::Read;
-use std::{fs, io};
+use failure::{format_err, Fallible, ResultExt};
+use std::fs;
 use serde_json;
 
 /// Read aleph version info from os version json file.

src/minimal/platform.rs

@@ -9,12 +9,17 @@
 use failure::{bail, format_err, Fallible, ResultExt};
 use std::io::Read;
 use std::{fs, io};
+use crate::util;
 
 /// Platform key.
-static CMDLINE_PLATFORM_FLAG: &str = "ignition.platform.id";
+#[cfg(not(feature = "cl-legacy"))]
+const CMDLINE_PLATFORM_FLAG: &str = "ignition.platform.id";
+/// Platform key (CL and RHCOS legacy name: "OEM").
+#[cfg(feature = "cl-legacy")]
+const CMDLINE_PLATFORM_FLAG: &str = "coreos.oem.id";
 
 /// Read platform value from cmdline file.
-pub(crate) fn read_id<T>(cmdline_path: T) -> Fallible<String>
+pub(crate) fn get_platform<T>(cmdline_path: T) -> Fallible<String>
 where
     T: AsRef<str>,
 {
@@ -31,11 +36,11 @@ where
         .with_context(|e| format_err!("failed to read cmdline file {}: {}", fpath, e))?;
 
     // lookup flag by key name
-    match find_flag_value(CMDLINE_PLATFORM_FLAG, &contents) {
+    match util::find_flag_value(CMDLINE_PLATFORM_FLAG, &contents) {
         Some(platform) => {
             log::trace!("found platform id: {}", platform);
             Ok(platform)
-        }
+        },
         None => bail!(
             "could not find flag '{}' in {}",
             CMDLINE_PLATFORM_FLAG,
@@ -44,33 +49,6 @@ where
     }
 }
 
-/// Find OEM ID flag value in cmdline string.
-fn find_flag_value(flagname: &str, cmdline: &str) -> Option<String> {
-    // split content into elements and keep key-value tuples only.
-    let params: Vec<(&str, &str)> = cmdline
-        .split(' ')
-        .filter_map(|s| {
-            let kv: Vec<&str> = s.splitn(2, '=').collect();
-            match kv.len() {
-                2 => Some((kv[0], kv[1])),
-                _ => None,
-            }
-        })
-        .collect();
-
-    // find the oem flag
-    for (key, val) in params {
-        if key != flagname {
-            continue;
-        }
-        let bare_val = val.trim();
-        if !bare_val.is_empty() {
-            return Some(bare_val.to_string());
-        }
-    }
-    None
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -90,7 +68,7 @@ mod tests {
             ("ignition.platform.id=ec2 foo=bar", Some("ec2".to_string())),
         ];
         for (tcase, tres) in tests {
-            let res = find_flag_value(flagname, tcase);
+            let res = util::find_flag_value(flagname, tcase);
             assert_eq!(res, tres, "failed testcase: '{}'", tcase);
         }
     }