aws-sdk-rds 1.293.0 → 1.295.0

data/lib/aws-sdk-rds/types.rb

@@ -960,6 +960,10 @@ module Aws::RDS
     #   The number of days for which automatic DB snapshots are retained.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_type
+    #   The storage type for the DB cluster.
+    #   @return [String]
+    #
     # @!attribute [rw] allocated_storage
     #   The allocated storage size in gibibytes (GiB) for all database
     #   engines except Amazon Aurora. For Aurora, `AllocatedStorage` always
@@ -976,10 +980,6 @@ module Aws::RDS
     #   is only for non-Aurora Multi-AZ DB clusters.
     #   @return [Integer]
     #
-    # @!attribute [rw] storage_type
-    #   The storage type for the DB cluster.
-    #   @return [String]
-    #
     # @!attribute [rw] certificate_details
     #   The details of the DB instance’s server certificate.
     #
@@ -1003,12 +1003,12 @@ module Aws::RDS
       :iam_database_authentication_enabled,
       :engine_version,
       :backup_retention_period,
+      :storage_type,
       :allocated_storage,
       :rds_custom_cluster_configuration,
       :iops,
-      :storage_type,
       :certificate_details)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password]
       include Aws::Structure
     end
 
@@ -1284,20 +1284,19 @@ module Aws::RDS
     #   The identifier of the DB cluster snapshot to copy. This parameter
     #   isn't case-sensitive.
     #
-    #   You can't copy an encrypted, shared DB cluster snapshot from one
-    #   Amazon Web Services Region to another.
-    #
     #   Constraints:
     #
-    #   * Must specify a valid system snapshot in the "available" state.
+    #   * Must specify a valid source snapshot in the "available" state.
     #
     #   * If the source snapshot is in the same Amazon Web Services Region
     #     as the copy, specify a valid DB snapshot identifier.
     #
     #   * If the source snapshot is in a different Amazon Web Services
-    #     Region than the copy, specify a valid DB cluster snapshot ARN. For
-    #     more information, go to [ Copying Snapshots Across Amazon Web
-    #     Services Regions][1] in the *Amazon Aurora User Guide*.
+    #     Region than the copy, specify a valid DB cluster snapshot ARN. You
+    #     can also specify an ARN of a snapshot that is in a different
+    #     account and a different Amazon Web Services Region. For more
+    #     information, go to [ Copying Snapshots Across Amazon Web Services
+    #     Regions][1] in the *Amazon Aurora User Guide*.
     #
     #   Example: `my-cluster-snapshot1`
     #
@@ -1441,7 +1440,7 @@ module Aws::RDS
       :copy_tags,
       :tags,
       :source_region)
-      SENSITIVE = []
+      SENSITIVE = [:pre_signed_url]
       include Aws::Structure
     end
 
@@ -1542,20 +1541,18 @@ module Aws::RDS
     #   the copy, specify a valid DB snapshot identifier. For example, you
     #   might specify `rds:mysql-instance1-snapshot-20130805`.
     #
-    #   If the source snapshot is in a different Amazon Web Services Region
-    #   than the copy, specify a valid DB snapshot ARN. For example, you
-    #   might specify
-    #   `arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20130805`.
-    #
     #   If you are copying from a shared manual DB snapshot, this parameter
     #   must be the Amazon Resource Name (ARN) of the shared DB snapshot.
     #
-    #   If you are copying an encrypted snapshot this parameter must be in
-    #   the ARN format for the source Amazon Web Services Region.
+    #   If the source snapshot is in a different Amazon Web Services Region
+    #   than the copy, specify a valid DB snapshot ARN. You can also specify
+    #   an ARN of a snapshot that is in a different account and a different
+    #   Amazon Web Services Region. For example, you might specify
+    #   `arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20130805`.
     #
     #   Constraints:
     #
-    #   * Must specify a valid system snapshot in the "available" state.
+    #   * Must specify a valid source snapshot in the "available" state.
     #
     #   ^
     #
@@ -1718,6 +1715,18 @@ module Aws::RDS
     #   Example: `rds-caz-aiqhTgQv`.
     #   @return [String]
     #
+    # @!attribute [rw] snapshot_target
+    #   Configures the location where RDS will store copied snapshots.
+    #
+    #   Valid Values:
+    #
+    #   * `local` (Dedicated Local Zone)
+    #
+    #   * `outposts` (Amazon Web Services Outposts)
+    #
+    #   * `region` (Amazon Web Services Region)
+    #   @return [String]
+    #
     # @!attribute [rw] copy_option_group
     #   Specifies whether to copy the DB option group associated with the
     #   source DB snapshot to the target Amazon Web Services account and
@@ -1731,18 +1740,6 @@ module Aws::RDS
     #   a Dedicated Local Zone.
     #   @return [String]
     #
-    # @!attribute [rw] snapshot_target
-    #   Configures the location where RDS will store copied snapshots.
-    #
-    #   Valid Values:
-    #
-    #   * `local` (Dedicated Local Zone)
-    #
-    #   * `outposts` (Amazon Web Services Outposts)
-    #
-    #   * `region` (Amazon Web Services Region)
-    #   @return [String]
-    #
     # @!attribute [rw] source_region
     #   The source region of the snapshot. This is only needed when the
     #   shapshot is encrypted and in a different region.
@@ -1759,11 +1756,11 @@ module Aws::RDS
       :pre_signed_url,
       :option_group_name,
       :target_custom_availability_zone,
+      :snapshot_target,
       :copy_option_group,
       :snapshot_availability_zone,
-      :snapshot_target,
       :source_region)
-      SENSITIVE = []
+      SENSITIVE = [:pre_signed_url]
       include Aws::Structure
     end
 
@@ -2069,6 +2066,20 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html#create-symmetric-cmk
     #   @return [String]
     #
+    # @!attribute [rw] source_custom_db_engine_version_identifier
+    #   The ARN of a CEV to use as a source for creating a new CEV. You can
+    #   specify a different Amazon Machine Imagine (AMI) by using either
+    #   `Source` or `UseAwsProvidedLatestImage`. You can't specify a
+    #   different JSON manifest when you specify
+    #   `SourceCustomDbEngineVersionIdentifier`.
+    #   @return [String]
+    #
+    # @!attribute [rw] use_aws_provided_latest_image
+    #   Specifies whether to use the latest service-provided Amazon Machine
+    #   Image (AMI) for the CEV. If you specify `UseAwsProvidedLatestImage`,
+    #   you can't also specify `ImageId`.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] description
     #   An optional description of your CEV.
     #   @return [String]
@@ -2124,20 +2135,6 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html
     #   @return [Array<Types::Tag>]
     #
-    # @!attribute [rw] source_custom_db_engine_version_identifier
-    #   The ARN of a CEV to use as a source for creating a new CEV. You can
-    #   specify a different Amazon Machine Imagine (AMI) by using either
-    #   `Source` or `UseAwsProvidedLatestImage`. You can't specify a
-    #   different JSON manifest when you specify
-    #   `SourceCustomDbEngineVersionIdentifier`.
-    #   @return [String]
-    #
-    # @!attribute [rw] use_aws_provided_latest_image
-    #   Specifies whether to use the latest service-provided Amazon Machine
-    #   Image (AMI) for the CEV. If you specify `UseAwsProvidedLatestImage`,
-    #   you can't also specify `ImageId`.
-    #   @return [Boolean]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/CreateCustomDBEngineVersionMessage AWS API Documentation
     #
     class CreateCustomDBEngineVersionMessage < Struct.new(
@@ -2147,11 +2144,11 @@ module Aws::RDS
       :database_installation_files_s3_prefix,
       :image_id,
       :kms_key_id,
+      :source_custom_db_engine_version_identifier,
+      :use_aws_provided_latest_image,
       :description,
       :manifest,
-      :tags,
-      :source_custom_db_engine_version_identifier,
-      :use_aws_provided_latest_image)
+      :tags)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -2700,87 +2697,6 @@ module Aws::RDS
     #   Reserved for future use.
     #   @return [Types::RdsCustomClusterConfiguration]
     #
-    # @!attribute [rw] deletion_protection
-    #   Specifies whether the DB cluster has deletion protection enabled.
-    #   The database can't be deleted when deletion protection is enabled.
-    #   By default, deletion protection isn't enabled.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
-    #   @return [Boolean]
-    #
-    # @!attribute [rw] global_cluster_identifier
-    #   The global cluster ID of an Aurora cluster that becomes the primary
-    #   cluster in the new global database cluster.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #   @return [String]
-    #
-    # @!attribute [rw] enable_http_endpoint
-    #   Specifies whether to enable the HTTP endpoint for the DB cluster. By
-    #   default, the HTTP endpoint isn't enabled.
-    #
-    #   When enabled, the HTTP endpoint provides a connectionless web
-    #   service API (RDS Data API) for running SQL queries on the DB
-    #   cluster. You can also query your database from inside the RDS
-    #   console with the RDS query editor.
-    #
-    #   For more information, see [Using RDS Data API][1] in the *Amazon
-    #   Aurora User Guide*.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html
-    #   @return [Boolean]
-    #
-    # @!attribute [rw] copy_tags_to_snapshot
-    #   Specifies whether to copy all tags from the DB cluster to snapshots
-    #   of the DB cluster. The default is not to copy them.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
-    #   @return [Boolean]
-    #
-    # @!attribute [rw] domain
-    #   The Active Directory directory ID to create the DB cluster in.
-    #
-    #   For Amazon Aurora DB clusters, Amazon RDS can use Kerberos
-    #   authentication to authenticate users that connect to the DB cluster.
-    #
-    #   For more information, see [Kerberos authentication][1] in the
-    #   *Amazon Aurora User Guide*.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/kerberos-authentication.html
-    #   @return [String]
-    #
-    # @!attribute [rw] domain_iam_role_name
-    #   The name of the IAM role to use when making API calls to the
-    #   Directory Service.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #   @return [String]
-    #
-    # @!attribute [rw] enable_global_write_forwarding
-    #   Specifies whether to enable this DB cluster to forward write
-    #   operations to the primary cluster of a global cluster (Aurora global
-    #   database). By default, write operations are not allowed on Aurora DB
-    #   clusters that are secondary clusters in an Aurora global database.
-    #
-    #   You can set this value only on Aurora DB clusters that are members
-    #   of an Aurora global database. With this parameter enabled, a
-    #   secondary cluster can forward writes to the current primary cluster,
-    #   and the resulting changes are replicated back to this cluster. For
-    #   the primary DB cluster of an Aurora global database, this value is
-    #   used immediately if the primary is demoted by a global cluster API
-    #   operation, but it does nothing until then.
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #   @return [Boolean]
-    #
     # @!attribute [rw] db_cluster_instance_class
     #   The compute and memory capacity of each DB instance in the Multi-AZ
     #   DB cluster, for example `db.m6gd.xlarge`. Not all DB instance
@@ -2874,40 +2790,31 @@ module Aws::RDS
     # @!attribute [rw] publicly_accessible
     #   Specifies whether the DB cluster is publicly accessible.
     #
+    #   Valid for Cluster Type: Multi-AZ DB clusters only
+    #
     #   When the DB cluster is publicly accessible and you connect from
-    #   outside of the DB cluster's virtual private cloud (VPC), its Domain
-    #   Name System (DNS) endpoint resolves to the public IP address. When
+    #   outside of the DB cluster's virtual private cloud (VPC), its domain
+    #   name system (DNS) endpoint resolves to the public IP address. When
     #   you connect from within the same VPC as the DB cluster, the endpoint
     #   resolves to the private IP address. Access to the DB cluster is
-    #   ultimately controlled by the security group it uses. That public
-    #   access isn't permitted if the security group assigned to the DB
-    #   cluster doesn't permit it.
+    #   controlled by its security group settings.
     #
     #   When the DB cluster isn't publicly accessible, it is an internal DB
     #   cluster with a DNS name that resolves to a private IP address.
     #
-    #   Valid for Cluster Type: Multi-AZ DB clusters only
-    #
-    #   Default: The default behavior varies depending on whether
-    #   `DBSubnetGroupName` is specified.
-    #
-    #   If `DBSubnetGroupName` isn't specified, and `PubliclyAccessible`
-    #   isn't specified, the following applies:
-    #
-    #   * If the default VPC in the target Region doesn’t have an internet
-    #     gateway attached to it, the DB cluster is private.
-    #
-    #   * If the default VPC in the target Region has an internet gateway
-    #     attached to it, the DB cluster is public.
+    #   The default behavior when `PubliclyAccessible` is not specified
+    #   depends on whether a `DBSubnetGroup` is specified.
     #
-    #   If `DBSubnetGroupName` is specified, and `PubliclyAccessible` isn't
-    #   specified, the following applies:
+    #   If `DBSubnetGroup` isn't specified, `PubliclyAccessible` defaults
+    #   to `true`.
     #
-    #   * If the subnets are part of a VPC that doesn’t have an internet
-    #     gateway attached to it, the DB cluster is private.
+    #   If `DBSubnetGroup` is specified, `PubliclyAccessible` defaults to
+    #   `false` unless the value of `DBSubnetGroup` is `default`, in which
+    #   case `PubliclyAccessible` defaults to `true`.
     #
-    #   * If the subnets are part of a VPC that has an internet gateway
-    #     attached to it, the DB cluster is public.
+    #   If `PubliclyAccessible` is true and the VPC that the `DBSubnetGroup`
+    #   is in doesn't have an internet gateway attached to it, Amazon RDS
+    #   returns an error.
     #   @return [Boolean]
     #
     # @!attribute [rw] auto_minor_version_upgrade
@@ -2925,65 +2832,177 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Upgrading.html#USER_UpgradeDBInstance.Upgrading.AutoMinorVersionUpgrades
     #   @return [Boolean]
     #
-    # @!attribute [rw] monitoring_interval
-    #   The interval, in seconds, between points when Enhanced Monitoring
-    #   metrics are collected for the DB cluster. To turn off collecting
-    #   Enhanced Monitoring metrics, specify `0`.
-    #
-    #   If `MonitoringRoleArn` is specified, also set `MonitoringInterval`
-    #   to a value other than `0`.
+    # @!attribute [rw] deletion_protection
+    #   Specifies whether the DB cluster has deletion protection enabled.
+    #   The database can't be deleted when deletion protection is enabled.
+    #   By default, deletion protection isn't enabled.
     #
     #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #   @return [Boolean]
     #
