Skip to content

Bump ureq version to 2.10.0 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0xMihir wants to merge 2 commits into
base: master
Choose a base branch
from
+51 −39
Open

Bump ureq version to 2.10.0 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28cb1e1
Bump ureq version
0xMihir Jul 8, 2024
cae36ab
Bump version
0xMihir Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ec2_instance_metadata"
version = "0.3.0"
version = "0.3.1"
authors = ["Zac Brown <zacbrown@users.noreply.github.com>"]
edition = "2018"
description = "A crate for fetching AWS EC2 instance metadata."
Expand All @@ -10,4 +10,4 @@ license = "MIT"

[dependencies]
json = "0.12"
ureq = "1.4"
ureq = "2.10.0"
86 changes: 49 additions & 37 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
extern crate json;
extern crate ureq;
use std::time::Duration;

#[derive(Clone, Copy)]
enum MetadataUrls {
Expand Down Expand Up @@ -134,7 +135,7 @@ impl std::error::Error for Error {
pub struct InstanceMetadataClient;

impl InstanceMetadataClient {
const REQUEST_TIMEOUT_MS: u64 = 2000; // 2 seconds
const REQUEST_TIMEOUT: Duration = Duration::from_secs(2);

pub fn new() -> Self {
Self {}
Expand All @@ -143,106 +144,117 @@ impl InstanceMetadataClient {
fn get_token(&self) -> Result<String> {
const TOKEN_API_URL: &str = "http://169.254.169.254/latest/api/token";

let resp = ureq::put(TOKEN_API_URL)
let agent = ureq::AgentBuilder::new()
.timeout_connect(Self::REQUEST_TIMEOUT)
.build();

let resp = agent
.put(TOKEN_API_URL)
.set("X-aws-ec2-metadata-token-ttl-seconds", "21600")
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let token = resp.into_string()?;
Ok(token)
if let Ok(resp) = resp {
let token = resp.into_string()?;
Ok(token)
} else {
let err = resp.unwrap_err();
Err(Error::from(err))
}
}

/// Get the instance metadata for the machine.
pub fn get(&self) -> Result<InstanceMetadata> {
let token = self.get_token()?;
let instance_id_resp = ureq::get(MetadataUrls::InstanceId.into())

let agent = ureq::AgentBuilder::new()
.timeout_connect(Self::REQUEST_TIMEOUT)
.build();

let instance_id_resp = agent
.get(MetadataUrls::InstanceId.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let instance_id = if instance_id_resp.ok() {
let instance_id = if let Ok(instance_id_resp) = instance_id_resp {
instance_id_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::InstanceId.into()));
};

let ident_creds_resp = ureq::get(MetadataUrls::AccountId.into())
let ident_creds_resp = agent
.get(MetadataUrls::AccountId.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let account_id = if ident_creds_resp.ok() {
let account_id = if let Ok(ident_creds_resp) = ident_creds_resp {
let ident_creds = ident_creds_resp.into_string()?;
identity_credentials_to_account_id(&ident_creds)?
} else {
return Err(Error::NotFound(MetadataUrls::AccountId.into()));
};

let ami_id_resp = ureq::get(MetadataUrls::AmiId.into())
let ami_id_resp = agent
.get(MetadataUrls::AmiId.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let ami_id = if ami_id_resp.ok() {
let ami_id = if let Ok(ami_id_resp) = ami_id_resp {
ami_id_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::AmiId.into()));
};

let availability_zone_resp = ureq::get(MetadataUrls::AvailabilityZone.into())
let availability_zone_resp = agent
.get(MetadataUrls::AvailabilityZone.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let (availability_zone, region) = if availability_zone_resp.ok() {
let (availability_zone, region) = if let Ok(availability_zone_resp) = availability_zone_resp {
let availability_zone = availability_zone_resp.into_string()?;
let region = availability_zone_to_region(&availability_zone)?;
(availability_zone, region)
} else {
return Err(Error::NotFound(MetadataUrls::AvailabilityZone.into()));
};

let instance_type_resp = ureq::get(MetadataUrls::InstanceType.into())
let instance_type_resp = agent
.get(MetadataUrls::InstanceType.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let instance_type = if instance_type_resp.ok() {
let instance_type = if let Ok(instance_type_resp) = instance_type_resp {
instance_type_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::InstanceType.into()));
};

let hostname_resp = ureq::get(MetadataUrls::Hostname.into())
let hostname_resp = agent
.get(MetadataUrls::Hostname.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let hostname = if hostname_resp.ok() {
let hostname = if let Ok(hostname_resp) = hostname_resp {
hostname_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::Hostname.into()));
};

let local_hostname_resp = ureq::get(MetadataUrls::LocalHostname.into())
let local_hostname_resp = agent
.get(MetadataUrls::LocalHostname.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

let local_hostname = if local_hostname_resp.ok() {
local_hostname_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::LocalHostname.into()));
};

let public_hostname_resp = ureq::get(MetadataUrls::PublicHostname.into())
let local_hostname = if let Ok(local_hostname_resp) = local_hostname_resp {
local_hostname_resp.into_string()?
} else {
return Err(Error::NotFound(MetadataUrls::LocalHostname.into()));
};

let public_hostname_resp = agent
.get(MetadataUrls::PublicHostname.into())
.set("X-aws-ec2-metadata-token", &token)
.timeout_connect(Self::REQUEST_TIMEOUT_MS)
.call();

// "public-hostname" isn't always available - the instance must be configured
// to support having one assigned.
let public_hostname = if public_hostname_resp.ok() {
let public_hostname = if let Ok(public_hostname_resp) = public_hostname_resp {
Some(public_hostname_resp.into_string()?)
} else {
None
Expand Down