aws-sdk-rds 1.0.0.rc9 → 1.0.0.rc10

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

@@ -359,6 +359,10 @@ module Aws::RDS
     SourceRegionList = Shapes::ListShape.new(name: 'SourceRegionList')
     SourceRegionMessage = Shapes::StructureShape.new(name: 'SourceRegionMessage')
     SourceType = Shapes::StringShape.new(name: 'SourceType')
+    StartDBInstanceMessage = Shapes::StructureShape.new(name: 'StartDBInstanceMessage')
+    StartDBInstanceResult = Shapes::StructureShape.new(name: 'StartDBInstanceResult')
+    StopDBInstanceMessage = Shapes::StructureShape.new(name: 'StopDBInstanceMessage')
+    StopDBInstanceResult = Shapes::StructureShape.new(name: 'StopDBInstanceResult')
     StorageQuotaExceededFault = Shapes::StructureShape.new(name: 'StorageQuotaExceededFault')
     StorageTypeNotSupportedFault = Shapes::StructureShape.new(name: 'StorageTypeNotSupportedFault')
     String = Shapes::StringShape.new(name: 'String')
@@ -489,6 +493,7 @@ module Aws::RDS
     CopyDBSnapshotMessage.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "Tags"))
     CopyDBSnapshotMessage.add_member(:copy_tags, Shapes::ShapeRef.new(shape: BooleanOptional, location_name: "CopyTags"))
     CopyDBSnapshotMessage.add_member(:pre_signed_url, Shapes::ShapeRef.new(shape: String, location_name: "PreSignedUrl"))
+    CopyDBSnapshotMessage.add_member(:option_group_name, Shapes::ShapeRef.new(shape: String, location_name: "OptionGroupName"))
     CopyDBSnapshotMessage.add_member(:destination_region, Shapes::ShapeRef.new(shape: String, location_name: "DestinationRegion", metadata: {"documented"=>false}))
     CopyDBSnapshotMessage.add_member(:source_region, Shapes::ShapeRef.new(shape: String, location_name: "SourceRegion"))
     CopyDBSnapshotMessage.struct_class = Types::CopyDBSnapshotMessage
@@ -709,6 +714,7 @@ module Aws::RDS
     DBCluster.add_member(:db_cluster_arn, Shapes::ShapeRef.new(shape: String, location_name: "DBClusterArn"))
     DBCluster.add_member(:associated_roles, Shapes::ShapeRef.new(shape: DBClusterRoles, location_name: "AssociatedRoles"))
     DBCluster.add_member(:iam_database_authentication_enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "IAMDatabaseAuthenticationEnabled"))
+    DBCluster.add_member(:clone_group_id, Shapes::ShapeRef.new(shape: String, location_name: "CloneGroupId"))
     DBCluster.add_member(:cluster_create_time, Shapes::ShapeRef.new(shape: TStamp, location_name: "ClusterCreateTime"))
     DBCluster.struct_class = Types::DBCluster
 
@@ -1804,6 +1810,7 @@ module Aws::RDS
     RestoreDBClusterFromSnapshotResult.struct_class = Types::RestoreDBClusterFromSnapshotResult
 
     RestoreDBClusterToPointInTimeMessage.add_member(:db_cluster_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "DBClusterIdentifier"))
+    RestoreDBClusterToPointInTimeMessage.add_member(:restore_type, Shapes::ShapeRef.new(shape: String, location_name: "RestoreType"))
     RestoreDBClusterToPointInTimeMessage.add_member(:source_db_cluster_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "SourceDBClusterIdentifier"))
     RestoreDBClusterToPointInTimeMessage.add_member(:restore_to_time, Shapes::ShapeRef.new(shape: TStamp, location_name: "RestoreToTime"))
     RestoreDBClusterToPointInTimeMessage.add_member(:use_latest_restorable_time, Shapes::ShapeRef.new(shape: Boolean, location_name: "UseLatestRestorableTime"))
