aws-sdk-rds 1.0.0.rc1 → 1.0.0.rc2

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

@@ -669,6 +669,7 @@ module Aws
       DBCluster.add_member(:earliest_restorable_time, Shapes::ShapeRef.new(shape: TStamp, location_name: "EarliestRestorableTime"))
       DBCluster.add_member(:endpoint, Shapes::ShapeRef.new(shape: String, location_name: "Endpoint"))
       DBCluster.add_member(:reader_endpoint, Shapes::ShapeRef.new(shape: String, location_name: "ReaderEndpoint"))
+      DBCluster.add_member(:multi_az, Shapes::ShapeRef.new(shape: Boolean, location_name: "MultiAZ"))
       DBCluster.add_member(:engine, Shapes::ShapeRef.new(shape: String, location_name: "Engine"))
       DBCluster.add_member(:engine_version, Shapes::ShapeRef.new(shape: String, location_name: "EngineVersion"))
       DBCluster.add_member(:latest_restorable_time, Shapes::ShapeRef.new(shape: TStamp, location_name: "LatestRestorableTime"))
@@ -687,6 +688,7 @@ module Aws
       DBCluster.add_member(:db_cluster_resource_id, Shapes::ShapeRef.new(shape: String, location_name: "DbClusterResourceId"))
       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(:cluster_create_time, Shapes::ShapeRef.new(shape: TStamp, location_name: "ClusterCreateTime"))
       DBCluster.struct_class = Types::DBCluster
 
       DBClusterList.member = Shapes::ShapeRef.new(shape: DBCluster, location_name: "DBCluster")
@@ -1939,6 +1941,7 @@ module Aws
           o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
           o.errors << Shapes::ShapeRef.new(shape: DBInstanceNotFoundFault)
           o.errors << Shapes::ShapeRef.new(shape: DBSnapshotNotFoundFault)
