Use BTreeMap instead of HashMap for Host config #670

augustuswm · 2024-05-13T15:35:42Z

Currently the CLI stores the hosts from the host.toml file in a HashMap which means that when a host has not been specified by a user this call gives us back an arbitrary host:

oxide.rs/sdk/src/context.rs

Lines 53 to 58 in 3ac6e32

    
           (Err(_), Err(_)) => { 
        
               let Some((host, host_entry)) = config.hosts.hosts.iter().next() else { 
        
                   return Ok(None); 
        
               }; 
        
               (host.clone(), host_entry.token.clone()) 
        
           }

If we switch this to a BTreeMap we at least guarantee that the cli consistently selects the same host entry.

This is related to #301

ahl

ship it

Use BTreeMap instead of HashMap

3d2abe3

ahl approved these changes May 13, 2024

View reviewed changes

augustuswm merged commit 650a5a8 into main May 13, 2024
16 checks passed

augustuswm deleted the deterministic-host branch May 13, 2024 16:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use BTreeMap instead of HashMap for Host config #670

Use BTreeMap instead of HashMap for Host config #670

augustuswm commented May 13, 2024

ahl left a comment

	(Err(_), Err(_)) => {
	let Some((host, host_entry)) = config.hosts.hosts.iter().next() else {
	return Ok(None);
	};
	(host.clone(), host_entry.token.clone())
	}

Use BTreeMap instead of HashMap for Host config #670

Use BTreeMap instead of HashMap for Host config #670

Conversation

augustuswm commented May 13, 2024

ahl left a comment

Choose a reason for hiding this comment