-    #   Valid Values: `0 | 1 | 5 | 10 | 15 | 30 | 60`
+    # @!attribute [rw] global_cluster_identifier
+    #   The global cluster ID of an Aurora cluster that becomes the primary
+    #   cluster in the new global database cluster.
     #
-    #   Default: `0`
-    #   @return [Integer]
+    #   Valid for Cluster Type: Aurora DB clusters only
+    #   @return [String]
     #
-    # @!attribute [rw] monitoring_role_arn
-    #   The Amazon Resource Name (ARN) for the IAM role that permits RDS to
-    #   send Enhanced Monitoring metrics to Amazon CloudWatch Logs. An
-    #   example is `arn:aws:iam:123456789012:role/emaccess`. For information
-    #   on creating a monitoring role, see [Setting up and enabling Enhanced
-    #   Monitoring][1] in the *Amazon RDS User Guide*.
+    # @!attribute [rw] enable_http_endpoint
+    #   Specifies whether to enable the HTTP endpoint for the DB cluster. By
+    #   default, the HTTP endpoint isn't enabled.
     #
-    #   If `MonitoringInterval` is set to a value other than `0`, supply a
-    #   `MonitoringRoleArn` value.
+    #   When enabled, the HTTP endpoint provides a connectionless web
+    #   service API (RDS Data API) for running SQL queries on the DB
+    #   cluster. You can also query your database from inside the RDS
+    #   console with the RDS query editor.
     #
-    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #   For more information, see [Using RDS Data API][1] in the *Amazon
+    #   Aurora User Guide*.
     #
+    #   Valid for Cluster Type: Aurora DB clusters only
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling
-    #   @return [String]
     #
-    # @!attribute [rw] database_insights_mode
-    #   The mode of Database Insights to enable for the DB cluster.
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html
+    #   @return [Boolean]
     #
-    #   If you set this value to `advanced`, you must also set the
-    #   `PerformanceInsightsEnabled` parameter to `true` and the
-    #   `PerformanceInsightsRetentionPeriod` parameter to 465.
+    # @!attribute [rw] copy_tags_to_snapshot
+    #   Specifies whether to copy all tags from the DB cluster to snapshots
+    #   of the DB cluster. The default is not to copy them.
     #
     #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
-    #   @return [String]
+    #   @return [Boolean]
     #
-    # @!attribute [rw] enable_performance_insights
-    #   Specifies whether to turn on Performance Insights for the DB
-    #   cluster.
+    # @!attribute [rw] domain
+    #   The Active Directory directory ID to create the DB cluster in.
     #
-    #   For more information, see [ Using Amazon Performance Insights][1] in
-    #   the *Amazon RDS User Guide*.
+    #   For Amazon Aurora DB clusters, Amazon RDS can use Kerberos
+    #   authentication to authenticate users that connect to the DB cluster.
     #
-    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #   For more information, see [Kerberos authentication][1] in the
+    #   *Amazon Aurora User Guide*.
     #
+    #   Valid for Cluster Type: Aurora DB clusters only
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html
-    #   @return [Boolean]
     #
-    # @!attribute [rw] performance_insights_kms_key_id
-    #   The Amazon Web Services KMS key identifier for encryption of
-    #   Performance Insights data.
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/kerberos-authentication.html
+    #   @return [String]
+    #
+    # @!attribute [rw] domain_iam_role_name
+    #   The name of the IAM role to use when making API calls to the
+    #   Directory Service.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters only
+    #   @return [String]
+    #
+    # @!attribute [rw] enable_global_write_forwarding
+    #   Specifies whether to enable this DB cluster to forward write
+    #   operations to the primary cluster of a global cluster (Aurora global
+    #   database). By default, write operations are not allowed on Aurora DB
+    #   clusters that are secondary clusters in an Aurora global database.
+    #
+    #   You can set this value only on Aurora DB clusters that are members
+    #   of an Aurora global database. With this parameter enabled, a
+    #   secondary cluster can forward writes to the current primary cluster,
+    #   and the resulting changes are replicated back to this cluster. For
+    #   the primary DB cluster of an Aurora global database, this value is
+    #   used immediately if the primary is demoted by a global cluster API
+    #   operation, but it does nothing until then.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters only
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] network_type
+    #   The network type of the DB cluster.
+    #
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
+    #   or the IPv4 and the IPv6 protocols (`DUAL`).
+    #
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon Aurora User Guide.*
+    #
+    #   Valid for Cluster Type: Aurora DB clusters only
+    #
+    #   Valid Values: `IPV4 | DUAL`
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   @return [String]
+    #
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   Contains the scaling configuration of an Aurora Serverless v2 DB
+    #   cluster.
+    #
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #
+    # @!attribute [rw] monitoring_interval
+    #   The interval, in seconds, between points when Enhanced Monitoring
+    #   metrics are collected for the DB cluster. To turn off collecting
+    #   Enhanced Monitoring metrics, specify `0`.
+    #
+    #   If `MonitoringRoleArn` is specified, also set `MonitoringInterval`
+    #   to a value other than `0`.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #
+    #   Valid Values: `0 | 1 | 5 | 10 | 15 | 30 | 60`
+    #
+    #   Default: `0`
+    #   @return [Integer]
+    #
+    # @!attribute [rw] monitoring_role_arn
+    #   The Amazon Resource Name (ARN) for the IAM role that permits RDS to
+    #   send Enhanced Monitoring metrics to Amazon CloudWatch Logs. An
+    #   example is `arn:aws:iam:123456789012:role/emaccess`. For information
+    #   on creating a monitoring role, see [Setting up and enabling Enhanced
+    #   Monitoring][1] in the *Amazon RDS User Guide*.
+    #
+    #   If `MonitoringInterval` is set to a value other than `0`, supply a
+    #   `MonitoringRoleArn` value.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling
+    #   @return [String]
+    #
+    # @!attribute [rw] database_insights_mode
+    #   The mode of Database Insights to enable for the DB cluster.
+    #
+    #   If you set this value to `advanced`, you must also set the
+    #   `PerformanceInsightsEnabled` parameter to `true` and the
+    #   `PerformanceInsightsRetentionPeriod` parameter to 465.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #   @return [String]
+    #
+    # @!attribute [rw] enable_performance_insights
+    #   Specifies whether to turn on Performance Insights for the DB
+    #   cluster.
+    #
+    #   For more information, see [ Using Amazon Performance Insights][1] in
+    #   the *Amazon RDS User Guide*.
+    #
+    #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PerfInsights.html
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] performance_insights_kms_key_id
+    #   The Amazon Web Services KMS key identifier for encryption of
+    #   Performance Insights data.
     #
     #   The Amazon Web Services KMS key identifier is the key ARN, key ID,
     #   alias ARN, or alias name for the KMS key.
@@ -3030,37 +3049,6 @@ module Aws::RDS
     #    </note>
     #   @return [Boolean]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   Contains the scaling configuration of an Aurora Serverless v2 DB
-    #   cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfiguration]
-    #
-    # @!attribute [rw] network_type
-    #   The network type of the DB cluster.
-    #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
-    #   or the IPv4 and the IPv6 protocols (`DUAL`).
-    #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon Aurora User Guide.*
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #
-    #   Valid Values: `IPV4 | DUAL`
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   @return [String]
-    #
     # @!attribute [rw] cluster_scalability_type
     #   Specifies the scalability mode of the Aurora DB cluster. When set to
     #   `limitless`, the cluster operates as an Aurora Limitless Database.
@@ -3102,6 +3090,14 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html
     #   @return [Boolean]
     #
+    # @!attribute [rw] enable_local_write_forwarding
+    #   Specifies whether read replicas can forward write operations to the
+    #   writer DB instance in the DB cluster. By default, write operations
+    #   aren't allowed on reader DB instances.
+    #
+    #   Valid for: Aurora DB clusters only
+    #   @return [Boolean]
+    #
     # @!attribute [rw] master_user_secret_kms_key_id
     #   The Amazon Web Services KMS key identifier to encrypt a secret that
     #   is automatically generated and managed in Amazon Web Services
@@ -3128,14 +3124,6 @@ module Aws::RDS
     #   Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters
     #   @return [String]
     #
-    # @!attribute [rw] enable_local_write_forwarding
-    #   Specifies whether read replicas can forward write operations to the
-    #   writer DB instance in the DB cluster. By default, write operations
-    #   aren't allowed on reader DB instances.
-    #
-    #   Valid for: Aurora DB clusters only
-    #   @return [Boolean]
-    #
     # @!attribute [rw] ca_certificate_identifier
     #   The CA certificate identifier to use for the DB cluster's server
     #   certificate.
@@ -3241,6 +3229,12 @@ module Aws::RDS
       :engine_mode,
       :scaling_configuration,
       :rds_custom_cluster_configuration,
+      :db_cluster_instance_class,
+      :allocated_storage,
+      :storage_type,
+      :iops,
+      :publicly_accessible,
+      :auto_minor_version_upgrade,
       :deletion_protection,
       :global_cluster_identifier,
       :enable_http_endpoint,
@@ -3248,12 +3242,8 @@ module Aws::RDS
       :domain,
       :domain_iam_role_name,
       :enable_global_write_forwarding,
-      :db_cluster_instance_class,
-      :allocated_storage,
-      :storage_type,
-      :iops,
-      :publicly_accessible,
-      :auto_minor_version_upgrade,
+      :network_type,
+      :serverless_v2_scaling_configuration,
       :monitoring_interval,
       :monitoring_role_arn,
       :database_insights_mode,
@@ -3261,18 +3251,16 @@ module Aws::RDS
       :performance_insights_kms_key_id,
       :performance_insights_retention_period,
       :enable_limitless_database,
-      :serverless_v2_scaling_configuration,
-      :network_type,
       :cluster_scalability_type,
       :db_system_id,
       :manage_master_user_password,
-      :master_user_secret_kms_key_id,
       :enable_local_write_forwarding,
+      :master_user_secret_kms_key_id,
       :ca_certificate_identifier,
       :engine_lifecycle_support,
       :master_user_authentication_type,
       :source_region)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password, :pre_signed_url]
       include Aws::Structure
     end
 
@@ -4192,6 +4180,16 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput value, in mebibyte per second (MiBps), for
+    #   the DB instance.
+    #
+    #   This setting applies only to the `gp3` storage type.
+    #
+    #   This setting doesn't apply to Amazon Aurora or RDS Custom DB
+    #   instances.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The option group to associate the DB instance with.
     #
@@ -4228,36 +4226,27 @@ module Aws::RDS
     #
     #   When the DB instance is publicly accessible and you connect from
     #   outside of the DB instance's virtual private cloud (VPC), its
-    #   Domain Name System (DNS) endpoint resolves to the public IP address.
+    #   domain name system (DNS) endpoint resolves to the public IP address.
     #   When you connect from within the same VPC as the DB instance, the
     #   endpoint resolves to the private IP address. Access to the DB
-    #   instance is ultimately controlled by the security group it uses.
-    #   That public access is not permitted if the security group assigned
-    #   to the DB instance doesn't permit it.
+    #   instance is controlled by its security group settings.
     #
     #   When the DB instance isn't publicly accessible, it is an internal
     #   DB instance with a DNS name that resolves to a private IP address.
     #
-    #   Default: The default behavior varies depending on whether
-    #   `DBSubnetGroupName` is specified.
-    #
-    #   If `DBSubnetGroupName` isn't specified, and `PubliclyAccessible`
-    #   isn't specified, the following applies:
-    #
-    #   * If the default VPC in the target Region doesn’t have an internet
-    #     gateway attached to it, the DB instance is private.
+    #   The default behavior when `PubliclyAccessible` is not specified
+    #   depends on whether a `DBSubnetGroup` is specified.
     #
-    #   * If the default VPC in the target Region has an internet gateway
-    #     attached to it, the DB instance is public.
-    #
-    #   If `DBSubnetGroupName` is specified, and `PubliclyAccessible` isn't
-    #   specified, the following applies:
+    #   If `DBSubnetGroup` isn't specified, `PubliclyAccessible` defaults
+    #   to `false` for Aurora instances and `true` for non-Aurora instances.
     #
-    #   * If the subnets are part of a VPC that doesn’t have an internet
-    #     gateway attached to it, the DB instance is private.
+    #   If `DBSubnetGroup` is specified, `PubliclyAccessible` defaults to
+    #   `false` unless the value of `DBSubnetGroup` is `default`, in which
+    #   case `PubliclyAccessible` defaults to `true`.
     #
-    #   * If the subnets are part of a VPC that has an internet gateway
-    #     attached to it, the DB instance is public.
+    #   If `PubliclyAccessible` is true and the VPC that the `DBSubnetGroup`
+    #   is in doesn't have an internet gateway attached to it, Amazon RDS
+    #   returns an error.
     #   @return [Boolean]
     #
     # @!attribute [rw] tags
@@ -4665,28 +4654,21 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
     #   @return [Boolean]
     #
-    # @!attribute [rw] custom_iam_instance_profile
-    #   The instance profile associated with the underlying Amazon EC2
-    #   instance of an RDS Custom DB instance.
-    #
-    #   This setting is required for RDS Custom.
-    #
-    #   Constraints:
-    #
-    #   * The profile must exist in your account.
+    # @!attribute [rw] network_type
+    #   The network type of the DB instance.
     #
-    #   * The profile must have an IAM role that Amazon EC2 has permissions
-    #     to assume.
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
+    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
     #
-    #   * The instance profile name and the associated IAM role name must
-    #     start with the prefix `AWSRDSCustom`.
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon RDS User Guide.*
     #
-    #   For the list of permissions required for the IAM role, see [
-    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
+    #   Valid Values: `IPV4 | DUAL`
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
     # @!attribute [rw] backup_target
@@ -4710,32 +4692,55 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-on-outposts.html
     #   @return [String]
     #
-    # @!attribute [rw] network_type
-    #   The network type of the DB instance.
-    #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
-    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
+    # @!attribute [rw] custom_iam_instance_profile
+    #   The instance profile associated with the underlying Amazon EC2
+    #   instance of an RDS Custom DB instance.
     #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon RDS User Guide.*
+    #   This setting is required for RDS Custom.
     #