@@ -1898,6 +1905,19 @@ module Aws::RDS
     SourceRegionMessage.add_member(:source_regions, Shapes::ShapeRef.new(shape: SourceRegionList, location_name: "SourceRegions"))
     SourceRegionMessage.struct_class = Types::SourceRegionMessage
 
+    StartDBInstanceMessage.add_member(:db_instance_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "DBInstanceIdentifier"))
+    StartDBInstanceMessage.struct_class = Types::StartDBInstanceMessage
+
+    StartDBInstanceResult.add_member(:db_instance, Shapes::ShapeRef.new(shape: DBInstance, location_name: "DBInstance"))
+    StartDBInstanceResult.struct_class = Types::StartDBInstanceResult
+
+    StopDBInstanceMessage.add_member(:db_instance_identifier, Shapes::ShapeRef.new(shape: String, required: true, location_name: "DBInstanceIdentifier"))
+    StopDBInstanceMessage.add_member(:db_snapshot_identifier, Shapes::ShapeRef.new(shape: String, location_name: "DBSnapshotIdentifier"))
+    StopDBInstanceMessage.struct_class = Types::StopDBInstanceMessage
+
+    StopDBInstanceResult.add_member(:db_instance, Shapes::ShapeRef.new(shape: DBInstance, location_name: "DBInstance"))
+    StopDBInstanceResult.struct_class = Types::StopDBInstanceResult
+
     Subnet.add_member(:subnet_identifier, Shapes::ShapeRef.new(shape: String, location_name: "SubnetIdentifier"))
     Subnet.add_member(:subnet_availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZone, location_name: "SubnetAvailabilityZone"))
     Subnet.add_member(:subnet_status, Shapes::ShapeRef.new(shape: String, location_name: "SubnetStatus"))
@@ -3079,6 +3099,38 @@ module Aws::RDS
         o.errors << Shapes::ShapeRef.new(shape: AuthorizationNotFoundFault)
         o.errors << Shapes::ShapeRef.new(shape: InvalidDBSecurityGroupStateFault)
       end)
+
+      api.add_operation(:start_db_instance, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "StartDBInstance"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: StartDBInstanceMessage)
+        o.output = Shapes::ShapeRef.new(shape: StartDBInstanceResult)
+        o.errors << Shapes::ShapeRef.new(shape: DBInstanceNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidDBInstanceStateFault)
+        o.errors << Shapes::ShapeRef.new(shape: InsufficientDBInstanceCapacityFault)
+        o.errors << Shapes::ShapeRef.new(shape: DBSubnetGroupNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: DBSubnetGroupDoesNotCoverEnoughAZs)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidDBClusterStateFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidSubnet)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidVPCNetworkStateFault)
+        o.errors << Shapes::ShapeRef.new(shape: DBClusterNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: AuthorizationNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: KMSKeyNotAccessibleFault)
+      end)
+
+      api.add_operation(:stop_db_instance, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "StopDBInstance"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: StopDBInstanceMessage)
+        o.output = Shapes::ShapeRef.new(shape: StopDBInstanceResult)
+        o.errors << Shapes::ShapeRef.new(shape: DBInstanceNotFoundFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidDBInstanceStateFault)
+        o.errors << Shapes::ShapeRef.new(shape: DBSnapshotAlreadyExistsFault)
+        o.errors << Shapes::ShapeRef.new(shape: SnapshotQuotaExceededFault)
+        o.errors << Shapes::ShapeRef.new(shape: InvalidDBClusterStateFault)
+      end)
     end
 
   end

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

@@ -263,6 +263,12 @@ module Aws::RDS
       data.iam_database_authentication_enabled
     end
 
+    # Identifies the clone group to which the DB cluster is associated.
+    # @return [String]
+    def clone_group_id
+      data.clone_group_id
+    end
+
     # Specifies the time when the DB cluster was created, in Universal
     # Coordinated Time (UTC).
     # @return [Time]
