Merge pull request #1372 from jpculp/imdsclient-lib

Add imdsclient library for querying IMDS

packages/os/Cargo.toml

@@ -18,6 +18,7 @@ source-groups = [
     "webpki-roots-shim",
     "logdog",
     "models",
+    "imdsclient"
 ]
 
 [lib]

sources/Cargo.toml

@@ -34,6 +34,8 @@ members = [
 
     "bottlerocket-release",
 
+    "imdsclient",
+
     "ghostdog",
 
     "growpart",

sources/api/early-boot-config/Cargo.toml

@@ -11,11 +11,12 @@ exclude = ["README.md"]
 
 [dependencies]
 apiclient = { path = "../apiclient" }
+async-trait = "0.1.36"
 base64 = "0.13"
 flate2 = { version = "1.0", default-features = false, features = ["rust_backend"] }
 http = "0.2"
+imdsclient = { path = "../../imdsclient" }
 log = "0.4"
-reqwest = { version = "0.11", default-features = false, features = ["blocking"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
 serde_plain = "0.3"

sources/api/early-boot-config/src/main.rs

@@ -142,6 +142,7 @@ async fn run() -> Result<()> {
     let method = "PATCH";
     for settings_json in data_provider
         .platform_data()
+        .await
         .context(error::ProviderError)?
     {
         // Don't send an empty request to the API

sources/api/early-boot-config/src/provider.rs

@@ -1,6 +1,7 @@
 //! The provider module owns the `PlatformDataProvider` trait
 
 use crate::settings::SettingsJson;
+use async_trait::async_trait;
 
 #[cfg(any(bottlerocket_platform = "aws", bottlerocket_platform = "aws-dev"))]
 pub(crate) mod aws;
@@ -12,11 +13,14 @@ pub(crate) mod local_file;
 pub(crate) mod vmware;
 
 /// Support for new platforms can be added by implementing this trait.
+#[async_trait]
 pub(crate) trait PlatformDataProvider {
     /// You should return a list of SettingsJson, representing the settings changes you want to
     /// send to the API.
     ///
     /// This is a list so that handling multiple data sources within a platform can feel more
     /// natural; you can also send all changes in one entry if you like.
-    fn platform_data(&self) -> std::result::Result<Vec<SettingsJson>, Box<dyn std::error::Error>>;
+    async fn platform_data(
+        &self,
+    ) -> std::result::Result<Vec<SettingsJson>, Box<dyn std::error::Error>>;
 }