-    #   Valid Values: `IPV4 | DUAL`
+    #   Constraints:
     #
+    #   * The profile must exist in your account.
     #
+    #   * The profile must have an IAM role that Amazon EC2 has permissions
+    #     to assume.
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   @return [String]
+    #   * The instance profile name and the associated IAM role name must
+    #     start with the prefix `AWSRDSCustom`.
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput value, in mebibyte per second (MiBps), for
-    #   the DB instance.
+    #   For the list of permissions required for the IAM role, see [
+    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
     #
-    #   This setting applies only to the `gp3` storage type.
     #
-    #   This setting doesn't apply to Amazon Aurora or RDS Custom DB
-    #   instances.
-    #   @return [Integer]
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
+    #   @return [String]
+    #
+    # @!attribute [rw] db_system_id
+    #   The Oracle system identifier (SID), which is the name of the Oracle
+    #   database instance that manages your database files. In this context,
+    #   the term "Oracle database instance" refers exclusively to the
+    #   system global area (SGA) and Oracle background processes. If you
+    #   don't specify a SID, the value defaults to `RDSCDB`. The Oracle SID
+    #   is also the name of your CDB.
+    #   @return [String]
+    #
+    # @!attribute [rw] ca_certificate_identifier
+    #   The CA certificate identifier to use for the DB instance's server
+    #   certificate.
+    #
+    #   This setting doesn't apply to RDS Custom DB instances.
+    #
+    #   For more information, see [Using SSL/TLS to encrypt a connection to
+    #   a DB instance][1] in the *Amazon RDS User Guide* and [ Using SSL/TLS
+    #   to encrypt a connection to a DB cluster][2] in the *Amazon Aurora
+    #   User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html
+    #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL.html
+    #   @return [String]
     #
     # @!attribute [rw] manage_master_user_password
     #   Specifies whether to manage the master user password with Amazon Web
@@ -4780,37 +4785,6 @@ module Aws::RDS
     #   each Amazon Web Services Region.
     #   @return [String]
     #
-    # @!attribute [rw] ca_certificate_identifier
-    #   The CA certificate identifier to use for the DB instance's server
-    #   certificate.
-    #
-    #   This setting doesn't apply to RDS Custom DB instances.
-    #
-    #   For more information, see [Using SSL/TLS to encrypt a connection to
-    #   a DB instance][1] in the *Amazon RDS User Guide* and [ Using SSL/TLS
-    #   to encrypt a connection to a DB cluster][2] in the *Amazon Aurora
-    #   User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html
-    #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/UsingWithRDS.SSL.html
-    #   @return [String]
-    #
-    # @!attribute [rw] db_system_id
-    #   The Oracle system identifier (SID), which is the name of the Oracle
-    #   database instance that manages your database files. In this context,
-    #   the term "Oracle database instance" refers exclusively to the
-    #   system global area (SGA) and Oracle background processes. If you
-    #   don't specify a SID, the value defaults to `RDSCDB`. The Oracle SID
-    #   is also the name of your CDB.
-    #   @return [String]
-    #
-    # @!attribute [rw] dedicated_log_volume
-    #   Indicates whether the DB instance has a dedicated log volume (DLV)
-    #   enabled.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] multi_tenant
     #   Specifies whether to use the multi-tenant configuration or the
     #   single-tenant configuration (default). This parameter only applies
@@ -4828,6 +4802,11 @@ module Aws::RDS
     #     single-tenant configuration.
     #   @return [Boolean]
     #
+    # @!attribute [rw] dedicated_log_volume
+    #   Indicates whether the DB instance has a dedicated log volume (DLV)
+    #   enabled.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] engine_lifecycle_support
     #   The life cycle type for this DB instance.
     #
@@ -4902,6 +4881,7 @@ module Aws::RDS
       :auto_minor_version_upgrade,
       :license_model,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :character_set_name,
       :nchar_character_set_name,
@@ -4934,19 +4914,18 @@ module Aws::RDS
       :deletion_protection,
       :max_allocated_storage,
       :enable_customer_owned_ip,
-      :custom_iam_instance_profile,
-      :backup_target,
       :network_type,
-      :storage_throughput,
+      :backup_target,
+      :custom_iam_instance_profile,
+      :db_system_id,
+      :ca_certificate_identifier,
       :manage_master_user_password,
       :master_user_secret_kms_key_id,
-      :ca_certificate_identifier,
-      :db_system_id,
-      :dedicated_log_volume,
       :multi_tenant,
+      :dedicated_log_volume,
       :engine_lifecycle_support,
       :master_user_authentication_type)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password, :tde_credential_password]
       include Aws::Structure
     end
 
@@ -5066,6 +5045,13 @@ module Aws::RDS
     #   to initially allocate for the DB instance.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   Specifies the storage throughput value for the read replica.
+    #
+    #   This setting doesn't apply to RDS Custom or Amazon Aurora DB
+    #   instances.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The option group to associate the DB instance with. If not
     #   specified, RDS uses the option group associated with the source DB
@@ -5573,41 +5559,28 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/oracle-read-replicas.html
     #   @return [String]
     #
-    # @!attribute [rw] max_allocated_storage
-    #   The upper limit in gibibytes (GiB) to which Amazon RDS can
-    #   automatically scale the storage of the DB instance.
-    #
-    #   For more information about this setting, including limitations that
-    #   apply to it, see [ Managing capacity automatically with Amazon RDS
-    #   storage autoscaling][1] in the *Amazon RDS User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.Autoscaling
-    #   @return [Integer]
-    #
-    # @!attribute [rw] custom_iam_instance_profile
-    #   The instance profile associated with the underlying Amazon EC2
-    #   instance of an RDS Custom DB instance. The instance profile must
-    #   meet the following requirements:
-    #
-    #   * The profile must exist in your account.
-    #
-    #   * The profile must have an IAM role that Amazon EC2 has permissions
-    #     to assume.
+    # @!attribute [rw] enable_customer_owned_ip
+    #   Specifies whether to enable a customer-owned IP address (CoIP) for
+    #   an RDS on Outposts read replica.
     #
-    #   * The instance profile name and the associated IAM role name must
-    #     start with the prefix `AWSRDSCustom`.
+    #   A *CoIP* provides local or external connectivity to resources in
+    #   your Outpost subnets through your on-premises network. For some use
+    #   cases, a CoIP can provide lower latency for connections to the read
+    #   replica from outside of its virtual private cloud (VPC) on your
+    #   local network.
     #
-    #   For the list of permissions required for the IAM role, see [
-    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
+    #   For more information about RDS on Outposts, see [Working with Amazon
+    #   RDS on Amazon Web Services Outposts][1] in the *Amazon RDS User
+    #   Guide*.
     #
-    #   This setting is required for RDS Custom DB instances.
+    #   For more information about CoIPs, see [Customer-owned IP
+    #   addresses][2] in the *Amazon Web Services Outposts User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
-    #   @return [String]
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-on-outposts.html
+    #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
+    #   @return [Boolean]
     #
     # @!attribute [rw] network_type
     #   The network type of the DB instance.
@@ -5630,35 +5603,18 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   Specifies the storage throughput value for the read replica.
-    #
-    #   This setting doesn't apply to RDS Custom or Amazon Aurora DB
-    #   instances.
-    #   @return [Integer]
-    #
-    # @!attribute [rw] enable_customer_owned_ip
-    #   Specifies whether to enable a customer-owned IP address (CoIP) for
-    #   an RDS on Outposts read replica.
-    #
-    #   A *CoIP* provides local or external connectivity to resources in
-    #   your Outpost subnets through your on-premises network. For some use
-    #   cases, a CoIP can provide lower latency for connections to the read
-    #   replica from outside of its virtual private cloud (VPC) on your
-    #   local network.
-    #
-    #   For more information about RDS on Outposts, see [Working with Amazon
-    #   RDS on Amazon Web Services Outposts][1] in the *Amazon RDS User
-    #   Guide*.
+    # @!attribute [rw] max_allocated_storage
+    #   The upper limit in gibibytes (GiB) to which Amazon RDS can
+    #   automatically scale the storage of the DB instance.
     #
-    #   For more information about CoIPs, see [Customer-owned IP
-    #   addresses][2] in the *Amazon Web Services Outposts User Guide*.
+    #   For more information about this setting, including limitations that
+    #   apply to it, see [ Managing capacity automatically with Amazon RDS
+    #   storage autoscaling][1] in the *Amazon RDS User Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-on-outposts.html
-    #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
-    #   @return [Boolean]
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.Autoscaling
+    #   @return [Integer]
     #
     # @!attribute [rw] backup_target
     #   The location where RDS stores automated backups and manual
@@ -5671,6 +5627,29 @@ module Aws::RDS
     #   * `region` for Amazon Web Services Region
     #   @return [String]
     #
+    # @!attribute [rw] custom_iam_instance_profile
+    #   The instance profile associated with the underlying Amazon EC2
+    #   instance of an RDS Custom DB instance. The instance profile must
+    #   meet the following requirements:
+    #
+    #   * The profile must exist in your account.
+    #
+    #   * The profile must have an IAM role that Amazon EC2 has permissions
+    #     to assume.
+    #
+    #   * The instance profile name and the associated IAM role name must
+    #     start with the prefix `AWSRDSCustom`.
+    #
+    #   For the list of permissions required for the IAM role, see [
+    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
+    #
+    #   This setting is required for RDS Custom DB instances.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
+    #   @return [String]
+    #
     # @!attribute [rw] allocated_storage
     #   The amount of storage (in gibibytes) to allocate initially for the
     #   read replica. Follow the allocation rules specified in
@@ -5749,6 +5728,7 @@ module Aws::RDS
       :multi_az,
       :auto_minor_version_upgrade,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :db_parameter_group_name,
       :publicly_accessible,
@@ -5777,19 +5757,18 @@ module Aws::RDS
       :domain_auth_secret_arn,
       :domain_dns_ips,
       :replica_mode,
-      :max_allocated_storage,
-      :custom_iam_instance_profile,
-      :network_type,
-      :storage_throughput,
       :enable_customer_owned_ip,
+      :network_type,
+      :max_allocated_storage,
       :backup_target,
+      :custom_iam_instance_profile,
       :allocated_storage,
       :source_db_cluster_identifier,
       :dedicated_log_volume,
       :upgrade_storage_config,
       :ca_certificate_identifier,
       :source_region)
-      SENSITIVE = []
+      SENSITIVE = [:pre_signed_url]
       include Aws::Structure
     end
 
@@ -7126,10 +7105,6 @@ module Aws::RDS
     #   The current state of this DB cluster.
     #   @return [String]
     #
-    # @!attribute [rw] automatic_restart_time
-    #   The time when a stopped DB cluster is restarted automatically.
-    #   @return [Time]
-    #
     # @!attribute [rw] percent_progress
     #   The progress of the operation as a percentage.
     #   @return [String]
@@ -7325,6 +7300,12 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html
     #   @return [Integer]
     #
+    # @!attribute [rw] pending_modified_values
+    #   Information about pending changes to the DB cluster. This
+    #   information is returned only when there are pending changes.
+    #   Specific changes are identified by subelements.
+    #   @return [Types::ClusterPendingModifiedValues]
+    #
     # @!attribute [rw] engine_mode
     #   The DB engine mode of the DB cluster, either `provisioned` or
     #   `serverless`.
@@ -7352,34 +7333,99 @@ module Aws::RDS
     #   Reserved for future use.
     #   @return [Types::RdsCustomClusterConfiguration]
     #
-    # @!attribute [rw] deletion_protection
-    #   Indicates whether the DB cluster has deletion protection enabled.
-    #   The database can't be deleted when deletion protection is enabled.
-    #   @return [Boolean]
+    # @!attribute [rw] db_cluster_instance_class
+    #   The name of the compute and memory capacity class of the DB
+    #   instance.
     #
-    # @!attribute [rw] http_endpoint_enabled
-    #   Indicates whether the HTTP endpoint is enabled for an Aurora DB
-    #   cluster.
+    #   This setting is only for non-Aurora Multi-AZ DB clusters.
+    #   @return [String]
     #
-    #   When enabled, the HTTP endpoint provides a connectionless web
-    #   service API (RDS Data API) for running SQL queries on the DB
-    #   cluster. You can also query your database from inside the RDS
-    #   console with the RDS query editor.
+    # @!attribute [rw] storage_type
+    #   The storage type associated with the DB cluster.
+    #   @return [String]
     #
-    #   For more information, see [Using RDS Data API][1] in the *Amazon
-    #   Aurora User Guide*.
+    # @!attribute [rw] iops
+    #   The Provisioned IOPS (I/O operations per second) value.
     #
+    #   This setting is only for non-Aurora Multi-AZ DB clusters.
+    #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput for the DB cluster. The throughput is
+    #   automatically set based on the IOPS that you provision, and is not
+    #   configurable.
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html
-    #   @return [Boolean]
+    #   This setting is only for non-Aurora Multi-AZ DB clusters.
+    #   @return [Integer]
     #
