diff --git a/Include/sdk/_sdk-versions.json b/Include/sdk/_sdk-versions.json index d3a0e8b4d..aa6cd35ca 100644 --- a/Include/sdk/_sdk-versions.json +++ b/Include/sdk/_sdk-versions.json @@ -1,7 +1,7 @@ { "NewServiceVersion" : "3.7.400.0", - "ProductVersion" : "3.7.884.0", + "ProductVersion" : "3.7.885.0", "CoreVersion" : "3.7.400.19", "OverrideCoreVersion" : "3.3", "DefaultToPreview" : false, @@ -194,7 +194,7 @@ "InPreview" : false }, "ElasticMapReduce" : { - "Version" : "3.7.400.19", + "Version" : "3.7.401.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -284,7 +284,7 @@ "InPreview" : false }, "RDS" : { - "Version" : "3.7.401.17", + "Version" : "3.7.401.18", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -380,7 +380,7 @@ "InPreview" : false }, "StorageGateway" : { - "Version" : "3.7.400.19", + "Version" : "3.7.401.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -540,7 +540,7 @@ "InPreview" : false }, "CognitoIdentityProvider" : { - "Version" : "3.7.402.16", + "Version" : "3.7.403.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -572,7 +572,7 @@ "InPreview" : false }, "ElasticLoadBalancingV2" : { - "Version" : "3.7.403.2", + "Version" : "3.7.404.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -820,7 +820,7 @@ "InPreview" : false }, "Glue" : { - "Version" : "3.7.405.9", + "Version" : "3.7.406.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -884,7 +884,7 @@ "InPreview" : false }, "MediaConvert" : { - "Version" : "3.7.400.19", + "Version" : "3.7.401.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" @@ -1732,7 +1732,7 @@ "InPreview" : false }, "Synthetics" : { - "Version" : "3.7.400.19", + "Version" : "3.7.401.0", "AssemblyVersionOverride" : "3.3", "Dependencies" : { "Core" : "3.7.400.19" diff --git a/changelogs/CHANGELOG.2024.md b/changelogs/CHANGELOG.2024.md index 66f3ae43f..8c43fe57b 100644 --- a/changelogs/CHANGELOG.2024.md +++ b/changelogs/CHANGELOG.2024.md @@ -1,4 +1,27 @@ -### 4.1.654 (2024-09-11 21:07Z) +### 4.1.655 (2024-09-12 21:08Z) + * AWS Tools for PowerShell now use AWS .NET SDK 3.7.885.0 and leverage its new features and improvements. Please find a description of the changes at https://github.com/aws/aws-sdk-net/blob/main/changelogs/SDK.CHANGELOG.ALL.md. + * Amazon CloudWatch Synthetics + * Modified cmdlet New-CWSYNCanary: added parameter ResourcesToReplicateTag. + * Amazon Cognito Identity Provider + * Modified cmdlet Set-CGIPUserMFAPreference: added parameters EmailMfaSettings_Enabled and EmailMfaSettings_PreferredMfa. + * Modified cmdlet Set-CGIPUserMFAPreferenceAdmin: added parameters EmailMfaSettings_Enabled and EmailMfaSettings_PreferredMfa. + * Modified cmdlet Set-CGIPUserPoolMfaConfig: added parameters EmailMfaConfiguration_Message and EmailMfaConfiguration_Subject. + * Amazon Elastic MapReduce + * Modified cmdlet Add-EMRInstanceFleet: added parameters InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference, InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn, InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy, OnDemandResizeSpecification_AllocationStrategy and SpotResizeSpecification_AllocationStrategy. + * Modified cmdlet Edit-EMRInstanceFleet: added parameters CapacityReservationOptions_CapacityReservationPreference, CapacityReservationOptions_CapacityReservationResourceGroupArn, CapacityReservationOptions_UsageStrategy, InstanceFleet_InstanceTypeConfig, OnDemandResizeSpecification_AllocationStrategy and SpotResizeSpecification_AllocationStrategy. + * Amazon Elemental MediaConvert + * Added cmdlet Get-EMCVersionList leveraging the ListVersions service API. + * Modified cmdlet New-EMCJob: added parameter JobEngineVersion. + * Amazon Glue + * Modified cmdlet New-GLUETableOptimizer: added parameters IcebergConfiguration_CleanExpiredFile, IcebergConfiguration_Location, IcebergConfiguration_NumberOfSnapshotsToRetain, IcebergConfiguration_OrphanFileRetentionPeriodInDay and IcebergConfiguration_SnapshotRetentionPeriodInDay. + * Modified cmdlet Update-GLUETableOptimizer: added parameters IcebergConfiguration_CleanExpiredFile, IcebergConfiguration_Location, IcebergConfiguration_NumberOfSnapshotsToRetain, IcebergConfiguration_OrphanFileRetentionPeriodInDay and IcebergConfiguration_SnapshotRetentionPeriodInDay. + * Amazon Storage Gateway + * Modified cmdlet New-SGNFSFileShare: added parameter EncryptionType. + * Modified cmdlet New-SGSMBFileShare: added parameter EncryptionType. + * Modified cmdlet Update-SGNFSFileShare: added parameter EncryptionType. + * Modified cmdlet Update-SGSMBFileShare: added parameter EncryptionType. + +### 4.1.654 (2024-09-11 21:07Z) * AWS Tools for PowerShell now use AWS .NET SDK 3.7.884.0 and leverage its new features and improvements. Please find a description of the changes at https://github.com/aws/aws-sdk-net/blob/main/changelogs/SDK.CHANGELOG.ALL.md. * Amazon Elemental MediaLive * Added cmdlet Get-EMLChannelPlacementGroup leveraging the DescribeChannelPlacementGroup service API. diff --git a/changelogs/CHANGELOG.ALL.md b/changelogs/CHANGELOG.ALL.md index 586bdcdf8..b1bd87185 100644 --- a/changelogs/CHANGELOG.ALL.md +++ b/changelogs/CHANGELOG.ALL.md @@ -1,4 +1,27 @@ -### 4.1.654 (2024-09-11 21:07Z) +### 4.1.655 (2024-09-12 21:08Z) + * AWS Tools for PowerShell now use AWS .NET SDK 3.7.885.0 and leverage its new features and improvements. Please find a description of the changes at https://github.com/aws/aws-sdk-net/blob/main/changelogs/SDK.CHANGELOG.ALL.md. + * Amazon CloudWatch Synthetics + * Modified cmdlet New-CWSYNCanary: added parameter ResourcesToReplicateTag. + * Amazon Cognito Identity Provider + * Modified cmdlet Set-CGIPUserMFAPreference: added parameters EmailMfaSettings_Enabled and EmailMfaSettings_PreferredMfa. + * Modified cmdlet Set-CGIPUserMFAPreferenceAdmin: added parameters EmailMfaSettings_Enabled and EmailMfaSettings_PreferredMfa. + * Modified cmdlet Set-CGIPUserPoolMfaConfig: added parameters EmailMfaConfiguration_Message and EmailMfaConfiguration_Subject. + * Amazon Elastic MapReduce + * Modified cmdlet Add-EMRInstanceFleet: added parameters InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference, InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn, InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy, OnDemandResizeSpecification_AllocationStrategy and SpotResizeSpecification_AllocationStrategy. + * Modified cmdlet Edit-EMRInstanceFleet: added parameters CapacityReservationOptions_CapacityReservationPreference, CapacityReservationOptions_CapacityReservationResourceGroupArn, CapacityReservationOptions_UsageStrategy, InstanceFleet_InstanceTypeConfig, OnDemandResizeSpecification_AllocationStrategy and SpotResizeSpecification_AllocationStrategy. + * Amazon Elemental MediaConvert + * Added cmdlet Get-EMCVersionList leveraging the ListVersions service API. + * Modified cmdlet New-EMCJob: added parameter JobEngineVersion. + * Amazon Glue + * Modified cmdlet New-GLUETableOptimizer: added parameters IcebergConfiguration_CleanExpiredFile, IcebergConfiguration_Location, IcebergConfiguration_NumberOfSnapshotsToRetain, IcebergConfiguration_OrphanFileRetentionPeriodInDay and IcebergConfiguration_SnapshotRetentionPeriodInDay. + * Modified cmdlet Update-GLUETableOptimizer: added parameters IcebergConfiguration_CleanExpiredFile, IcebergConfiguration_Location, IcebergConfiguration_NumberOfSnapshotsToRetain, IcebergConfiguration_OrphanFileRetentionPeriodInDay and IcebergConfiguration_SnapshotRetentionPeriodInDay. + * Amazon Storage Gateway + * Modified cmdlet New-SGNFSFileShare: added parameter EncryptionType. + * Modified cmdlet New-SGSMBFileShare: added parameter EncryptionType. + * Modified cmdlet Update-SGNFSFileShare: added parameter EncryptionType. + * Modified cmdlet Update-SGSMBFileShare: added parameter EncryptionType. + +### 4.1.654 (2024-09-11 21:07Z) * AWS Tools for PowerShell now use AWS .NET SDK 3.7.884.0 and leverage its new features and improvements. Please find a description of the changes at https://github.com/aws/aws-sdk-net/blob/main/changelogs/SDK.CHANGELOG.ALL.md. * Amazon Elemental MediaLive * Added cmdlet Get-EMLChannelPlacementGroup leveraging the DescribeChannelPlacementGroup service API. diff --git a/generator/AWSPSGeneratorLib/Config/ServiceConfig/elasticmapreduce.xml b/generator/AWSPSGeneratorLib/Config/ServiceConfig/elasticmapreduce.xml index ca466914a..40618bddc 100644 --- a/generator/AWSPSGeneratorLib/Config/ServiceConfig/elasticmapreduce.xml +++ b/generator/AWSPSGeneratorLib/Config/ServiceConfig/elasticmapreduce.xml @@ -28,7 +28,14 @@ - + + + + + + + + diff --git a/generator/AWSPSGeneratorLib/Config/ServiceConfig/glue.xml b/generator/AWSPSGeneratorLib/Config/ServiceConfig/glue.xml index dde3cab13..90bd21282 100644 --- a/generator/AWSPSGeneratorLib/Config/ServiceConfig/glue.xml +++ b/generator/AWSPSGeneratorLib/Config/ServiceConfig/glue.xml @@ -69,7 +69,7 @@ - + diff --git a/generator/AWSPSGeneratorLib/Config/ServiceConfig/mediaconvert.xml b/generator/AWSPSGeneratorLib/Config/ServiceConfig/mediaconvert.xml index c859b7455..7ab393a5e 100644 --- a/generator/AWSPSGeneratorLib/Config/ServiceConfig/mediaconvert.xml +++ b/generator/AWSPSGeneratorLib/Config/ServiceConfig/mediaconvert.xml @@ -111,6 +111,10 @@ + + + + diff --git a/modules/AWSPowerShell/AWSAliases.ps1 b/modules/AWSPowerShell/AWSAliases.ps1 index a22e390fd..933e5dfe6 100644 --- a/modules/AWSPowerShell/AWSAliases.ps1 +++ b/modules/AWSPowerShell/AWSAliases.ps1 @@ -18501,6 +18501,9 @@ Set-Alias -Name List-EMCQueues -Value Get-EMCQueueList Set-Alias -Name List-EMCQueueList -Value Get-EMCQueueList Set-Alias -Name EMC-ListQueues -Value Get-EMCQueueList Set-Alias -Name EMC-ListTagsForResource -Value Get-EMCResourceTag +Set-Alias -Name List-EMCVersions -Value Get-EMCVersionList +Set-Alias -Name List-EMCVersionList -Value Get-EMCVersionList +Set-Alias -Name EMC-ListVersions -Value Get-EMCVersionList Set-Alias -Name Put-EMCPolicy -Value Write-EMCPolicy Set-Alias -Name EMC-PutPolicy -Value Write-EMCPolicy Set-Alias -Name Search-EMCJobs -Value Search-EMCJob diff --git a/modules/AWSPowerShell/AWSPowerShellCompleters.psm1 b/modules/AWSPowerShell/AWSPowerShellCompleters.psm1 index cf0d703fa..044261500 100644 --- a/modules/AWSPowerShell/AWSPowerShellCompleters.psm1 +++ b/modules/AWSPowerShell/AWSPowerShellCompleters.psm1 @@ -14683,7 +14683,7 @@ $CGIP_Completers = { ($_ -eq "Send-CGIPAuthChallengeResponseAdmin/ChallengeName") } { - $v = "ADMIN_NO_SRP_AUTH","CUSTOM_CHALLENGE","DEVICE_PASSWORD_VERIFIER","DEVICE_SRP_AUTH","MFA_SETUP","NEW_PASSWORD_REQUIRED","PASSWORD_VERIFIER","SELECT_MFA_TYPE","SMS_MFA","SOFTWARE_TOKEN_MFA" + $v = "ADMIN_NO_SRP_AUTH","CUSTOM_CHALLENGE","DEVICE_PASSWORD_VERIFIER","DEVICE_SRP_AUTH","EMAIL_OTP","MFA_SETUP","NEW_PASSWORD_REQUIRED","PASSWORD_VERIFIER","SELECT_MFA_TYPE","SMS_MFA","SOFTWARE_TOKEN_MFA" break } @@ -26755,21 +26755,33 @@ $EMR_Completers = { } # Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference - "Add-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference" + { + ($_ -eq "Add-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference") -Or + ($_ -eq "Edit-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference") -Or + ($_ -eq "Add-EMRInstanceFleet/InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference") + } { $v = "none","open" break } # Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy - "Add-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy") + } { $v = "use-capacity-reservations-first" break } # Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy - "Add-EMRInstanceFleet/OnDemandSpecification_AllocationStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/OnDemandResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/OnDemandResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/OnDemandSpecification_AllocationStrategy") + } { $v = "lowest-price","prioritized" break @@ -26797,7 +26809,11 @@ $EMR_Completers = { } # Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy - "Add-EMRInstanceFleet/SpotSpecification_AllocationStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/SpotResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/SpotResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/SpotSpecification_AllocationStrategy") + } { $v = "capacity-optimized","capacity-optimized-prioritized","diversified","lowest-price","price-capacity-optimized" break @@ -26827,18 +26843,22 @@ $EMR_Completers = { $EMR_map = @{ "AuthMode"=@("New-EMRStudio") - "CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet") - "CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet") + "CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") + "CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "ComputeLimits_UnitType"=@("Start-EMRJobFlow","Write-EMRManagedScalingPolicy") "ExecutionEngine_Type"=@("Start-EMRNotebookExecution") "IdcUserAssignment"=@("New-EMRStudio") "IdentityType"=@("Get-EMRStudioSessionMapping","Get-EMRStudioSessionMappingList","New-EMRStudioSessionMapping","Remove-EMRStudioSessionMapping","Update-EMRStudioSessionMapping") "InstanceFleet_InstanceFleetType"=@("Add-EMRInstanceFleet") + "InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet") + "InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet") "InstanceFleetType"=@("Get-EMRInstanceList") + "OnDemandResizeSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "OnDemandSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet") "OutputNotebookFormat"=@("Start-EMRNotebookExecution") "RepoUpgradeOnBoot"=@("Start-EMRJobFlow") "ScaleDownBehavior"=@("Start-EMRJobFlow") + "SpotResizeSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "SpotSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet") "SpotSpecification_TimeoutAction"=@("Add-EMRInstanceFleet") "Status"=@("Get-EMRNotebookExecutionList") @@ -31212,7 +31232,7 @@ $GLUE_Completers = { ($_ -eq "Update-GLUETableOptimizer/Type") } { - $v = "compaction" + $v = "compaction","orphan_file_deletion","retention" break } @@ -44033,6 +44053,7 @@ $EMC_SelectMap = @{ "Get-EMCPresetList", "Get-EMCQueueList", "Get-EMCResourceTag", + "Get-EMCVersionList", "Write-EMCPolicy", "Search-EMCJob", "Add-EMCResourceTag", @@ -66894,6 +66915,18 @@ $SG_Completers = { break } + # Amazon.StorageGateway.EncryptionType + { + ($_ -eq "New-SGNFSFileShare/EncryptionType") -Or + ($_ -eq "New-SGSMBFileShare/EncryptionType") -Or + ($_ -eq "Update-SGNFSFileShare/EncryptionType") -Or + ($_ -eq "Update-SGSMBFileShare/EncryptionType") + } + { + $v = "DsseKms","SseKms","SseS3" + break + } + # Amazon.StorageGateway.GatewayCapacity "Update-SGGatewayInformation/GatewayCapacity" { @@ -66944,6 +66977,7 @@ $SG_Completers = { $SG_map = @{ "CaseSensitivity"=@("New-SGSMBFileShare","Update-SGSMBFileShare") + "EncryptionType"=@("New-SGNFSFileShare","New-SGSMBFileShare","Update-SGNFSFileShare","Update-SGSMBFileShare") "GatewayCapacity"=@("Update-SGGatewayInformation") "ObjectACL"=@("New-SGNFSFileShare","New-SGSMBFileShare","Update-SGNFSFileShare","Update-SGSMBFileShare") "RetentionLockType"=@("New-SGTapePool") diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/AWS.Tools.CognitoIdentityProvider.Completers.psm1 b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/AWS.Tools.CognitoIdentityProvider.Completers.psm1 index 765ad785a..9f7101ca6 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/AWS.Tools.CognitoIdentityProvider.Completers.psm1 +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/AWS.Tools.CognitoIdentityProvider.Completers.psm1 @@ -127,7 +127,7 @@ $CGIP_Completers = { ($_ -eq "Send-CGIPAuthChallengeResponseAdmin/ChallengeName") } { - $v = "ADMIN_NO_SRP_AUTH","CUSTOM_CHALLENGE","DEVICE_PASSWORD_VERIFIER","DEVICE_SRP_AUTH","MFA_SETUP","NEW_PASSWORD_REQUIRED","PASSWORD_VERIFIER","SELECT_MFA_TYPE","SMS_MFA","SOFTWARE_TOKEN_MFA" + $v = "ADMIN_NO_SRP_AUTH","CUSTOM_CHALLENGE","DEVICE_PASSWORD_VERIFIER","DEVICE_SRP_AUTH","EMAIL_OTP","MFA_SETUP","NEW_PASSWORD_REQUIRED","PASSWORD_VERIFIER","SELECT_MFA_TYPE","SMS_MFA","SOFTWARE_TOKEN_MFA" break } diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Get-CGIPUserAttributeVerificationCode-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Get-CGIPUserAttributeVerificationCode-Cmdlet.cs index 9fd356545..8c309c5d2 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Get-CGIPUserAttributeVerificationCode-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Get-CGIPUserAttributeVerificationCode-Cmdlet.cs @@ -51,7 +51,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserAdmin-Cmdlet.cs index cf511e088..82b7589bb 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserAdmin-Cmdlet.cs @@ -44,7 +44,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPool-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPool-Cmdlet.cs index d93b87148..c58983180 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPool-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPool-Cmdlet.cs @@ -38,7 +38,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPoolClient-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPoolClient-Cmdlet.cs index 4c3d78647..20f06962c 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPoolClient-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/New-CGIPUserPoolClient-Cmdlet.cs @@ -346,17 +346,17 @@ public partial class NewCGIPUserPoolClientCmdlet : AmazonCognitoIdentityProvider #region Parameter ReadAttribute /// /// - /// The list of user attributes that you want your app client to have read-only access - /// to. After your user authenticates in your app, their access token authorizes them - /// to read their own attribute value for any attribute in this list. An example of this - /// kind of activity is when your user selects a link to view their profile information. - /// Your app makes a GetUser + /// The list of user attributes that you want your app client to have read access to. + /// After your user authenticates in your app, their access token authorizes them to read + /// their own attribute value for any attribute in this list. An example of this kind + /// of activity is when your user selects a link to view their profile information. Your + /// app makes a GetUser /// API request to retrieve and display your user's profile data.When you don't specify the ReadAttributes for your app client, your app can /// read the values of email_verified, phone_number_verified, and the Standard - /// attributes of your user pool. When your user pool has read access to these default - /// attributes, ReadAttributes doesn't return any information. Amazon Cognito only - /// populates ReadAttributes in the API response if you have specified your own - /// custom set of read attributes. + /// attributes of your user pool. When your user pool app client has read access to these + /// default attributes, ReadAttributes doesn't return any information. Amazon Cognito + /// only populates ReadAttributes in the API response if you have specified your + /// own custom set of read attributes. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Register-CGIPUserInPool-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Register-CGIPUserInPool-Cmdlet.cs index 1d757b0d0..2f8931949 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Register-CGIPUserInPool-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Register-CGIPUserInPool-Cmdlet.cs @@ -47,7 +47,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPForgottenPassword-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPForgottenPassword-Cmdlet.cs index a265eee69..4cac37a2b 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPForgottenPassword-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPForgottenPassword-Cmdlet.cs @@ -62,7 +62,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPUserPasswordAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPUserPasswordAdmin-Cmdlet.cs index 546506583..c760f2bfb 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPUserPasswordAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Reset-CGIPUserPasswordAdmin-Cmdlet.cs @@ -46,7 +46,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponse-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponse-Cmdlet.cs index eb680d2cb..5fece2596 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponse-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponse-Cmdlet.cs @@ -54,7 +54,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into @@ -111,8 +111,11 @@ public partial class SendCGIPAuthChallengeResponseCmdlet : AmazonCognitoIdentity /// The responses to the challenge that you received in the previous request. Each challenge /// has its own required response parameters. The following examples are partial JSON /// request bodies that highlight challenge-response parameters.You must provide a SECRET_HASH parameter in all challenge responses to an app client - /// that has a client secret.
SMS_MFA
"ChallengeName": "SMS_MFA", "ChallengeResponses": {"SMS_MFA_CODE": "[SMS_code]", - /// "USERNAME": "[username]"}
PASSWORD_VERIFIER
"ChallengeName": "PASSWORD_VERIFIER", "ChallengeResponses": {"PASSWORD_CLAIM_SIGNATURE": + /// that has a client secret.
SMS_MFA
"ChallengeName": "SMS_MFA", "ChallengeResponses": {"SMS_MFA_CODE": "[code]", "USERNAME": + /// "[username]"}
EMAIL_OTP
"ChallengeName": "EMAIL_OTP", "ChallengeResponses": {"EMAIL_OTP_CODE": "[code]", + /// "USERNAME": "[username]"}
PASSWORD_VERIFIER
This challenge response is part of the SRP flow. Amazon Cognito requires that your + /// application respond to this challenge within a few seconds. When the response time + /// exceeds this period, your user pool returns a NotAuthorizedException error."ChallengeName": "PASSWORD_VERIFIER", "ChallengeResponses": {"PASSWORD_CLAIM_SIGNATURE": /// "[claim_signature]", "PASSWORD_CLAIM_SECRET_BLOCK": "[secret_block]", "TIMESTAMP": /// [timestamp], "USERNAME": "[username]"}Add "DEVICE_KEY" when you sign in with a remembered device.
CUSTOM_CHALLENGE
"ChallengeName": "CUSTOM_CHALLENGE", "ChallengeResponses": {"USERNAME": "[username]", /// "ANSWER": "[challenge_answer]"}Add "DEVICE_KEY" when you sign in with a remembered device.
NEW_PASSWORD_REQUIRED
"ChallengeName": "NEW_PASSWORD_REQUIRED", "ChallengeResponses": {"NEW_PASSWORD": diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponseAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponseAdmin-Cmdlet.cs index ea158cef8..e59fcda50 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponseAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPAuthChallengeResponseAdmin-Cmdlet.cs @@ -48,7 +48,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into @@ -111,8 +111,11 @@ public partial class SendCGIPAuthChallengeResponseAdminCmdlet : AmazonCognitoIde /// The responses to the challenge that you received in the previous request. Each challenge /// has its own required response parameters. The following examples are partial JSON /// request bodies that highlight challenge-response parameters.You must provide a SECRET_HASH parameter in all challenge responses to an app client - /// that has a client secret.
SMS_MFA
"ChallengeName": "SMS_MFA", "ChallengeResponses": {"SMS_MFA_CODE": "[SMS_code]", - /// "USERNAME": "[username]"}
PASSWORD_VERIFIER
"ChallengeName": "PASSWORD_VERIFIER", "ChallengeResponses": {"PASSWORD_CLAIM_SIGNATURE": + /// that has a client secret.
SMS_MFA
"ChallengeName": "SMS_MFA", "ChallengeResponses": {"SMS_MFA_CODE": "[code]", "USERNAME": + /// "[username]"}
EMAIL_OTP
"ChallengeName": "EMAIL_OTP", "ChallengeResponses": {"EMAIL_OTP_CODE": "[code]", + /// "USERNAME": "[username]"}
PASSWORD_VERIFIER
This challenge response is part of the SRP flow. Amazon Cognito requires that your + /// application respond to this challenge within a few seconds. When the response time + /// exceeds this period, your user pool returns a NotAuthorizedException error."ChallengeName": "PASSWORD_VERIFIER", "ChallengeResponses": {"PASSWORD_CLAIM_SIGNATURE": /// "[claim_signature]", "PASSWORD_CLAIM_SECRET_BLOCK": "[secret_block]", "TIMESTAMP": /// [timestamp], "USERNAME": "[username]"}Add "DEVICE_KEY" when you sign in with a remembered device.
CUSTOM_CHALLENGE
"ChallengeName": "CUSTOM_CHALLENGE", "ChallengeResponses": {"USERNAME": "[username]", /// "ANSWER": "[challenge_answer]"}Add "DEVICE_KEY" when you sign in with a remembered device.
NEW_PASSWORD_REQUIRED
"ChallengeName": "NEW_PASSWORD_REQUIRED", "ChallengeResponses": {"NEW_PASSWORD": diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPConfirmationCode-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPConfirmationCode-Cmdlet.cs index 5b3105397..146c49453 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPConfirmationCode-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Send-CGIPConfirmationCode-Cmdlet.cs @@ -47,7 +47,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreference-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreference-Cmdlet.cs index 4f24fe55c..2f8c16aa0 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreference-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreference-Cmdlet.cs @@ -82,10 +82,33 @@ public partial class SetCGIPUserMFAPreferenceCmdlet : AmazonCognitoIdentityProvi public System.String AccessToken { get; set; } #endregion + #region Parameter EmailMfaSettings_Enabled + /// + /// + /// Specifies whether email message MFA is active for a user. When the value of this parameter + /// is Enabled, the user will be prompted for MFA during all sign-in attempts, + /// unless device tracking is turned on and the device has been trusted. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.Boolean? EmailMfaSettings_Enabled { get; set; } + #endregion + + #region Parameter EmailMfaSettings_PreferredMfa + /// + /// + /// Specifies whether email message MFA is the user's preferred method. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.Boolean? EmailMfaSettings_PreferredMfa { get; set; } + #endregion + #region Parameter SMSMfaSetting /// /// - /// The SMS text message multi-factor authentication (MFA) settings. + /// User preferences for SMS message MFA. Activates or deactivates SMS MFA and sets it + /// as the preferred MFA method when multiple methods are available. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -96,7 +119,8 @@ public partial class SetCGIPUserMFAPreferenceCmdlet : AmazonCognitoIdentityProvi #region Parameter SoftwareTokenMfaSetting /// /// - /// The time-based one-time password (TOTP) software token MFA settings. + /// User preferences for time-based one-time password (TOTP) MFA. Activates or deactivates + /// TOTP MFA and sets it as the preferred MFA method when multiple methods are available. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -152,6 +176,8 @@ protected override void ProcessRecord() WriteWarning("You are passing $null as a value for parameter AccessToken which is marked as required. In case you believe this parameter was incorrectly marked as required, report this by opening an issue at https://github.com/aws/aws-tools-for-powershell/issues."); } #endif + context.EmailMfaSettings_Enabled = this.EmailMfaSettings_Enabled; + context.EmailMfaSettings_PreferredMfa = this.EmailMfaSettings_PreferredMfa; context.SMSMfaSetting = this.SMSMfaSetting; context.SoftwareTokenMfaSetting = this.SoftwareTokenMfaSetting; @@ -174,6 +200,35 @@ public object Execute(ExecutorContext context) { request.AccessToken = cmdletContext.AccessToken; } + + // populate EmailMfaSettings + var requestEmailMfaSettingsIsNull = true; + request.EmailMfaSettings = new Amazon.CognitoIdentityProvider.Model.EmailMfaSettingsType(); + System.Boolean? requestEmailMfaSettings_emailMfaSettings_Enabled = null; + if (cmdletContext.EmailMfaSettings_Enabled != null) + { + requestEmailMfaSettings_emailMfaSettings_Enabled = cmdletContext.EmailMfaSettings_Enabled.Value; + } + if (requestEmailMfaSettings_emailMfaSettings_Enabled != null) + { + request.EmailMfaSettings.Enabled = requestEmailMfaSettings_emailMfaSettings_Enabled.Value; + requestEmailMfaSettingsIsNull = false; + } + System.Boolean? requestEmailMfaSettings_emailMfaSettings_PreferredMfa = null; + if (cmdletContext.EmailMfaSettings_PreferredMfa != null) + { + requestEmailMfaSettings_emailMfaSettings_PreferredMfa = cmdletContext.EmailMfaSettings_PreferredMfa.Value; + } + if (requestEmailMfaSettings_emailMfaSettings_PreferredMfa != null) + { + request.EmailMfaSettings.PreferredMfa = requestEmailMfaSettings_emailMfaSettings_PreferredMfa.Value; + requestEmailMfaSettingsIsNull = false; + } + // determine if request.EmailMfaSettings should be set to null + if (requestEmailMfaSettingsIsNull) + { + request.EmailMfaSettings = null; + } if (cmdletContext.SMSMfaSetting != null) { request.SMSMfaSettings = cmdletContext.SMSMfaSetting; @@ -244,6 +299,8 @@ private Amazon.CognitoIdentityProvider.Model.SetUserMFAPreferenceResponse CallAW internal partial class CmdletContext : ExecutorContext { public System.String AccessToken { get; set; } + public System.Boolean? EmailMfaSettings_Enabled { get; set; } + public System.Boolean? EmailMfaSettings_PreferredMfa { get; set; } public Amazon.CognitoIdentityProvider.Model.SMSMfaSettingsType SMSMfaSetting { get; set; } public Amazon.CognitoIdentityProvider.Model.SoftwareTokenMfaSettingsType SoftwareTokenMfaSetting { get; set; } public System.Func Select { get; set; } = diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreferenceAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreferenceAdmin-Cmdlet.cs index e6619cf65..1a21cdca6 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreferenceAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserMFAPreferenceAdmin-Cmdlet.cs @@ -28,8 +28,8 @@ namespace Amazon.PowerShell.Cmdlets.CGIP { /// - /// The user's multi-factor authentication (MFA) preference, including which MFA options - /// are activated, and if any are preferred. Only one factor can be set as preferred. + /// Sets the user's multi-factor authentication (MFA) preference, including which MFA + /// options are activated, and if any are preferred. Only one factor can be set as preferred. /// The preferred MFA factor will be used to authenticate a user if multiple factors are /// activated. If multiple options are activated and no preference is set, a challenge /// to choose an MFA option will be returned during sign-in. @@ -56,10 +56,33 @@ public partial class SetCGIPUserMFAPreferenceAdminCmdlet : AmazonCognitoIdentity protected override bool IsGeneratedCmdlet { get; set; } = true; + #region Parameter EmailMfaSettings_Enabled + /// + /// + /// Specifies whether email message MFA is active for a user. When the value of this parameter + /// is Enabled, the user will be prompted for MFA during all sign-in attempts, + /// unless device tracking is turned on and the device has been trusted. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.Boolean? EmailMfaSettings_Enabled { get; set; } + #endregion + + #region Parameter EmailMfaSettings_PreferredMfa + /// + /// + /// Specifies whether email message MFA is the user's preferred method. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.Boolean? EmailMfaSettings_PreferredMfa { get; set; } + #endregion + #region Parameter SMSMfaSetting /// /// - /// The SMS text message MFA settings. + /// User preferences for SMS message MFA. Activates or deactivates SMS MFA and sets it + /// as the preferred MFA method when multiple methods are available. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -70,7 +93,8 @@ public partial class SetCGIPUserMFAPreferenceAdminCmdlet : AmazonCognitoIdentity #region Parameter SoftwareTokenMfaSetting /// /// - /// The time-based one-time password software token MFA settings. + /// User preferences for time-based one-time password (TOTP) MFA. Activates or deactivates + /// TOTP MFA and sets it as the preferred MFA method when multiple methods are available. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -101,7 +125,7 @@ public partial class SetCGIPUserMFAPreferenceAdminCmdlet : AmazonCognitoIdentity #region Parameter UserPoolId /// /// - /// The user pool ID. + /// The ID of the user pool where you want to set a user's MFA preferences. /// /// #if !MODULAR @@ -176,6 +200,8 @@ protected override void ProcessRecord() context.Select = (response, cmdlet) => this.UserPoolId; } #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute + context.EmailMfaSettings_Enabled = this.EmailMfaSettings_Enabled; + context.EmailMfaSettings_PreferredMfa = this.EmailMfaSettings_PreferredMfa; context.SMSMfaSetting = this.SMSMfaSetting; context.SoftwareTokenMfaSetting = this.SoftwareTokenMfaSetting; context.Username = this.Username; @@ -208,6 +234,35 @@ public object Execute(ExecutorContext context) // create request var request = new Amazon.CognitoIdentityProvider.Model.AdminSetUserMFAPreferenceRequest(); + + // populate EmailMfaSettings + var requestEmailMfaSettingsIsNull = true; + request.EmailMfaSettings = new Amazon.CognitoIdentityProvider.Model.EmailMfaSettingsType(); + System.Boolean? requestEmailMfaSettings_emailMfaSettings_Enabled = null; + if (cmdletContext.EmailMfaSettings_Enabled != null) + { + requestEmailMfaSettings_emailMfaSettings_Enabled = cmdletContext.EmailMfaSettings_Enabled.Value; + } + if (requestEmailMfaSettings_emailMfaSettings_Enabled != null) + { + request.EmailMfaSettings.Enabled = requestEmailMfaSettings_emailMfaSettings_Enabled.Value; + requestEmailMfaSettingsIsNull = false; + } + System.Boolean? requestEmailMfaSettings_emailMfaSettings_PreferredMfa = null; + if (cmdletContext.EmailMfaSettings_PreferredMfa != null) + { + requestEmailMfaSettings_emailMfaSettings_PreferredMfa = cmdletContext.EmailMfaSettings_PreferredMfa.Value; + } + if (requestEmailMfaSettings_emailMfaSettings_PreferredMfa != null) + { + request.EmailMfaSettings.PreferredMfa = requestEmailMfaSettings_emailMfaSettings_PreferredMfa.Value; + requestEmailMfaSettingsIsNull = false; + } + // determine if request.EmailMfaSettings should be set to null + if (requestEmailMfaSettingsIsNull) + { + request.EmailMfaSettings = null; + } if (cmdletContext.SMSMfaSetting != null) { request.SMSMfaSettings = cmdletContext.SMSMfaSetting; @@ -285,6 +340,8 @@ private Amazon.CognitoIdentityProvider.Model.AdminSetUserMFAPreferenceResponse C internal partial class CmdletContext : ExecutorContext { + public System.Boolean? EmailMfaSettings_Enabled { get; set; } + public System.Boolean? EmailMfaSettings_PreferredMfa { get; set; } public Amazon.CognitoIdentityProvider.Model.SMSMfaSettingsType SMSMfaSetting { get; set; } public Amazon.CognitoIdentityProvider.Model.SoftwareTokenMfaSettingsType SoftwareTokenMfaSetting { get; set; } public System.String Username { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserPoolMfaConfig-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserPoolMfaConfig-Cmdlet.cs index 9a3b95390..65f3f9ca1 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserPoolMfaConfig-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Set-CGIPUserPoolMfaConfig-Cmdlet.cs @@ -40,7 +40,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into @@ -60,6 +60,19 @@ public partial class SetCGIPUserPoolMfaConfigCmdlet : AmazonCognitoIdentityProvi protected override bool IsGeneratedCmdlet { get; set; } = true; + #region Parameter EmailMfaConfiguration_Message + /// + /// + /// The template for the email message that your user pool sends to users with an MFA + /// code. The message must contain the {####} placeholder. In the message, Amazon + /// Cognito replaces this placeholder with the code. If you don't provide this parameter, + /// Amazon Cognito sends messages in the default format. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.String EmailMfaConfiguration_Message { get; set; } + #endregion + #region Parameter MfaConfiguration /// /// @@ -77,7 +90,8 @@ public partial class SetCGIPUserPoolMfaConfigCmdlet : AmazonCognitoIdentityProvi #region Parameter SmsMfaConfiguration /// /// - /// The SMS text message MFA configuration. + /// Configures user pool SMS messages for MFA. Sets the message template and the SMS message + /// sending configuration for Amazon SNS. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -87,13 +101,24 @@ public partial class SetCGIPUserPoolMfaConfigCmdlet : AmazonCognitoIdentityProvi #region Parameter SoftwareTokenMfaConfiguration /// /// - /// The software token MFA configuration. + /// Configures a user pool for time-based one-time password (TOTP) MFA. Enables or disables + /// TOTP. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] public Amazon.CognitoIdentityProvider.Model.SoftwareTokenMfaConfigType SoftwareTokenMfaConfiguration { get; set; } #endregion + #region Parameter EmailMfaConfiguration_Subject + /// + /// + /// The subject of the email message that your user pool sends to users with an MFA code. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.String EmailMfaConfiguration_Subject { get; set; } + #endregion + #region Parameter UserPoolId /// /// @@ -173,6 +198,8 @@ protected override void ProcessRecord() context.Select = (response, cmdlet) => this.UserPoolId; } #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute + context.EmailMfaConfiguration_Message = this.EmailMfaConfiguration_Message; + context.EmailMfaConfiguration_Subject = this.EmailMfaConfiguration_Subject; context.MfaConfiguration = this.MfaConfiguration; context.SmsMfaConfiguration = this.SmsMfaConfiguration; context.SoftwareTokenMfaConfiguration = this.SoftwareTokenMfaConfiguration; @@ -199,6 +226,35 @@ public object Execute(ExecutorContext context) // create request var request = new Amazon.CognitoIdentityProvider.Model.SetUserPoolMfaConfigRequest(); + + // populate EmailMfaConfiguration + var requestEmailMfaConfigurationIsNull = true; + request.EmailMfaConfiguration = new Amazon.CognitoIdentityProvider.Model.EmailMfaConfigType(); + System.String requestEmailMfaConfiguration_emailMfaConfiguration_Message = null; + if (cmdletContext.EmailMfaConfiguration_Message != null) + { + requestEmailMfaConfiguration_emailMfaConfiguration_Message = cmdletContext.EmailMfaConfiguration_Message; + } + if (requestEmailMfaConfiguration_emailMfaConfiguration_Message != null) + { + request.EmailMfaConfiguration.Message = requestEmailMfaConfiguration_emailMfaConfiguration_Message; + requestEmailMfaConfigurationIsNull = false; + } + System.String requestEmailMfaConfiguration_emailMfaConfiguration_Subject = null; + if (cmdletContext.EmailMfaConfiguration_Subject != null) + { + requestEmailMfaConfiguration_emailMfaConfiguration_Subject = cmdletContext.EmailMfaConfiguration_Subject; + } + if (requestEmailMfaConfiguration_emailMfaConfiguration_Subject != null) + { + request.EmailMfaConfiguration.Subject = requestEmailMfaConfiguration_emailMfaConfiguration_Subject; + requestEmailMfaConfigurationIsNull = false; + } + // determine if request.EmailMfaConfiguration should be set to null + if (requestEmailMfaConfigurationIsNull) + { + request.EmailMfaConfiguration = null; + } if (cmdletContext.MfaConfiguration != null) { request.MfaConfiguration = cmdletContext.MfaConfiguration; @@ -276,6 +332,8 @@ private Amazon.CognitoIdentityProvider.Model.SetUserPoolMfaConfigResponse CallAW internal partial class CmdletContext : ExecutorContext { + public System.String EmailMfaConfiguration_Message { get; set; } + public System.String EmailMfaConfiguration_Subject { get; set; } public Amazon.CognitoIdentityProvider.UserPoolMfaType MfaConfiguration { get; set; } public Amazon.CognitoIdentityProvider.Model.SmsMfaConfigType SmsMfaConfiguration { get; set; } public Amazon.CognitoIdentityProvider.Model.SoftwareTokenMfaConfigType SoftwareTokenMfaConfiguration { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuth-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuth-Cmdlet.cs index bf6df411d..221f59f83 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuth-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuth-Cmdlet.cs @@ -49,7 +49,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuthAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuthAdmin-Cmdlet.cs index f337d172e..8e00edcd9 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuthAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Start-CGIPAuthAdmin-Cmdlet.cs @@ -40,7 +40,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttribute-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttribute-Cmdlet.cs index 28d0b9803..728e7486c 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttribute-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttribute-Cmdlet.cs @@ -53,7 +53,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttributeAdmin-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttributeAdmin-Cmdlet.cs index 3cf0d53f9..a3f0e1d7e 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttributeAdmin-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserAttributeAdmin-Cmdlet.cs @@ -38,7 +38,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPool-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPool-Cmdlet.cs index a55dff310..2e5b31d75 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPool-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPool-Cmdlet.cs @@ -38,7 +38,7 @@ namespace Amazon.PowerShell.Cmdlets.CGIP /// their accounts, or sign in. /// /// If you have never used SMS text messages with Amazon Cognito or any other Amazon Web - /// Services service, Amazon Simple Notification Service might place your account in the + /// Servicesservice, Amazon Simple Notification Service might place your account in the /// SMS sandbox. In sandbox /// mode, you can send messages only to verified phone numbers. After you test /// your app while in the sandbox environment, you can move out of the sandbox and into diff --git a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPoolClient-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPoolClient-Cmdlet.cs index b84258a8d..4f49bf284 100644 --- a/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPoolClient-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/CognitoIdentityProvider/Basic/Update-CGIPUserPoolClient-Cmdlet.cs @@ -343,17 +343,17 @@ public partial class UpdateCGIPUserPoolClientCmdlet : AmazonCognitoIdentityProvi #region Parameter ReadAttribute /// /// - /// The list of user attributes that you want your app client to have read-only access - /// to. After your user authenticates in your app, their access token authorizes them - /// to read their own attribute value for any attribute in this list. An example of this - /// kind of activity is when your user selects a link to view their profile information. - /// Your app makes a GetUser + /// The list of user attributes that you want your app client to have read access to. + /// After your user authenticates in your app, their access token authorizes them to read + /// their own attribute value for any attribute in this list. An example of this kind + /// of activity is when your user selects a link to view their profile information. Your + /// app makes a GetUser /// API request to retrieve and display your user's profile data.When you don't specify the ReadAttributes for your app client, your app can /// read the values of email_verified, phone_number_verified, and the Standard - /// attributes of your user pool. When your user pool has read access to these default - /// attributes, ReadAttributes doesn't return any information. Amazon Cognito only - /// populates ReadAttributes in the API response if you have specified your own - /// custom set of read attributes. + /// attributes of your user pool. When your user pool app client has read access to these + /// default attributes, ReadAttributes doesn't return any information. Amazon Cognito + /// only populates ReadAttributes in the API response if you have specified your + /// own custom set of read attributes. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/AWS.Tools.ElasticMapReduce.Completers.psm1 b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/AWS.Tools.ElasticMapReduce.Completers.psm1 index 7e30832ee..9c2362664 100644 --- a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/AWS.Tools.ElasticMapReduce.Completers.psm1 +++ b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/AWS.Tools.ElasticMapReduce.Completers.psm1 @@ -142,21 +142,33 @@ $EMR_Completers = { } # Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference - "Add-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference" + { + ($_ -eq "Add-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference") -Or + ($_ -eq "Edit-EMRInstanceFleet/CapacityReservationOptions_CapacityReservationPreference") -Or + ($_ -eq "Add-EMRInstanceFleet/InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference") + } { $v = "none","open" break } # Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy - "Add-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/CapacityReservationOptions_UsageStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy") + } { $v = "use-capacity-reservations-first" break } # Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy - "Add-EMRInstanceFleet/OnDemandSpecification_AllocationStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/OnDemandResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/OnDemandResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/OnDemandSpecification_AllocationStrategy") + } { $v = "lowest-price","prioritized" break @@ -184,7 +196,11 @@ $EMR_Completers = { } # Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy - "Add-EMRInstanceFleet/SpotSpecification_AllocationStrategy" + { + ($_ -eq "Add-EMRInstanceFleet/SpotResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Edit-EMRInstanceFleet/SpotResizeSpecification_AllocationStrategy") -Or + ($_ -eq "Add-EMRInstanceFleet/SpotSpecification_AllocationStrategy") + } { $v = "capacity-optimized","capacity-optimized-prioritized","diversified","lowest-price","price-capacity-optimized" break @@ -214,18 +230,22 @@ $EMR_Completers = { $EMR_map = @{ "AuthMode"=@("New-EMRStudio") - "CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet") - "CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet") + "CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") + "CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "ComputeLimits_UnitType"=@("Start-EMRJobFlow","Write-EMRManagedScalingPolicy") "ExecutionEngine_Type"=@("Start-EMRNotebookExecution") "IdcUserAssignment"=@("New-EMRStudio") "IdentityType"=@("Get-EMRStudioSessionMapping","Get-EMRStudioSessionMappingList","New-EMRStudioSessionMapping","Remove-EMRStudioSessionMapping","Update-EMRStudioSessionMapping") "InstanceFleet_InstanceFleetType"=@("Add-EMRInstanceFleet") + "InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference"=@("Add-EMRInstanceFleet") + "InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy"=@("Add-EMRInstanceFleet") "InstanceFleetType"=@("Get-EMRInstanceList") + "OnDemandResizeSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "OnDemandSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet") "OutputNotebookFormat"=@("Start-EMRNotebookExecution") "RepoUpgradeOnBoot"=@("Start-EMRJobFlow") "ScaleDownBehavior"=@("Start-EMRJobFlow") + "SpotResizeSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet","Edit-EMRInstanceFleet") "SpotSpecification_AllocationStrategy"=@("Add-EMRInstanceFleet") "SpotSpecification_TimeoutAction"=@("Add-EMRInstanceFleet") "Status"=@("Get-EMRNotebookExecutionList") diff --git a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Add-EMRInstanceFleet-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Add-EMRInstanceFleet-Cmdlet.cs index b1264691c..5ed6632fa 100644 --- a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Add-EMRInstanceFleet-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Add-EMRInstanceFleet-Cmdlet.cs @@ -78,6 +78,33 @@ public partial class AddEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCmd public Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy SpotSpecification_AllocationStrategy { get; set; } #endregion + #region Parameter OnDemandResizeSpecification_AllocationStrategy + /// + /// + /// Specifies the allocation strategy to use to launch On-Demand instances during a resize. + /// The default is lowest-price. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_AllocationStrategy")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy")] + public Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy OnDemandResizeSpecification_AllocationStrategy { get; set; } + #endregion + + #region Parameter SpotResizeSpecification_AllocationStrategy + /// + /// + /// Specifies the allocation strategy to use to launch Spot instances during a resize. + /// If you run Amazon EMR releases 6.9.0 or higher, the default is price-capacity-optimized. + /// If you run Amazon EMR releases 6.8.0 or lower, the default is capacity-optimized. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_SpotResizeSpecification_AllocationStrategy")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy")] + public Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy SpotResizeSpecification_AllocationStrategy { get; set; } + #endregion + #region Parameter SpotSpecification_BlockDurationMinute /// /// @@ -112,6 +139,19 @@ public partial class AddEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCmd public Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference CapacityReservationOptions_CapacityReservationPreference { get; set; } #endregion + #region Parameter InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference + /// + /// + /// Indicates the instance's Capacity Reservation preferences. Possible preferences include:
  • open - The instance can run in any open Capacity Reservation that has matching + /// attributes (instance type, platform, Availability Zone).
  • none - The instance avoids running in a Capacity Reservation even if one is + /// available. The instance runs as an On-Demand Instance.
+ /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference")] + public Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference { get; set; } + #endregion + #region Parameter CapacityReservationOptions_CapacityReservationResourceGroupArn /// /// @@ -123,6 +163,16 @@ public partial class AddEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCmd public System.String CapacityReservationOptions_CapacityReservationResourceGroupArn { get; set; } #endregion + #region Parameter InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn + /// + /// + /// The ARN of the Capacity Reservation resource group in which to run the instance. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.String InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn { get; set; } + #endregion + #region Parameter ClusterId /// /// @@ -305,6 +355,23 @@ public partial class AddEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCmd public Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy CapacityReservationOptions_UsageStrategy { get; set; } #endregion + #region Parameter InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy + /// + /// + /// Indicates whether to use unused Capacity Reservations for fulfilling On-Demand capacity.If you specify use-capacity-reservations-first, the fleet uses unused Capacity + /// Reservations to fulfill On-Demand capacity up to the target On-Demand capacity. If + /// multiple instance pools have unused Capacity Reservations, the On-Demand allocation + /// strategy (lowest-price) is applied. If the number of unused Capacity Reservations + /// is less than the On-Demand target capacity, the remaining On-Demand target capacity + /// is launched according to the On-Demand allocation strategy (lowest-price).If you do not specify a value, the fleet fulfills the On-Demand capacity according + /// to the chosen On-Demand allocation strategy. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy")] + public Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The default value is '*'. @@ -394,7 +461,12 @@ protected override void ProcessRecord() context.SpotSpecification_TimeoutAction = this.SpotSpecification_TimeoutAction; context.SpotSpecification_TimeoutDurationMinute = this.SpotSpecification_TimeoutDurationMinute; context.InstanceFleet_Name = this.InstanceFleet_Name; + context.OnDemandResizeSpecification_AllocationStrategy = this.OnDemandResizeSpecification_AllocationStrategy; + context.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference = this.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference; + context.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn = this.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn; + context.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy = this.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy; context.OnDemandResizeSpecification_TimeoutDurationMinute = this.OnDemandResizeSpecification_TimeoutDurationMinute; + context.SpotResizeSpecification_AllocationStrategy = this.SpotResizeSpecification_AllocationStrategy; context.SpotResizeSpecification_TimeoutDurationMinute = this.SpotResizeSpecification_TimeoutDurationMinute; context.InstanceFleet_TargetOnDemandCapacity = this.InstanceFleet_TargetOnDemandCapacity; context.InstanceFleet_TargetSpotCapacity = this.InstanceFleet_TargetSpotCapacity; @@ -617,11 +689,56 @@ public object Execute(ExecutorContext context) // populate ResizeSpecifications var requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = true; requestInstanceFleet_instanceFleet_ResizeSpecifications = new Amazon.ElasticMapReduce.Model.InstanceFleetResizingSpecifications(); + Amazon.ElasticMapReduce.Model.SpotResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + + // populate SpotResizeSpecification + var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = true; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = new Amazon.ElasticMapReduce.Model.SpotResizingSpecification(); + Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy = null; + if (cmdletContext.SpotResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy = cmdletContext.SpotResizeSpecification_AllocationStrategy; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.AllocationStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + } + System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = null; + if (cmdletContext.SpotResizeSpecification_TimeoutDurationMinute != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = cmdletContext.SpotResizeSpecification_TimeoutDurationMinute.Value; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute.Value; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications.SpotResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification; + requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; + } Amazon.ElasticMapReduce.Model.OnDemandResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; // populate OnDemandResizeSpecification var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = true; requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = new Amazon.ElasticMapReduce.Model.OnDemandResizingSpecification(); + Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy = null; + if (cmdletContext.OnDemandResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy = cmdletContext.OnDemandResizeSpecification_AllocationStrategy; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.AllocationStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; + } System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_TimeoutDurationMinute = null; if (cmdletContext.OnDemandResizeSpecification_TimeoutDurationMinute != null) { @@ -632,39 +749,59 @@ public object Execute(ExecutorContext context) requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_TimeoutDurationMinute.Value; requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; } - // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification should be set to null - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull) + Amazon.ElasticMapReduce.Model.OnDemandCapacityReservationOptions requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = null; + + // populate CapacityReservationOptions + var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = true; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = new Amazon.ElasticMapReduce.Model.OnDemandCapacityReservationOptions(); + Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference = null; + if (cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference = cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications.OnDemandResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification; - requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.CapacityReservationPreference = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; } - Amazon.ElasticMapReduce.Model.SpotResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; - - // populate SpotResizeSpecification - var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = true; - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = new Amazon.ElasticMapReduce.Model.SpotResizingSpecification(); - System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = null; - if (cmdletContext.SpotResizeSpecification_TimeoutDurationMinute != null) + System.String requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn = null; + if (cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = cmdletContext.SpotResizeSpecification_TimeoutDurationMinute.Value; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn = cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute.Value; - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.CapacityReservationResourceGroupArn = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; } - // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification should be set to null - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull) + Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy = null; + if (cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy = cmdletContext.InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications.SpotResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.UsageStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.CapacityReservationOptions = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications.OnDemandResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification; requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; } // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications should be set to null @@ -755,7 +892,12 @@ internal partial class CmdletContext : ExecutorContext public Amazon.ElasticMapReduce.SpotProvisioningTimeoutAction SpotSpecification_TimeoutAction { get; set; } public System.Int32? SpotSpecification_TimeoutDurationMinute { get; set; } public System.String InstanceFleet_Name { get; set; } + public Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy OnDemandResizeSpecification_AllocationStrategy { get; set; } + public Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference { get; set; } + public System.String InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn { get; set; } + public Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy { get; set; } public System.Int32? OnDemandResizeSpecification_TimeoutDurationMinute { get; set; } + public Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy SpotResizeSpecification_AllocationStrategy { get; set; } public System.Int32? SpotResizeSpecification_TimeoutDurationMinute { get; set; } public System.Int32? InstanceFleet_TargetOnDemandCapacity { get; set; } public System.Int32? InstanceFleet_TargetSpotCapacity { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Edit-EMRInstanceFleet-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Edit-EMRInstanceFleet-Cmdlet.cs index 8b06c6a81..65e8e1b33 100644 --- a/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Edit-EMRInstanceFleet-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/ElasticMapReduce/Basic/Edit-EMRInstanceFleet-Cmdlet.cs @@ -49,6 +49,58 @@ public partial class EditEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCm protected override bool IsGeneratedCmdlet { get; set; } = true; + #region Parameter OnDemandResizeSpecification_AllocationStrategy + /// + /// + /// Specifies the allocation strategy to use to launch On-Demand instances during a resize. + /// The default is lowest-price. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_AllocationStrategy")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy")] + public Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy OnDemandResizeSpecification_AllocationStrategy { get; set; } + #endregion + + #region Parameter SpotResizeSpecification_AllocationStrategy + /// + /// + /// Specifies the allocation strategy to use to launch Spot instances during a resize. + /// If you run Amazon EMR releases 6.9.0 or higher, the default is price-capacity-optimized. + /// If you run Amazon EMR releases 6.8.0 or lower, the default is capacity-optimized. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_SpotResizeSpecification_AllocationStrategy")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy")] + public Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy SpotResizeSpecification_AllocationStrategy { get; set; } + #endregion + + #region Parameter CapacityReservationOptions_CapacityReservationPreference + /// + /// + /// Indicates the instance's Capacity Reservation preferences. Possible preferences include:
  • open - The instance can run in any open Capacity Reservation that has matching + /// attributes (instance type, platform, Availability Zone).
  • none - The instance avoids running in a Capacity Reservation even if one is + /// available. The instance runs as an On-Demand Instance.
+ /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationPreference")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference")] + public Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference CapacityReservationOptions_CapacityReservationPreference { get; set; } + #endregion + + #region Parameter CapacityReservationOptions_CapacityReservationResourceGroupArn + /// + /// + /// The ARN of the Capacity Reservation resource group in which to run the instance. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_CapacityReservationResourceGroupArn")] + public System.String CapacityReservationOptions_CapacityReservationResourceGroupArn { get; set; } + #endregion + #region Parameter ClusterId /// /// @@ -83,6 +135,19 @@ public partial class EditEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCm public System.String InstanceFleet_InstanceFleetId { get; set; } #endregion + #region Parameter InstanceFleet_InstanceTypeConfig + /// + /// + /// An array of InstanceTypeConfig objects that specify how Amazon EMR provisions Amazon + /// EC2 instances when it fulfills On-Demand and Spot capacities. For more information, + /// see InstanceTypeConfig. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_InstanceTypeConfigs")] + public Amazon.ElasticMapReduce.Model.InstanceTypeConfig[] InstanceFleet_InstanceTypeConfig { get; set; } + #endregion + #region Parameter InstanceFleet_TargetOnDemandCapacity /// /// @@ -138,6 +203,24 @@ public partial class EditEMRInstanceFleetCmdlet : AmazonElasticMapReduceClientCm public System.Int32? SpotResizeSpecification_TimeoutDurationMinute { get; set; } #endregion + #region Parameter CapacityReservationOptions_UsageStrategy + /// + /// + /// Indicates whether to use unused Capacity Reservations for fulfilling On-Demand capacity.If you specify use-capacity-reservations-first, the fleet uses unused Capacity + /// Reservations to fulfill On-Demand capacity up to the target On-Demand capacity. If + /// multiple instance pools have unused Capacity Reservations, the On-Demand allocation + /// strategy (lowest-price) is applied. If the number of unused Capacity Reservations + /// is less than the On-Demand target capacity, the remaining On-Demand target capacity + /// is launched according to the On-Demand allocation strategy (lowest-price).If you do not specify a value, the fleet fulfills the On-Demand capacity according + /// to the chosen On-Demand allocation strategy. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("InstanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_UsageStrategy")] + [AWSConstantClassSource("Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy")] + public Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy CapacityReservationOptions_UsageStrategy { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The cmdlet doesn't have a return value by default. @@ -213,7 +296,16 @@ protected override void ProcessRecord() WriteWarning("You are passing $null as a value for parameter InstanceFleet_InstanceFleetId which is marked as required. In case you believe this parameter was incorrectly marked as required, report this by opening an issue at https://github.com/aws/aws-tools-for-powershell/issues."); } #endif + if (this.InstanceFleet_InstanceTypeConfig != null) + { + context.InstanceFleet_InstanceTypeConfig = new List(this.InstanceFleet_InstanceTypeConfig); + } + context.OnDemandResizeSpecification_AllocationStrategy = this.OnDemandResizeSpecification_AllocationStrategy; + context.CapacityReservationOptions_CapacityReservationPreference = this.CapacityReservationOptions_CapacityReservationPreference; + context.CapacityReservationOptions_CapacityReservationResourceGroupArn = this.CapacityReservationOptions_CapacityReservationResourceGroupArn; + context.CapacityReservationOptions_UsageStrategy = this.CapacityReservationOptions_UsageStrategy; context.OnDemandResizeSpecification_TimeoutDurationMinute = this.OnDemandResizeSpecification_TimeoutDurationMinute; + context.SpotResizeSpecification_AllocationStrategy = this.SpotResizeSpecification_AllocationStrategy; context.SpotResizeSpecification_TimeoutDurationMinute = this.SpotResizeSpecification_TimeoutDurationMinute; context.InstanceFleet_TargetOnDemandCapacity = this.InstanceFleet_TargetOnDemandCapacity; context.InstanceFleet_TargetSpotCapacity = this.InstanceFleet_TargetSpotCapacity; @@ -251,6 +343,16 @@ public object Execute(ExecutorContext context) request.InstanceFleet.InstanceFleetId = requestInstanceFleet_instanceFleet_InstanceFleetId; requestInstanceFleetIsNull = false; } + List requestInstanceFleet_instanceFleet_InstanceTypeConfig = null; + if (cmdletContext.InstanceFleet_InstanceTypeConfig != null) + { + requestInstanceFleet_instanceFleet_InstanceTypeConfig = cmdletContext.InstanceFleet_InstanceTypeConfig; + } + if (requestInstanceFleet_instanceFleet_InstanceTypeConfig != null) + { + request.InstanceFleet.InstanceTypeConfigs = requestInstanceFleet_instanceFleet_InstanceTypeConfig; + requestInstanceFleetIsNull = false; + } System.Int32? requestInstanceFleet_instanceFleet_TargetOnDemandCapacity = null; if (cmdletContext.InstanceFleet_TargetOnDemandCapacity != null) { @@ -276,11 +378,56 @@ public object Execute(ExecutorContext context) // populate ResizeSpecifications var requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = true; requestInstanceFleet_instanceFleet_ResizeSpecifications = new Amazon.ElasticMapReduce.Model.InstanceFleetResizingSpecifications(); + Amazon.ElasticMapReduce.Model.SpotResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + + // populate SpotResizeSpecification + var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = true; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = new Amazon.ElasticMapReduce.Model.SpotResizingSpecification(); + Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy = null; + if (cmdletContext.SpotResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy = cmdletContext.SpotResizeSpecification_AllocationStrategy; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.AllocationStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_AllocationStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + } + System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = null; + if (cmdletContext.SpotResizeSpecification_TimeoutDurationMinute != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = cmdletContext.SpotResizeSpecification_TimeoutDurationMinute.Value; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute.Value; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications.SpotResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification; + requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; + } Amazon.ElasticMapReduce.Model.OnDemandResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; // populate OnDemandResizeSpecification var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = true; requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = new Amazon.ElasticMapReduce.Model.OnDemandResizingSpecification(); + Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy = null; + if (cmdletContext.OnDemandResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy = cmdletContext.OnDemandResizeSpecification_AllocationStrategy; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.AllocationStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_AllocationStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; + } System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_TimeoutDurationMinute = null; if (cmdletContext.OnDemandResizeSpecification_TimeoutDurationMinute != null) { @@ -291,39 +438,59 @@ public object Execute(ExecutorContext context) requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_onDemandResizeSpecification_TimeoutDurationMinute.Value; requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; } - // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification should be set to null - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull) + Amazon.ElasticMapReduce.Model.OnDemandCapacityReservationOptions requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = null; + + // populate CapacityReservationOptions + var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = true; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = new Amazon.ElasticMapReduce.Model.OnDemandCapacityReservationOptions(); + Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationPreference = null; + if (cmdletContext.CapacityReservationOptions_CapacityReservationPreference != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationPreference = cmdletContext.CapacityReservationOptions_CapacityReservationPreference; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationPreference != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications.OnDemandResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification; - requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.CapacityReservationPreference = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationPreference; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; } - Amazon.ElasticMapReduce.Model.SpotResizingSpecification requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; - - // populate SpotResizeSpecification - var requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = true; - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = new Amazon.ElasticMapReduce.Model.SpotResizingSpecification(); - System.Int32? requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = null; - if (cmdletContext.SpotResizeSpecification_TimeoutDurationMinute != null) + System.String requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationResourceGroupArn = null; + if (cmdletContext.CapacityReservationOptions_CapacityReservationResourceGroupArn != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute = cmdletContext.SpotResizeSpecification_TimeoutDurationMinute.Value; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationResourceGroupArn = cmdletContext.CapacityReservationOptions_CapacityReservationResourceGroupArn; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationResourceGroupArn != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification.TimeoutDurationMinutes = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification_spotResizeSpecification_TimeoutDurationMinute.Value; - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull = false; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.CapacityReservationResourceGroupArn = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_CapacityReservationResourceGroupArn; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; } - // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification should be set to null - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecificationIsNull) + Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_UsageStrategy = null; + if (cmdletContext.CapacityReservationOptions_UsageStrategy != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification = null; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_UsageStrategy = cmdletContext.CapacityReservationOptions_UsageStrategy; } - if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification != null) + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_UsageStrategy != null) { - requestInstanceFleet_instanceFleet_ResizeSpecifications.SpotResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_SpotResizeSpecification; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions.UsageStrategy = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions_capacityReservationOptions_UsageStrategy; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptionsIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification.CapacityReservationOptions = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification_CapacityReservationOptions; + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull = false; + } + // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification should be set to null + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecificationIsNull) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification = null; + } + if (requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification != null) + { + requestInstanceFleet_instanceFleet_ResizeSpecifications.OnDemandResizeSpecification = requestInstanceFleet_instanceFleet_ResizeSpecifications_instanceFleet_ResizeSpecifications_OnDemandResizeSpecification; requestInstanceFleet_instanceFleet_ResizeSpecificationsIsNull = false; } // determine if requestInstanceFleet_instanceFleet_ResizeSpecifications should be set to null @@ -404,7 +571,13 @@ internal partial class CmdletContext : ExecutorContext { public System.String ClusterId { get; set; } public System.String InstanceFleet_InstanceFleetId { get; set; } + public List InstanceFleet_InstanceTypeConfig { get; set; } + public Amazon.ElasticMapReduce.OnDemandProvisioningAllocationStrategy OnDemandResizeSpecification_AllocationStrategy { get; set; } + public Amazon.ElasticMapReduce.OnDemandCapacityReservationPreference CapacityReservationOptions_CapacityReservationPreference { get; set; } + public System.String CapacityReservationOptions_CapacityReservationResourceGroupArn { get; set; } + public Amazon.ElasticMapReduce.OnDemandCapacityReservationUsageStrategy CapacityReservationOptions_UsageStrategy { get; set; } public System.Int32? OnDemandResizeSpecification_TimeoutDurationMinute { get; set; } + public Amazon.ElasticMapReduce.SpotProvisioningAllocationStrategy SpotResizeSpecification_AllocationStrategy { get; set; } public System.Int32? SpotResizeSpecification_TimeoutDurationMinute { get; set; } public System.Int32? InstanceFleet_TargetOnDemandCapacity { get; set; } public System.Int32? InstanceFleet_TargetSpotCapacity { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/Glue/AWS.Tools.Glue.Completers.psm1 b/modules/AWSPowerShell/Cmdlets/Glue/AWS.Tools.Glue.Completers.psm1 index 6c6c532c0..6a1ef5ced 100644 --- a/modules/AWSPowerShell/Cmdlets/Glue/AWS.Tools.Glue.Completers.psm1 +++ b/modules/AWSPowerShell/Cmdlets/Glue/AWS.Tools.Glue.Completers.psm1 @@ -289,7 +289,7 @@ $GLUE_Completers = { ($_ -eq "Update-GLUETableOptimizer/Type") } { - $v = "compaction" + $v = "compaction","orphan_file_deletion","retention" break } diff --git a/modules/AWSPowerShell/Cmdlets/Glue/Basic/New-GLUETableOptimizer-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/Glue/Basic/New-GLUETableOptimizer-Cmdlet.cs index 2bfe82488..8e8ad1ac2 100644 --- a/modules/AWSPowerShell/Cmdlets/Glue/Basic/New-GLUETableOptimizer-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/Glue/Basic/New-GLUETableOptimizer-Cmdlet.cs @@ -60,6 +60,18 @@ public partial class NewGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IExec public System.String CatalogId { get; set; } #endregion + #region Parameter IcebergConfiguration_CleanExpiredFile + /// + /// + /// If set to false, snapshots are only deleted from table metadata, and the underlying + /// data and metadata files are not deleted. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_CleanExpiredFiles")] + public System.Boolean? IcebergConfiguration_CleanExpiredFile { get; set; } + #endregion + #region Parameter DatabaseName /// /// @@ -80,13 +92,50 @@ public partial class NewGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IExec #region Parameter TableOptimizerConfiguration_Enabled /// /// - /// Whether table optimization is enabled. + /// Whether table optimization is enabled. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] public System.Boolean? TableOptimizerConfiguration_Enabled { get; set; } #endregion + #region Parameter IcebergConfiguration_Location + /// + /// + /// Specifies a directory in which to look for files (defaults to the table's location). + /// You may choose a sub-directory rather than the top-level table location. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_Location")] + public System.String IcebergConfiguration_Location { get; set; } + #endregion + + #region Parameter IcebergConfiguration_NumberOfSnapshotsToRetain + /// + /// + /// The number of Iceberg snapshots to retain within the retention period. If an input + /// is not provided, the corresponding Iceberg table configuration field will be used + /// or if not present, the default value 1 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_NumberOfSnapshotsToRetain")] + public System.Int32? IcebergConfiguration_NumberOfSnapshotsToRetain { get; set; } + #endregion + + #region Parameter IcebergConfiguration_OrphanFileRetentionPeriodInDay + /// + /// + /// The number of days that orphan files should be retained before file deletion. If an + /// input is not provided, the default value 3 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_OrphanFileRetentionPeriodInDays")] + public System.Int32? IcebergConfiguration_OrphanFileRetentionPeriodInDay { get; set; } + #endregion + #region Parameter TableOptimizerConfiguration_RoleArn /// /// @@ -98,6 +147,19 @@ public partial class NewGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IExec public System.String TableOptimizerConfiguration_RoleArn { get; set; } #endregion + #region Parameter IcebergConfiguration_SnapshotRetentionPeriodInDay + /// + /// + /// The number of days to retain the Iceberg snapshots. If an input is not provided, the + /// corresponding Iceberg table configuration field will be used or if not present, the + /// default value 5 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_SnapshotRetentionPeriodInDays")] + public System.Int32? IcebergConfiguration_SnapshotRetentionPeriodInDay { get; set; } + #endregion + #region Parameter TableName /// /// @@ -195,6 +257,11 @@ protected override void ProcessRecord() } #endif context.TableOptimizerConfiguration_Enabled = this.TableOptimizerConfiguration_Enabled; + context.IcebergConfiguration_Location = this.IcebergConfiguration_Location; + context.IcebergConfiguration_OrphanFileRetentionPeriodInDay = this.IcebergConfiguration_OrphanFileRetentionPeriodInDay; + context.IcebergConfiguration_CleanExpiredFile = this.IcebergConfiguration_CleanExpiredFile; + context.IcebergConfiguration_NumberOfSnapshotsToRetain = this.IcebergConfiguration_NumberOfSnapshotsToRetain; + context.IcebergConfiguration_SnapshotRetentionPeriodInDay = this.IcebergConfiguration_SnapshotRetentionPeriodInDay; context.TableOptimizerConfiguration_RoleArn = this.TableOptimizerConfiguration_RoleArn; context.Type = this.Type; #if MODULAR @@ -254,6 +321,116 @@ public object Execute(ExecutorContext context) { request.TableOptimizerConfiguration.RoleArn = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RoleArn; requestTableOptimizerConfigurationIsNull = false; + } + Amazon.Glue.Model.OrphanFileDeletionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = null; + + // populate OrphanFileDeletionConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = new Amazon.Glue.Model.OrphanFileDeletionConfiguration(); + Amazon.Glue.Model.IcebergOrphanFileDeletionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = null; + + // populate IcebergConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = new Amazon.Glue.Model.IcebergOrphanFileDeletionConfiguration(); + System.String requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location = null; + if (cmdletContext.IcebergConfiguration_Location != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location = cmdletContext.IcebergConfiguration_Location; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration.Location = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay = null; + if (cmdletContext.IcebergConfiguration_OrphanFileRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay = cmdletContext.IcebergConfiguration_OrphanFileRetentionPeriodInDay.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration.OrphanFileRetentionPeriodInDays = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration.IcebergConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration != null) + { + request.TableOptimizerConfiguration.OrphanFileDeletionConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration; + requestTableOptimizerConfigurationIsNull = false; + } + Amazon.Glue.Model.RetentionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = null; + + // populate RetentionConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = new Amazon.Glue.Model.RetentionConfiguration(); + Amazon.Glue.Model.IcebergRetentionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = null; + + // populate IcebergConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = new Amazon.Glue.Model.IcebergRetentionConfiguration(); + System.Boolean? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile = null; + if (cmdletContext.IcebergConfiguration_CleanExpiredFile != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile = cmdletContext.IcebergConfiguration_CleanExpiredFile.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.CleanExpiredFiles = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain = null; + if (cmdletContext.IcebergConfiguration_NumberOfSnapshotsToRetain != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain = cmdletContext.IcebergConfiguration_NumberOfSnapshotsToRetain.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.NumberOfSnapshotsToRetain = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay = null; + if (cmdletContext.IcebergConfiguration_SnapshotRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay = cmdletContext.IcebergConfiguration_SnapshotRetentionPeriodInDay.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.SnapshotRetentionPeriodInDays = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration.IcebergConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration != null) + { + request.TableOptimizerConfiguration.RetentionConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration; + requestTableOptimizerConfigurationIsNull = false; } // determine if request.TableOptimizerConfiguration should be set to null if (requestTableOptimizerConfigurationIsNull) @@ -329,6 +506,11 @@ internal partial class CmdletContext : ExecutorContext public System.String DatabaseName { get; set; } public System.String TableName { get; set; } public System.Boolean? TableOptimizerConfiguration_Enabled { get; set; } + public System.String IcebergConfiguration_Location { get; set; } + public System.Int32? IcebergConfiguration_OrphanFileRetentionPeriodInDay { get; set; } + public System.Boolean? IcebergConfiguration_CleanExpiredFile { get; set; } + public System.Int32? IcebergConfiguration_NumberOfSnapshotsToRetain { get; set; } + public System.Int32? IcebergConfiguration_SnapshotRetentionPeriodInDay { get; set; } public System.String TableOptimizerConfiguration_RoleArn { get; set; } public Amazon.Glue.TableOptimizerType Type { get; set; } public System.Func Select { get; set; } = diff --git a/modules/AWSPowerShell/Cmdlets/Glue/Basic/Update-GLUETableOptimizer-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/Glue/Basic/Update-GLUETableOptimizer-Cmdlet.cs index 6c4609b91..ea2e18164 100644 --- a/modules/AWSPowerShell/Cmdlets/Glue/Basic/Update-GLUETableOptimizer-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/Glue/Basic/Update-GLUETableOptimizer-Cmdlet.cs @@ -59,6 +59,18 @@ public partial class UpdateGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IE public System.String CatalogId { get; set; } #endregion + #region Parameter IcebergConfiguration_CleanExpiredFile + /// + /// + /// If set to false, snapshots are only deleted from table metadata, and the underlying + /// data and metadata files are not deleted. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_CleanExpiredFiles")] + public System.Boolean? IcebergConfiguration_CleanExpiredFile { get; set; } + #endregion + #region Parameter DatabaseName /// /// @@ -79,13 +91,50 @@ public partial class UpdateGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IE #region Parameter TableOptimizerConfiguration_Enabled /// /// - /// Whether table optimization is enabled. + /// Whether table optimization is enabled. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] public System.Boolean? TableOptimizerConfiguration_Enabled { get; set; } #endregion + #region Parameter IcebergConfiguration_Location + /// + /// + /// Specifies a directory in which to look for files (defaults to the table's location). + /// You may choose a sub-directory rather than the top-level table location. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_Location")] + public System.String IcebergConfiguration_Location { get; set; } + #endregion + + #region Parameter IcebergConfiguration_NumberOfSnapshotsToRetain + /// + /// + /// The number of Iceberg snapshots to retain within the retention period. If an input + /// is not provided, the corresponding Iceberg table configuration field will be used + /// or if not present, the default value 1 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_NumberOfSnapshotsToRetain")] + public System.Int32? IcebergConfiguration_NumberOfSnapshotsToRetain { get; set; } + #endregion + + #region Parameter IcebergConfiguration_OrphanFileRetentionPeriodInDay + /// + /// + /// The number of days that orphan files should be retained before file deletion. If an + /// input is not provided, the default value 3 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_OrphanFileRetentionPeriodInDays")] + public System.Int32? IcebergConfiguration_OrphanFileRetentionPeriodInDay { get; set; } + #endregion + #region Parameter TableOptimizerConfiguration_RoleArn /// /// @@ -97,6 +146,19 @@ public partial class UpdateGLUETableOptimizerCmdlet : AmazonGlueClientCmdlet, IE public System.String TableOptimizerConfiguration_RoleArn { get; set; } #endregion + #region Parameter IcebergConfiguration_SnapshotRetentionPeriodInDay + /// + /// + /// The number of days to retain the Iceberg snapshots. If an input is not provided, the + /// corresponding Iceberg table configuration field will be used or if not present, the + /// default value 5 will be used. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("TableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_SnapshotRetentionPeriodInDays")] + public System.Int32? IcebergConfiguration_SnapshotRetentionPeriodInDay { get; set; } + #endregion + #region Parameter TableName /// /// @@ -194,6 +256,11 @@ protected override void ProcessRecord() } #endif context.TableOptimizerConfiguration_Enabled = this.TableOptimizerConfiguration_Enabled; + context.IcebergConfiguration_Location = this.IcebergConfiguration_Location; + context.IcebergConfiguration_OrphanFileRetentionPeriodInDay = this.IcebergConfiguration_OrphanFileRetentionPeriodInDay; + context.IcebergConfiguration_CleanExpiredFile = this.IcebergConfiguration_CleanExpiredFile; + context.IcebergConfiguration_NumberOfSnapshotsToRetain = this.IcebergConfiguration_NumberOfSnapshotsToRetain; + context.IcebergConfiguration_SnapshotRetentionPeriodInDay = this.IcebergConfiguration_SnapshotRetentionPeriodInDay; context.TableOptimizerConfiguration_RoleArn = this.TableOptimizerConfiguration_RoleArn; context.Type = this.Type; #if MODULAR @@ -253,6 +320,116 @@ public object Execute(ExecutorContext context) { request.TableOptimizerConfiguration.RoleArn = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RoleArn; requestTableOptimizerConfigurationIsNull = false; + } + Amazon.Glue.Model.OrphanFileDeletionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = null; + + // populate OrphanFileDeletionConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = new Amazon.Glue.Model.OrphanFileDeletionConfiguration(); + Amazon.Glue.Model.IcebergOrphanFileDeletionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = null; + + // populate IcebergConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = new Amazon.Glue.Model.IcebergOrphanFileDeletionConfiguration(); + System.String requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location = null; + if (cmdletContext.IcebergConfiguration_Location != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location = cmdletContext.IcebergConfiguration_Location; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration.Location = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_Location; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay = null; + if (cmdletContext.IcebergConfiguration_OrphanFileRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay = cmdletContext.IcebergConfiguration_OrphanFileRetentionPeriodInDay.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration.OrphanFileRetentionPeriodInDays = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration_icebergConfiguration_OrphanFileRetentionPeriodInDay.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration.IcebergConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration_IcebergConfiguration; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration != null) + { + request.TableOptimizerConfiguration.OrphanFileDeletionConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_OrphanFileDeletionConfiguration; + requestTableOptimizerConfigurationIsNull = false; + } + Amazon.Glue.Model.RetentionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = null; + + // populate RetentionConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = new Amazon.Glue.Model.RetentionConfiguration(); + Amazon.Glue.Model.IcebergRetentionConfiguration requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = null; + + // populate IcebergConfiguration + var requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = true; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = new Amazon.Glue.Model.IcebergRetentionConfiguration(); + System.Boolean? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile = null; + if (cmdletContext.IcebergConfiguration_CleanExpiredFile != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile = cmdletContext.IcebergConfiguration_CleanExpiredFile.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.CleanExpiredFiles = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_CleanExpiredFile.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain = null; + if (cmdletContext.IcebergConfiguration_NumberOfSnapshotsToRetain != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain = cmdletContext.IcebergConfiguration_NumberOfSnapshotsToRetain.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.NumberOfSnapshotsToRetain = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_NumberOfSnapshotsToRetain.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + System.Int32? requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay = null; + if (cmdletContext.IcebergConfiguration_SnapshotRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay = cmdletContext.IcebergConfiguration_SnapshotRetentionPeriodInDay.Value; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration.SnapshotRetentionPeriodInDays = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration_icebergConfiguration_SnapshotRetentionPeriodInDay.Value; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration != null) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration.IcebergConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration_tableOptimizerConfiguration_RetentionConfiguration_IcebergConfiguration; + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull = false; + } + // determine if requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration should be set to null + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfigurationIsNull) + { + requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration = null; + } + if (requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration != null) + { + request.TableOptimizerConfiguration.RetentionConfiguration = requestTableOptimizerConfiguration_tableOptimizerConfiguration_RetentionConfiguration; + requestTableOptimizerConfigurationIsNull = false; } // determine if request.TableOptimizerConfiguration should be set to null if (requestTableOptimizerConfigurationIsNull) @@ -328,6 +505,11 @@ internal partial class CmdletContext : ExecutorContext public System.String DatabaseName { get; set; } public System.String TableName { get; set; } public System.Boolean? TableOptimizerConfiguration_Enabled { get; set; } + public System.String IcebergConfiguration_Location { get; set; } + public System.Int32? IcebergConfiguration_OrphanFileRetentionPeriodInDay { get; set; } + public System.Boolean? IcebergConfiguration_CleanExpiredFile { get; set; } + public System.Int32? IcebergConfiguration_NumberOfSnapshotsToRetain { get; set; } + public System.Int32? IcebergConfiguration_SnapshotRetentionPeriodInDay { get; set; } public System.String TableOptimizerConfiguration_RoleArn { get; set; } public Amazon.Glue.TableOptimizerType Type { get; set; } public System.Func Select { get; set; } = diff --git a/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.Completers.psm1 b/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.Completers.psm1 index db00c258e..41bc1a008 100644 --- a/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.Completers.psm1 +++ b/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.Completers.psm1 @@ -312,6 +312,7 @@ $EMC_SelectMap = @{ "Get-EMCPresetList", "Get-EMCQueueList", "Get-EMCResourceTag", + "Get-EMCVersionList", "Write-EMCPolicy", "Search-EMCJob", "Add-EMCResourceTag", diff --git a/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.psd1 b/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.psd1 index fd49aab6d..e14e95b55 100644 --- a/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.psd1 +++ b/modules/AWSPowerShell/Cmdlets/MediaConvert/AWS.Tools.MediaConvert.psd1 @@ -98,6 +98,7 @@ This version of AWS Tools for PowerShell is compatible with Windows PowerShell 5 'Get-EMCQueue', 'Get-EMCQueueList', 'Get-EMCResourceTag', + 'Get-EMCVersionList', 'New-EMCJob', 'New-EMCJobTemplate', 'New-EMCPreset', diff --git a/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/Get-EMCVersionList-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/Get-EMCVersionList-Cmdlet.cs new file mode 100644 index 000000000..953c5b3de --- /dev/null +++ b/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/Get-EMCVersionList-Cmdlet.cs @@ -0,0 +1,224 @@ +/******************************************************************************* + * Copyright 2012-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Licensed under the Apache License, Version 2.0 (the "License"). You may not use + * this file except in compliance with the License. A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. + * This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. See the License for the + * specific language governing permissions and limitations under the License. + * ***************************************************************************** + * + * AWS Tools for Windows (TM) PowerShell (TM) + * + */ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Management.Automation; +using System.Text; +using Amazon.PowerShell.Common; +using Amazon.Runtime; +using Amazon.MediaConvert; +using Amazon.MediaConvert.Model; + +namespace Amazon.PowerShell.Cmdlets.EMC +{ + /// + /// Retrieve a JSON array of all available Job engine versions and the date they expire.

This cmdlet automatically pages all available results to the pipeline - parameters related to iteration are only needed if you want to manually control the paginated output. To disable autopagination, use -NoAutoIteration. + /// + [Cmdlet("Get", "EMCVersionList")] + [OutputType("Amazon.MediaConvert.Model.JobEngineVersion")] + [AWSCmdlet("Calls the AWS Elemental MediaConvert ListVersions API operation.", Operation = new[] {"ListVersions"}, SelectReturnType = typeof(Amazon.MediaConvert.Model.ListVersionsResponse))] + [AWSCmdletOutput("Amazon.MediaConvert.Model.JobEngineVersion or Amazon.MediaConvert.Model.ListVersionsResponse", + "This cmdlet returns a collection of Amazon.MediaConvert.Model.JobEngineVersion objects.", + "The service call response (type Amazon.MediaConvert.Model.ListVersionsResponse) can also be referenced from properties attached to the cmdlet entry in the $AWSHistory stack." + )] + public partial class GetEMCVersionListCmdlet : AmazonMediaConvertClientCmdlet, IExecutor + { + + protected override bool IsGeneratedCmdlet { get; set; } = true; + + #region Parameter MaxResult + /// + /// + /// Optional. Number of valid Job engine versions, + /// up to twenty, that will be returned at one time. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("MaxResults")] + public System.Int32? MaxResult { get; set; } + #endregion + + #region Parameter NextToken + /// + /// + /// Optional. Use this string, provided with the + /// response to a previous request, to request the next batch of Job engine versions. + /// + /// + ///
Note: This parameter is only used if you are manually controlling output pagination of the service API call. + ///
In order to manually control output pagination, use '-NextToken $null' for the first call and '-NextToken $AWSHistory.LastServiceResponse.NextToken' for subsequent calls. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.String NextToken { get; set; } + #endregion + + #region Parameter Select + /// + /// Use the -Select parameter to control the cmdlet output. The default value is 'Versions'. + /// Specifying -Select '*' will result in the cmdlet returning the whole service response (Amazon.MediaConvert.Model.ListVersionsResponse). + /// Specifying the name of a property of type Amazon.MediaConvert.Model.ListVersionsResponse will result in that property being returned. + /// Specifying -Select '^ParameterName' will result in the cmdlet returning the selected cmdlet parameter value. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public string Select { get; set; } = "Versions"; + #endregion + + #region Parameter NoAutoIteration + /// + /// By default the cmdlet will auto-iterate and retrieve all results to the pipeline by performing multiple + /// service calls. If set, the cmdlet will retrieve only the next 'page' of results using the value of NextToken + /// as the start point. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public SwitchParameter NoAutoIteration { get; set; } + #endregion + + protected override void ProcessRecord() + { + this._AWSSignerType = "v4"; + base.ProcessRecord(); + + var context = new CmdletContext(); + + // allow for manipulation of parameters prior to loading into context + PreExecutionContextLoad(context); + + if (ParameterWasBound(nameof(this.Select))) + { + context.Select = CreateSelectDelegate(Select) ?? + throw new System.ArgumentException("Invalid value for -Select parameter.", nameof(this.Select)); + } + context.MaxResult = this.MaxResult; + context.NextToken = this.NextToken; + + // allow further manipulation of loaded context prior to processing + PostExecutionContextLoad(context); + + var output = Execute(context) as CmdletOutput; + ProcessOutput(output); + } + + #region IExecutor Members + + public object Execute(ExecutorContext context) + { + var cmdletContext = context as CmdletContext; + var useParameterSelect = this.Select.StartsWith("^"); + + // create request and set iteration invariants + var request = new Amazon.MediaConvert.Model.ListVersionsRequest(); + + if (cmdletContext.MaxResult != null) + { + request.MaxResults = cmdletContext.MaxResult.Value; + } + + // Initialize loop variant and commence piping + var _nextToken = cmdletContext.NextToken; + var _userControllingPaging = this.NoAutoIteration.IsPresent || ParameterWasBound(nameof(this.NextToken)); + + var client = Client ?? CreateClient(_CurrentCredentials, _RegionEndpoint); + do + { + request.NextToken = _nextToken; + + CmdletOutput output; + + try + { + + var response = CallAWSServiceOperation(client, request); + + object pipelineOutput = null; + if (!useParameterSelect) + { + pipelineOutput = cmdletContext.Select(response, this); + } + output = new CmdletOutput + { + PipelineOutput = pipelineOutput, + ServiceResponse = response + }; + + _nextToken = response.NextToken; + } + catch (Exception e) + { + output = new CmdletOutput { ErrorResponse = e }; + } + + ProcessOutput(output); + + } while (!_userControllingPaging && AutoIterationHelpers.HasValue(_nextToken)); + + if (useParameterSelect) + { + WriteObject(cmdletContext.Select(null, this)); + } + + + return null; + } + + public ExecutorContext CreateContext() + { + return new CmdletContext(); + } + + #endregion + + #region AWS Service Operation Call + + private Amazon.MediaConvert.Model.ListVersionsResponse CallAWSServiceOperation(IAmazonMediaConvert client, Amazon.MediaConvert.Model.ListVersionsRequest request) + { + Utils.Common.WriteVerboseEndpointMessage(this, client.Config, "AWS Elemental MediaConvert", "ListVersions"); + try + { + #if DESKTOP + return client.ListVersions(request); + #elif CORECLR + return client.ListVersionsAsync(request).GetAwaiter().GetResult(); + #else + #error "Unknown build edition" + #endif + } + catch (AmazonServiceException exc) + { + var webException = exc.InnerException as System.Net.WebException; + if (webException != null) + { + throw new Exception(Utils.Common.FormatNameResolutionFailureMessage(client.Config, webException.Message), webException); + } + throw; + } + } + + #endregion + + internal partial class CmdletContext : ExecutorContext + { + public System.Int32? MaxResult { get; set; } + public System.String NextToken { get; set; } + public System.Func Select { get; set; } = + (response, cmdlet) => response.Versions; + } + + } +} diff --git a/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/New-EMCJob-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/New-EMCJob-Cmdlet.cs index 1a9cf662b..d7f69ec99 100644 --- a/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/New-EMCJob-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/MediaConvert/Basic/New-EMCJob-Cmdlet.cs @@ -86,6 +86,20 @@ public partial class NewEMCJobCmdlet : AmazonMediaConvertClientCmdlet, IExecutor public Amazon.MediaConvert.Model.HopDestination[] HopDestination { get; set; } #endregion + #region Parameter JobEngineVersion + /// + /// + /// Use Job engine versions to run jobs for + /// your production workflow on one version, while you test and validate the latest version. + /// To specify a Job engine version: Enter a date in a YYYY-MM-DD format. For a list of + /// valid Job engine versions, submit a ListVersions request. To not specify a Job engine + /// version: Leave blank. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + public System.String JobEngineVersion { get; set; } + #endregion + #region Parameter JobTemplate /// /// @@ -298,6 +312,7 @@ protected override void ProcessRecord() { context.HopDestination = new List(this.HopDestination); } + context.JobEngineVersion = this.JobEngineVersion; context.JobTemplate = this.JobTemplate; context.Priority = this.Priority; context.Queue = this.Queue; @@ -380,6 +395,10 @@ public object Execute(ExecutorContext context) { request.HopDestinations = cmdletContext.HopDestination; } + if (cmdletContext.JobEngineVersion != null) + { + request.JobEngineVersion = cmdletContext.JobEngineVersion; + } if (cmdletContext.JobTemplate != null) { request.JobTemplate = cmdletContext.JobTemplate; @@ -481,6 +500,7 @@ internal partial class CmdletContext : ExecutorContext public Amazon.MediaConvert.BillingTagsSource BillingTagsSource { get; set; } public System.String ClientRequestToken { get; set; } public List HopDestination { get; set; } + public System.String JobEngineVersion { get; set; } public System.String JobTemplate { get; set; } public System.Int32? Priority { get; set; } public System.String Queue { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/RDS/Basic/Edit-RDSDBProxyTargetGroup-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/RDS/Basic/Edit-RDSDBProxyTargetGroup-Cmdlet.cs index 3e0f56f32..ab8494f74 100644 --- a/modules/AWSPowerShell/Cmdlets/RDS/Basic/Edit-RDSDBProxyTargetGroup-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/RDS/Basic/Edit-RDSDBProxyTargetGroup-Cmdlet.cs @@ -47,8 +47,7 @@ public partial class EditRDSDBProxyTargetGroupCmdlet : AmazonRDSClientCmdlet, IE /// /// The number of seconds for a proxy to wait for a connection to become available in /// the connection pool. This setting only applies when the proxy has opened its maximum - /// number of connections and all connections are busy with client sessions. For an unlimited - /// wait time, specify 0.Default: 120Constraints:
  • Must be between 0 and 3600.
+ /// number of connections and all connections are busy with client sessions.Default: 120Constraints:
  • Must be between 0 and 3600.
/// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstance-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstance-Cmdlet.cs index c52284e19..d77ba8043 100644 --- a/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstance-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstance-Cmdlet.cs @@ -280,7 +280,7 @@ public partial class NewRDSDBInstanceCmdlet : AmazonRDSClientCmdlet, IExecutor #region Parameter DBSubnetGroupName /// /// - /// A DB subnet group to associate with this DB instance.Constraints:
  • Must match the name of an existing DB subnet group.
  • Must not be default.
Example: mydbsubnetgroup + /// A DB subnet group to associate with this DB instance.Constraints:
  • Must match the name of an existing DB subnet group.
Example: mydbsubnetgroup /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -452,7 +452,7 @@ public partial class NewRDSDBInstanceCmdlet : AmazonRDSClientCmdlet, IExecutor #region Parameter Engine /// /// - /// The database engine to use for this DB instance.Not every database engine is available in every Amazon Web Services Region.Valid Values:
  • aurora-mysql (for Aurora MySQL DB instances)
  • aurora-postgresql (for Aurora PostgreSQL DB instances)
  • custom-oracle-ee (for RDS Custom for Oracle DB instances)
  • custom-oracle-ee-cdb (for RDS Custom for Oracle DB instances)
  • custom-oracle-se2 (for RDS Custom for Oracle DB instances)
  • custom-oracle-se2-cdb (for RDS Custom for Oracle DB instances)
  • custom-sqlserver-ee (for RDS Custom for SQL Server DB instances)
  • custom-sqlserver-se (for RDS Custom for SQL Server DB instances)
  • custom-sqlserver-web (for RDS Custom for SQL Server DB instances)
  • db2-ae
  • db2-se
  • mariadb
  • mysql
  • oracle-ee
  • oracle-ee-cdb
  • oracle-se2
  • oracle-se2-cdb
  • postgres
  • sqlserver-ee
  • sqlserver-se
  • sqlserver-ex
  • sqlserver-web
+ /// The database engine to use for this DB instance.Not every database engine is available in every Amazon Web Services Region.Valid Values:
  • aurora-mysql (for Aurora MySQL DB instances)
  • aurora-postgresql (for Aurora PostgreSQL DB instances)
  • custom-oracle-ee (for RDS Custom for Oracle DB instances)
  • custom-oracle-ee-cdb (for RDS Custom for Oracle DB instances)
  • custom-oracle-se2 (for RDS Custom for Oracle DB instances)
  • custom-oracle-se2-cdb (for RDS Custom for Oracle DB instances)
  • custom-sqlserver-ee (for RDS Custom for SQL Server DB instances)
  • custom-sqlserver-se (for RDS Custom for SQL Server DB instances)
  • custom-sqlserver-web (for RDS Custom for SQL Server DB instances)
  • custom-sqlserver-dev (for RDS Custom for SQL Server DB instances)
  • db2-ae
  • db2-se
  • mariadb
  • mysql
  • oracle-ee
  • oracle-ee-cdb
  • oracle-se2
  • oracle-se2-cdb
  • postgres
  • sqlserver-ee
  • sqlserver-se
  • sqlserver-ex
  • sqlserver-web
/// /// #if !MODULAR diff --git a/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstanceReadReplica-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstanceReadReplica-Cmdlet.cs index ea4d85938..bb4cfe763 100644 --- a/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstanceReadReplica-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/RDS/Basic/New-RDSDBInstanceReadReplica-Cmdlet.cs @@ -520,8 +520,7 @@ public partial class NewRDSDBInstanceReadReplicaCmdlet : AmazonRDSClientCmdlet, /// Version 4 Signing Process.If you are using an Amazon Web Services SDK tool or the CLI, you can specify SourceRegion /// (or --source-region for the CLI) instead of specifying PreSignedUrl /// manually. Specifying SourceRegion autogenerates a presigned URL that is a valid - /// request for the operation that can run in the source Amazon Web Services Region.SourceRegion isn't supported for SQL Server, because Amazon RDS for SQL Server - /// doesn't support cross-Region read replicas.This setting doesn't apply to RDS Custom DB instances. + /// request for the operation that can run in the source Amazon Web Services Region.This setting doesn't apply to RDS Custom DB instances. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/RDS/Basic/Submit-RDSPendingMaintenanceAction-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/RDS/Basic/Submit-RDSPendingMaintenanceAction-Cmdlet.cs index 547ca9e3c..13a53d3a1 100644 --- a/modules/AWSPowerShell/Cmdlets/RDS/Basic/Submit-RDSPendingMaintenanceAction-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/RDS/Basic/Submit-RDSPendingMaintenanceAction-Cmdlet.cs @@ -45,8 +45,9 @@ public partial class SubmitRDSPendingMaintenanceActionCmdlet : AmazonRDSClientCm #region Parameter ApplyAction /// /// - /// The pending maintenance action to apply to this resource.Valid Values: system-update, db-upgrade, hardware-maintenance, - /// ca-certificate-rotation + /// The pending maintenance action to apply to this resource.Valid Values:
  • ca-certificate-rotation
  • db-upgrade
  • hardware-maintenance
  • os-upgrade
  • system-update
For more information about these actions, see Maintenance + /// actions for Amazon Aurora or Maintenance + /// actions for Amazon RDS. /// /// #if !MODULAR diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/AWS.Tools.StorageGateway.Completers.psm1 b/modules/AWSPowerShell/Cmdlets/StorageGateway/AWS.Tools.StorageGateway.Completers.psm1 index d13151cb0..a21fb862d 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/AWS.Tools.StorageGateway.Completers.psm1 +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/AWS.Tools.StorageGateway.Completers.psm1 @@ -97,6 +97,18 @@ $SG_Completers = { break } + # Amazon.StorageGateway.EncryptionType + { + ($_ -eq "New-SGNFSFileShare/EncryptionType") -Or + ($_ -eq "New-SGSMBFileShare/EncryptionType") -Or + ($_ -eq "Update-SGNFSFileShare/EncryptionType") -Or + ($_ -eq "Update-SGSMBFileShare/EncryptionType") + } + { + $v = "DsseKms","SseKms","SseS3" + break + } + # Amazon.StorageGateway.GatewayCapacity "Update-SGGatewayInformation/GatewayCapacity" { @@ -147,6 +159,7 @@ $SG_Completers = { $SG_map = @{ "CaseSensitivity"=@("New-SGSMBFileShare","Update-SGSMBFileShare") + "EncryptionType"=@("New-SGNFSFileShare","New-SGSMBFileShare","Update-SGNFSFileShare","Update-SGSMBFileShare") "GatewayCapacity"=@("Update-SGGatewayInformation") "ObjectACL"=@("New-SGNFSFileShare","New-SGSMBFileShare","Update-SGNFSFileShare","Update-SGSMBFileShare") "RetentionLockType"=@("New-SGTapePool") diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGNFSFileShare-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGNFSFileShare-Cmdlet.cs index 4239cd1dc..56e4e7dd9 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGNFSFileShare-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGNFSFileShare-Cmdlet.cs @@ -128,6 +128,22 @@ public partial class NewSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.String NFSFileShareDefaults_DirectoryMode { get; set; } #endregion + #region Parameter EncryptionType + /// + /// + /// A value that specifies the type of server-side encryption that the file share will + /// use for the data that it stores in Amazon S3.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.StorageGateway.EncryptionType")] + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } + #endregion + #region Parameter NFSFileShareDefaults_FileMode /// /// @@ -191,23 +207,13 @@ public partial class NewSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.Boolean? GuessMIMETypeEnabled { get; set; } #endregion - #region Parameter KMSEncrypted - /// - /// - /// Set to true to use Amazon S3 server-side encryption with your own KMS key, - /// or false to use a key managed by Amazon S3. Optional.Valid Values: true | false - /// - /// - [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] - public System.Boolean? KMSEncrypted { get; set; } - #endregion - #region Parameter KMSKey /// /// - /// The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon - /// S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This - /// value can only be set when KMSEncrypted is true. Optional. + /// Optional. The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) + /// used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric + /// CMKs. This value must be set if KMSEncrypted is true, or if EncryptionType + /// is SseKms or DsseKms. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -244,7 +250,9 @@ public partial class NewSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdlet, /// generating an ObjectUploaded notification. Because clients can make many small /// writes to files, it's best to set this parameter for as long as possible to avoid /// generating multiple notifications for the same file in a small time period.SettlingTimeInSeconds has no effect on the timing of the object uploading - /// to Amazon S3, only the timing of the notification.The following example sets NotificationPolicy on with SettlingTimeInSeconds + /// to Amazon S3, only the timing of the notification.This setting is not meant to specify an exact time at which the notification will + /// be sent. In some cases, the gateway might require more than the specified delay time + /// to generate and send notifications.The following example sets NotificationPolicy on with SettlingTimeInSeconds /// set to 60.{\"Upload\": {\"SettlingTimeInSeconds\": 60}}The following example sets NotificationPolicy off.{} /// /// @@ -376,6 +384,24 @@ public partial class NewSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.String ClientToken { get; set; } #endregion + #region Parameter KMSEncrypted + /// + /// + /// Optional. Set to true to use Amazon S3 server-side encryption with your own + /// KMS key (SSE-KMS), or false to use a key managed by Amazon S3 (SSE-S3). To + /// use dual-layer encryption (DSSE-KMS), set the EncryptionType parameter instead.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true.Valid Values: true | false + /// + /// This parameter is deprecated. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [System.ObsoleteAttribute("KMSEncrypted is deprecated, use EncryptionType instead.")] + public System.Boolean? KMSEncrypted { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The default value is 'FileShareARN'. @@ -453,6 +479,7 @@ protected override void ProcessRecord() } #endif context.DefaultStorageClass = this.DefaultStorageClass; + context.EncryptionType = this.EncryptionType; context.FileShareName = this.FileShareName; context.GatewayARN = this.GatewayARN; #if MODULAR @@ -462,7 +489,9 @@ protected override void ProcessRecord() } #endif context.GuessMIMETypeEnabled = this.GuessMIMETypeEnabled; + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSEncrypted = this.KMSEncrypted; + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSKey = this.KMSKey; context.LocationARN = this.LocationARN; #if MODULAR @@ -547,6 +576,10 @@ public object Execute(ExecutorContext context) { request.DefaultStorageClass = cmdletContext.DefaultStorageClass; } + if (cmdletContext.EncryptionType != null) + { + request.EncryptionType = cmdletContext.EncryptionType; + } if (cmdletContext.FileShareName != null) { request.FileShareName = cmdletContext.FileShareName; @@ -559,10 +592,12 @@ public object Execute(ExecutorContext context) { request.GuessMIMETypeEnabled = cmdletContext.GuessMIMETypeEnabled.Value; } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSEncrypted != null) { request.KMSEncrypted = cmdletContext.KMSEncrypted.Value; } + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSKey != null) { request.KMSKey = cmdletContext.KMSKey; @@ -719,9 +754,11 @@ internal partial class CmdletContext : ExecutorContext public List ClientList { get; set; } public System.String ClientToken { get; set; } public System.String DefaultStorageClass { get; set; } + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } public System.String FileShareName { get; set; } public System.String GatewayARN { get; set; } public System.Boolean? GuessMIMETypeEnabled { get; set; } + [System.ObsoleteAttribute] public System.Boolean? KMSEncrypted { get; set; } public System.String KMSKey { get; set; } public System.String LocationARN { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGSMBFileShare-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGSMBFileShare-Cmdlet.cs index 3986ef9cd..006c801e4 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGSMBFileShare-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/New-SGSMBFileShare-Cmdlet.cs @@ -153,6 +153,22 @@ public partial class NewSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.String DefaultStorageClass { get; set; } #endregion + #region Parameter EncryptionType + /// + /// + /// A value that specifies the type of server-side encryption that the file share will + /// use for the data that it stores in Amazon S3.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.StorageGateway.EncryptionType")] + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } + #endregion + #region Parameter FileShareName /// /// @@ -206,23 +222,13 @@ public partial class NewSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.String[] InvalidUserList { get; set; } #endregion - #region Parameter KMSEncrypted - /// - /// - /// Set to true to use Amazon S3 server-side encryption with your own KMS key, - /// or false to use a key managed by Amazon S3. Optional.Valid Values: true | false - /// - /// - [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] - public System.Boolean? KMSEncrypted { get; set; } - #endregion - #region Parameter KMSKey /// /// - /// The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon - /// S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This - /// value can only be set when KMSEncrypted is true. Optional. + /// Optional. The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) + /// used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric + /// CMKs. This value must be set if KMSEncrypted is true, or if EncryptionType + /// is SseKms or DsseKms. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -259,7 +265,9 @@ public partial class NewSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdlet, /// generating an ObjectUploaded notification. Because clients can make many small /// writes to files, it's best to set this parameter for as long as possible to avoid /// generating multiple notifications for the same file in a small time period.SettlingTimeInSeconds has no effect on the timing of the object uploading - /// to Amazon S3, only the timing of the notification.The following example sets NotificationPolicy on with SettlingTimeInSeconds + /// to Amazon S3, only the timing of the notification.This setting is not meant to specify an exact time at which the notification will + /// be sent. In some cases, the gateway might require more than the specified delay time + /// to generate and send notifications.The following example sets NotificationPolicy on with SettlingTimeInSeconds /// set to 60.{\"Upload\": {\"SettlingTimeInSeconds\": 60}}The following example sets NotificationPolicy off.{} /// /// @@ -339,9 +347,9 @@ public partial class NewSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdlet, /// /// /// Set this value to true to enable access control list (ACL) on the SMB file - /// share. Set it to false to map file and directory permissions to the POSIX permissions.For more information, see Using - /// Microsoft Windows ACLs to control access to an SMB file share in the Storage - /// Gateway User Guide.Valid Values: true | false + /// share. Set it to false to map file and directory permissions to the POSIX permissions.For more information, see Using + /// Windows ACLs to limit SMB file share access in the Amazon S3 File Gateway User + /// Guide.Valid Values: true | false /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -407,6 +415,24 @@ public partial class NewSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdlet, public System.String ClientToken { get; set; } #endregion + #region Parameter KMSEncrypted + /// + /// + /// Optional. Set to true to use Amazon S3 server-side encryption with your own + /// KMS key (SSE-KMS), or false to use a key managed by Amazon S3 (SSE-S3). To + /// use dual-layer encryption (DSSE-KMS), set the EncryptionType parameter instead.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true.Valid Values: true | false + /// + /// This parameter is deprecated. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [System.ObsoleteAttribute("KMSEncrypted is deprecated, use EncryptionType instead.")] + public System.Boolean? KMSEncrypted { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The default value is 'FileShareARN'. @@ -487,6 +513,7 @@ protected override void ProcessRecord() } #endif context.DefaultStorageClass = this.DefaultStorageClass; + context.EncryptionType = this.EncryptionType; context.FileShareName = this.FileShareName; context.GatewayARN = this.GatewayARN; #if MODULAR @@ -500,7 +527,9 @@ protected override void ProcessRecord() { context.InvalidUserList = new List(this.InvalidUserList); } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSEncrypted = this.KMSEncrypted; + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSKey = this.KMSKey; context.LocationARN = this.LocationARN; #if MODULAR @@ -598,6 +627,10 @@ public object Execute(ExecutorContext context) { request.DefaultStorageClass = cmdletContext.DefaultStorageClass; } + if (cmdletContext.EncryptionType != null) + { + request.EncryptionType = cmdletContext.EncryptionType; + } if (cmdletContext.FileShareName != null) { request.FileShareName = cmdletContext.FileShareName; @@ -614,10 +647,12 @@ public object Execute(ExecutorContext context) { request.InvalidUserList = cmdletContext.InvalidUserList; } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSEncrypted != null) { request.KMSEncrypted = cmdletContext.KMSEncrypted.Value; } + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSKey != null) { request.KMSKey = cmdletContext.KMSKey; @@ -736,10 +771,12 @@ internal partial class CmdletContext : ExecutorContext public Amazon.StorageGateway.CaseSensitivity CaseSensitivity { get; set; } public System.String ClientToken { get; set; } public System.String DefaultStorageClass { get; set; } + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } public System.String FileShareName { get; set; } public System.String GatewayARN { get; set; } public System.Boolean? GuessMIMETypeEnabled { get; set; } public List InvalidUserList { get; set; } + [System.ObsoleteAttribute] public System.Boolean? KMSEncrypted { get; set; } public System.String KMSKey { get; set; } public System.String LocationARN { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGMaintenanceStartTime-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGMaintenanceStartTime-Cmdlet.cs index f40a41eb8..1f9d7a52a 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGMaintenanceStartTime-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGMaintenanceStartTime-Cmdlet.cs @@ -61,7 +61,11 @@ public partial class UpdateSGMaintenanceStartTimeCmdlet : AmazonStorageGatewayCl #region Parameter SoftwareUpdatePreferences_AutomaticUpdatePolicy /// /// - /// Indicates the automatic update policy for a gateway.ALL_VERSIONS - Enables regular gateway maintenance updates.EMERGENCY_VERSIONS_ONLY - Disables regular gateway maintenance updates. + /// Indicates the automatic update policy for a gateway.ALL_VERSIONS - Enables regular gateway maintenance updates.EMERGENCY_VERSIONS_ONLY - Disables regular gateway maintenance updates. The + /// gateway will still receive emergency version updates on rare occasions if necessary + /// to remedy highly critical security or durability issues. You will be notified before + /// an emergency version update is applied. These updates are applied during your gateway's + /// scheduled maintenance window. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGNFSFileShare-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGNFSFileShare-Cmdlet.cs index a6b11abf5..1d08ea1d0 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGNFSFileShare-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGNFSFileShare-Cmdlet.cs @@ -118,6 +118,22 @@ public partial class UpdateSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.String NFSFileShareDefaults_DirectoryMode { get; set; } #endregion + #region Parameter EncryptionType + /// + /// + /// A value that specifies the type of server-side encryption that the file share will + /// use for the data that it stores in Amazon S3.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.StorageGateway.EncryptionType")] + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } + #endregion + #region Parameter NFSFileShareDefaults_FileMode /// /// @@ -180,23 +196,13 @@ public partial class UpdateSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.Boolean? GuessMIMETypeEnabled { get; set; } #endregion - #region Parameter KMSEncrypted - /// - /// - /// Set to true to use Amazon S3 server-side encryption with your own KMS key, - /// or false to use a key managed by Amazon S3. Optional.Valid Values: true | false - /// - /// - [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] - public System.Boolean? KMSEncrypted { get; set; } - #endregion - #region Parameter KMSKey /// /// - /// The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon - /// S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This - /// value can only be set when KMSEncrypted is true. Optional. + /// Optional. The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) + /// used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric + /// CMKs. This value must be set if KMSEncrypted is true, or if EncryptionType + /// is SseKms or DsseKms. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -211,7 +217,9 @@ public partial class UpdateSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdl /// generating an ObjectUploaded notification. Because clients can make many small /// writes to files, it's best to set this parameter for as long as possible to avoid /// generating multiple notifications for the same file in a small time period.SettlingTimeInSeconds has no effect on the timing of the object uploading - /// to Amazon S3, only the timing of the notification.The following example sets NotificationPolicy on with SettlingTimeInSeconds + /// to Amazon S3, only the timing of the notification.This setting is not meant to specify an exact time at which the notification will + /// be sent. In some cases, the gateway might require more than the specified delay time + /// to generate and send notifications.The following example sets NotificationPolicy on with SettlingTimeInSeconds /// set to 60.{\"Upload\": {\"SettlingTimeInSeconds\": 60}}The following example sets NotificationPolicy off.{} /// /// @@ -279,6 +287,24 @@ public partial class UpdateSGNFSFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.String Squash { get; set; } #endregion + #region Parameter KMSEncrypted + /// + /// + /// Optional. Set to true to use Amazon S3 server-side encryption with your own + /// KMS key (SSE-KMS), or false to use a key managed by Amazon S3 (SSE-S3). To + /// use dual-layer encryption (DSSE-KMS), set the EncryptionType parameter instead.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true.Valid Values: true | false + /// + /// This parameter is deprecated. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [System.ObsoleteAttribute("KMSEncrypted is deprecated, use EncryptionType instead.")] + public System.Boolean? KMSEncrypted { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The default value is 'FileShareARN'. @@ -348,6 +374,7 @@ protected override void ProcessRecord() context.ClientList = new List(this.ClientList); } context.DefaultStorageClass = this.DefaultStorageClass; + context.EncryptionType = this.EncryptionType; context.FileShareARN = this.FileShareARN; #if MODULAR if (this.FileShareARN == null && ParameterWasBound(nameof(this.FileShareARN))) @@ -357,7 +384,9 @@ protected override void ProcessRecord() #endif context.FileShareName = this.FileShareName; context.GuessMIMETypeEnabled = this.GuessMIMETypeEnabled; + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSEncrypted = this.KMSEncrypted; + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSKey = this.KMSKey; context.NFSFileShareDefaults_DirectoryMode = this.NFSFileShareDefaults_DirectoryMode; context.NFSFileShareDefaults_FileMode = this.NFSFileShareDefaults_FileMode; @@ -415,6 +444,10 @@ public object Execute(ExecutorContext context) { request.DefaultStorageClass = cmdletContext.DefaultStorageClass; } + if (cmdletContext.EncryptionType != null) + { + request.EncryptionType = cmdletContext.EncryptionType; + } if (cmdletContext.FileShareARN != null) { request.FileShareARN = cmdletContext.FileShareARN; @@ -427,10 +460,12 @@ public object Execute(ExecutorContext context) { request.GuessMIMETypeEnabled = cmdletContext.GuessMIMETypeEnabled.Value; } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSEncrypted != null) { request.KMSEncrypted = cmdletContext.KMSEncrypted.Value; } + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSKey != null) { request.KMSKey = cmdletContext.KMSKey; @@ -569,9 +604,11 @@ internal partial class CmdletContext : ExecutorContext public System.Int32? CacheAttributes_CacheStaleTimeoutInSecond { get; set; } public List ClientList { get; set; } public System.String DefaultStorageClass { get; set; } + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } public System.String FileShareARN { get; set; } public System.String FileShareName { get; set; } public System.Boolean? GuessMIMETypeEnabled { get; set; } + [System.ObsoleteAttribute] public System.Boolean? KMSEncrypted { get; set; } public System.String KMSKey { get; set; } public System.String NFSFileShareDefaults_DirectoryMode { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGSMBFileShare-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGSMBFileShare-Cmdlet.cs index edf435151..306c571ad 100644 --- a/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGSMBFileShare-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/StorageGateway/Basic/Update-SGSMBFileShare-Cmdlet.cs @@ -129,6 +129,22 @@ public partial class UpdateSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.String DefaultStorageClass { get; set; } #endregion + #region Parameter EncryptionType + /// + /// + /// A value that specifies the type of server-side encryption that the file share will + /// use for the data that it stores in Amazon S3.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [AWSConstantClassSource("Amazon.StorageGateway.EncryptionType")] + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } + #endregion + #region Parameter FileShareARN /// /// @@ -182,23 +198,13 @@ public partial class UpdateSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.String[] InvalidUserList { get; set; } #endregion - #region Parameter KMSEncrypted - /// - /// - /// Set to true to use Amazon S3 server-side encryption with your own KMS key, - /// or false to use a key managed by Amazon S3. Optional.Valid Values: true | false - /// - /// - [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] - public System.Boolean? KMSEncrypted { get; set; } - #endregion - #region Parameter KMSKey /// /// - /// The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon - /// S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This - /// value can only be set when KMSEncrypted is true. Optional. + /// Optional. The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) + /// used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric + /// CMKs. This value must be set if KMSEncrypted is true, or if EncryptionType + /// is SseKms or DsseKms. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -213,7 +219,9 @@ public partial class UpdateSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdl /// generating an ObjectUploaded notification. Because clients can make many small /// writes to files, it's best to set this parameter for as long as possible to avoid /// generating multiple notifications for the same file in a small time period.SettlingTimeInSeconds has no effect on the timing of the object uploading - /// to Amazon S3, only the timing of the notification.The following example sets NotificationPolicy on with SettlingTimeInSeconds + /// to Amazon S3, only the timing of the notification.This setting is not meant to specify an exact time at which the notification will + /// be sent. In some cases, the gateway might require more than the specified delay time + /// to generate and send notifications.The following example sets NotificationPolicy on with SettlingTimeInSeconds /// set to 60.{\"Upload\": {\"SettlingTimeInSeconds\": 60}}The following example sets NotificationPolicy off.{} /// /// @@ -275,9 +283,9 @@ public partial class UpdateSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdl /// /// /// Set this value to true to enable access control list (ACL) on the SMB file - /// share. Set it to false to map file and directory permissions to the POSIX permissions.For more information, see Using - /// Microsoft Windows ACLs to control access to an SMB file share in the Storage - /// Gateway User Guide.Valid Values: true | false + /// share. Set it to false to map file and directory permissions to the POSIX permissions.For more information, see Using + /// Windows ACLs to limit SMB file share access in the Amazon S3 File Gateway User + /// Guide.Valid Values: true | false /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -297,6 +305,24 @@ public partial class UpdateSGSMBFileShareCmdlet : AmazonStorageGatewayClientCmdl public System.String[] ValidUserList { get; set; } #endregion + #region Parameter KMSEncrypted + /// + /// + /// Optional. Set to true to use Amazon S3 server-side encryption with your own + /// KMS key (SSE-KMS), or false to use a key managed by Amazon S3 (SSE-S3). To + /// use dual-layer encryption (DSSE-KMS), set the EncryptionType parameter instead.We recommend using EncryptionType instead of KMSEncrypted to set the + /// file share encryption method. You do not need to provide values for both parameters.If values for both parameters exist in the same request, then the specified encryption + /// methods must not conflict. For example, if EncryptionType is SseS3, + /// then KMSEncrypted must be false. If EncryptionType is SseKms + /// or DsseKms, then KMSEncrypted must be true.Valid Values: true | false + /// + /// This parameter is deprecated. + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [System.ObsoleteAttribute("KMSEncrypted is deprecated, use EncryptionType instead.")] + public System.Boolean? KMSEncrypted { get; set; } + #endregion + #region Parameter Select /// /// Use the -Select parameter to control the cmdlet output. The default value is 'FileShareARN'. @@ -368,6 +394,7 @@ protected override void ProcessRecord() context.CacheAttributes_CacheStaleTimeoutInSecond = this.CacheAttributes_CacheStaleTimeoutInSecond; context.CaseSensitivity = this.CaseSensitivity; context.DefaultStorageClass = this.DefaultStorageClass; + context.EncryptionType = this.EncryptionType; context.FileShareARN = this.FileShareARN; #if MODULAR if (this.FileShareARN == null && ParameterWasBound(nameof(this.FileShareARN))) @@ -381,7 +408,9 @@ protected override void ProcessRecord() { context.InvalidUserList = new List(this.InvalidUserList); } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSEncrypted = this.KMSEncrypted; + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute context.KMSKey = this.KMSKey; context.NotificationPolicy = this.NotificationPolicy; context.ObjectACL = this.ObjectACL; @@ -448,6 +477,10 @@ public object Execute(ExecutorContext context) { request.DefaultStorageClass = cmdletContext.DefaultStorageClass; } + if (cmdletContext.EncryptionType != null) + { + request.EncryptionType = cmdletContext.EncryptionType; + } if (cmdletContext.FileShareARN != null) { request.FileShareARN = cmdletContext.FileShareARN; @@ -464,10 +497,12 @@ public object Execute(ExecutorContext context) { request.InvalidUserList = cmdletContext.InvalidUserList; } + #pragma warning disable CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSEncrypted != null) { request.KMSEncrypted = cmdletContext.KMSEncrypted.Value; } + #pragma warning restore CS0618, CS0612 //A class member was marked with the Obsolete attribute if (cmdletContext.KMSKey != null) { request.KMSKey = cmdletContext.KMSKey; @@ -567,10 +602,12 @@ internal partial class CmdletContext : ExecutorContext public System.Int32? CacheAttributes_CacheStaleTimeoutInSecond { get; set; } public Amazon.StorageGateway.CaseSensitivity CaseSensitivity { get; set; } public System.String DefaultStorageClass { get; set; } + public Amazon.StorageGateway.EncryptionType EncryptionType { get; set; } public System.String FileShareARN { get; set; } public System.String FileShareName { get; set; } public System.Boolean? GuessMIMETypeEnabled { get; set; } public List InvalidUserList { get; set; } + [System.ObsoleteAttribute] public System.Boolean? KMSEncrypted { get; set; } public System.String KMSKey { get; set; } public System.String NotificationPolicy { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Get-CWSYNCanaryList-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Get-CWSYNCanaryList-Cmdlet.cs index e01ba9353..f20e90d2f 100644 --- a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Get-CWSYNCanaryList-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Get-CWSYNCanaryList-Cmdlet.cs @@ -78,8 +78,8 @@ public partial class GetCWSYNCanaryListCmdlet : AmazonSyntheticsClientCmdlet, IE /// /// /// Specify this parameter to limit how many canaries are returned each time you use the - /// DescribeCanaries operation. If you omit this parameter, the default of 100 - /// is used. + /// DescribeCanaries operation. If you omit this parameter, the default of 20 is + /// used. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] diff --git a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/New-CWSYNCanary-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/New-CWSYNCanary-Cmdlet.cs index 7116bb45f..a745e8528 100644 --- a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/New-CWSYNCanary-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/New-CWSYNCanary-Cmdlet.cs @@ -260,6 +260,19 @@ public partial class NewCWSYNCanaryCmdlet : AmazonSyntheticsClientCmdlet, IExecu public System.String Name { get; set; } #endregion + #region Parameter ResourcesToReplicateTag + /// + /// + /// To have the tags that you apply to this canary also be applied to the Lambda function + /// that the canary uses, specify this parameter with the value lambda-function.If you specify this parameter and don't specify any tags in the Tags parameter, + /// the canary creation fails. + /// + /// + [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] + [Alias("ResourcesToReplicateTags")] + public System.String[] ResourcesToReplicateTag { get; set; } + #endregion + #region Parameter RuntimeVersion /// /// @@ -351,7 +364,8 @@ public partial class NewCWSYNCanaryCmdlet : AmazonSyntheticsClientCmdlet, IExecu /// A list of key-value pairs to associate with the canary. You can associate as many /// as 50 tags with a canary.Tags can help you organize and categorize your resources. You can also use them to /// scope user permissions, by granting a user permission to access or change only the - /// resources that have certain tag values. + /// resources that have certain tag values.To have the tags that you apply to this canary also be applied to the Lambda function + /// that the canary uses, specify this parameter with the value lambda-function. /// /// [System.Management.Automation.Parameter(ValueFromPipelineByPropertyName = true)] @@ -484,6 +498,10 @@ protected override void ProcessRecord() WriteWarning("You are passing $null as a value for parameter Name which is marked as required. In case you believe this parameter was incorrectly marked as required, report this by opening an issue at https://github.com/aws/aws-tools-for-powershell/issues."); } #endif + if (this.ResourcesToReplicateTag != null) + { + context.ResourcesToReplicateTag = new List(this.ResourcesToReplicateTag); + } context.RunConfig_ActiveTracing = this.RunConfig_ActiveTracing; if (this.RunConfig_EnvironmentVariable != null) { @@ -667,6 +685,10 @@ public object Execute(ExecutorContext context) { request.Name = cmdletContext.Name; } + if (cmdletContext.ResourcesToReplicateTag != null) + { + request.ResourcesToReplicateTags = cmdletContext.ResourcesToReplicateTag; + } // populate RunConfig var requestRunConfigIsNull = true; @@ -866,6 +888,7 @@ internal partial class CmdletContext : ExecutorContext public System.String ExecutionRoleArn { get; set; } public System.Int32? FailureRetentionPeriodInDay { get; set; } public System.String Name { get; set; } + public List ResourcesToReplicateTag { get; set; } public System.Boolean? RunConfig_ActiveTracing { get; set; } public Dictionary RunConfig_EnvironmentVariable { get; set; } public System.Int32? RunConfig_MemoryInMB { get; set; } diff --git a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Remove-CWSYNCanary-Cmdlet.cs b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Remove-CWSYNCanary-Cmdlet.cs index 787059e9b..255ba2fd3 100644 --- a/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Remove-CWSYNCanary-Cmdlet.cs +++ b/modules/AWSPowerShell/Cmdlets/Synthetics/Basic/Remove-CWSYNCanary-Cmdlet.cs @@ -39,16 +39,14 @@ namespace Amazon.PowerShell.Cmdlets.CWSYN /// you delete a canary that you do not intend to use again, you should also delete the /// following: ///
  • - /// The CloudWatch alarms created for this canary. These alarms have a name of Synthetics-SharpDrop-Alarm-MyCanaryName. - ///
  • + /// The CloudWatch alarms created for this canary. These alarms have a name of Synthetics-Alarm-first-198-characters-of-canary-name-canaryId-alarm + /// number
  • /// Amazon S3 objects and buckets, such as the canary's artifact location. ///
  • /// IAM roles created for the canary. If they were created in the console, these roles - /// have the name role/service-role/CloudWatchSyntheticsRole-MyCanaryName. - ///
  • + /// have the name role/service-role/CloudWatchSyntheticsRole-First-21-Characters-of-CanaryName
  • /// CloudWatch Logs log groups created for the canary. These logs groups have the name - /// /aws/lambda/cwsyn-MyCanaryName. - ///
+ /// /aws/lambda/cwsyn-First-21-Characters-of-CanaryName /// Before you delete a canary, you might want to use GetCanary to display the /// information about this canary. Make note of the information returned by this operation /// so that you can delete these resources after you delete the canary. diff --git a/modules/AWSPowerShell/CmdletsList.dat b/modules/AWSPowerShell/CmdletsList.dat index e8cdc7664..9e33e598b 100644 Binary files a/modules/AWSPowerShell/CmdletsList.dat and b/modules/AWSPowerShell/CmdletsList.dat differ diff --git a/modules/ModularAWSPowerShell/CmdletsList.dat b/modules/ModularAWSPowerShell/CmdletsList.dat index e75511cad..d55d29310 100644 Binary files a/modules/ModularAWSPowerShell/CmdletsList.dat and b/modules/ModularAWSPowerShell/CmdletsList.dat differ