Skip to content

Commit

Permalink
[smithy-rs] Split out fluent builder generators and clean up (#3585)
Browse files Browse the repository at this point in the history
It looks like I will need to render specialized fluent builders for
waiters. This PR is some prerequisite work to split fluent builder
generation out of the fluent client generator into its own thing. This
makes it possible to refactor the fluent builder generator to be more
configurable in a follow up PR so that it can generate waiter fluent
builders as well.

----

_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: Zelda Hessler <[email protected]>
  • Loading branch information
2 people authored and aws-sdk-rust-ci committed Apr 22, 2024
1 parent 8abe3eb commit 37f3857
Show file tree
Hide file tree
Showing 15,362 changed files with 68,667 additions and 62,196 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::apply_archive_rule::_apply_archive_rule_output::ApplyA

pub use crate::operation::apply_archive_rule::_apply_archive_rule_input::ApplyArchiveRuleInputBuilder;

impl ApplyArchiveRuleInputBuilder {
impl crate::operation::apply_archive_rule::builders::ApplyArchiveRuleInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl ApplyArchiveRuleFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::cancel_policy_generation::_cancel_policy_generation_ou

pub use crate::operation::cancel_policy_generation::_cancel_policy_generation_input::CancelPolicyGenerationInputBuilder;

impl CancelPolicyGenerationInputBuilder {
impl crate::operation::cancel_policy_generation::builders::CancelPolicyGenerationInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl CancelPolicyGenerationFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::check_access_not_granted::_check_access_not_granted_ou

pub use crate::operation::check_access_not_granted::_check_access_not_granted_input::CheckAccessNotGrantedInputBuilder;

impl CheckAccessNotGrantedInputBuilder {
impl crate::operation::check_access_not_granted::builders::CheckAccessNotGrantedInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl CheckAccessNotGrantedFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand All @@ -122,6 +122,7 @@ impl CheckAccessNotGrantedFluentBuilder {
pub fn get_policy_document(&self) -> &::std::option::Option<::std::string::String> {
self.inner.get_policy_document()
}
///
/// Appends an item to `access`.
///
/// To override the contents of this collection use [`set_access`](Self::set_access).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::check_no_new_access::_check_no_new_access_output::Chec

pub use crate::operation::check_no_new_access::_check_no_new_access_input::CheckNoNewAccessInputBuilder;

impl CheckNoNewAccessInputBuilder {
impl crate::operation::check_no_new_access::builders::CheckNoNewAccessInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -100,12 +100,12 @@ impl CheckNoNewAccessFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::create_access_preview::_create_access_preview_output::

pub use crate::operation::create_access_preview::_create_access_preview_input::CreateAccessPreviewInputBuilder;

impl CreateAccessPreviewInputBuilder {
impl crate::operation::create_access_preview::builders::CreateAccessPreviewInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl CreateAccessPreviewFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand All @@ -122,6 +122,7 @@ impl CreateAccessPreviewFluentBuilder {
pub fn get_analyzer_arn(&self) -> &::std::option::Option<::std::string::String> {
self.inner.get_analyzer_arn()
}
///
/// Adds a key-value pair to `configurations`.
///
/// To override the contents of this collection use [`set_configurations`](Self::set_configurations).
Expand Down
10 changes: 6 additions & 4 deletions sdk/accessanalyzer/src/operation/create_analyzer/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::create_analyzer::_create_analyzer_output::CreateAnalyz

pub use crate::operation::create_analyzer::_create_analyzer_input::CreateAnalyzerInputBuilder;

impl CreateAnalyzerInputBuilder {
impl crate::operation::create_analyzer::builders::CreateAnalyzerInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl CreateAnalyzerFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down Expand Up @@ -136,6 +136,7 @@ impl CreateAnalyzerFluentBuilder {
pub fn get_type(&self) -> &::std::option::Option<crate::types::Type> {
self.inner.get_type()
}
///
/// Appends an item to `archiveRules`.
///
/// To override the contents of this collection use [`set_archive_rules`](Self::set_archive_rules).
Expand All @@ -154,6 +155,7 @@ impl CreateAnalyzerFluentBuilder {
pub fn get_archive_rules(&self) -> &::std::option::Option<::std::vec::Vec<crate::types::InlineArchiveRule>> {
self.inner.get_archive_rules()
}
///
/// Adds a key-value pair to `tags`.
///
/// To override the contents of this collection use [`set_tags`](Self::set_tags).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::create_archive_rule::_create_archive_rule_output::Crea

pub use crate::operation::create_archive_rule::_create_archive_rule_input::CreateArchiveRuleInputBuilder;

impl CreateArchiveRuleInputBuilder {
impl crate::operation::create_archive_rule::builders::CreateArchiveRuleInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -100,12 +100,12 @@ impl CreateArchiveRuleFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down Expand Up @@ -137,6 +137,7 @@ impl CreateArchiveRuleFluentBuilder {
pub fn get_rule_name(&self) -> &::std::option::Option<::std::string::String> {
self.inner.get_rule_name()
}
///
/// Adds a key-value pair to `filter`.
///
/// To override the contents of this collection use [`set_filter`](Self::set_filter).
Expand Down
8 changes: 4 additions & 4 deletions sdk/accessanalyzer/src/operation/delete_analyzer/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::delete_analyzer::_delete_analyzer_output::DeleteAnalyz

pub use crate::operation::delete_analyzer::_delete_analyzer_input::DeleteAnalyzerInputBuilder;

impl DeleteAnalyzerInputBuilder {
impl crate::operation::delete_analyzer::builders::DeleteAnalyzerInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl DeleteAnalyzerFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::delete_archive_rule::_delete_archive_rule_output::Dele

pub use crate::operation::delete_archive_rule::_delete_archive_rule_input::DeleteArchiveRuleInputBuilder;

impl DeleteArchiveRuleInputBuilder {
impl crate::operation::delete_archive_rule::builders::DeleteArchiveRuleInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl DeleteArchiveRuleFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::get_access_preview::_get_access_preview_output::GetAcc

pub use crate::operation::get_access_preview::_get_access_preview_input::GetAccessPreviewInputBuilder;

impl GetAccessPreviewInputBuilder {
impl crate::operation::get_access_preview::builders::GetAccessPreviewInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl GetAccessPreviewFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::get_analyzed_resource::_get_analyzed_resource_output::

pub use crate::operation::get_analyzed_resource::_get_analyzed_resource_input::GetAnalyzedResourceInputBuilder;

impl GetAnalyzedResourceInputBuilder {
impl crate::operation::get_analyzed_resource::builders::GetAnalyzedResourceInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl GetAnalyzedResourceFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/accessanalyzer/src/operation/get_analyzer/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::get_analyzer::_get_analyzer_output::GetAnalyzerOutputB

pub use crate::operation::get_analyzer::_get_analyzer_input::GetAnalyzerInputBuilder;

impl GetAnalyzerInputBuilder {
impl crate::operation::get_analyzer::builders::GetAnalyzerInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl GetAnalyzerFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/accessanalyzer/src/operation/get_archive_rule/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::get_archive_rule::_get_archive_rule_output::GetArchive

pub use crate::operation::get_archive_rule::_get_archive_rule_input::GetArchiveRuleInputBuilder;

impl GetArchiveRuleInputBuilder {
impl crate::operation::get_archive_rule::builders::GetArchiveRuleInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -100,12 +100,12 @@ impl GetArchiveRuleFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
8 changes: 4 additions & 4 deletions sdk/accessanalyzer/src/operation/get_finding/builders.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use crate::operation::get_finding::_get_finding_output::GetFindingOutputBuil

pub use crate::operation::get_finding::_get_finding_input::GetFindingInputBuilder;

impl GetFindingInputBuilder {
impl crate::operation::get_finding::builders::GetFindingInputBuilder {
/// Sends a request with this input using the given client.
pub async fn send_with(
self,
Expand Down Expand Up @@ -99,12 +99,12 @@ impl GetFindingFluentBuilder {
> {
crate::client::customize::CustomizableOperation::new(self)
}
pub(crate) fn config_override(mut self, config_override: impl Into<crate::config::Builder>) -> Self {
self.set_config_override(Some(config_override.into()));
pub(crate) fn config_override(mut self, config_override: impl ::std::convert::Into<crate::config::Builder>) -> Self {
self.set_config_override(::std::option::Option::Some(config_override.into()));
self
}

pub(crate) fn set_config_override(&mut self, config_override: Option<crate::config::Builder>) -> &mut Self {
pub(crate) fn set_config_override(&mut self, config_override: ::std::option::Option<crate::config::Builder>) -> &mut Self {
self.config_override = config_override;
self
}
Expand Down
Loading

0 comments on commit 37f3857

Please sign in to comment.