-    # @!attribute [rw] activity_stream_mode
-    #   The mode of the database activity stream. Database events such as a
-    #   change or access generate an activity stream event. The database
-    #   session can handle these events either synchronously or
-    #   asynchronously.
-    #   @return [String]
+    # @!attribute [rw] io_optimized_next_allowed_modification_time
+    #   The next time you can modify the DB cluster to use the
+    #   `aurora-iopt1` storage type.
+    #
+    #   This setting is only for Aurora DB clusters.
+    #   @return [Time]
+    #
+    # @!attribute [rw] publicly_accessible
+    #   Indicates whether the DB cluster is publicly accessible.
+    #
+    #   When the DB cluster is publicly accessible and you connect from
+    #   outside of the DB cluster's virtual private cloud (VPC), its Domain
+    #   Name System (DNS) endpoint resolves to the public IP address. When
+    #   you connect from within the same VPC as the DB cluster, the endpoint
+    #   resolves to the private IP address. Access to the DB cluster is
+    #   ultimately controlled by the security group it uses. That public
+    #   access isn't permitted if the security group assigned to the DB
+    #   cluster doesn't permit it.
+    #
+    #   When the DB cluster isn't publicly accessible, it is an internal DB
+    #   cluster with a DNS name that resolves to a private IP address.
+    #
+    #   For more information, see CreateDBCluster.
+    #
+    #   This setting is only for non-Aurora Multi-AZ DB clusters.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] auto_minor_version_upgrade
+    #   Indicates whether minor version patches are applied automatically.
+    #
+    #   This setting is for Aurora DB clusters and Multi-AZ DB clusters.
+    #
+    #   For more information about automatic minor version upgrades, see
+    #   [Automatically upgrading the minor engine version][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Upgrading.html#USER_UpgradeDBInstance.Upgrading.AutoMinorVersionUpgrades
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] deletion_protection
+    #   Indicates whether the DB cluster has deletion protection enabled.
+    #   The database can't be deleted when deletion protection is enabled.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] http_endpoint_enabled
+    #   Indicates whether the HTTP endpoint is enabled for an Aurora DB
+    #   cluster.
+    #
+    #   When enabled, the HTTP endpoint provides a connectionless web
+    #   service API (RDS Data API) for running SQL queries on the DB
+    #   cluster. You can also query your database from inside the RDS
+    #   console with the RDS query editor.
+    #
+    #   For more information, see [Using RDS Data API][1] in the *Amazon
+    #   Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/data-api.html
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] activity_stream_mode
+    #   The mode of the database activity stream. Database events such as a
+    #   change or access generate an activity stream event. The database
+    #   session can handle these events either synchronously or
+    #   asynchronously.
+    #   @return [String]
     #
     # @!attribute [rw] activity_stream_status
     #   The status of the database activity stream.
@@ -7445,61 +7491,49 @@ module Aws::RDS
     #   forwarding feature for this cluster.
     #   @return [Boolean]
     #
-    # @!attribute [rw] pending_modified_values
-    #   Information about pending changes to the DB cluster. This
-    #   information is returned only when there are pending changes.
-    #   Specific changes are identified by subelements.
-    #   @return [Types::ClusterPendingModifiedValues]
+    # @!attribute [rw] network_type
+    #   The network type of the DB instance.
     #
-    # @!attribute [rw] db_cluster_instance_class
-    #   The name of the compute and memory capacity class of the DB
-    #   instance.
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
+    #   or the IPv4 and the IPv6 protocols (`DUAL`).
     #
-    #   This setting is only for non-Aurora Multi-AZ DB clusters.
-    #   @return [String]
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon Aurora User Guide.*
     #
-    # @!attribute [rw] storage_type
-    #   The storage type associated with the DB cluster.
-    #   @return [String]
+    #   This setting is only for Aurora DB clusters.
     #
-    # @!attribute [rw] iops
-    #   The Provisioned IOPS (I/O operations per second) value.
+    #   Valid Values: `IPV4 | DUAL`
     #
-    #   This setting is only for non-Aurora Multi-AZ DB clusters.
-    #   @return [Integer]
     #
-    # @!attribute [rw] publicly_accessible
-    #   Indicates whether the DB cluster is publicly accessible.
     #
-    #   When the DB cluster is publicly accessible and you connect from
-    #   outside of the DB cluster's virtual private cloud (VPC), its Domain
-    #   Name System (DNS) endpoint resolves to the public IP address. When
-    #   you connect from within the same VPC as the DB cluster, the endpoint
-    #   resolves to the private IP address. Access to the DB cluster is
-    #   ultimately controlled by the security group it uses. That public
-    #   access isn't permitted if the security group assigned to the DB
-    #   cluster doesn't permit it.
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   @return [String]
     #
-    #   When the DB cluster isn't publicly accessible, it is an internal DB
-    #   cluster with a DNS name that resolves to a private IP address.
+    # @!attribute [rw] automatic_restart_time
+    #   The time when a stopped DB cluster is restarted automatically.
+    #   @return [Time]
     #
-    #   For more information, see CreateDBCluster.
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   The scaling configuration for an Aurora Serverless v2 DB cluster.
     #
-    #   This setting is only for non-Aurora Multi-AZ DB clusters.
-    #   @return [Boolean]
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
     #
-    # @!attribute [rw] auto_minor_version_upgrade
-    #   Indicates whether minor version patches are applied automatically.
     #
-    #   This setting is for Aurora DB clusters and Multi-AZ DB clusters.
     #
-    #   For more information about automatic minor version upgrades, see
-    #   [Automatically upgrading the minor engine version][1].
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfigurationInfo]
     #
+    # @!attribute [rw] serverless_v2_platform_version
+    #   The version of the Aurora Serverless V2 platform used by the DB
+    #   cluster. For more information, see [Using Aurora Serverless v2][1]
+    #   in the *Amazon Aurora User Guide*.
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Upgrading.html#USER_UpgradeDBInstance.Upgrading.AutoMinorVersionUpgrades
-    #   @return [Boolean]
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [String]
     #
     # @!attribute [rw] monitoring_interval
     #   The interval, in seconds, between points when Enhanced Monitoring
@@ -7559,46 +7593,6 @@ module Aws::RDS
     #   Default: `7` days
     #   @return [Integer]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   The scaling configuration for an Aurora Serverless v2 DB cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfigurationInfo]
-    #
-    # @!attribute [rw] serverless_v2_platform_version
-    #   The version of the Aurora Serverless V2 platform used by the DB
-    #   cluster. For more information, see [Using Aurora Serverless v2][1]
-    #   in the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [String]
-    #
-    # @!attribute [rw] network_type
-    #   The network type of the DB instance.
-    #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
-    #   or the IPv4 and the IPv6 protocols (`DUAL`).
-    #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon Aurora User Guide.*
-    #
-    #   This setting is only for Aurora DB clusters.
-    #
-    #   Valid Values: `IPV4 | DUAL`
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   @return [String]
-    #
     # @!attribute [rw] db_system_id
     #   Reserved for future use.
     #   @return [String]
@@ -7618,13 +7612,6 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html
     #   @return [Types::MasterUserSecret]
     #
-    # @!attribute [rw] io_optimized_next_allowed_modification_time
-    #   The next time you can modify the DB cluster to use the
-    #   `aurora-iopt1` storage type.
-    #
-    #   This setting is only for Aurora DB clusters.
-    #   @return [Time]
-    #
     # @!attribute [rw] local_write_forwarding_status
     #   Indicates whether an Aurora DB cluster has in-cluster write
     #   forwarding enabled, not enabled, requested, or is in the process of
@@ -7640,14 +7627,6 @@ module Aws::RDS
     #   The details for Aurora Limitless Database.
     #   @return [Types::LimitlessDatabase]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput for the DB cluster. The throughput is
-    #   automatically set based on the IOPS that you provision, and is not
-    #   configurable.
-    #
-    #   This setting is only for non-Aurora Multi-AZ DB clusters.
-    #   @return [Integer]
-    #
     # @!attribute [rw] cluster_scalability_type
     #   The scalability mode of the Aurora DB cluster. When set to
     #   `limitless`, the cluster operates as an Aurora Limitless Database.
@@ -7687,7 +7666,6 @@ module Aws::RDS
       :db_cluster_parameter_group,
       :db_subnet_group,
       :status,
-      :automatic_restart_time,
       :percent_progress,
       :earliest_restorable_time,
       :endpoint,
@@ -7721,9 +7699,17 @@ module Aws::RDS
       :backtrack_consumed_change_records,
       :enabled_cloudwatch_logs_exports,
       :capacity,
+      :pending_modified_values,
       :engine_mode,
       :scaling_configuration_info,
       :rds_custom_cluster_configuration,
+      :db_cluster_instance_class,
+      :storage_type,
+      :iops,
+      :storage_throughput,
+      :io_optimized_next_allowed_modification_time,
+      :publicly_accessible,
+      :auto_minor_version_upgrade,
       :deletion_protection,
       :http_endpoint_enabled,
       :activity_stream_mode,
@@ -7737,28 +7723,21 @@ module Aws::RDS
       :global_cluster_identifier,
       :global_write_forwarding_status,
       :global_write_forwarding_requested,
-      :pending_modified_values,
-      :db_cluster_instance_class,
-      :storage_type,
-      :iops,
-      :publicly_accessible,
-      :auto_minor_version_upgrade,
+      :network_type,
+      :automatic_restart_time,
+      :serverless_v2_scaling_configuration,
+      :serverless_v2_platform_version,
       :monitoring_interval,
       :monitoring_role_arn,
       :database_insights_mode,
       :performance_insights_enabled,
       :performance_insights_kms_key_id,
       :performance_insights_retention_period,
-      :serverless_v2_scaling_configuration,
-      :serverless_v2_platform_version,
-      :network_type,
       :db_system_id,
       :master_user_secret,
-      :io_optimized_next_allowed_modification_time,
       :local_write_forwarding_status,
       :aws_backup_recovery_point_arn,
       :limitless_database,
-      :storage_throughput,
       :cluster_scalability_type,
       :certificate_details,
       :engine_lifecycle_support)
@@ -7897,11 +7876,6 @@ module Aws::RDS
     #   This setting is only for non-Aurora Multi-AZ DB clusters.
     #   @return [Integer]
     #
-    # @!attribute [rw] aws_backup_recovery_point_arn
-    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
-    #   Services Backup.
-    #   @return [String]
-    #
     # @!attribute [rw] storage_throughput
     #   The storage throughput for the automated backup. The throughput is
     #   automatically set based on the IOPS that you provision, and is not
@@ -7910,6 +7884,11 @@ module Aws::RDS
     #   This setting is only for non-Aurora Multi-AZ DB clusters.
     #   @return [Integer]
     #
+    # @!attribute [rw] aws_backup_recovery_point_arn
+    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
+    #   Services Backup.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/DBClusterAutomatedBackup AWS API Documentation
     #
     class DBClusterAutomatedBackup < Struct.new(
@@ -7936,8 +7915,8 @@ module Aws::RDS
       :kms_key_id,
       :storage_type,
       :iops,
-      :aws_backup_recovery_point_arn,
-      :storage_throughput)
+      :storage_throughput,
+      :aws_backup_recovery_point_arn)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8597,21 +8576,12 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html
     #   @return [Array<Types::Tag>]
     #
-    # @!attribute [rw] db_system_id
-    #   Reserved for future use.
-    #   @return [String]
-    #
     # @!attribute [rw] storage_type
     #   The storage type associated with the DB cluster snapshot.
     #
     #   This setting is only for Aurora DB clusters.
     #   @return [String]
     #
-    # @!attribute [rw] db_cluster_resource_id
-    #   The resource ID of the DB cluster that this DB cluster snapshot was
-    #   created from.
-    #   @return [String]
-    #
     # @!attribute [rw] storage_throughput
     #   The storage throughput for the DB cluster snapshot. The throughput
     #   is automatically set based on the IOPS that you provision, and is
@@ -8620,6 +8590,15 @@ module Aws::RDS
     #   This setting is only for non-Aurora Multi-AZ DB clusters.
     #   @return [Integer]
     #
+    # @!attribute [rw] db_cluster_resource_id
+    #   The resource ID of the DB cluster that this DB cluster snapshot was
+    #   created from.
+    #   @return [String]
+    #
+    # @!attribute [rw] db_system_id
+    #   Reserved for future use.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/DBClusterSnapshot AWS API Documentation
     #
     class DBClusterSnapshot < Struct.new(
@@ -8645,10 +8624,10 @@ module Aws::RDS
       :source_db_cluster_snapshot_arn,
       :iam_database_authentication_enabled,
       :tag_list,
-      :db_system_id,
       :storage_type,
+      :storage_throughput,
       :db_cluster_resource_id,
-      :storage_throughput)
+      :db_system_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8789,10 +8768,38 @@ module Aws::RDS
     #   The name of the database engine.
     #   @return [String]
     #
+    # @!attribute [rw] major_engine_version
+    #   The major engine version of the CEV.
+    #   @return [String]
+    #
     # @!attribute [rw] engine_version
     #   The version number of the database engine.
     #   @return [String]
     #
+    # @!attribute [rw] database_installation_files_s3_bucket_name
+    #   The name of the Amazon S3 bucket that contains your database
+    #   installation files.
+    #   @return [String]
+    #
+    # @!attribute [rw] database_installation_files_s3_prefix
+    #   The Amazon S3 directory that contains the database installation
+    #   files. If not specified, then no prefix is assumed.
+    #   @return [String]
+    #
+    # @!attribute [rw] custom_db_engine_version_manifest
+    #   JSON string that lists the installation files and parameters that
+    #   RDS Custom uses to create a custom engine version (CEV). RDS Custom
+    #   applies the patches in the order in which they're listed in the
+    #   manifest. You can set the Oracle home, Oracle base, and UNIX/Linux
+    #   user and group using the installation parameters. For more
+    #   information, see [JSON fields in the CEV manifest][1] in the *Amazon
+    #   RDS User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-cev.preparing.html#custom-cev.preparing.manifest.fields
+    #   @return [String]
+    #
     # @!attribute [rw] db_parameter_group_family
     #   The name of the DB parameter group family for the database engine.
     #   @return [String]
@@ -8801,6 +8808,10 @@ module Aws::RDS
     #   The description of the database engine.
     #   @return [String]
     #
+    # @!attribute [rw] db_engine_version_arn
+    #   The ARN of the custom engine version.
+    #   @return [String]
+    #
     # @!attribute [rw] db_engine_version_description
     #   The description of the database engine version.
     #   @return [String]
@@ -8820,6 +8831,16 @@ module Aws::RDS
     #   the usage operation. Applicable for RDS Custom for SQL Server.
     #   @return [String]
     #
+    # @!attribute [rw] kms_key_id
+    #   The Amazon Web Services KMS key identifier for an encrypted CEV.
+    #   This parameter is required for RDS Custom, but optional for Amazon
+    #   RDS.
+    #   @return [String]
+    #
+    # @!attribute [rw] create_time
+    #   The creation time of the DB engine version.
+    #   @return [Time]
+    #
     # @!attribute [rw] supported_character_sets
     #   A list of the character sets supported by this engine for the
     #   `CharacterSetName` parameter of the `CreateDBInstance` operation.
@@ -8896,34 +8917,6 @@ module Aws::RDS
     #   specific DB engine version.
     #   @return [Boolean]
     #