@@ -362,9 +368,9 @@ module Aws::RDS
     #   A value that indicates that the DB cluster should be associated with
     #   the specified CharacterSet.
     # @option options [String] :database_name
-    #   The name for your database of up to 8 alpha-numeric characters. If you
-    #   do not provide a name, Amazon RDS will not create a database in the DB
-    #   cluster you are creating.
+    #   The name for your database of up to 64 alpha-numeric characters. If
+    #   you do not provide a name, Amazon RDS will not create a database in
+    #   the DB cluster you are creating.
     # @option options [String] :db_cluster_parameter_group_name
     #   The name of the DB cluster parameter group to associate with this DB
     #   cluster. If this argument is omitted, `default.aurora5.6` will be
@@ -801,6 +807,7 @@ module Aws::RDS
     #
     #   dbcluster = db_cluster.restore({
     #     db_cluster_identifier: "String", # required
+    #     restore_type: "String",
     #     restore_to_time: Time.now,
     #     use_latest_restorable_time: false,
     #     port: 1,
@@ -827,6 +834,21 @@ module Aws::RDS
     #   * First character must be a letter
     #
     #   * Cannot end with a hyphen or contain two consecutive hyphens
+    # @option options [String] :restore_type
+    #   The type of restore to be performed. You can specify one of the
+    #   following values:
+    #
+    #   * `full-copy` - The new DB cluster is restored as a full copy of the
+    #     source DB cluster.
+    #
+    #   * `copy-on-write` - The new DB cluster is restored as a clone of the
+    #     source DB cluster.
+    #
+    #   Constraints: You cannot specify `copy-on-write` if the engine version
+    #   of the source DB cluster is earlier than 1.11.
+    #
+    #   If you don't specify a `RestoreType` value, then the new DB cluster
+    #   is restored as a full copy of the source DB cluster.
     # @option options [Time,DateTime,Date,Integer,String] :restore_to_time
     #   The date and time to restore the DB cluster to.
     #
@@ -837,8 +859,13 @@ module Aws::RDS
     #
     #   * Must be before the latest restorable time for the DB instance
     #
+    #   * Must be specified if `UseLatestRestorableTime` parameter is not
+    #     provided
+    #
     #   * Cannot be specified if `UseLatestRestorableTime` parameter is true
     #
+    #   * Cannot be specified if `RestoreType` parameter is `copy-on-write`
+    #
     #   Example: `2015-03-07T23:45:00Z`
     # @option options [Boolean] :use_latest_restorable_time
     #   A value that is set to `true` to restore the DB cluster to the latest
@@ -864,7 +891,7 @@ module Aws::RDS
     # @option options [String] :option_group_name
     #   The name of the option group for the new DB cluster.
     # @option options [Array<String>] :vpc_security_group_ids
-    #   A lst of VPC security groups that the new DB cluster belongs to.
+    #   A list of VPC security groups that the new DB cluster belongs to.
     # @option options [Array<Types::Tag>] :tags
     #   A list of tags.
     # @option options [String] :kms_key_id
@@ -892,8 +919,8 @@ module Aws::RDS
     #   * If the DB cluster is not encrypted, then the restored DB cluster is
     #     not encrypted.
     #
-    #   If `DBClusterIdentifier` refers to a DB cluster that is note
-    #   encrypted, then the restore request is rejected.
+    #   If `DBClusterIdentifier` refers to a DB cluster that is not encrypted,
+    #   then the restore request is rejected.
     # @option options [Boolean] :enable_iam_database_authentication
     #   A Boolean value that is true to enable mapping of AWS Identity and
     #   Access Management (IAM) accounts to database accounts, and otherwise

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

@@ -539,7 +539,9 @@ module Aws::RDS
     #
     #   **Oracle**
     #