+          o.errors << Shapes::ShapeRef.new(shape: DBClusterNotFoundFault)
         end)
 
         api.add_operation(:apply_pending_maintenance_action, Seahorse::Model::Operation.new.tap do |o|
@@ -2037,6 +2040,7 @@ module Aws
           o.errors << Shapes::ShapeRef.new(shape: InvalidDBClusterStateFault)
           o.errors << Shapes::ShapeRef.new(shape: InvalidDBSubnetGroupStateFault)
           o.errors << Shapes::ShapeRef.new(shape: InvalidSubnet)
+          o.errors << Shapes::ShapeRef.new(shape: InvalidDBInstanceStateFault)
           o.errors << Shapes::ShapeRef.new(shape: DBClusterParameterGroupNotFoundFault)
           o.errors << Shapes::ShapeRef.new(shape: KMSKeyNotAccessibleFault)
           o.errors << Shapes::ShapeRef.new(shape: DBClusterNotFoundFault)
@@ -2670,6 +2674,7 @@ module Aws
           o.output = Shapes::ShapeRef.new(shape: TagListMessage)
           o.errors << Shapes::ShapeRef.new(shape: DBInstanceNotFoundFault)
           o.errors << Shapes::ShapeRef.new(shape: DBSnapshotNotFoundFault)
+          o.errors << Shapes::ShapeRef.new(shape: DBClusterNotFoundFault)
         end)
 
         api.add_operation(:modify_db_cluster, Seahorse::Model::Operation.new.tap do |o|
@@ -2864,6 +2869,7 @@ module Aws
           o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
           o.errors << Shapes::ShapeRef.new(shape: DBInstanceNotFoundFault)
           o.errors << Shapes::ShapeRef.new(shape: DBSnapshotNotFoundFault)
+          o.errors << Shapes::ShapeRef.new(shape: DBClusterNotFoundFault)
         end)
 
         api.add_operation(:reset_db_cluster_parameter_group, Seahorse::Model::Operation.new.tap do |o|

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

@@ -125,6 +125,13 @@ module Aws
         data.reader_endpoint
       end
 
+      # Specifies whether the DB cluster has instances in multiple
+      # Availability Zones.
+      # @return [Boolean]
+      def multi_az
+        data.multi_az
+      end
+
       # Provides the name of the database engine to be used for this DB
       # cluster.
       # @return [String]
@@ -247,6 +254,13 @@ module Aws
         data.associated_roles
       end
 
+      # Specifies the time when the DB cluster was created, in Universal
+      # Coordinated Time (UTC).
+      # @return [Time]
+      def cluster_create_time
+        data.cluster_create_time
+      end
+
       # @!endgroup
 
       # @return [Client]

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

@@ -825,25 +825,77 @@ module Aws
       #
       #   * **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-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`
+      #
       #   * **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.17 |
-      #     10.0.24`
+      #   * **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`
+      #
+      #   **Microsoft SQL Server 2016**
+      #
+      #   * `13.00.2164.0.v1` (supported for all editions, and all AWS regions
+      #     except sa-east-1)
+      #
+      #   ^
+      #
+      #   **Microsoft SQL Server 2014**
+      #
+      #   * `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)
+      #
+      #   **Microsoft SQL Server 2012**
+      #
+      #   * `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)
+      #
+      #   * `11.00.2100.60.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   **Microsoft SQL Server 2008 R2**
+      #
+      #   * `10.50.6529.0.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   * `10.50.6000.34.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   * `10.50.2789.0.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
       #
       #   **MySQL**
       #
-      #   * **Version 5.7 (available in all AWS regions):** ` 5.7.10 | 5.7.11`
+      #   * **Version 5.7 (available in all AWS regions):** ` 5.7.11`
       #
-      #   * **Version 5.6 (available in all AWS regions):** ` 5.6.27 | 5.6.29`
+      #   * **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`
+      #
+      #   * **Version 5.6 (available in all AWS regions):** ` 5.6.29`
+      #
+      #   * **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`
       #
       #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
       #     ap-northeast-2, ap-southeast-1, ap-southeast-2, eu-central-1,
@@ -871,114 +923,96 @@ module Aws
       #     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.5.40 | 5.5.40a`
       #
-      #   **Oracle Database Enterprise Edition (oracle-ee)**
       #
-      #   * **Version 12.1.0.2 (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):** ` 12.1.0.2.v5`
       #
-      #   * **Version 12.1.0.2 (available in all AWS regions):** ` 12.1.0.2.v1 |
-      #     12.1.0.2.v2 | 12.1.0.2.v3 | 12.1.0.2.v4`
+      #   **Oracle 12c**
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `12.1.0.2.v5` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `12.1.0.2.v4` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `12.1.0.2.v3` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `12.1.0.2.v2` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   * `12.1.0.2.v1` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   **Oracle Database Standard Edition Two (oracle-se2)**
       #
-      #   * **Version 12.1.0.2 (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):** ` 12.1.0.2.v5`
       #
-      #   * **Version 12.1.0.2 (available in all AWS regions):** ` 12.1.0.2.v2 |
-      #     12.1.0.2.v3 | 12.1.0.2.v4`
+      #   * `12.1.0.1.v6` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   **Oracle Database Standard Edition One (oracle-se1)**
+      #   * `12.1.0.1.v5` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `12.1.0.1.v4` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `12.1.0.1.v3` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `12.1.0.1.v2` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `12.1.0.1.v1` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   **Oracle 11g**
       #
-      #   **Oracle Database Standard Edition (oracle-se)**
+      #   * `11.2.0.4.v9` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `11.2.0.4.v8` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `11.2.0.4.v7` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `11.2.0.4.v6` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `11.2.0.4.v5` (supported for EE, SE1, and SE, in all AWS regions)
+      #
+      #   * `11.2.0.4.v4` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   * `11.2.0.4.v3` (supported for EE, SE1, and SE, in all AWS regions)
+      #
+      #   * `11.2.0.4.v1` (supported for EE, SE1, and SE, in all AWS regions)
       #
       #   **PostgreSQL**
       #
       #   * **Version 9.5 (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):** ` 9.5.2 | 9.5.4`
+      #     us-west-2):** ` 9.5.4`
+      #
+      #   * **Version 9.5 (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-east-2, us-west-1,
+      #     us-west-2):** ` 9.5.2`
       #
       #   * **Version 9.4 (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):** ` 9.4.7 | 9.4.9`
+      #     us-west-2):** ` 9.4.9`
+      #
+      #   * **Version 9.4 (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-east-2, us-west-1,
+      #     us-west-2):** ` 9.4.7`
       #
       #   * **Version 9.4 (available in all AWS regions):** ` 9.4.5`
       #
       #   * **Version 9.4 (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):** ` 9.4.1 | 9.4.4`
+      #     us-west-2):** ` 9.4.4`
+      #
+      #   * **Version 9.4 (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-east-2, us-gov-west-1,
+      #     us-west-1, us-west-2):** ` 9.4.1`
       #
       #   * **Version 9.3 (available in these AWS regions: ap-northeast-1,
       #     ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1,
@@ -992,44 +1026,6 @@ module Aws
       #   * **Version 9.3 (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-west-1, us-west-2):** ` 9.3.12 | 9.3.14`
-      #
-      #   **Microsoft SQL Server Enterprise Edition (sqlserver-ee)**
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Express Edition (sqlserver-ex)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Standard Edition (sqlserver-se)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Web Edition (sqlserver-web)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
       # @option options [Boolean] :auto_minor_version_upgrade
       #   Indicates that minor engine upgrades will be applied automatically to
       #   the DB instance during the maintenance window.
@@ -2468,12 +2464,14 @@ module Aws
       #
       #   Supported filters:
       #
-      #   * `db-instance-id` - Accepts DB instance identifiers and DB instance
+      #   * `db-cluster-id` - Accepts DB cluster identifiers and DB cluster
       #     Amazon Resource Names (ARNs). The results list will only include
-      #     pending maintenance actions for the DB instances identified by these
+      #     pending maintenance actions for the DB clusters identified by these
       #     ARNs.
       #
-      #   ^
+      #   * `db-instance-id` - Accepts DB instance identifiers and DB instance
+      #     ARNs. The results list will only include pending maintenance actions
+      #     for the DB instances identified by these ARNs.
       # @option options [String] :marker
       #   An optional pagination token provided by a previous
       #   `DescribePendingMaintenanceActions` request. If this parameter is

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

@@ -284,9 +284,9 @@ module Aws
       #
       #   Example: `my-db-snapshot`
       # @option options [String] :kms_key_id
-      #   The AWS Key Management Service (AWS KMS) key identifier for an
-      #   encrypted DB snapshot. The KMS key identifier is the Amazon Resource
-      #   Name (ARN) or the KMS key alias for the KMS encryption key.
+      #   The AWS KMS key ID for an encrypted DB snapshot. The KMS key ID is the
+      #   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
@@ -294,7 +294,7 @@ module Aws
       #
       #   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
+      #   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
       #   source DB snapshot.
       #

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

@@ -687,25 +687,77 @@ module Aws
       #
       #   * **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-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`
+      #
       #   * **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.17 |
-      #     10.0.24`
+      #   * **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`
+      #
+      #   **Microsoft SQL Server 2016**
+      #
+      #   * `13.00.2164.0.v1` (supported for all editions, and all AWS regions
+      #     except sa-east-1)
+      #
+      #   ^
+      #
+      #   **Microsoft SQL Server 2014**
+      #
+      #   * `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)
+      #
+      #   **Microsoft SQL Server 2012**
+      #
+      #   * `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)
+      #
+      #   * `11.00.2100.60.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   **Microsoft SQL Server 2008 R2**
+      #
+      #   * `10.50.6529.0.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   * `10.50.6000.34.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
+      #
+      #   * `10.50.2789.0.v1` (supported for all editions, and all AWS regions
+      #     except us-east-2)
       #
       #   **MySQL**
       #
-      #   * **Version 5.7 (available in all AWS regions):** ` 5.7.10 | 5.7.11`
+      #   * **Version 5.7 (available in all AWS regions):** ` 5.7.11`
+      #
+      #   * **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`
       #
-      #   * **Version 5.6 (available in all AWS regions):** ` 5.6.27 | 5.6.29`
+      #   * **Version 5.6 (available in all AWS regions):** ` 5.6.29`
+      #
+      #   * **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`
       #
       #   * **Version 5.6 (available in these AWS regions: ap-northeast-1,
       #     ap-northeast-2, ap-southeast-1, ap-southeast-2, eu-central-1,
@@ -733,114 +785,96 @@ module Aws
       #     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.5.40 | 5.5.40a`
       #
-      #   **Oracle Database Enterprise Edition (oracle-ee)**
       #
-      #   * **Version 12.1.0.2 (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):** ` 12.1.0.2.v5`
       #
-      #   * **Version 12.1.0.2 (available in all AWS regions):** ` 12.1.0.2.v1 |
-      #     12.1.0.2.v2 | 12.1.0.2.v3 | 12.1.0.2.v4`
+      #   **Oracle 12c**
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `12.1.0.2.v5` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `12.1.0.2.v4` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `12.1.0.2.v3` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `12.1.0.2.v2` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   * `12.1.0.2.v1` (supported for EE in all AWS regions, and SE2 in all
+      #     AWS regions except us-gov-west-1)
       #
-      #   **Oracle Database Standard Edition Two (oracle-se2)**
       #
-      #   * **Version 12.1.0.2 (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):** ` 12.1.0.2.v5`
       #
-      #   * **Version 12.1.0.2 (available in all AWS regions):** ` 12.1.0.2.v2 |
-      #     12.1.0.2.v3 | 12.1.0.2.v4`
+      #   * `12.1.0.1.v6` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   **Oracle Database Standard Edition One (oracle-se1)**
+      #   * `12.1.0.1.v5` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `12.1.0.1.v4` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `12.1.0.1.v3` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `12.1.0.1.v2` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `12.1.0.1.v1` (supported for EE, SE1, and SE, in all AWS regions
+      #     except ap-south-1, ap-northeast-2)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   **Oracle 11g**
       #
-      #   **Oracle Database Standard Edition (oracle-se)**
+      #   * `11.2.0.4.v9` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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-west-1, us-west-2):** ` 12.1.0.1.v6`
+      #   * `11.2.0.4.v8` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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):** ` 12.1.0.1.v3 |
-      #     12.1.0.1.v4 | 12.1.0.1.v5`
+      #   * `11.2.0.4.v7` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 12.1.0.1 (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-gov-west-1, us-west-1, us-west-2):** `
-      #     12.1.0.1.v1 | 12.1.0.1.v2`
+      #   * `11.2.0.4.v6` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 11.2.0.4 (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):** ` 11.2.0.4.v6 | 11.2.0.4.v9`
+      #   * `11.2.0.4.v5` (supported for EE, SE1, and SE, in all AWS regions)
+      #
+      #   * `11.2.0.4.v4` (supported for EE, SE1, and SE, in all AWS regions)
       #
-      #   * **Version 11.2.0.4 (available in all AWS regions):** ` 11.2.0.4.v1 |
-      #     11.2.0.4.v3 | 11.2.0.4.v4 | 11.2.0.4.v5 | 11.2.0.4.v7 | 11.2.0.4.v8`
+      #   * `11.2.0.4.v3` (supported for EE, SE1, and SE, in all AWS regions)
+      #
+      #   * `11.2.0.4.v1` (supported for EE, SE1, and SE, in all AWS regions)
       #
       #   **PostgreSQL**
       #
       #   * **Version 9.5 (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):** ` 9.5.2 | 9.5.4`
+      #     us-west-2):** ` 9.5.4`
+      #
+      #   * **Version 9.5 (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-east-2, us-west-1,
+      #     us-west-2):** ` 9.5.2`
       #
       #   * **Version 9.4 (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):** ` 9.4.7 | 9.4.9`
+      #     us-west-2):** ` 9.4.9`
+      #
+      #   * **Version 9.4 (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-east-2, us-west-1,
+      #     us-west-2):** ` 9.4.7`
       #
       #   * **Version 9.4 (available in all AWS regions):** ` 9.4.5`
       #
       #   * **Version 9.4 (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):** ` 9.4.1 | 9.4.4`
+      #     us-west-2):** ` 9.4.4`
+      #
+      #   * **Version 9.4 (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-east-2, us-gov-west-1,
+      #     us-west-1, us-west-2):** ` 9.4.1`
       #
       #   * **Version 9.3 (available in these AWS regions: ap-northeast-1,
       #     ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1,
@@ -854,44 +888,6 @@ module Aws
       #   * **Version 9.3 (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-west-1, us-west-2):** ` 9.3.12 | 9.3.14`
-      #
-      #   **Microsoft SQL Server Enterprise Edition (sqlserver-ee)**
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Express Edition (sqlserver-ex)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Standard Edition (sqlserver-se)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
-      #
-      #   **Microsoft SQL Server Web Edition (sqlserver-web)**
-      #
-      #   * **Version 12.00 (available in all AWS regions):** ` 12.00.4422.0.v1`
-      #
-      #   * **Version 11.00 (available in all AWS regions):** ` 11.00.2100.60.v1
-      #     | 11.00.5058.0.v1 | 11.00.6020.0.v1`
-      #
-      #   * **Version 10.50 (available in all AWS regions):** ` 10.50.2789.0.v1
-      #     | 10.50.6000.34.v1 | 10.50.6529.0.v1`
       # @option options [Boolean] :auto_minor_version_upgrade
       #   Indicates that minor engine upgrades will be applied automatically to
       #   the DB instance during the maintenance window.
@@ -1490,7 +1486,15 @@ module Aws
       #
       #   * Cannot end with a hyphen or contain two consecutive hyphens
       # @option options [Array<Types::Filter>] :filters
-      #   This parameter is not currently supported.
+      #   A filter that specifies one or more DB clusters to describe.
+      #
+      #   Supported filters:
+      #
+      #   * `db-cluster-id` - Accepts DB cluster identifiers and DB cluster
+      #     Amazon Resource Names (ARNs). The results list will only include
+      #     information about the DB clusters identified by these ARNs.
+      #
+      #   ^
       # @option options [Integer] :max_records
       #   The maximum number of records to include in the response. If more
       #   records exist than the specified `MaxRecords` value, a pagination
@@ -1642,7 +1646,15 @@ module Aws
       #
       #   * Cannot end with a hyphen or contain two consecutive hyphens
       # @option options [Array<Types::Filter>] :filters
-      #   This parameter is not currently supported.
+      #   A filter that specifies one or more DB instances to describe.
+      #
+      #   Supported filters:
+      #
+      #   * `db-instance-id` - Accepts DB instance identifiers and DB instance
+      #     Amazon Resource Names (ARNs). The results list will only include
+      #     information about the DB instances identified by these ARNs.
+      #
+      #   ^
       # @return [DBInstance::Collection]
       def db_instances(options = {})
         batches = Enumerator.new do |y|
@@ -2342,12 +2354,14 @@ module Aws
       #
       #   Supported filters:
       #
-      #   * `db-instance-id` - Accepts DB instance identifiers and DB instance
+      #   * `db-cluster-id` - Accepts DB cluster identifiers and DB cluster
       #     Amazon Resource Names (ARNs). The results list will only include
-      #     pending maintenance actions for the DB instances identified by these
+      #     pending maintenance actions for the DB clusters identified by these
       #     ARNs.
       #
-      #   ^
+      #   * `db-instance-id` - Accepts DB instance identifiers and DB instance
+      #     ARNs. The results list will only include pending maintenance actions
+      #     for the DB instances identified by these ARNs.
       # @option options [String] :marker
       #   An optional pagination token provided by a previous
       #   `DescribePendingMaintenanceActions` request. If this parameter is