Skip to content

Commit dafe709

Browse files
aws-sdk-rust-cijoshtriplettrcoh
committed
[smithy-rs] Rollup of 3 commits
Includes commits: 5fe6dca9 Run `cargo update` on the runtime lockfiles and the SDK lockfile (#3950) 97ff93f7 Add method to config that uses an empty test environment (#3555) 5f22e875 Fix typos (#3822) Co-authored-by: AWS SDK Rust Bot <[email protected]> Co-authored-by: Josh Triplett <[email protected]> Co-authored-by: Russell Cohen <[email protected]>
1 parent e225d92 commit dafe709

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

sdk/aws-config/src/imds/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ fn user_agent() -> AwsUserAgent {
8989
/// use aws_config::imds::client::Client;
9090
/// # async fn docs() {
9191
/// let client = Client::builder()
92-
/// .endpoint("http://customidms:456/").expect("valid URI")
92+
/// .endpoint("http://customimds:456/").expect("valid URI")
9393
/// .build();
9494
/// # }
9595
/// ```
9696
///
9797
/// 2. The `AWS_EC2_METADATA_SERVICE_ENDPOINT` environment variable. Note: If this environment variable
98-
/// is set, it MUST contain to a valid URI or client construction will fail.
98+
/// is set, it MUST contain a valid URI or client construction will fail.
9999
///
100100
/// 3. The `ec2_metadata_service_endpoint` field in `~/.aws/config`:
101101
/// ```ini

sdk/aws-config/src/lib.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,16 @@ mod loader {
519519
ret
520520
}
521521

522+
/// Ignore any environment variables on the host during config resolution
523+
///
524+
/// This allows for testing in a reproducible environment that ensures any
525+
/// environment variables from the host do not influence environment variable
526+
/// resolution.
527+
pub fn empty_test_environment(mut self) -> Self {
528+
self.env = Some(Env::from_slice(&[]));
529+
self
530+
}
531+
522532
/// Override the access token provider used to build [`SdkConfig`].
523533
///
524534
/// # Examples
@@ -782,6 +792,7 @@ mod loader {
782792
.region()
783793
.await
784794
};
795+
let conf = conf.with_region(region.clone());
785796

786797
let retry_config = if let Some(retry_config) = self.retry_config {
787798
retry_config

versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
smithy_rs_revision = 'c7b1038e5f6f62991345e56cdb7bbb09d6d68952'
1+
smithy_rs_revision = '5f22e875451be899e48f9f365c04c48d405e4ecf'
22
aws_doc_sdk_examples_revision = '46c2187478902e72891354b87435d7c72fe20680'
33

44
[manual_interventions]
55
crates_to_remove = []
66
[crates.aws-config]
77
category = 'AwsRuntime'
88
version = '1.5.12'
9-
source_hash = '5338354ed0110c7c15bc1d5a386030a090bdd5c1892b69635d3a7f0e3fb0928a'
9+
source_hash = '265b1db06adb0b54b2b405635292b85ab35d4859dbcc1dbabd9822c688992a99'
1010

1111
[crates.aws-credential-types]
1212
category = 'AwsRuntime'

0 commit comments

Comments
 (0)