Commit a8b58410 authored by AWS SDK Rust Bot's avatar AWS SDK Rust Bot
Browse files

[smithy-rs] Rollup of 2 commits 



Includes commits:
  7cc3a6ea Fix compilation error in generate code caused by name collision (#3175)
  bfb43567 Cherry-pick commits back into release branch for 0.57.2 (#3187)

Co-authored-by: default avatarAWS SDK Rust Bot <97246200+aws-sdk-rust-ci@users.noreply.github.com>
Co-authored-by: default avatarRussell Cohen <rcoh@amazon.com>
parent a804b032

sdk/accessanalyzer/src/lens.rs

+16 −16
Original line number Diff line number Diff line 
// Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.

pub(crate) fn reflens_list_access_preview_findings_output_next_token(

pub(crate) fn reflens_list_access_preview_findings_output_output_next_token(

    input: &crate::operation::list_access_preview_findings::ListAccessPreviewFindingsOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -9,7 +9,7 @@ pub(crate) fn reflens_list_access_preview_findings_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_access_previews_output_next_token(

pub(crate) fn reflens_list_access_previews_output_output_next_token(

    input: &crate::operation::list_access_previews::ListAccessPreviewsOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -19,7 +19,7 @@ pub(crate) fn reflens_list_access_previews_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_analyzed_resources_output_next_token(

pub(crate) fn reflens_list_analyzed_resources_output_output_next_token(

    input: &crate::operation::list_analyzed_resources::ListAnalyzedResourcesOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -29,7 +29,7 @@ pub(crate) fn reflens_list_analyzed_resources_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_analyzers_output_next_token(

pub(crate) fn reflens_list_analyzers_output_output_next_token(

    input: &crate::operation::list_analyzers::ListAnalyzersOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -39,7 +39,7 @@ pub(crate) fn reflens_list_analyzers_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_archive_rules_output_next_token(

pub(crate) fn reflens_list_archive_rules_output_output_next_token(

    input: &crate::operation::list_archive_rules::ListArchiveRulesOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -49,7 +49,7 @@ pub(crate) fn reflens_list_archive_rules_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_findings_output_next_token(

pub(crate) fn reflens_list_findings_output_output_next_token(

    input: &crate::operation::list_findings::ListFindingsOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -59,7 +59,7 @@ pub(crate) fn reflens_list_findings_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_list_policy_generations_output_next_token(

pub(crate) fn reflens_list_policy_generations_output_output_next_token(

    input: &crate::operation::list_policy_generations::ListPolicyGenerationsOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -69,7 +69,7 @@ pub(crate) fn reflens_list_policy_generations_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn reflens_validate_policy_output_next_token(

pub(crate) fn reflens_validate_policy_output_output_next_token(

    input: &crate::operation::validate_policy::ValidatePolicyOutput,

) -> ::std::option::Option<&::std::string::String> {

    let input = match &input.next_token {
@@ -79,56 +79,56 @@ pub(crate) fn reflens_validate_policy_output_next_token( 
    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_access_preview_findings_output_findings(

pub(crate) fn lens_list_access_preview_findings_output_output_findings(

    input: crate::operation::list_access_preview_findings::ListAccessPreviewFindingsOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::AccessPreviewFinding>> {

    let input = input.findings;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_access_previews_output_access_previews(

pub(crate) fn lens_list_access_previews_output_output_access_previews(

    input: crate::operation::list_access_previews::ListAccessPreviewsOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::AccessPreviewSummary>> {

    let input = input.access_previews;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_analyzed_resources_output_analyzed_resources(

pub(crate) fn lens_list_analyzed_resources_output_output_analyzed_resources(

    input: crate::operation::list_analyzed_resources::ListAnalyzedResourcesOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::AnalyzedResourceSummary>> {

    let input = input.analyzed_resources;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_analyzers_output_analyzers(

pub(crate) fn lens_list_analyzers_output_output_analyzers(

    input: crate::operation::list_analyzers::ListAnalyzersOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::AnalyzerSummary>> {

    let input = input.analyzers;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_archive_rules_output_archive_rules(

pub(crate) fn lens_list_archive_rules_output_output_archive_rules(

    input: crate::operation::list_archive_rules::ListArchiveRulesOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::ArchiveRuleSummary>> {

    let input = input.archive_rules;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_findings_output_findings(

pub(crate) fn lens_list_findings_output_output_findings(

    input: crate::operation::list_findings::ListFindingsOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::FindingSummary>> {

    let input = input.findings;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_list_policy_generations_output_policy_generations(

pub(crate) fn lens_list_policy_generations_output_output_policy_generations(

    input: crate::operation::list_policy_generations::ListPolicyGenerationsOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::PolicyGeneration>> {

    let input = input.policy_generations;

    ::std::option::Option::Some(input)

}



pub(crate) fn lens_validate_policy_output_findings(

pub(crate) fn lens_validate_policy_output_output_findings(

    input: crate::operation::validate_policy::ValidatePolicyOutput,

) -> ::std::option::Option<::std::vec::Vec<crate::types::ValidatePolicyFinding>> {

    let input = input.findings;

sdk/accessanalyzer/src/operation/list_access_preview_findings/paginator.rs

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ impl ListAccessPreviewFindingsPaginator { 
                        // If the input member is None or it was an error

                        let done = match resp {

                            ::std::result::Result::Ok(ref resp) => {

                                let new_token = crate::lens::reflens_list_access_preview_findings_output_next_token(resp);

                                let new_token = crate::lens::reflens_list_access_preview_findings_output_output_next_token(resp);

                                let is_empty = new_token.map(|token| token.is_empty()).unwrap_or(true);

                                if !is_empty && new_token == input.next_token.as_ref() && self.stop_on_duplicate_token {

                                    true
@@ -140,7 +140,7 @@ impl ListAccessPreviewFindingsPaginatorItems { 
        >,

    > {

        ::aws_smithy_async::future::pagination_stream::TryFlatMap::new(self.0.send()).flat_map(|page| {

            crate::lens::lens_list_access_preview_findings_output_findings(page)

            crate::lens::lens_list_access_preview_findings_output_output_findings(page)

                .unwrap_or_default()

                .into_iter()

        })

sdk/accessanalyzer/src/operation/list_access_previews/paginator.rs

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ impl ListAccessPreviewsPaginator { 
                        // If the input member is None or it was an error

                        let done = match resp {

                            ::std::result::Result::Ok(ref resp) => {

                                let new_token = crate::lens::reflens_list_access_previews_output_next_token(resp);

                                let new_token = crate::lens::reflens_list_access_previews_output_output_next_token(resp);

                                let is_empty = new_token.map(|token| token.is_empty()).unwrap_or(true);

                                if !is_empty && new_token == input.next_token.as_ref() && self.stop_on_duplicate_token {

                                    true
@@ -138,7 +138,7 @@ impl ListAccessPreviewsPaginatorItems { 
        >,

    > {

        ::aws_smithy_async::future::pagination_stream::TryFlatMap::new(self.0.send()).flat_map(|page| {

            crate::lens::lens_list_access_previews_output_access_previews(page)

            crate::lens::lens_list_access_previews_output_output_access_previews(page)

                .unwrap_or_default()

                .into_iter()

        })

sdk/accessanalyzer/src/operation/list_analyzed_resources/paginator.rs

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ impl ListAnalyzedResourcesPaginator { 
                        // If the input member is None or it was an error

                        let done = match resp {

                            ::std::result::Result::Ok(ref resp) => {

                                let new_token = crate::lens::reflens_list_analyzed_resources_output_next_token(resp);

                                let new_token = crate::lens::reflens_list_analyzed_resources_output_output_next_token(resp);

                                let is_empty = new_token.map(|token| token.is_empty()).unwrap_or(true);

                                if !is_empty && new_token == input.next_token.as_ref() && self.stop_on_duplicate_token {

                                    true
@@ -139,7 +139,7 @@ impl ListAnalyzedResourcesPaginatorItems { 
        >,

    > {

        ::aws_smithy_async::future::pagination_stream::TryFlatMap::new(self.0.send()).flat_map(|page| {

            crate::lens::lens_list_analyzed_resources_output_analyzed_resources(page)

            crate::lens::lens_list_analyzed_resources_output_output_analyzed_resources(page)

                .unwrap_or_default()

                .into_iter()

        })

sdk/accessanalyzer/src/operation/list_analyzers/paginator.rs

+6 −3
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ impl ListAnalyzersPaginator { 
                        // If the input member is None or it was an error

                        let done = match resp {

                            ::std::result::Result::Ok(ref resp) => {

                                let new_token = crate::lens::reflens_list_analyzers_output_next_token(resp);

                                let new_token = crate::lens::reflens_list_analyzers_output_output_next_token(resp);

                                let is_empty = new_token.map(|token| token.is_empty()).unwrap_or(true);

                                if !is_empty && new_token == input.next_token.as_ref() && self.stop_on_duplicate_token {

                                    true
@@ -137,7 +137,10 @@ impl ListAnalyzersPaginatorItems { 
            >,

        >,

    > {

        ::aws_smithy_async::future::pagination_stream::TryFlatMap::new(self.0.send())

            .flat_map(|page| crate::lens::lens_list_analyzers_output_analyzers(page).unwrap_or_default().into_iter())

        ::aws_smithy_async::future::pagination_stream::TryFlatMap::new(self.0.send()).flat_map(|page| {

            crate::lens::lens_list_analyzers_output_output_analyzers(page)

                .unwrap_or_default()

                .into_iter()

        })

    }

}