-    #   The Oracle System ID (SID) of the created DB instance.
+    #   The Oracle System ID (SID) of the created DB instance. If you specify
+    #   `null`, the default value `ORCL` is used. You can't specify the
+    #   string NULL, or any other reserved word, for `DBName`.
     #
     #   Default: `ORCL`
     #
@@ -611,11 +613,33 @@ module Aws::RDS
     # @option options [required, String] :engine
     #   The name of the database engine to be used for this instance.
     #
-    #   Valid Values: `mysql` \| `mariadb` \| `oracle-se1` \| `oracle-se2` \|
-    #   `oracle-se` \| `oracle-ee` \| `sqlserver-ee` \| `sqlserver-se` \|
-    #   `sqlserver-ex` \| `sqlserver-web` \| `postgres` \| `aurora`
-    #
     #   Not every database engine is available for every AWS region.
+    #
+    #   Valid Values:
+    #
+    #   * `aurora`
+    #
+    #   * `mariadb`
+    #
+    #   * `mysql`
+    #
+    #   * `oracle-ee`
+    #
+    #   * `oracle-se2`
+    #
+    #   * `oracle-se1`
+    #
+    #   * `oracle-se`
+    #
+    #   * `postgres`
+    #
+    #   * `sqlserver-ee`
+    #
+    #   * `sqlserver-se`
+    #
+    #   * `sqlserver-ex`
+    #
+    #   * `sqlserver-web`
     # @option options [String] :master_username
     #   The name for the master database user.
     #
@@ -856,98 +880,118 @@ module Aws::RDS
     #
     #   **Amazon Aurora**
     #
-    #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
+    #   * Version 5.6 (available in these AWS regions: ap-northeast-1,
     #     ap-northeast-2, ap-south-1, ap-southeast-2, eu-west-1, us-east-1,
-    #     us-east-2, us-west-2):** ` 5.6.10a`
+    #     us-east-2, us-west-2): ` 5.6.10a`
     #
     #   ^
     #
     #   **MariaDB**
     #
-    #   * **Version 10.1 (available in these AWS regions: us-east-2):** `
-    #     10.1.16`
+    #   * `10.1.19` (supported in all AWS regions)
+    #
+    #   * `10.1.14` (supported in all regions except us-east-2)
     #
-    #   * **Version 10.1 (available in these AWS regions: ap-northeast-1,
-    #     ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2,
-    #     eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1,
-    #     us-west-2):** ` 10.1.14`
     #
-    #   * **Version 10.0 (available in all AWS regions):** ` 10.0.24`
     #
-    #   * **Version 10.0 (available in these AWS regions: ap-northeast-1,
-    #     ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2,
-    #     eu-central-1, eu-west-1, sa-east-1, us-east-1, us-gov-west-1,
-    #     us-west-1, us-west-2):** ` 10.0.17`
+    #   * `10.0.28` (supported in all AWS regions)
+    #
+    #   * `10.0.24` (supported in all AWS regions)
+    #
+    #   * `10.0.17` (supported in all regions except us-east-2, ca-central-1,
+    #     eu-west-2)
     #
     #   **Microsoft SQL Server 2016**
     #
-    #   * `13.00.2164.0.v1` (supported for all editions, and all AWS regions
-    #     except sa-east-1)
+    #   * `13.00.4422.0.v1` (supported for all editions, and all AWS regions)
     #
-    #   ^
+    #   * `13.00.2164.0.v1` (supported for all editions, and all AWS regions)
     #
     #   **Microsoft SQL Server 2014**
     #
+    #   * `12.00.5546.0.v1` (supported for all editions, and all AWS regions)
+    #
     #   * `12.00.5000.0.v1` (supported for all editions, and all AWS regions)
     #
     #   * `12.00.4422.0.v1` (supported for all editions except Enterprise