-    # @!attribute [rw] major_engine_version
-    #   The major engine version of the CEV.
-    #   @return [String]
-    #
-    # @!attribute [rw] database_installation_files_s3_bucket_name
-    #   The name of the Amazon S3 bucket that contains your database
-    #   installation files.
-    #   @return [String]
-    #
-    # @!attribute [rw] database_installation_files_s3_prefix
-    #   The Amazon S3 directory that contains the database installation
-    #   files. If not specified, then no prefix is assumed.
-    #   @return [String]
-    #
-    # @!attribute [rw] db_engine_version_arn
-    #   The ARN of the custom engine version.
-    #   @return [String]
-    #
-    # @!attribute [rw] kms_key_id
-    #   The Amazon Web Services KMS key identifier for an encrypted CEV.
-    #   This parameter is required for RDS Custom, but optional for Amazon
-    #   RDS.
-    #   @return [String]
-    #
-    # @!attribute [rw] create_time
-    #   The creation time of the DB engine version.
-    #   @return [Time]
-    #
     # @!attribute [rw] tag_list
     #   A list of tags.
     #
@@ -8942,20 +8935,6 @@ module Aws::RDS
     #   PostgreSQL.
     #   @return [Boolean]
     #
-    # @!attribute [rw] custom_db_engine_version_manifest
-    #   JSON string that lists the installation files and parameters that
-    #   RDS Custom uses to create a custom engine version (CEV). RDS Custom
-    #   applies the patches in the order in which they're listed in the
-    #   manifest. You can set the Oracle home, Oracle base, and UNIX/Linux
-    #   user and group using the installation parameters. For more
-    #   information, see [JSON fields in the CEV manifest][1] in the *Amazon
-    #   RDS User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-cev.preparing.html#custom-cev.preparing.manifest.fields
-    #   @return [String]
-    #
     # @!attribute [rw] supports_limitless_database
     #   Indicates whether the DB engine version supports Aurora Limitless
     #   Database.
@@ -9008,13 +8987,20 @@ module Aws::RDS
     #
     class DBEngineVersion < Struct.new(
       :engine,
+      :major_engine_version,
       :engine_version,
+      :database_installation_files_s3_bucket_name,
+      :database_installation_files_s3_prefix,
+      :custom_db_engine_version_manifest,
       :db_parameter_group_family,
       :db_engine_description,
+      :db_engine_version_arn,
       :db_engine_version_description,
       :default_character_set,
       :image,
       :db_engine_media_type,
+      :kms_key_id,
+      :create_time,
       :supported_character_sets,
       :supported_nchar_character_sets,
       :valid_upgrade_target,
@@ -9027,15 +9013,8 @@ module Aws::RDS
       :status,
       :supports_parallel_query,
       :supports_global_databases,
-      :major_engine_version,
-      :database_installation_files_s3_bucket_name,
-      :database_installation_files_s3_prefix,
-      :db_engine_version_arn,
-      :kms_key_id,
-      :create_time,
       :tag_list,
       :supports_babelfish,
-      :custom_db_engine_version_manifest,
       :supports_limitless_database,
       :supports_certificate_rotation_without_restart,
       :supported_ca_certificate_identifiers,
@@ -9102,10 +9081,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/accessing-monitoring.html#Overview.DBInstance.Status
     #   @return [String]
     #
-    # @!attribute [rw] automatic_restart_time
-    #   The time when a stopped DB instance is restarted automatically.
-    #   @return [Time]
-    #
     # @!attribute [rw] master_username
     #   The master username for the DB instance.
     #   @return [String]
@@ -9255,6 +9230,12 @@ module Aws::RDS
     #   instance.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput for the DB instance.
+    #
+    #   This setting applies only to the `gp3` storage type.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_memberships
     #   The list of option group memberships for this DB instance.
     #   @return [Array<Types::OptionGroupMembership>]
@@ -9508,10 +9489,18 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html
     #   @return [Array<Types::Tag>]
     #
-    # @!attribute [rw] db_instance_automated_backups_replications
-    #   The list of replicated automated backups associated with the DB
-    #   instance.
-    #   @return [Array<Types::DBInstanceAutomatedBackupsReplication>]
+    # @!attribute [rw] automation_mode
+    #   The automation mode of the RDS Custom DB instance: `full` or `all
+    #   paused`. If `full`, the DB instance automates monitoring and
+    #   instance recovery. If `all paused`, the instance pauses automation
+    #   for the duration set by `--resume-full-automation-mode-minutes`.
+    #   @return [String]
+    #
+    # @!attribute [rw] resume_full_automation_mode_time
+    #   The number of minutes to pause the automation. When the time period
+    #   ends, RDS Custom resumes full automation. The minimum value is 60
+    #   (default). The maximum value is 1,440.
+    #   @return [Time]
     #
     # @!attribute [rw] customer_owned_ip_enabled
     #   Indicates whether a customer-owned IP address (CoIP) is enabled for
@@ -9536,9 +9525,23 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
     #   @return [Boolean]
     #
-    # @!attribute [rw] aws_backup_recovery_point_arn
-    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
-    #   Services Backup.
+    # @!attribute [rw] network_type
+    #   The network type of the DB instance.
+    #
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
+    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
+    #
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon RDS User Guide* and [ Working with a DB instance in a
+    #   VPC][2] in the *Amazon Aurora User Guide.*
+    #
+    #   Valid Values: `IPV4 | DUAL`
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
     # @!attribute [rw] activity_stream_status
@@ -9568,17 +9571,24 @@ module Aws::RDS
     #   database activity stream.
     #   @return [Boolean]
     #
-    # @!attribute [rw] automation_mode
-    #   The automation mode of the RDS Custom DB instance: `full` or `all
-    #   paused`. If `full`, the DB instance automates monitoring and
-    #   instance recovery. If `all paused`, the instance pauses automation
-    #   for the duration set by `--resume-full-automation-mode-minutes`.
+    # @!attribute [rw] aws_backup_recovery_point_arn
+    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
+    #   Services Backup.
     #   @return [String]
     #
-    # @!attribute [rw] resume_full_automation_mode_time
-    #   The number of minutes to pause the automation. When the time period
-    #   ends, RDS Custom resumes full automation. The minimum value is 60
-    #   (default). The maximum value is 1,440.
+    # @!attribute [rw] db_instance_automated_backups_replications
+    #   The list of replicated automated backups associated with the DB
+    #   instance.
+    #   @return [Array<Types::DBInstanceAutomatedBackupsReplication>]
+    #
+    # @!attribute [rw] backup_target
+    #   The location where automated backups and manual snapshots are
+    #   stored: Dedicated Local Zones, Amazon Web Services Outposts or the
+    #   Amazon Web Services Region.
+    #   @return [String]
+    #
+    # @!attribute [rw] automatic_restart_time
+    #   The time when a stopped DB instance is restarted automatically.
     #   @return [Time]
     #
     # @!attribute [rw] custom_iam_instance_profile
@@ -9602,40 +9612,13 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
     #   @return [String]
     #
-    # @!attribute [rw] backup_target
-    #   The location where automated backups and manual snapshots are
-    #   stored: Dedicated Local Zones, Amazon Web Services Outposts or the
-    #   Amazon Web Services Region.
-    #   @return [String]
-    #
-    # @!attribute [rw] network_type
-    #   The network type of the DB instance.
-    #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
-    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
-    #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon RDS User Guide* and [ Working with a DB instance in a
-    #   VPC][2] in the *Amazon Aurora User Guide.*
-    #
-    #   Valid Values: `IPV4 | DUAL`
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   @return [String]
-    #
     # @!attribute [rw] activity_stream_policy_status
     #   The status of the policy state of the activity stream.
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput for the DB instance.
-    #
-    #   This setting applies only to the `gp3` storage type.
-    #   @return [Integer]
+    # @!attribute [rw] certificate_details
+    #   The details of the DB instance's server certificate.
+    #   @return [Types::CertificateDetails]
     #
     # @!attribute [rw] db_system_id
     #   The Oracle system ID (Oracle SID) for a container database (CDB).
@@ -9655,10 +9638,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-secrets-manager.html
     #   @return [Types::MasterUserSecret]
     #
-    # @!attribute [rw] certificate_details
-    #   The details of the DB instance's server certificate.
-    #   @return [Types::CertificateDetails]
-    #
     # @!attribute [rw] read_replica_source_db_cluster_identifier
     #   The identifier of the source DB cluster if this DB instance is a
     #   read replica.
@@ -9668,6 +9647,11 @@ module Aws::RDS
     #   The progress of the storage optimization operation as a percentage.
     #   @return [String]
     #
+    # @!attribute [rw] multi_tenant
+    #   Specifies whether the DB instance is in the multi-tenant
+    #   configuration (TRUE) or the single-tenant configuration (FALSE).
+    #   @return [Boolean]
+    #
     # @!attribute [rw] dedicated_log_volume
     #   Indicates whether the DB instance has a dedicated log volume (DLV)
     #   enabled.
@@ -9685,11 +9669,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.UpgradeFileSystem
     #   @return [Boolean]
     #
-    # @!attribute [rw] multi_tenant
-    #   Specifies whether the DB instance is in the multi-tenant
-    #   configuration (TRUE) or the single-tenant configuration (FALSE).
-    #   @return [Boolean]
-    #
     # @!attribute [rw] engine_lifecycle_support
     #   The lifecycle type for the DB instance.
     #
@@ -9703,7 +9682,6 @@ module Aws::RDS
       :db_instance_class,
       :engine,
       :db_instance_status,
-      :automatic_restart_time,
       :master_username,
       :db_name,
       :endpoint,
@@ -9728,6 +9706,7 @@ module Aws::RDS
       :replica_mode,
       :license_model,
       :iops,
+      :storage_throughput,
       :option_group_memberships,
       :character_set_name,
       :nchar_character_set_name,
@@ -9762,29 +9741,29 @@ module Aws::RDS
       :listener_endpoint,
       :max_allocated_storage,
       :tag_list,
-      :db_instance_automated_backups_replications,
+      :automation_mode,
+      :resume_full_automation_mode_time,
       :customer_owned_ip_enabled,
-      :aws_backup_recovery_point_arn,
+      :network_type,
       :activity_stream_status,
       :activity_stream_kms_key_id,
       :activity_stream_kinesis_stream_name,
       :activity_stream_mode,
       :activity_stream_engine_native_audit_fields_included,
-      :automation_mode,
-      :resume_full_automation_mode_time,
-      :custom_iam_instance_profile,
+      :aws_backup_recovery_point_arn,
+      :db_instance_automated_backups_replications,
       :backup_target,
-      :network_type,
+      :automatic_restart_time,
+      :custom_iam_instance_profile,
       :activity_stream_policy_status,
-      :storage_throughput,
+      :certificate_details,
       :db_system_id,
       :master_user_secret,
-      :certificate_details,
       :read_replica_source_db_cluster_identifier,
       :percent_progress,
+      :multi_tenant,
       :dedicated_log_volume,
       :is_storage_config_upgrade_available,
-      :multi_tenant,
       :engine_lifecycle_support)
       SENSITIVE = []
       include Aws::Structure
@@ -9884,6 +9863,10 @@ module Aws::RDS
     #   The IOPS (I/O operations per second) value for the automated backup.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput for the automated backup.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The option group the automated backup is associated with. If
     #   omitted, the default option group for the engine specified is used.
@@ -9940,9 +9923,11 @@ module Aws::RDS
     #   Region.
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput for the automated backup.
-    #   @return [Integer]
+    # @!attribute [rw] multi_tenant
+    #   Specifies whether the automatic backup is for a DB instance in the
+    #   multi-tenant configuration (TRUE) or the single-tenant configuration
+    #   (FALSE).
+    #   @return [Boolean]
     #
     # @!attribute [rw] aws_backup_recovery_point_arn
     #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
@@ -9954,12 +9939,6 @@ module Aws::RDS
     #   enabled.
     #   @return [Boolean]
     #
-    # @!attribute [rw] multi_tenant
-    #   Specifies whether the automatic backup is for a DB instance in the
-    #   multi-tenant configuration (TRUE) or the single-tenant configuration
-    #   (FALSE).
-    #   @return [Boolean]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/DBInstanceAutomatedBackup AWS API Documentation
     #
     class DBInstanceAutomatedBackup < Struct.new(
@@ -9979,6 +9958,7 @@ module Aws::RDS
       :engine_version,
       :license_model,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :tde_credential_arn,
       :encrypted,
@@ -9990,10 +9970,9 @@ module Aws::RDS
       :db_instance_automated_backups_arn,
       :db_instance_automated_backups_replications,
       :backup_target,
-      :storage_throughput,
+      :multi_tenant,
       :aws_backup_recovery_point_arn,
-      :dedicated_log_volume,
-      :multi_tenant)
+      :dedicated_log_volume)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -11314,6 +11293,10 @@ module Aws::RDS
     #   the DB instance at the time of the snapshot.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   Specifies the storage throughput for the DB snapshot.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   Provides the option group name for the DB snapshot.
     #   @return [String]
@@ -11394,6 +11377,11 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] snapshot_target
+    #   Specifies where manual snapshots are stored: Dedicated Local Zones,
+    #   Amazon Web Services Outposts or the Amazon Web Services Region.
+    #   @return [String]
+    #
     # @!attribute [rw] original_snapshot_create_time
     #   Specifies the time of the CreateDBSnapshot operation in Coordinated
     #   Universal Time (UTC). Doesn't change when the snapshot is copied.
@@ -11412,32 +11400,23 @@ module Aws::RDS
     #   SnapshotDatabaseTime, then the replica lag is two hours.
     #   @return [Time]
     #
-    # @!attribute [rw] snapshot_target
-    #   Specifies where manual snapshots are stored: Dedicated Local Zones,
-    #   Amazon Web Services Outposts or the Amazon Web Services Region.
-    #   @return [String]
-    #
-    # @!attribute [rw] storage_throughput
-    #   Specifies the storage throughput for the DB snapshot.
-    #   @return [Integer]
-    #
     # @!attribute [rw] db_system_id
     #   The Oracle system identifier (SID), which is the name of the Oracle
     #   database instance that manages your database files. The Oracle SID
     #   is also the name of your CDB.
     #   @return [String]
     #
-    # @!attribute [rw] dedicated_log_volume
-    #   Indicates whether the DB instance has a dedicated log volume (DLV)
-    #   enabled.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] multi_tenant
     #   Indicates whether the snapshot is of a DB instance using the
     #   multi-tenant configuration (TRUE) or the single-tenant configuration
     #   (FALSE).
     #   @return [Boolean]
     #
