Skip to content

Commit

Permalink
[smithy-rs] Rename make_token to idempotency_token_provider (#2783)
Browse files Browse the repository at this point in the history
## Motivation and Context
Incorporates suggestion made in
smithy-lang/smithy-rs#2762 (comment)

## Description
This PR renames `make_token` to `idempotency_token_provider` for clarity
wherever it is referred to in the fields and API in service configs and
their builders.

## Testing
Existing tests in CI

## Checklist
<!--- If a checkbox below is not applicable, then please DELETE it
rather than leaving it unchecked -->
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the
smithy-rs codegen or runtime crates
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the AWS
SDK, generated SDK code, or SDK runtime crates

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._

---------

Co-authored-by: Yuki Saito <[email protected]>
  • Loading branch information
2 people authored and aws-sdk-rust-ci committed Aug 3, 2023
1 parent 87ae71a commit c706be8
Show file tree
Hide file tree
Showing 814 changed files with 4,436 additions and 2,958 deletions.
33 changes: 20 additions & 13 deletions sdk/accessanalyzer/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
///
#[derive(::std::clone::Clone)]
pub struct Config {
pub(crate) make_token: crate::idempotency_token::IdempotencyTokenProvider,
pub(crate) idempotency_token_provider: crate::idempotency_token::IdempotencyTokenProvider,
pub(crate) endpoint_resolver:
::aws_smithy_http::endpoint::SharedEndpointResolver<crate::endpoint::Params>,
retry_config: Option<::aws_smithy_types::retry::RetryConfig>,
Expand Down Expand Up @@ -50,8 +50,8 @@ impl Config {
/// Returns a copy of the idempotency token provider.
/// If a random token provider was configured,
/// a newly-randomized token provider will be returned.
pub fn make_token(&self) -> crate::idempotency_token::IdempotencyTokenProvider {
self.make_token.clone()
pub fn idempotency_token_provider(&self) -> crate::idempotency_token::IdempotencyTokenProvider {
self.idempotency_token_provider.clone()
}
/// Returns the endpoint resolver.
pub fn endpoint_resolver(
Expand Down Expand Up @@ -111,7 +111,8 @@ impl Config {
/// Builder for creating a `Config`.
#[derive(Clone, Default)]
pub struct Builder {
make_token: ::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider:
::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
endpoint_resolver: ::std::option::Option<
::aws_smithy_http::endpoint::SharedEndpointResolver<crate::endpoint::Params>,
>,
Expand Down Expand Up @@ -140,20 +141,26 @@ impl Builder {
Self::default()
}
/// Sets the idempotency token provider to use for service calls that require tokens.
pub fn make_token(
pub fn idempotency_token_provider(
mut self,
make_token: impl ::std::convert::Into<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider: impl ::std::convert::Into<
crate::idempotency_token::IdempotencyTokenProvider,
>,
) -> Self {
self.set_make_token(::std::option::Option::Some(make_token.into()));
self.set_idempotency_token_provider(::std::option::Option::Some(
idempotency_token_provider.into(),
));
self
}

/// Sets the idempotency token provider to use for service calls that require tokens.
pub fn set_make_token(
pub fn set_idempotency_token_provider(
&mut self,
make_token: ::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider: ::std::option::Option<
crate::idempotency_token::IdempotencyTokenProvider,
>,
) -> &mut Self {
self.make_token = make_token;
self.idempotency_token_provider = idempotency_token_provider;
self
}
/// Sets the endpoint resolver to use when making requests.
Expand Down Expand Up @@ -583,7 +590,7 @@ impl Builder {
#[allow(unused_mut)]
/// Apply test defaults to the builder
pub fn set_test_defaults(&mut self) -> &mut Self {
self.set_make_token(Some("00000000-0000-4000-8000-000000000000".into()));
self.set_idempotency_token_provider(Some("00000000-0000-4000-8000-000000000000".into()));
self.set_credentials_provider(Some(
::aws_credential_types::provider::SharedCredentialsProvider::new(
::aws_credential_types::Credentials::for_tests(),
Expand All @@ -601,8 +608,8 @@ impl Builder {
/// Builds a [`Config`].
pub fn build(self) -> Config {
Config {
make_token: self
.make_token
idempotency_token_provider: self
.idempotency_token_provider
.unwrap_or_else(crate::idempotency_token::default_provider),
endpoint_resolver: self.endpoint_resolver.unwrap_or_else(|| {
::aws_smithy_http::endpoint::SharedEndpointResolver::new(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/apply_archive_rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl ApplyArchiveRuleInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/create_access_preview.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateAccessPreviewInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/create_analyzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateAnalyzerInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/create_archive_rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateArchiveRuleInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/delete_analyzer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl DeleteAnalyzerInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/delete_archive_rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl DeleteArchiveRuleInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/start_policy_generation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl StartPolicyGenerationInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/update_archive_rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl UpdateArchiveRuleInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/accessanalyzer/src/operation/update_findings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl UpdateFindingsInput {
}
};
if self.client_token.is_none() {
self.client_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
33 changes: 20 additions & 13 deletions sdk/alexaforbusiness/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
///
#[derive(::std::clone::Clone)]
pub struct Config {
pub(crate) make_token: crate::idempotency_token::IdempotencyTokenProvider,
pub(crate) idempotency_token_provider: crate::idempotency_token::IdempotencyTokenProvider,
pub(crate) endpoint_resolver:
::aws_smithy_http::endpoint::SharedEndpointResolver<crate::endpoint::Params>,
retry_config: Option<::aws_smithy_types::retry::RetryConfig>,
Expand Down Expand Up @@ -50,8 +50,8 @@ impl Config {
/// Returns a copy of the idempotency token provider.
/// If a random token provider was configured,
/// a newly-randomized token provider will be returned.
pub fn make_token(&self) -> crate::idempotency_token::IdempotencyTokenProvider {
self.make_token.clone()
pub fn idempotency_token_provider(&self) -> crate::idempotency_token::IdempotencyTokenProvider {
self.idempotency_token_provider.clone()
}
/// Returns the endpoint resolver.
pub fn endpoint_resolver(
Expand Down Expand Up @@ -111,7 +111,8 @@ impl Config {
/// Builder for creating a `Config`.
#[derive(Clone, Default)]
pub struct Builder {
make_token: ::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider:
::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
endpoint_resolver: ::std::option::Option<
::aws_smithy_http::endpoint::SharedEndpointResolver<crate::endpoint::Params>,
>,
Expand Down Expand Up @@ -140,20 +141,26 @@ impl Builder {
Self::default()
}
/// Sets the idempotency token provider to use for service calls that require tokens.
pub fn make_token(
pub fn idempotency_token_provider(
mut self,
make_token: impl ::std::convert::Into<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider: impl ::std::convert::Into<
crate::idempotency_token::IdempotencyTokenProvider,
>,
) -> Self {
self.set_make_token(::std::option::Option::Some(make_token.into()));
self.set_idempotency_token_provider(::std::option::Option::Some(
idempotency_token_provider.into(),
));
self
}

/// Sets the idempotency token provider to use for service calls that require tokens.
pub fn set_make_token(
pub fn set_idempotency_token_provider(
&mut self,
make_token: ::std::option::Option<crate::idempotency_token::IdempotencyTokenProvider>,
idempotency_token_provider: ::std::option::Option<
crate::idempotency_token::IdempotencyTokenProvider,
>,
) -> &mut Self {
self.make_token = make_token;
self.idempotency_token_provider = idempotency_token_provider;
self
}
/// Sets the endpoint resolver to use when making requests.
Expand Down Expand Up @@ -583,7 +590,7 @@ impl Builder {
#[allow(unused_mut)]
/// Apply test defaults to the builder
pub fn set_test_defaults(&mut self) -> &mut Self {
self.set_make_token(Some("00000000-0000-4000-8000-000000000000".into()));
self.set_idempotency_token_provider(Some("00000000-0000-4000-8000-000000000000".into()));
self.set_credentials_provider(Some(
::aws_credential_types::provider::SharedCredentialsProvider::new(
::aws_credential_types::Credentials::for_tests(),
Expand All @@ -601,8 +608,8 @@ impl Builder {
/// Builds a [`Config`].
pub fn build(self) -> Config {
Config {
make_token: self
.make_token
idempotency_token_provider: self
.idempotency_token_provider
.unwrap_or_else(crate::idempotency_token::default_provider),
endpoint_resolver: self.endpoint_resolver.unwrap_or_else(|| {
::aws_smithy_http::endpoint::SharedEndpointResolver::new(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_address_book.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateAddressBookInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateBusinessReportScheduleInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateConferenceProviderInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_contact.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateContactInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_gateway_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateGatewayGroupInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_network_profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateNetworkProfileInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateProfileInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_room.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateRoomInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_skill_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateSkillGroupInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
5 changes: 3 additions & 2 deletions sdk/alexaforbusiness/src/operation/create_user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ impl CreateUserInput {
}
};
if self.client_request_token.is_none() {
self.client_request_token =
::std::option::Option::Some(_config.make_token.make_idempotency_token());
self.client_request_token = ::std::option::Option::Some(
_config.idempotency_token_provider.make_idempotency_token(),
);
}
let mut request = {
fn uri_base(
Expand Down
Loading

0 comments on commit c706be8

Please sign in to comment.