-    #     Edition, and all AWS regions except us-east-2)
+    #     Edition, and all AWS regions except ca-central-1 and eu-west-2)
     #
     #   **Microsoft SQL Server 2012**
     #
+    #   * `11.00.6594.0.v1` (supported for all editions, and all AWS regions)
+    #
     #   * `11.00.6020.0.v1` (supported for all editions, and all AWS regions)
     #
     #   * `11.00.5058.0.v1` (supported for all editions, and all AWS regions
-    #     except us-east-2)
+    #     except us-east-2, ca-central-1, and eu-west-2)
     #
     #   * `11.00.2100.60.v1` (supported for all editions, and all AWS regions
-    #     except us-east-2)
+    #     except us-east-2, ca-central-1, and eu-west-2)
     #
     #   **Microsoft SQL Server 2008 R2**
     #
     #   * `10.50.6529.0.v1` (supported for all editions, and all AWS regions
-    #     except us-east-2)
+    #     except us-east-2, ca-central-1, and eu-west-2)
     #
     #   * `10.50.6000.34.v1` (supported for all editions, and all AWS regions
-    #     except us-east-2)
+    #     except us-east-2, ca-central-1, and eu-west-2)
     #
     #   * `10.50.2789.0.v1` (supported for all editions, and all AWS regions
-    #     except us-east-2)
+    #     except us-east-2, ca-central-1, and eu-west-2)
     #
     #   **MySQL**
     #
-    #   * **Version 5.7 (available in all AWS regions):** ` 5.7.11`
+    #   * `5.7.17` (supported in all AWS regions)
+    #
+    #   * `5.7.16` (supported in all AWS regions)
+    #
+    #   * `5.7.11` (supported in all AWS regions)
+    #
+    #   * `5.7.10` (supported in all regions except us-east-2, ca-central-1,
+    #     eu-west-2)
+    #
+    #
+    #
+    #   * `5.6.35` (supported in all AWS regions)
+    #
+    #   * `5.6.34` (supported in all AWS regions)
+    #
+    #   * `5.6.29` (supported in all AWS regions)
     #
-    #   * **Version 5.7 (available in these AWS regions: ap-northeast-1,
-    #     ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2,
-    #     eu-central-1, eu-west-1, sa-east-1, us-east-1, us-gov-west-1,
-    #     us-west-1, us-west-2):** ` 5.7.10`
+    #   * `5.6.27` (supported in all regions except us-east-2, ca-central-1,
+    #     eu-west-2)
     #
-    #   * **Version 5.6 (available in all AWS regions):** ` 5.6.29`
+    #   * `5.6.23` (supported in all regions except us-east-2, ap-south-1,
+    #     ca-central-1, eu-west-2)
     #
-    #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
-    #     ap-northeast-2, ap-south-1, ap-southeast-1, ap-southeast-2,
-    #     eu-central-1, eu-west-1, sa-east-1, us-east-1, us-gov-west-1,
-    #     us-west-1, us-west-2):** ` 5.6.27`
+    #   * `5.6.22` (supported in all regions except us-east-2, ap-south-1,
+    #     ap-northeast-2, ca-central-1, eu-west-2)
     #
-    #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
-    #     ap-northeast-2, ap-southeast-1, ap-southeast-2, eu-central-1,
-    #     eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1,
-    #     us-west-2):** ` 5.6.23`
+    #   * `5.6.21b` (supported in all regions except us-east-2, ap-south-1,
+    #     ap-northeast-2, ca-central-1, eu-west-2)
     #
-    #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
-    #     ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1,
-    #     us-east-1, us-gov-west-1, us-west-1, us-west-2):** ` 5.6.19a |
-    #     5.6.19b | 5.6.21 | 5.6.21b | 5.6.22`
+    #   * `5.6.21` (supported in all regions except us-east-2, ap-south-1,
+    #     ap-northeast-2, ca-central-1, eu-west-2)
     #