+    # @!attribute [rw] dedicated_log_volume
+    #   Indicates whether the DB instance has a dedicated log volume (DLV)
+    #   enabled.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] snapshot_availability_zone
     #   Specifies the name of the Availability Zone where RDS stores the DB
     #   snapshot. This value is valid only for snapshots that RDS stores on
@@ -11462,6 +11441,7 @@ module Aws::RDS
       :license_model,
       :snapshot_type,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :percent_progress,
       :source_region,
@@ -11476,13 +11456,12 @@ module Aws::RDS
       :processor_features,
       :dbi_resource_id,
       :tag_list,
+      :snapshot_target,
       :original_snapshot_create_time,
       :snapshot_database_time,
-      :snapshot_target,
-      :storage_throughput,
       :db_system_id,
-      :dedicated_log_volume,
       :multi_tenant,
+      :dedicated_log_volume,
       :snapshot_availability_zone)
       SENSITIVE = []
       include Aws::Structure
@@ -15950,7 +15929,7 @@ module Aws::RDS
       :log_file_data,
       :marker,
       :additional_data_pending)
-      SENSITIVE = []
+      SENSITIVE = [:log_file_data]
       include Aws::Structure
     end
 
@@ -17068,15 +17047,6 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_Tagging.html
     #   @return [Array<Types::Tag>]
     #
-    # @!attribute [rw] create_time
-    #   The time when the integration was created, in Universal Coordinated
-    #   Time (UTC).
-    #   @return [Time]
-    #
-    # @!attribute [rw] errors
-    #   Any errors associated with the integration.
-    #   @return [Array<Types::IntegrationError>]
-    #
     # @!attribute [rw] data_filter
     #   Data filters for the integration. These filters determine which
     #   tables from the source database are sent to the target Amazon
@@ -17087,6 +17057,15 @@ module Aws::RDS
     #   A description of the integration.
     #   @return [String]
     #
+    # @!attribute [rw] create_time
+    #   The time when the integration was created, in Universal Coordinated
+    #   Time (UTC).
+    #   @return [Time]
+    #
+    # @!attribute [rw] errors
+    #   Any errors associated with the integration.
+    #   @return [Array<Types::IntegrationError>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/Integration AWS API Documentation
     #
     class Integration < Struct.new(
@@ -17098,10 +17077,10 @@ module Aws::RDS
       :additional_encryption_context,
       :status,
       :tags,
-      :create_time,
-      :errors,
       :data_filter,
-      :description)
+      :description,
+      :create_time,
+      :errors)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -18299,6 +18278,37 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Upgrading.html#USER_UpgradeDBInstance.Upgrading.AutoMinorVersionUpgrades
     #   @return [Boolean]
     #
+    # @!attribute [rw] network_type
+    #   The network type of the DB cluster.
+    #
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
+    #   or the IPv4 and the IPv6 protocols (`DUAL`).
+    #
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon Aurora User Guide.*
+    #
+    #   Valid for Cluster Type: Aurora DB clusters only
+    #
+    #   Valid Values: `IPV4 | DUAL`
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   @return [String]
+    #
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   Contains the scaling configuration of an Aurora Serverless v2 DB
+    #   cluster.
+    #
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #
     # @!attribute [rw] monitoring_interval
     #   The interval, in seconds, between points when Enhanced Monitoring
     #   metrics are collected for the DB cluster. To turn off collecting
@@ -18397,37 +18407,6 @@ module Aws::RDS
     #   Amazon RDS issues an error.
     #   @return [Integer]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   Contains the scaling configuration of an Aurora Serverless v2 DB
-    #   cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfiguration]
-    #
-    # @!attribute [rw] network_type
-    #   The network type of the DB cluster.
-    #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB cluster. A `DBSubnetGroup` can support only the IPv4 protocol
-    #   or the IPv4 and the IPv6 protocols (`DUAL`).
-    #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon Aurora User Guide.*
-    #
-    #   Valid for Cluster Type: Aurora DB clusters only
-    #
-    #   Valid Values: `IPV4 | DUAL`
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
-    #   @return [String]
-    #
     # @!attribute [rw] manage_master_user_password
     #   Specifies whether to manage the master user password with Amazon Web
     #   Services Secrets Manager.
@@ -18484,6 +18463,14 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/rds-secrets-manager.html
     #   @return [Boolean]
     #
+    # @!attribute [rw] enable_local_write_forwarding
+    #   Specifies whether read replicas can forward write operations to the
+    #   writer DB instance in the DB cluster. By default, write operations
+    #   aren't allowed on reader DB instances.
+    #
+    #   Valid for: Aurora DB clusters only
+    #   @return [Boolean]
+    #
     # @!attribute [rw] master_user_secret_kms_key_id
     #   The Amazon Web Services KMS key identifier to encrypt a secret that
     #   is automatically generated and managed in Amazon Web Services
@@ -18554,14 +18541,6 @@ module Aws::RDS
     #   ^
     #   @return [Boolean]
     #
-    # @!attribute [rw] enable_local_write_forwarding
-    #   Specifies whether read replicas can forward write operations to the
-    #   writer DB instance in the DB cluster. By default, write operations
-    #   aren't allowed on reader DB instances.
-    #
-    #   Valid for: Aurora DB clusters only
-    #   @return [Boolean]
-    #
     # @!attribute [rw] aws_backup_recovery_point_arn
     #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
     #   Services Backup.
@@ -18644,25 +18623,25 @@ module Aws::RDS
       :storage_type,
       :iops,
       :auto_minor_version_upgrade,
+      :network_type,
+      :serverless_v2_scaling_configuration,
       :monitoring_interval,
       :monitoring_role_arn,
       :database_insights_mode,
       :enable_performance_insights,
       :performance_insights_kms_key_id,
       :performance_insights_retention_period,
-      :serverless_v2_scaling_configuration,
-      :network_type,
       :manage_master_user_password,
       :rotate_master_user_password,
+      :enable_local_write_forwarding,
       :master_user_secret_kms_key_id,
       :engine_mode,
       :allow_engine_mode_change,
-      :enable_local_write_forwarding,
       :aws_backup_recovery_point_arn,
       :enable_limitless_database,
       :ca_certificate_identifier,
       :master_user_authentication_type)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password]
       include Aws::Structure
     end
 
@@ -19283,6 +19262,15 @@ module Aws::RDS
     #   Default: Uses existing setting
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput value for the DB instance.
+    #
+    #   This setting applies only to the `gp3` storage type.
+    #
+    #   This setting doesn't apply to Amazon Aurora or RDS Custom DB
+    #   instances.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The option group to associate the DB instance with.
     #
@@ -19420,7 +19408,7 @@ module Aws::RDS
     #
     #   * Must be in the distinguished name format.
     #
-    #   * Can't be longer than 64 characters.
+    #   ^
     #
     #   Example:
     #   `OU=mymanagedADtestOU,DC=mymanagedADtest,DC=mymanagedAD,DC=mydomain`
@@ -19449,6 +19437,11 @@ module Aws::RDS
     #   Example: `123.124.125.126,234.235.236.237`
     #   @return [Array<String>]
     #
+    # @!attribute [rw] disable_domain
+    #   Specifies whether to remove the DB instance from the Active
+    #   Directory domain.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] copy_tags_to_snapshot
     #   Specifies whether to copy all tags from the DB instance to snapshots
     #   of the DB instance. By default, tags aren't copied.
@@ -19560,11 +19553,6 @@ module Aws::RDS
     #   This setting doesn't apply to RDS Custom DB instances.
     #   @return [String]
     #
-    # @!attribute [rw] disable_domain
-    #   Specifies whether to remove the DB instance from the Active
-    #   Directory domain.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] promotion_tier
     #   The order of priority in which an Aurora Replica is promoted to the
     #   primary instance after a failure of the existing primary instance.
@@ -19820,6 +19808,26 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/oracle-read-replicas.html
     #   @return [String]
     #
+    # @!attribute [rw] automation_mode
+    #   The automation mode of the RDS Custom DB instance. If `full`, the DB
+    #   instance automates monitoring and instance recovery. If `all
+    #   paused`, the instance pauses automation for the duration set by
+    #   `ResumeFullAutomationModeMinutes`.
+    #   @return [String]
+    #
+    # @!attribute [rw] resume_full_automation_mode_minutes
+    #   The number of minutes to pause the automation. When the time period
+    #   ends, RDS Custom resumes full automation.
+    #
+    #   Default: `60`
+    #
+    #   Constraints:
+    #
+    #   * Must be at least 60.
+    #
+    #   * Must be no more than 1,440.
+    #   @return [Integer]
+    #
     # @!attribute [rw] enable_customer_owned_ip
     #   Specifies whether to enable a customer-owned IP address (CoIP) for
     #   an RDS on Outposts DB instance.
@@ -19843,33 +19851,6 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
     #   @return [Boolean]
     #
-    # @!attribute [rw] aws_backup_recovery_point_arn
-    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
-    #   Services Backup.
-    #
-    #   This setting doesn't apply to RDS Custom DB instances.
-    #   @return [String]
-    #
-    # @!attribute [rw] automation_mode
-    #   The automation mode of the RDS Custom DB instance. If `full`, the DB
-    #   instance automates monitoring and instance recovery. If `all
-    #   paused`, the instance pauses automation for the duration set by
-    #   `ResumeFullAutomationModeMinutes`.
-    #   @return [String]
-    #
-    # @!attribute [rw] resume_full_automation_mode_minutes
-    #   The number of minutes to pause the automation. When the time period
-    #   ends, RDS Custom resumes full automation.
-    #
-    #   Default: `60`
-    #
-    #   Constraints:
-    #
-    #   * Must be at least 60.
-    #
-    #   * Must be no more than 1,440.
-    #   @return [Integer]
-    #
     # @!attribute [rw] network_type
     #   The network type of the DB instance.
     #
@@ -19887,14 +19868,12 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput value for the DB instance.
-    #
-    #   This setting applies only to the `gp3` storage type.
+    # @!attribute [rw] aws_backup_recovery_point_arn
+    #   The Amazon Resource Name (ARN) of the recovery point in Amazon Web
+    #   Services Backup.
     #
-    #   This setting doesn't apply to Amazon Aurora or RDS Custom DB
-    #   instances.
-    #   @return [Integer]
+    #   This setting doesn't apply to RDS Custom DB instances.
+    #   @return [String]
     #
     # @!attribute [rw] manage_master_user_password
     #   Specifies whether to manage the master user password with Amazon Web
@@ -19983,10 +19962,33 @@ module Aws::RDS
     #   different Amazon Web Services account, specify the key ARN or alias
     #   ARN.
     #
-    #   There is a default KMS key for your Amazon Web Services account.
-    #   Your Amazon Web Services account has a different default KMS key for
-    #   each Amazon Web Services Region.
-    #   @return [String]
+    #   There is a default KMS key for your Amazon Web Services account.
+    #   Your Amazon Web Services account has a different default KMS key for
+    #   each Amazon Web Services Region.
+    #   @return [String]
+    #
+    # @!attribute [rw] multi_tenant
+    #   Specifies whether the to convert your DB instance from the
+    #   single-tenant configuration to the multi-tenant configuration. This
+    #   parameter is supported only for RDS for Oracle CDB instances.
+    #
+    #   During the conversion, RDS creates an initial tenant database and
+    #   associates the DB name, master user name, character set, and
+    #   national character set metadata with this database. The tags
+    #   associated with the instance also propagate to the initial tenant
+    #   database. You can add more tenant databases to your DB instance by
+    #   using the `CreateTenantDatabase` operation.
+    #
+    #   The conversion to the multi-tenant configuration is permanent and
+    #   irreversible, so you can't later convert back to the single-tenant
+    #   configuration. When you specify this parameter, you must also
+    #   specify `ApplyImmediately`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] dedicated_log_volume
+    #   Indicates whether the DB instance has a dedicated log volume (DLV)
+    #   enabled.
+    #   @return [Boolean]
     #
     # @!attribute [rw] engine
     #   The target Oracle DB engine when you convert a non-CDB to a CDB.
@@ -20018,29 +20020,6 @@ module Aws::RDS
     #     `--option-group-name`.
     #   @return [String]
     #
-    # @!attribute [rw] dedicated_log_volume
-    #   Indicates whether the DB instance has a dedicated log volume (DLV)
-    #   enabled.
-    #   @return [Boolean]
-    #
-    # @!attribute [rw] multi_tenant
-    #   Specifies whether the to convert your DB instance from the
-    #   single-tenant configuration to the multi-tenant configuration. This
-    #   parameter is supported only for RDS for Oracle CDB instances.
-    #
-    #   During the conversion, RDS creates an initial tenant database and
-    #   associates the DB name, master user name, character set, and
-    #   national character set metadata with this database. The tags
-    #   associated with the instance also propagate to the initial tenant
-    #   database. You can add more tenant databases to your DB instance by
-    #   using the `CreateTenantDatabase` operation.
-    #
-    #   The conversion to the multi-tenant configuration is permanent and
-    #   irreversible, so you can't later convert back to the single-tenant
-    #   configuration. When you specify this parameter, you must also
-    #   specify `ApplyImmediately`.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] master_user_authentication_type
     #   Specifies the authentication type for the master user. With IAM
     #   master user authentication, you can change the master DB user to use
@@ -20078,6 +20057,7 @@ module Aws::RDS
       :auto_minor_version_upgrade,
       :license_model,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :new_db_instance_identifier,
       :storage_type,
@@ -20089,13 +20069,13 @@ module Aws::RDS
       :domain_ou,
       :domain_auth_secret_arn,
       :domain_dns_ips,
+      :disable_domain,
       :copy_tags_to_snapshot,
       :monitoring_interval,
       :db_port_number,
       :publicly_accessible,
       :monitoring_role_arn,
       :domain_iam_role_name,
-      :disable_domain,
       :promotion_tier,
       :enable_iam_database_authentication,
       :database_insights_mode,
@@ -20109,20 +20089,19 @@ module Aws::RDS
       :max_allocated_storage,
       :certificate_rotation_restart,
       :replica_mode,
-      :enable_customer_owned_ip,
-      :aws_backup_recovery_point_arn,
       :automation_mode,
       :resume_full_automation_mode_minutes,
