Merge branch 'unmanaged_nodes/machine_identity' into rewrite/unmanaged_node

Author: chkeita

src/agent/onefuzz-agent/src/agent.rs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#![allow(clippy::too_many_arguments)]
 use anyhow::{Error, Result};
 use tokio::time;
 

src/agent/onefuzz-agent/src/agent/tests.rs

@@ -35,6 +35,7 @@ impl Fixture {
             work_queue,
             worker_runner,
             None,
+            true,
         )
     }
 

src/agent/onefuzz-agent/src/commands.rs

@@ -155,11 +155,6 @@ pub async fn add_ssh_key(key_info: &SshKeyInfo) -> Result<()> {
 
 #[cfg(target_family = "unix")]
 pub async fn add_ssh_key(key_info: &SshKeyInfo) -> Result<()> {
-    if get_scaleset_name().await?.is_none() {
-        warn!("adding ssh keys only supported on managed nodes");
-        return Ok(());
-    }
-
     let user =
         get_user_by_name(ONEFUZZ_SERVICE_USER).ok_or_else(|| format_err!("unable to find user"))?;
     info!("adding ssh key:{:?} to user:{:?}", key_info, user);

src/agent/onefuzz/examples/test-input.rs

@@ -4,7 +4,7 @@
 use std::path::PathBuf;
 
 use anyhow::Result;
-use onefuzz::input_tester::Tester;
+use onefuzz::{input_tester::Tester, machine_id::MachineIdentity};
 use structopt::StructOpt;
 
 #[derive(Debug, PartialEq, Eq, StructOpt)]
@@ -53,7 +53,13 @@ async fn main() -> Result<()> {
     }
 
     let env = Default::default();
-    let tester = Tester::new(&setup_dir, &opt.exe, &target_options, &env);
+    let tester = Tester::new(
+        &setup_dir,
+        &opt.exe,
+        &target_options,
+        &env,
+        MachineIdentity::default(),
+    );
 
     let check_debugger = !opt.no_check_debugger;
     let tester = tester

src/agent/onefuzz/src/expand.rs

@@ -520,12 +520,11 @@ mod tests {
     #[tokio::test]
     async fn test_expand_machine_id() -> Result<()> {
         let machine_id = Uuid::new_v4();
-        let expand = Expand::new(&MachineIdentity {
-            machine_id: machine_id,
+        let machine_identity = MachineIdentity {
+            machine_id,
             ..Default::default()
-        })
-        .machine_id()
-        .await?;
+        };
+        let expand = Expand::new(&machine_identity).machine_id().await?;
         let expanded = expand.evaluate_value("{machine_id}")?;
         // Check that "{machine_id}" expands to a valid UUID, but don't worry about the actual value.
         let expanded_machine_id = Uuid::parse_str(&expanded)?;

src/agent/onefuzz/src/libfuzzer.rs

@@ -445,6 +445,7 @@ mod tests {
             options.clone(),
             env.clone(),
             &temp_setup_dir.path(),
+            MachineIdentity::default(),
         );
 
         // verify catching bad exits with -help=1
@@ -473,6 +474,7 @@ mod tests {
             options.clone(),
             env.clone(),
             &temp_setup_dir.path(),
+            MachineIdentity::default(),
         );
         // verify good exits with -help=1
         assert!(

src/agent/onefuzz/src/machine_id.rs

@@ -28,9 +28,6 @@ const VM_NAME_URL: &str =
 const VM_SCALESET_NAME: &str =
 "http://169.254.169.254/metadata/instance/compute/vmScaleSetName?api-version=2020-06-01&format=text";
 
-const COMPUTE_METADATA_URL: &str =
-    "http://169.254.169.254/metadata/instance/compute?api-version=2020-06-01";
-
 impl MachineIdentity {
     pub async fn from_metadata() -> Result<Self> {
         let machine_id = Self::get_machine_id().await?;

src/deny.toml

@@ -19,7 +19,6 @@ ignore = [
     "RUSTSEC-2021-0139", # ansi_term is unmaintained
     "RUSTSEC-2021-0145", # atty bug: we are unaffected (no custom allocator)
 ]
-]
 
 [bans]