-    #   * **Version 5.5 (available in all AWS regions):** ` 5.5.46`
+    #   * `5.6.19b` (supported in all regions except us-east-2, ap-south-1,
+    #     ap-northeast-2, ca-central-1, eu-west-2)
     #
-    #   * **Version 5.1 (only available in AWS regions ap-northeast-1,
-    #     ap-southeast-1, ap-southeast-2, eu-west-1, sa-east-1, us-east-1,
-    #     us-gov-west-1, us-west-1, us-west-2):** ` 5.1.73a | 5.1.73b`
+    #   * `5.6.19a` (supported in all regions except us-east-2, ap-south-1,
+    #     ap-northeast-2, ca-central-1, eu-west-2)
+    #
+    #
+    #
+    #   * `5.5.54` (supported in all AWS regions)
+    #
+    #   * `5.5.53` (supported in all AWS regions)
+    #
+    #   * `5.5.46` (supported in all AWS regions)
     #
     #   **Oracle 12c**
     #
+    #   * `12.1.0.2.v8` (supported for EE in all AWS regions, and SE2 in all
+    #     AWS regions except us-gov-west-1)
+    #
     #   * `12.1.0.2.v7` (supported for EE in all AWS regions, and SE2 in all
     #     AWS regions except us-gov-west-1)
     #
@@ -971,6 +1015,8 @@ module Aws::RDS
     #
     #   **Oracle 11g**
     #
+    #   * `11.2.0.4.v12` (supported for EE, SE1, and SE, in all AWS regions)
+    #
     #   * `11.2.0.4.v11` (supported for EE, SE1, and SE, in all AWS regions)
     #
     #   * `11.2.0.4.v10` (supported for EE, SE1, and SE, in all AWS regions)
@@ -993,14 +1039,13 @@ module Aws::RDS
     #
     #   **PostgreSQL**
     #
-    #   * **Version 9.6:** ` 9.6.1`
+    #   * **Version 9.6.x:** ` 9.6.1 | 9.6.2`
     #
-    #   * **Version 9.5:** `9.5.4 | 9.5.2`
+    #   * **Version 9.5.x:** `9.5.6 | 9.5.4 | 9.5.2`
     #
-    #   * **Version 9.4:** ` 9.4.9 | 9.4.7 | 9.4.5 | 9.4.4 | 9.4.1`
+    #   * **Version 9.4.x:** `9.4.11 | 9.4.9 | 9.4.7`
     #
-    #   * **Version 9.3:** ` 9.3.14 | 9.3.12 | 9.3.10 | 9.3.9 | 9.3.6 | 9.3.5
-    #     | 9.3.3 | 9.3.2 | 9.3.1`
+    #   * **Version 9.3.x:** `9.3.16 | 9.3.14 | 9.3.12`
     # @option options [Boolean] :auto_minor_version_upgrade
     #   Indicates that minor engine upgrades will be applied automatically to
     #   the DB instance during the maintenance window.
@@ -1147,7 +1192,7 @@ module Aws::RDS
     #   accounts to database accounts; otherwise false.
     #
     #   You can enable IAM database authentication for the following database
-    #   engines
+    #   engines:
     #
     #   * For MySQL 5.6, minor version 5.6.34 or higher
     #

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

@@ -274,11 +274,12 @@ module Aws::RDS
     #     ],
     #     copy_tags: false,
     #     pre_signed_url: "String",
+    #     option_group_name: "String",
     #     source_region: "String",
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :target_db_snapshot_identifier
-    #   The identifier for the copied snapshot.
+    #   The identifier for the copy of the snapshot.
     #
     #   Constraints:
     #
@@ -296,27 +297,22 @@ module Aws::RDS
     #   Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias
     #   for the KMS encryption key.
     #
-    #   If you copy an unencrypted DB snapshot and specify a value for the
-    #   `KmsKeyId` parameter, Amazon RDS encrypts the target DB snapshot using
-    #   the specified KMS encryption key.
-    #
     #   If you copy an encrypted DB snapshot from your AWS account, you can