+      :enable_customer_owned_ip,
       :network_type,
-      :storage_throughput,
+      :aws_backup_recovery_point_arn,
       :manage_master_user_password,
       :rotate_master_user_password,
       :master_user_secret_kms_key_id,
-      :engine,
-      :dedicated_log_volume,
       :multi_tenant,
+      :dedicated_log_volume,
+      :engine,
       :master_user_authentication_type)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password, :tde_credential_password]
       include Aws::Structure
     end
 
@@ -21540,7 +21519,7 @@ module Aws::RDS
       :allowed_values,
       :is_modifiable,
       :is_collection)
-      SENSITIVE = []
+      SENSITIVE = [:value]
       include Aws::Structure
     end
 
@@ -21617,6 +21596,10 @@ module Aws::RDS
     #   Indicates whether a DB instance supports provisioned IOPS.
     #   @return [Boolean]
     #
+    # @!attribute [rw] supports_storage_throughput
+    #   Indicates whether a DB instance supports storage throughput.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] supports_enhanced_monitoring
     #   Indicates whether a DB instance supports Enhanced Monitoring at
     #   intervals from 1 to 60 seconds.
@@ -21655,6 +21638,24 @@ module Aws::RDS
     #   Maximum provisioned IOPS per GiB for a DB instance.
     #   @return [Float]
     #
+    # @!attribute [rw] min_storage_throughput_per_db_instance
+    #   Minimum storage throughput for a DB instance.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] max_storage_throughput_per_db_instance
+    #   Maximum storage throughput for a DB instance.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] min_storage_throughput_per_iops
+    #   Minimum storage throughput to provisioned IOPS ratio for a DB
+    #   instance.
+    #   @return [Float]
+    #
+    # @!attribute [rw] max_storage_throughput_per_iops
+    #   Maximum storage throughput to provisioned IOPS ratio for a DB
+    #   instance.
+    #   @return [Float]
+    #
     # @!attribute [rw] available_processor_features
     #   A list of the available processor features for the DB instance class
     #   of a DB instance.
@@ -21696,19 +21697,6 @@ module Aws::RDS
     #   specific combination of other DB engine attributes.
     #   @return [Boolean]
     #
-    # @!attribute [rw] supports_clusters
-    #   Indicates whether DB instances can be configured as a Multi-AZ DB
-    #   cluster.
-    #
-    #   For more information on Multi-AZ DB clusters, see [ Multi-AZ
-    #   deployments with two readable standby DB instances][1] in the
-    #   *Amazon RDS User Guide.*
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html
-    #   @return [Boolean]
-    #
     # @!attribute [rw] supported_network_types
     #   The network types supported by the DB instance (`IPV4` or `DUAL`).
     #
@@ -21723,27 +21711,18 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [Array<String>]
     #
-    # @!attribute [rw] supports_storage_throughput
-    #   Indicates whether a DB instance supports storage throughput.
-    #   @return [Boolean]
+    # @!attribute [rw] supports_clusters
+    #   Indicates whether DB instances can be configured as a Multi-AZ DB
+    #   cluster.
     #
-    # @!attribute [rw] min_storage_throughput_per_db_instance
-    #   Minimum storage throughput for a DB instance.
-    #   @return [Integer]
+    #   For more information on Multi-AZ DB clusters, see [ Multi-AZ
+    #   deployments with two readable standby DB instances][1] in the
+    #   *Amazon RDS User Guide.*
     #
-    # @!attribute [rw] max_storage_throughput_per_db_instance
-    #   Maximum storage throughput for a DB instance.
-    #   @return [Integer]
     #
-    # @!attribute [rw] min_storage_throughput_per_iops
-    #   Minimum storage throughput to provisioned IOPS ratio for a DB
-    #   instance.
-    #   @return [Float]
     #
-    # @!attribute [rw] max_storage_throughput_per_iops
-    #   Maximum storage throughput to provisioned IOPS ratio for a DB
-    #   instance.
-    #   @return [Float]
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html
+    #   @return [Boolean]
     #
     # @!attribute [rw] supports_dedicated_log_volume
     #   Indicates whether a DB instance supports using a dedicated log
@@ -21769,6 +21748,7 @@ module Aws::RDS
       :supports_storage_encryption,
       :storage_type,
       :supports_iops,
+      :supports_storage_throughput,
       :supports_enhanced_monitoring,
       :supports_iam_database_authentication,
       :supports_performance_insights,
@@ -21778,6 +21758,10 @@ module Aws::RDS
       :max_iops_per_db_instance,
       :min_iops_per_gib,
       :max_iops_per_gib,
+      :min_storage_throughput_per_db_instance,
+      :max_storage_throughput_per_db_instance,
+      :min_storage_throughput_per_iops,
+      :max_storage_throughput_per_iops,
       :available_processor_features,
       :supported_engine_modes,
       :supports_storage_autoscaling,
@@ -21785,13 +21769,8 @@ module Aws::RDS
       :outpost_capable,
       :supported_activity_stream_modes,
       :supports_global_databases,
-      :supports_clusters,
       :supported_network_types,
-      :supports_storage_throughput,
-      :min_storage_throughput_per_db_instance,
-      :max_storage_throughput_per_db_instance,
-      :min_storage_throughput_per_iops,
-      :max_storage_throughput_per_iops,
+      :supports_clusters,
       :supports_dedicated_log_volume,
       :supports_http_endpoint)
       SENSITIVE = []
@@ -22083,6 +22062,10 @@ module Aws::RDS
     #   The Provisioned IOPS value for the DB instance.
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput of the DB instance.
+    #   @return [Integer]
+    #
     # @!attribute [rw] db_instance_identifier
     #   The database identifier for the DB instance.
     #   @return [String]
@@ -22120,11 +22103,6 @@ module Aws::RDS
     #   DB instance class of the DB instance.
     #   @return [Array<Types::ProcessorFeature>]
     #
-    # @!attribute [rw] iam_database_authentication_enabled
-    #   Indicates whether mapping of Amazon Web Services Identity and Access
-    #   Management (IAM) accounts to database accounts is enabled.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] automation_mode
     #   The automation mode of the RDS Custom DB instance: `full` or
     #   `all-paused`. If `full`, the DB instance automates monitoring and
@@ -22138,23 +22116,24 @@ module Aws::RDS
     #   (default). The maximum value is 1,440.
     #   @return [Time]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput of the DB instance.
-    #   @return [Integer]
+    # @!attribute [rw] multi_tenant
+    #   Indicates whether the DB instance will change to the multi-tenant
+    #   configuration (TRUE) or the single-tenant configuration (FALSE).
+    #   @return [Boolean]
     #
-    # @!attribute [rw] engine
-    #   The database engine of the DB instance.
-    #   @return [String]
+    # @!attribute [rw] iam_database_authentication_enabled
+    #   Indicates whether mapping of Amazon Web Services Identity and Access
+    #   Management (IAM) accounts to database accounts is enabled.
+    #   @return [Boolean]
     #
     # @!attribute [rw] dedicated_log_volume
     #   Indicates whether the DB instance has a dedicated log volume (DLV)
     #   enabled.&gt;
     #   @return [Boolean]
     #
-    # @!attribute [rw] multi_tenant
-    #   Indicates whether the DB instance will change to the multi-tenant
-    #   configuration (TRUE) or the single-tenant configuration (FALSE).
-    #   @return [Boolean]
+    # @!attribute [rw] engine
+    #   The database engine of the DB instance.
+    #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/PendingModifiedValues AWS API Documentation
     #
@@ -22168,20 +22147,20 @@ module Aws::RDS
       :engine_version,
       :license_model,
       :iops,
+      :storage_throughput,
       :db_instance_identifier,
       :storage_type,
       :ca_certificate_identifier,
       :db_subnet_group_name,
       :pending_cloudwatch_logs_exports,
       :processor_features,
-      :iam_database_authentication_enabled,
       :automation_mode,
       :resume_full_automation_mode_time,
-      :storage_throughput,
-      :engine,
+      :multi_tenant,
+      :iam_database_authentication_enabled,
       :dedicated_log_volume,
-      :multi_tenant)
-      SENSITIVE = []
+      :engine)
+      SENSITIVE = [:master_user_password]
       include Aws::Structure
     end
 
@@ -23771,17 +23750,15 @@ module Aws::RDS
     #   the Directory Service.
     #   @return [String]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   Contains the scaling configuration of an Aurora Serverless v2 DB
-    #   cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
+    # @!attribute [rw] storage_type
+    #   Specifies the storage type to be associated with the DB cluster.
     #
+    #   Valid Values: `aurora`, `aurora-iopt1`
     #
+    #   Default: `aurora`
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #   Valid for: Aurora DB clusters only
+    #   @return [String]
     #
     # @!attribute [rw] network_type
     #   The network type of the DB cluster.
@@ -23804,6 +23781,18 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   Contains the scaling configuration of an Aurora Serverless v2 DB
+    #   cluster.
+    #
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #
     # @!attribute [rw] manage_master_user_password
     #   Specifies whether to manage the master user password with Amazon Web
     #   Services Secrets Manager.
@@ -23850,16 +23839,6 @@ module Aws::RDS
     #   each Amazon Web Services Region.
     #   @return [String]
     #
-    # @!attribute [rw] storage_type
-    #   Specifies the storage type to be associated with the DB cluster.
-    #
-    #   Valid Values: `aurora`, `aurora-iopt1`
-    #
-    #   Default: `aurora`
-    #
-    #   Valid for: Aurora DB clusters only
-    #   @return [String]
-    #
     # @!attribute [rw] engine_lifecycle_support
     #   The life cycle type for this DB cluster.
     #
@@ -23933,13 +23912,13 @@ module Aws::RDS
       :copy_tags_to_snapshot,
       :domain,
       :domain_iam_role_name,
-      :serverless_v2_scaling_configuration,
+      :storage_type,
       :network_type,
+      :serverless_v2_scaling_configuration,
       :manage_master_user_password,
       :master_user_secret_kms_key_id,
-      :storage_type,
       :engine_lifecycle_support)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password]
       include Aws::Structure
     end
 
@@ -24403,18 +24382,6 @@ module Aws::RDS
     #   Valid for: Aurora DB clusters and Multi-AZ DB clusters
     #   @return [Boolean]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   Contains the scaling configuration of an Aurora Serverless v2 DB
-    #   cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfiguration]
-    #
     # @!attribute [rw] network_type
     #   The network type of the DB cluster.
     #
@@ -24438,6 +24405,18 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   Contains the scaling configuration of an Aurora Serverless v2 DB
+    #   cluster.
+    #
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #
     # @!attribute [rw] rds_custom_cluster_configuration
     #   Reserved for future use.
     #   @return [Types::RdsCustomClusterConfiguration]
@@ -24570,8 +24549,8 @@ module Aws::RDS
       :storage_type,
       :iops,
       :publicly_accessible,
-      :serverless_v2_scaling_configuration,
       :network_type,
+      :serverless_v2_scaling_configuration,
       :rds_custom_cluster_configuration,
       :monitoring_interval,
       :monitoring_role_arn,
@@ -24910,26 +24889,6 @@ module Aws::RDS
     #   Valid for: Aurora DB clusters only
     #   @return [String]
     #
-    # @!attribute [rw] scaling_configuration
-    #   For DB clusters in `serverless` DB engine mode, the scaling
-    #   properties of the DB cluster.
-    #
-    #   Valid for: Aurora DB clusters only
-    #   @return [Types::ScalingConfiguration]
-    #
-    # @!attribute [rw] engine_mode
-    #   The engine mode of the new cluster. Specify `provisioned` or
-    #   `serverless`, depending on the type of the cluster you are creating.
-    #   You can create an Aurora Serverless v1 clone from a provisioned
-    #   cluster, or a provisioned clone from an Aurora Serverless v1
-    #   cluster. To create a clone that is an Aurora Serverless v1 cluster,
-    #   the original cluster must be an Aurora Serverless v1 cluster or an
-    #   encrypted provisioned cluster. To create a full copy that is an
-    #   Aurora Serverless v1 cluster, specify the engine mode `serverless`.
-    #
-    #   Valid for: Aurora DB clusters only
-    #   @return [String]
-    #
     # @!attribute [rw] db_cluster_instance_class
     #   The compute and memory capacity of the each DB instance in the
     #   Multi-AZ DB cluster, for example db.m6gd.xlarge. Not all DB instance
@@ -25016,18 +24975,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS
     #   @return [Integer]
     #
-    # @!attribute [rw] serverless_v2_scaling_configuration
-    #   Contains the scaling configuration of an Aurora Serverless v2 DB
-    #   cluster.
-    #
-    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
-    #   the *Amazon Aurora User Guide*.
-    #
-    #
-    #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
-    #   @return [Types::ServerlessV2ScalingConfiguration]
-    #
     # @!attribute [rw] network_type
     #   The network type of the DB cluster.
     #
@@ -25055,6 +25002,38 @@ module Aws::RDS
     #   The resource ID of the source DB cluster from which to restore.
     #   @return [String]
     #
+    # @!attribute [rw] serverless_v2_scaling_configuration
+    #   Contains the scaling configuration of an Aurora Serverless v2 DB
+    #   cluster.
+    #
+    #   For more information, see [Using Amazon Aurora Serverless v2][1] in
+    #   the *Amazon Aurora User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless-v2.html
+    #   @return [Types::ServerlessV2ScalingConfiguration]
+    #
+    # @!attribute [rw] scaling_configuration
+    #   For DB clusters in `serverless` DB engine mode, the scaling
+    #   properties of the DB cluster.
+    #
+    #   Valid for: Aurora DB clusters only
+    #   @return [Types::ScalingConfiguration]
+    #
+    # @!attribute [rw] engine_mode
+    #   The engine mode of the new cluster. Specify `provisioned` or
+    #   `serverless`, depending on the type of the cluster you are creating.
+    #   You can create an Aurora Serverless v1 clone from a provisioned
+    #   cluster, or a provisioned clone from an Aurora Serverless v1
+    #   cluster. To create a clone that is an Aurora Serverless v1 cluster,
+    #   the original cluster must be an Aurora Serverless v1 cluster or an
+    #   encrypted provisioned cluster. To create a full copy that is an
+    #   Aurora Serverless v1 cluster, specify the engine mode `serverless`.
+    #
+    #   Valid for: Aurora DB clusters only
+    #   @return [String]
+    #
     # @!attribute [rw] rds_custom_cluster_configuration
     #   Reserved for future use.
     #   @return [Types::RdsCustomClusterConfiguration]