-    #   specify a value for `KmsKeyId` to encrypt the copy with a new KMS
-    #   encryption key. If you don't specify a value for `KmsKeyId`, then the
-    #   copy of the DB snapshot is encrypted with the same KMS key as the
+    #   specify a value for this parameter to encrypt the copy with a new KMS
+    #   encryption key. If you don't specify a value for this parameter, then
+    #   the copy of the DB snapshot is encrypted with the same KMS key as the
     #   source DB snapshot.
     #
-    #   If you copy an encrypted snapshot to a different AWS region, then you
-    #   must specify a KMS key for the destination AWS region.
-    #
     #   If you copy an encrypted DB snapshot that is shared from another AWS
-    #   account, then you must specify a value for `KmsKeyId`.
+    #   account, then you must specify a value for this parameter.
+    #
+    #   If you specify this parameter when you copy an unencrypted snapshot,
+    #   the copy is encrypted.
     #
-    #   To copy an encrypted DB snapshot to another region, you must set
-    #   `KmsKeyId` to the KMS key ID used to encrypt the copy of the DB
-    #   snapshot in the destination region. KMS encryption keys are specific
-    #   to the region that they are created in, and you cannot use encryption
-    #   keys from one region in another region.
+    #   If you copy an encrypted snapshot to a different AWS region, then you
+    #   must specify a KMS key for the destination AWS region. KMS encryption
+    #   keys are specific to the region that they are created in, and you
+    #   cannot use encryption keys from one region in another region.
     # @option options [Array<Types::Tag>] :tags
     #   A list of tags.
     # @option options [Boolean] :copy_tags
@@ -324,9 +320,13 @@ module Aws::RDS
     #   snapshot; otherwise false. The default is false.
     # @option options [String] :pre_signed_url
     #   The URL that contains a Signature Version 4 signed request for the
-    #   `CopyDBSnapshot` API action in the AWS region that contains the source
-    #   DB snapshot to copy. The `PreSignedUrl` parameter must be used when
-    #   copying an encrypted DB snapshot from another AWS region.
+    #   `CopyDBSnapshot` API action in the source AWS region that contains the
+    #   source DB snapshot to copy.
+    #
+    #   You must specify this parameter when you copy an encrypted DB snapshot
+    #   from another AWS region by using the Amazon RDS API. You can specify
+    #   the source region option instead of this parameter when you copy an
+    #   encrypted DB snapshot from another AWS region by using the AWS CLI.
     #
     #   The presigned URL must be a valid request for the `CopyDBSnapshot` API
     #   action that can be executed in the source region that contains the
@@ -358,14 +358,26 @@ module Aws::RDS
     #     the following example:
     #     `arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20161115`.
     #
-    #   To learn how to generate a Signature Version 4 signed request, see [
-    #   Authenticating Requests: Using Query Parameters (AWS Signature Version
-    #   4)][1] and [ Signature Version 4 Signing Process][2].
+    #   To learn how to generate a Signature Version 4 signed request, see
+    #   [Authenticating Requests: Using Query Parameters (AWS Signature
+    #   Version 4)][1] and [Signature Version 4 Signing Process][2].
     #
     #
     #
     #   [1]: http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html
     #   [2]: http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
+    # @option options [String] :option_group_name
+    #   The name of an option group to associate with the copy.
+    #
+    #   Specify this option if you are copying a snapshot from one AWS region
+    #   to another, and your DB instance uses a non-default option group. If
+    #   your source DB instance uses Transparent Data Encryption for Oracle or
+    #   Microsoft SQL Server, you must specify this option when copying across
+    #   regions. For more information, see [Option Group Considerations][1].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopySnapshot.Options
     # @option options [String] :destination_region
     # @option options [String] :source_region
     #   The source region of the snapshot. This is only needed when the