@@ -25180,15 +25159,15 @@ module Aws::RDS
       :copy_tags_to_snapshot,
       :domain,
       :domain_iam_role_name,
-      :scaling_configuration,
-      :engine_mode,
       :db_cluster_instance_class,
       :storage_type,
       :publicly_accessible,
       :iops,
-      :serverless_v2_scaling_configuration,
       :network_type,
       :source_db_cluster_resource_id,
+      :serverless_v2_scaling_configuration,
+      :scaling_configuration,
+      :engine_mode,
       :rds_custom_cluster_configuration,
       :monitoring_interval,
       :monitoring_role_arn,
@@ -25461,6 +25440,12 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   Specifies the storage throughput value for the DB instance.
+    #
+    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The name of the option group to be used for the restored DB
     #   instance.
@@ -25717,27 +25702,25 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
     #   @return [Boolean]
     #
-    # @!attribute [rw] custom_iam_instance_profile
-    #   The instance profile associated with the underlying Amazon EC2
-    #   instance of an RDS Custom DB instance. The instance profile must
-    #   meet the following requirements:
+    # @!attribute [rw] network_type
+    #   The network type of the DB instance.
     #
-    #   * The profile must exist in your account.
+    #   Valid Values:
     #
-    #   * The profile must have an IAM role that Amazon EC2 has permissions
-    #     to assume.
+    #   * `IPV4`
     #
-    #   * The instance profile name and the associated IAM role name must
-    #     start with the prefix `AWSRDSCustom`.
+    #   * `DUAL`
     #
-    #   For the list of permissions required for the IAM role, see [
-    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
+    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
     #
-    #   This setting is required for RDS Custom.
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon RDS User Guide.*
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
     # @!attribute [rw] backup_target
@@ -25756,31 +25739,41 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-on-outposts.html
     #   @return [String]
     #
-    # @!attribute [rw] network_type
-    #   The network type of the DB instance.
+    # @!attribute [rw] custom_iam_instance_profile
+    #   The instance profile associated with the underlying Amazon EC2
+    #   instance of an RDS Custom DB instance. The instance profile must
+    #   meet the following requirements:
     #
-    #   Valid Values:
+    #   * The profile must exist in your account.
     #
-    #   * `IPV4`
+    #   * The profile must have an IAM role that Amazon EC2 has permissions
+    #     to assume.
     #
-    #   * `DUAL`
+    #   * The instance profile name and the associated IAM role name must
+    #     start with the prefix `AWSRDSCustom`.
     #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
-    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
+    #   For the list of permissions required for the IAM role, see [
+    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
     #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon RDS User Guide.*
+    #   This setting is required for RDS Custom.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   Specifies the storage throughput value for the DB instance.
+    # @!attribute [rw] allocated_storage
+    #   The amount of storage (in gibibytes) to allocate initially for the
+    #   DB instance. Follow the allocation rules specified in
+    #   CreateDBInstance.
     #
-    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
+    #   This setting isn't valid for RDS for SQL Server.
+    #
+    #   <note markdown="1"> Be sure to allocate enough storage for your new DB instance so that
+    #   the restore operation can succeed. You can also allocate additional
+    #   storage for future growth.
+    #
+    #    </note>
     #   @return [Integer]
     #
     # @!attribute [rw] db_cluster_snapshot_identifier
@@ -25809,20 +25802,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html
     #   @return [String]
     #
-    # @!attribute [rw] allocated_storage
-    #   The amount of storage (in gibibytes) to allocate initially for the
-    #   DB instance. Follow the allocation rules specified in
-    #   CreateDBInstance.
-    #
-    #   This setting isn't valid for RDS for SQL Server.
-    #
-    #   <note markdown="1"> Be sure to allocate enough storage for your new DB instance so that
-    #   the restore operation can succeed. You can also allocate additional
-    #   storage for future growth.
-    #
-    #    </note>
-    #   @return [Integer]
-    #
     # @!attribute [rw] dedicated_log_volume
     #   Specifies whether to enable a dedicated log volume (DLV) for the DB
     #   instance.
@@ -25938,6 +25917,7 @@ module Aws::RDS
       :db_name,
       :engine,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :tags,
       :storage_type,
@@ -25958,18 +25938,17 @@ module Aws::RDS
       :db_parameter_group_name,
       :deletion_protection,
       :enable_customer_owned_ip,
-      :custom_iam_instance_profile,
-      :backup_target,
       :network_type,
-      :storage_throughput,
-      :db_cluster_snapshot_identifier,
+      :backup_target,
+      :custom_iam_instance_profile,
       :allocated_storage,
+      :db_cluster_snapshot_identifier,
       :dedicated_log_volume,
       :ca_certificate_identifier,
       :engine_lifecycle_support,
       :manage_master_user_password,
       :master_user_secret_kms_key_id)
-      SENSITIVE = []
+      SENSITIVE = [:tde_credential_password]
       include Aws::Structure
     end
 
@@ -26235,6 +26214,12 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Storage.html#USER_PIOPS
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   Specifies the storage throughput value for the DB instance.
+    #
+    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The name of the option group to associate with this DB instance. If
     #   this argument is omitted, the default option group for the specified
@@ -26507,12 +26492,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   Specifies the storage throughput value for the DB instance.
-    #
-    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
-    #   @return [Integer]
-    #
     # @!attribute [rw] manage_master_user_password
     #   Specifies whether to manage the master user password with Amazon Web
     #   Services Secrets Manager.
@@ -26637,6 +26616,7 @@ module Aws::RDS
       :auto_minor_version_upgrade,
       :license_model,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :publicly_accessible,
       :tags,
@@ -26662,13 +26642,12 @@ module Aws::RDS
       :deletion_protection,
       :max_allocated_storage,
       :network_type,
-      :storage_throughput,
       :manage_master_user_password,
       :master_user_secret_kms_key_id,
       :dedicated_log_volume,
       :ca_certificate_identifier,
       :engine_lifecycle_support)
-      SENSITIVE = []
+      SENSITIVE = [:master_user_password]
       include Aws::Structure
     end
 
@@ -26944,6 +26923,12 @@ module Aws::RDS
     #   ^
     #   @return [Integer]
     #
+    # @!attribute [rw] storage_throughput
+    #   The storage throughput value for the DB instance.
+    #
+    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
+    #   @return [Integer]
+    #
     # @!attribute [rw] option_group_name
     #   The name of the option group to use for the restored DB instance.
     #
@@ -27184,14 +27169,6 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_PIOPS.StorageTypes.html#USER_PIOPS.Autoscaling
     #   @return [Integer]
     #
-    # @!attribute [rw] source_db_instance_automated_backups_arn
-    #   The Amazon Resource Name (ARN) of the replicated automated backups
-    #   from which to restore, for example,
-    #   `arn:aws:rds:us-east-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE`.
-    #
-    #   This setting doesn't apply to RDS Custom.
-    #   @return [String]
-    #
     # @!attribute [rw] enable_customer_owned_ip
     #   Specifies whether to enable a customer-owned IP address (CoIP) for
     #   an RDS on Outposts DB instance.
@@ -27217,27 +27194,33 @@ module Aws::RDS
     #   [2]: https://docs.aws.amazon.com/outposts/latest/userguide/routing.html#ip-addressing
     #   @return [Boolean]
     #
-    # @!attribute [rw] custom_iam_instance_profile
-    #   The instance profile associated with the underlying Amazon EC2
-    #   instance of an RDS Custom DB instance. The instance profile must
-    #   meet the following requirements:
+    # @!attribute [rw] network_type
+    #   The network type of the DB instance.
     #
-    #   * The profile must exist in your account.
+    #   The network type is determined by the `DBSubnetGroup` specified for
+    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
+    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
     #
-    #   * The profile must have an IAM role that Amazon EC2 has permissions
-    #     to assume.
+    #   For more information, see [ Working with a DB instance in a VPC][1]
+    #   in the *Amazon RDS User Guide.*
     #
-    #   * The instance profile name and the associated IAM role name must
-    #     start with the prefix `AWSRDSCustom`.
+    #   Valid Values:
     #
-    #   For the list of permissions required for the IAM role, see [
-    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
+    #   * `IPV4`
     #
-    #   This setting is required for RDS Custom.
+    #   * `DUAL`
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   @return [String]
+    #
+    # @!attribute [rw] source_db_instance_automated_backups_arn
+    #   The Amazon Resource Name (ARN) of the replicated automated backups
+    #   from which to restore, for example,
+    #   `arn:aws:rds:us-east-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE`.
+    #
+    #   This setting doesn't apply to RDS Custom.
     #   @return [String]
     #
     # @!attribute [rw] backup_target
@@ -27262,33 +27245,29 @@ module Aws::RDS
     #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/rds-on-outposts.html
     #   @return [String]
     #
-    # @!attribute [rw] network_type
-    #   The network type of the DB instance.
+    # @!attribute [rw] custom_iam_instance_profile
+    #   The instance profile associated with the underlying Amazon EC2
+    #   instance of an RDS Custom DB instance. The instance profile must
+    #   meet the following requirements:
     #
-    #   The network type is determined by the `DBSubnetGroup` specified for
-    #   the DB instance. A `DBSubnetGroup` can support only the IPv4
-    #   protocol or the IPv4 and the IPv6 protocols (`DUAL`).
+    #   * The profile must exist in your account.
     #
-    #   For more information, see [ Working with a DB instance in a VPC][1]
-    #   in the *Amazon RDS User Guide.*
+    #   * The profile must have an IAM role that Amazon EC2 has permissions
+    #     to assume.
     #
-    #   Valid Values:
+    #   * The instance profile name and the associated IAM role name must
+    #     start with the prefix `AWSRDSCustom`.
     #
-    #   * `IPV4`
+    #   For the list of permissions required for the IAM role, see [
+    #   Configure IAM and your VPC][1] in the *Amazon RDS User Guide*.
     #
-    #   * `DUAL`
+    #   This setting is required for RDS Custom.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html
+    #   [1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/custom-setup-orcl.html#custom-setup-orcl.iam-vpc
     #   @return [String]
     #
-    # @!attribute [rw] storage_throughput
-    #   The storage throughput value for the DB instance.
-    #
-    #   This setting doesn't apply to RDS Custom or Amazon Aurora.
-    #   @return [Integer]
-    #
     # @!attribute [rw] allocated_storage
     #   The amount of storage (in gibibytes) to allocate initially for the
     #   DB instance. Follow the allocation rules specified in
@@ -27420,6 +27399,7 @@ module Aws::RDS
       :db_name,
       :engine,
       :iops,
+      :storage_throughput,
       :option_group_name,
       :copy_tags_to_snapshot,
       :tags,
@@ -27441,19 +27421,18 @@ module Aws::RDS
       :deletion_protection,
       :source_dbi_resource_id,
       :max_allocated_storage,
-      :source_db_instance_automated_backups_arn,
       :enable_customer_owned_ip,
-      :custom_iam_instance_profile,
-      :backup_target,
       :network_type,
-      :storage_throughput,
+      :source_db_instance_automated_backups_arn,
+      :backup_target,
+      :custom_iam_instance_profile,
       :allocated_storage,
       :dedicated_log_volume,
       :ca_certificate_identifier,
       :engine_lifecycle_support,
       :manage_master_user_password,
       :master_user_secret_kms_key_id)
-      SENSITIVE = []
+      SENSITIVE = [:tde_credential_password]
       include Aws::Structure
     end
 
@@ -28033,17 +28012,17 @@ module Aws::RDS
     #   The mode of the database activity stream.
     #   @return [String]
     #
+    # @!attribute [rw] engine_native_audit_fields_included
+    #   Indicates whether engine-native audit fields are included in the
+    #   database activity stream.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] apply_immediately
     #   Indicates whether or not the database activity stream will start as
     #   soon as possible, regardless of the maintenance window for the
     #   database.
     #   @return [Boolean]
     #
-    # @!attribute [rw] engine_native_audit_fields_included
-    #   Indicates whether engine-native audit fields are included in the
-    #   database activity stream.
-    #   @return [Boolean]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/StartActivityStreamResponse AWS API Documentation
     #
     class StartActivityStreamResponse < Struct.new(
@@ -28051,8 +28030,8 @@ module Aws::RDS
       :kinesis_stream_name,
       :status,
       :mode,
-      :apply_immediately,
-      :engine_native_audit_fields_included)
+      :engine_native_audit_fields_included,
+      :apply_immediately)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -28172,7 +28151,7 @@ module Aws::RDS
       :kms_key_id,
       :pre_signed_url,
       :source_region)
-      SENSITIVE = []
+      SENSITIVE = [:pre_signed_url]
       include Aws::Structure
     end
 
@@ -29322,11 +29301,6 @@ module Aws::RDS
     #   be between 3 and 10 times storage.
     #   @return [Array<Types::DoubleRange>]
     #
-    # @!attribute [rw] supports_storage_autoscaling
-    #   Indicates whether or not Amazon RDS can automatically scale storage
-    #   for DB instances that use the new instance class.
-    #   @return [Boolean]
-    #
     # @!attribute [rw] provisioned_storage_throughput
     #   The valid range of provisioned storage throughput. For example,
     #   500-4,000 mebibytes per second (MiBps).
@@ -29337,6 +29311,11 @@ module Aws::RDS
     #   For example, 0-0.25.
     #   @return [Array<Types::DoubleRange>]
     #
+    # @!attribute [rw] supports_storage_autoscaling
+    #   Indicates whether or not Amazon RDS can automatically scale storage
+    #   for DB instances that use the new instance class.
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/ValidStorageOptions AWS API Documentation
     #
     class ValidStorageOptions < Struct.new(
@@ -29344,9 +29323,9 @@ module Aws::RDS
       :storage_size,
       :provisioned_iops,
       :iops_to_storage_ratio,
-      :supports_storage_autoscaling,
       :provisioned_storage_throughput,
-      :storage_throughput_to_iops_ratio)
+      :storage_throughput_to_iops_ratio,
+      :supports_storage_autoscaling)
       SENSITIVE = []
       include Aws::Structure
     end