diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,367 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,50 @@
+# Amazon Elasticsearch Service SDK
+
+* [Version](#version)
+* [Description](#description)
+* [Contribute](#contribute)
+* [Licence](#licence)
+
+
+## Version
+
+`1.3.3`
+
+
+## Description
+
+Amazon Elasticsearch Configuration Service
+
+Use the Amazon Elasticsearch configuration API to create, configure, and
+manage Elasticsearch domains.
+
+The endpoint for configuration service requests is region-specific:
+es./region/.amazonaws.com. For example, es.us-east-1.amazonaws.com. For
+a current list of supported regions and endpoints, see
+<http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region Regions and Endpoints>.
+
+Documentation is available via [Hackage](http://hackage.haskell.org/package/amazonka-elasticsearch)
+and the [AWS API Reference](http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html).
+
+The types from this library are intended to be used with [amazonka](http://hackage.haskell.org/package/amazonka),
+which provides mechanisms for specifying AuthN/AuthZ information and sending requests.
+
+Use of lenses is required for constructing and manipulating types.
+This is due to the amount of nesting of AWS types and transparency regarding
+de/serialisation into more palatable Haskell values.
+The provided lenses should be compatible with any of the major lens libraries
+[lens](http://hackage.haskell.org/package/lens) or [lens-family-core](http://hackage.haskell.org/package/lens-family-core).
+
+## Contribute
+
+For any problems, comments, or feedback please create an issue [here on GitHub](https://github.com/brendanhay/amazonka/issues).
+
+> _Note:_ this library is an auto-generated Haskell package. Please see `amazonka-gen` for more information.
+
+
+## Licence
+
+`amazonka-elasticsearch` is released under the [Mozilla Public License Version 2.0](http://www.mozilla.org/MPL/).
+
+Parts of the code are derived from AWS service descriptions, licensed under Apache 2.0.
+Source files subject to this contain an additional licensing clause in their header.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import           Distribution.Simple
+main = defaultMain
diff --git a/amazonka-elasticsearch.cabal b/amazonka-elasticsearch.cabal
new file mode 100644
--- /dev/null
+++ b/amazonka-elasticsearch.cabal
@@ -0,0 +1,100 @@
+name:                  amazonka-elasticsearch
+version:               1.3.3
+synopsis:              Amazon Elasticsearch Service SDK.
+homepage:              https://github.com/brendanhay/amazonka
+bug-reports:           https://github.com/brendanhay/amazonka/issues
+license:               OtherLicense
+license-file:          LICENSE
+author:                Brendan Hay
+maintainer:            Brendan Hay <brendan.g.hay@gmail.com>
+copyright:             Copyright (c) 2013-2015 Brendan Hay
+category:              Network, AWS, Cloud, Distributed Computing
+build-type:            Simple
+cabal-version:         >= 1.10
+extra-source-files:    README.md fixture/*.yaml fixture/*.proto
+description:
+    Amazon Elasticsearch Configuration Service
+
+    Use the Amazon Elasticsearch configuration API to create, configure, and
+    manage Elasticsearch domains.
+
+    The endpoint for configuration service requests is region-specific:
+    es./region/.amazonaws.com. For example, es.us-east-1.amazonaws.com. For
+    a current list of supported regions and endpoints, see
+    <http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region Regions and Endpoints>.
+    .
+    The types from this library are intended to be used with
+    <http://hackage.haskell.org/package/amazonka amazonka>, which provides
+    mechanisms for specifying AuthN/AuthZ information and sending requests.
+    .
+    Use of lenses is required for constructing and manipulating types.
+    This is due to the amount of nesting of AWS types and transparency regarding
+    de/serialisation into more palatable Haskell values.
+    The provided lenses should be compatible with any of the major lens libraries
+    such as <http://hackage.haskell.org/package/lens lens> or
+    <http://hackage.haskell.org/package/lens-family-core lens-family-core>.
+    .
+    See "Network.AWS.ElasticSearch" and the <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html AWS API Reference>
+    to get started.
+
+source-repository head
+    type:     git
+    location: git://github.com/brendanhay/amazonka.git
+
+library
+    default-language:  Haskell2010
+    hs-source-dirs:    src gen
+
+    ghc-options:       -Wall
+
+    exposed-modules:
+          Network.AWS.ElasticSearch
+        , Network.AWS.ElasticSearch.AddTags
+        , Network.AWS.ElasticSearch.CreateElasticsearchDomain
+        , Network.AWS.ElasticSearch.DeleteElasticsearchDomain
+        , Network.AWS.ElasticSearch.DescribeElasticsearchDomain
+        , Network.AWS.ElasticSearch.DescribeElasticsearchDomainConfig
+        , Network.AWS.ElasticSearch.DescribeElasticsearchDomains
+        , Network.AWS.ElasticSearch.ListDomainNames
+        , Network.AWS.ElasticSearch.ListTags
+        , Network.AWS.ElasticSearch.RemoveTags
+        , Network.AWS.ElasticSearch.Types
+        , Network.AWS.ElasticSearch.UpdateElasticsearchDomainConfig
+        , Network.AWS.ElasticSearch.Waiters
+
+    other-modules:
+          Network.AWS.ElasticSearch.Types.Product
+        , Network.AWS.ElasticSearch.Types.Sum
+
+    build-depends:
+          amazonka-core == 1.3.3.*
+        , base          >= 4.7     && < 5
+
+test-suite amazonka-elasticsearch-test
+    type:              exitcode-stdio-1.0
+    default-language:  Haskell2010
+    hs-source-dirs:    test
+    main-is:           Main.hs
+
+    ghc-options:       -Wall -threaded
+
+    -- This section is encoded by the template and any modules added by
+    -- hand outside these namespaces will not correctly be added to the
+    -- distribution package.
+    other-modules:
+          Test.AWS.ElasticSearch
+        , Test.AWS.Gen.ElasticSearch
+        , Test.AWS.ElasticSearch.Internal
+
+    build-depends:
+          amazonka-core == 1.3.3.*
+        , amazonka-test == 1.3.3.*
+        , amazonka-elasticsearch == 1.3.3.*
+        , base
+        , bytestring
+        , lens
+        , tasty
+        , tasty-hunit
+        , text
+        , time
+        , unordered-containers
diff --git a/fixture/AddTags.yaml b/fixture/AddTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/AddTags.yaml
diff --git a/fixture/AddTagsResponse.proto b/fixture/AddTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/AddTagsResponse.proto
diff --git a/fixture/CreateElasticsearchDomain.yaml b/fixture/CreateElasticsearchDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/CreateElasticsearchDomain.yaml
diff --git a/fixture/CreateElasticsearchDomainResponse.proto b/fixture/CreateElasticsearchDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/CreateElasticsearchDomainResponse.proto
diff --git a/fixture/DeleteElasticsearchDomain.yaml b/fixture/DeleteElasticsearchDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteElasticsearchDomain.yaml
diff --git a/fixture/DeleteElasticsearchDomainResponse.proto b/fixture/DeleteElasticsearchDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DeleteElasticsearchDomainResponse.proto
diff --git a/fixture/DescribeElasticsearchDomain.yaml b/fixture/DescribeElasticsearchDomain.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomain.yaml
diff --git a/fixture/DescribeElasticsearchDomainConfig.yaml b/fixture/DescribeElasticsearchDomainConfig.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomainConfig.yaml
diff --git a/fixture/DescribeElasticsearchDomainConfigResponse.proto b/fixture/DescribeElasticsearchDomainConfigResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomainConfigResponse.proto
diff --git a/fixture/DescribeElasticsearchDomainResponse.proto b/fixture/DescribeElasticsearchDomainResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomainResponse.proto
diff --git a/fixture/DescribeElasticsearchDomains.yaml b/fixture/DescribeElasticsearchDomains.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomains.yaml
diff --git a/fixture/DescribeElasticsearchDomainsResponse.proto b/fixture/DescribeElasticsearchDomainsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/DescribeElasticsearchDomainsResponse.proto
diff --git a/fixture/ListDomainNames.yaml b/fixture/ListDomainNames.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListDomainNames.yaml
diff --git a/fixture/ListDomainNamesResponse.proto b/fixture/ListDomainNamesResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListDomainNamesResponse.proto
diff --git a/fixture/ListTags.yaml b/fixture/ListTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/ListTags.yaml
diff --git a/fixture/ListTagsResponse.proto b/fixture/ListTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/ListTagsResponse.proto
diff --git a/fixture/RemoveTags.yaml b/fixture/RemoveTags.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTags.yaml
diff --git a/fixture/RemoveTagsResponse.proto b/fixture/RemoveTagsResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/RemoveTagsResponse.proto
diff --git a/fixture/UpdateElasticsearchDomainConfig.yaml b/fixture/UpdateElasticsearchDomainConfig.yaml
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateElasticsearchDomainConfig.yaml
diff --git a/fixture/UpdateElasticsearchDomainConfigResponse.proto b/fixture/UpdateElasticsearchDomainConfigResponse.proto
new file mode 100644
--- /dev/null
+++ b/fixture/UpdateElasticsearchDomainConfigResponse.proto
diff --git a/gen/Network/AWS/ElasticSearch.hs b/gen/Network/AWS/ElasticSearch.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch.hs
@@ -0,0 +1,244 @@
+{-# OPTIONS_GHC -fno-warn-unused-imports    #-}
+{-# OPTIONS_GHC -fno-warn-duplicate-exports #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Amazon Elasticsearch Configuration Service
+--
+-- Use the Amazon Elasticsearch configuration API to create, configure, and
+-- manage Elasticsearch domains.
+--
+-- The endpoint for configuration service requests is region-specific:
+-- es./region/.amazonaws.com. For example, es.us-east-1.amazonaws.com. For
+-- a current list of supported regions and endpoints, see
+-- <http://docs.aws.amazon.com/general/latest/gr/rande.html#cloudsearch_region Regions and Endpoints>.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html AWS API Reference>
+module Network.AWS.ElasticSearch
+    (
+    -- * Service Configuration
+      elasticSearch
+
+    -- * Errors
+    -- $errors
+
+    -- ** ValidationException
+    , _ValidationException
+
+    -- ** ResourceAlreadyExistsException
+    , _ResourceAlreadyExistsException
+
+    -- ** BaseException
+    , _BaseException
+
+    -- ** DisabledOperationException
+    , _DisabledOperationException
+
+    -- ** InternalException
+    , _InternalException
+
+    -- ** InvalidTypeException
+    , _InvalidTypeException
+
+    -- ** ResourceNotFoundException
+    , _ResourceNotFoundException
+
+    -- ** LimitExceededException
+    , _LimitExceededException
+
+    -- * Waiters
+    -- $waiters
+
+    -- * Operations
+    -- $operations
+
+    -- ** CreateElasticsearchDomain
+    , module Network.AWS.ElasticSearch.CreateElasticsearchDomain
+
+    -- ** RemoveTags
+    , module Network.AWS.ElasticSearch.RemoveTags
+
+    -- ** DescribeElasticsearchDomains
+    , module Network.AWS.ElasticSearch.DescribeElasticsearchDomains
+
+    -- ** DescribeElasticsearchDomain
+    , module Network.AWS.ElasticSearch.DescribeElasticsearchDomain
+
+    -- ** ListDomainNames
+    , module Network.AWS.ElasticSearch.ListDomainNames
+
+    -- ** DescribeElasticsearchDomainConfig
+    , module Network.AWS.ElasticSearch.DescribeElasticsearchDomainConfig
+
+    -- ** DeleteElasticsearchDomain
+    , module Network.AWS.ElasticSearch.DeleteElasticsearchDomain
+
+    -- ** UpdateElasticsearchDomainConfig
+    , module Network.AWS.ElasticSearch.UpdateElasticsearchDomainConfig
+
+    -- ** AddTags
+    , module Network.AWS.ElasticSearch.AddTags
+
+    -- ** ListTags
+    , module Network.AWS.ElasticSearch.ListTags
+
+    -- * Types
+
+    -- ** ESPartitionInstanceType
+    , ESPartitionInstanceType (..)
+
+    -- ** OptionState
+    , OptionState (..)
+
+    -- ** VolumeType
+    , VolumeType (..)
+
+    -- ** AccessPoliciesStatus
+    , AccessPoliciesStatus
+    , accessPoliciesStatus
+    , apsOptions
+    , apsStatus
+
+    -- ** AdvancedOptionsStatus
+    , AdvancedOptionsStatus
+    , advancedOptionsStatus
+    , aosOptions
+    , aosStatus
+
+    -- ** DomainInfo
+    , DomainInfo
+    , domainInfo
+    , diDomainName
+
+    -- ** EBSOptions
+    , EBSOptions
+    , ebsOptions
+    , eoVolumeSize
+    , eoIOPS
+    , eoVolumeType
+    , eoEBSEnabled
+
+    -- ** EBSOptionsStatus
+    , EBSOptionsStatus
+    , ebsOptionsStatus
+    , eosOptions
+    , eosStatus
+
+    -- ** ElasticsearchClusterConfig
+    , ElasticsearchClusterConfig
+    , elasticsearchClusterConfig
+    , eccDedicatedMasterCount
+    , eccDedicatedMasterType
+    , eccDedicatedMasterEnabled
+    , eccInstanceCount
+    , eccZoneAwarenessEnabled
+    , eccInstanceType
+
+    -- ** ElasticsearchClusterConfigStatus
+    , ElasticsearchClusterConfigStatus
+    , elasticsearchClusterConfigStatus
+    , eccsOptions
+    , eccsStatus
+
+    -- ** ElasticsearchDomainConfig
+    , ElasticsearchDomainConfig
+    , elasticsearchDomainConfig
+    , edcEBSOptions
+    , edcAccessPolicies
+    , edcElasticsearchClusterConfig
+    , edcSnapshotOptions
+    , edcAdvancedOptions
+
+    -- ** ElasticsearchDomainStatus
+    , ElasticsearchDomainStatus
+    , elasticsearchDomainStatus
+    , edsEBSOptions
+    , edsAccessPolicies
+    , edsCreated
+    , edsSnapshotOptions
+    , edsDeleted
+    , edsProcessing
+    , edsEndpoint
+    , edsAdvancedOptions
+    , edsDomainId
+    , edsDomainName
+    , edsARN
+    , edsElasticsearchClusterConfig
+
+    -- ** OptionStatus
+    , OptionStatus
+    , optionStatus
+    , osPendingDeletion
+    , osUpdateVersion
+    , osCreationDate
+    , osUpdateDate
+    , osState
+
+    -- ** SnapshotOptions
+    , SnapshotOptions
+    , snapshotOptions
+    , soAutomatedSnapshotStartHour
+
+    -- ** SnapshotOptionsStatus
+    , SnapshotOptionsStatus
+    , snapshotOptionsStatus
+    , sosOptions
+    , sosStatus
+
+    -- ** Tag
+    , Tag
+    , tag
+    , tagKey
+    , tagValue
+    ) where
+
+import           Network.AWS.ElasticSearch.AddTags
+import           Network.AWS.ElasticSearch.CreateElasticsearchDomain
+import           Network.AWS.ElasticSearch.DeleteElasticsearchDomain
+import           Network.AWS.ElasticSearch.DescribeElasticsearchDomain
+import           Network.AWS.ElasticSearch.DescribeElasticsearchDomainConfig
+import           Network.AWS.ElasticSearch.DescribeElasticsearchDomains
+import           Network.AWS.ElasticSearch.ListDomainNames
+import           Network.AWS.ElasticSearch.ListTags
+import           Network.AWS.ElasticSearch.RemoveTags
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.UpdateElasticsearchDomainConfig
+import           Network.AWS.ElasticSearch.Waiters
+
+{- $errors
+Error matchers are designed for use with the functions provided by
+<http://hackage.haskell.org/package/lens/docs/Control-Exception-Lens.html Control.Exception.Lens>.
+This allows catching (and rethrowing) service specific errors returned
+by 'ElasticSearch'.
+-}
+
+{- $operations
+Some AWS operations return results that are incomplete and require subsequent
+requests in order to obtain the entire result set. The process of sending
+subsequent requests to continue where a previous request left off is called
+pagination. For example, the 'ListObjects' operation of Amazon S3 returns up to
+1000 objects at a time, and you must send subsequent requests with the
+appropriate Marker in order to retrieve the next page of results.
+
+Operations that have an 'AWSPager' instance can transparently perform subsequent
+requests, correctly setting Markers and other request facets to iterate through
+the entire result set of a truncated API operation. Operations which support
+this have an additional note in the documentation.
+
+Many operations have the ability to filter results on the server side. See the
+individual operation parameters for details.
+-}
+
+{- $waiters
+Waiters poll by repeatedly sending a request until some remote success condition
+configured by the 'Wait' specification is fulfilled. The 'Wait' specification
+determines how many attempts should be made, in addition to delay and retry strategies.
+-}
diff --git a/gen/Network/AWS/ElasticSearch/AddTags.hs b/gen/Network/AWS/ElasticSearch/AddTags.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/AddTags.hs
@@ -0,0 +1,110 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.AddTags
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Attaches tags to an existing Elasticsearch domain. Tags are a set of
+-- case-sensitive key value pairs. An Elasticsearch domain may have up to
+-- 10 tags. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-managedomains.html#es-managedomains-awsresorcetagging Tagging Amazon Elasticsearch Service Domains for more information.>
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-AddTags.html AWS API Reference> for AddTags.
+module Network.AWS.ElasticSearch.AddTags
+    (
+    -- * Creating a Request
+      addTags
+    , AddTags
+    -- * Request Lenses
+    , atARN
+    , atTagList
+
+    -- * Destructuring the Response
+    , addTagsResponse
+    , AddTagsResponse
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'AddTags' operation. Specify the
+-- tags that you want to attach to the Elasticsearch domain.
+--
+-- /See:/ 'addTags' smart constructor.
+data AddTags = AddTags'
+    { _atARN     :: !Text
+    , _atTagList :: ![Tag]
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'AddTags' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'atARN'
+--
+-- * 'atTagList'
+addTags
+    :: Text -- ^ 'atARN'
+    -> AddTags
+addTags pARN_ =
+    AddTags'
+    { _atARN = pARN_
+    , _atTagList = mempty
+    }
+
+-- | Specify the 'ARN' for which you want to add the tags.
+atARN :: Lens' AddTags Text
+atARN = lens _atARN (\ s a -> s{_atARN = a});
+
+-- | List of 'Tag' that need to be added for the Elasticsearch domain.
+atTagList :: Lens' AddTags [Tag]
+atTagList = lens _atTagList (\ s a -> s{_atTagList = a}) . _Coerce;
+
+instance AWSRequest AddTags where
+        type Rs AddTags = AddTagsResponse
+        request = postJSON elasticSearch
+        response = receiveNull AddTagsResponse'
+
+instance ToHeaders AddTags where
+        toHeaders = const mempty
+
+instance ToJSON AddTags where
+        toJSON AddTags'{..}
+          = object
+              (catMaybes
+                 [Just ("ARN" .= _atARN),
+                  Just ("TagList" .= _atTagList)])
+
+instance ToPath AddTags where
+        toPath = const "/2015-01-01/tags"
+
+instance ToQuery AddTags where
+        toQuery = const mempty
+
+-- | /See:/ 'addTagsResponse' smart constructor.
+data AddTagsResponse =
+    AddTagsResponse'
+    deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'AddTagsResponse' with the minimum fields required to make a request.
+--
+addTagsResponse
+    :: AddTagsResponse
+addTagsResponse = AddTagsResponse'
diff --git a/gen/Network/AWS/ElasticSearch/CreateElasticsearchDomain.hs b/gen/Network/AWS/ElasticSearch/CreateElasticsearchDomain.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/CreateElasticsearchDomain.hs
@@ -0,0 +1,187 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.CreateElasticsearchDomain
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Creates a new Elasticsearch domain. For more information, see
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomains Creating Elasticsearch Domains>
+-- in the /Amazon Elasticsearch Service Developer Guide/.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-CreateElasticsearchDomain.html AWS API Reference> for CreateElasticsearchDomain.
+module Network.AWS.ElasticSearch.CreateElasticsearchDomain
+    (
+    -- * Creating a Request
+      createElasticsearchDomain
+    , CreateElasticsearchDomain
+    -- * Request Lenses
+    , cedEBSOptions
+    , cedAccessPolicies
+    , cedElasticsearchClusterConfig
+    , cedSnapshotOptions
+    , cedAdvancedOptions
+    , cedDomainName
+
+    -- * Destructuring the Response
+    , createElasticsearchDomainResponse
+    , CreateElasticsearchDomainResponse
+    -- * Response Lenses
+    , cedrsDomainStatus
+    , cedrsResponseStatus
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | /See:/ 'createElasticsearchDomain' smart constructor.
+data CreateElasticsearchDomain = CreateElasticsearchDomain'
+    { _cedEBSOptions                 :: !(Maybe EBSOptions)
+    , _cedAccessPolicies             :: !(Maybe Text)
+    , _cedElasticsearchClusterConfig :: !(Maybe ElasticsearchClusterConfig)
+    , _cedSnapshotOptions            :: !(Maybe SnapshotOptions)
+    , _cedAdvancedOptions            :: !(Maybe (Map Text Text))
+    , _cedDomainName                 :: !Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'CreateElasticsearchDomain' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'cedEBSOptions'
+--
+-- * 'cedAccessPolicies'
+--
+-- * 'cedElasticsearchClusterConfig'
+--
+-- * 'cedSnapshotOptions'
+--
+-- * 'cedAdvancedOptions'
+--
+-- * 'cedDomainName'
+createElasticsearchDomain
+    :: Text -- ^ 'cedDomainName'
+    -> CreateElasticsearchDomain
+createElasticsearchDomain pDomainName_ =
+    CreateElasticsearchDomain'
+    { _cedEBSOptions = Nothing
+    , _cedAccessPolicies = Nothing
+    , _cedElasticsearchClusterConfig = Nothing
+    , _cedSnapshotOptions = Nothing
+    , _cedAdvancedOptions = Nothing
+    , _cedDomainName = pDomainName_
+    }
+
+-- | Options to enable, disable and specify the type and size of EBS storage
+-- volumes.
+cedEBSOptions :: Lens' CreateElasticsearchDomain (Maybe EBSOptions)
+cedEBSOptions = lens _cedEBSOptions (\ s a -> s{_cedEBSOptions = a});
+
+-- | IAM access policy as a JSON-formatted string.
+cedAccessPolicies :: Lens' CreateElasticsearchDomain (Maybe Text)
+cedAccessPolicies = lens _cedAccessPolicies (\ s a -> s{_cedAccessPolicies = a});
+
+-- | Configuration options for an Elasticsearch domain. Specifies the
+-- instance type and number of instances in the domain cluster.
+cedElasticsearchClusterConfig :: Lens' CreateElasticsearchDomain (Maybe ElasticsearchClusterConfig)
+cedElasticsearchClusterConfig = lens _cedElasticsearchClusterConfig (\ s a -> s{_cedElasticsearchClusterConfig = a});
+
+-- | Option to set time, in UTC format, of the daily automated snapshot.
+-- Default value is 0 hours.
+cedSnapshotOptions :: Lens' CreateElasticsearchDomain (Maybe SnapshotOptions)
+cedSnapshotOptions = lens _cedSnapshotOptions (\ s a -> s{_cedSnapshotOptions = a});
+
+-- | Option to allow references to indices in an HTTP request body. Must be
+-- 'false' when configuring access to individual sub-resources. By default,
+-- the value is 'true'. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options Configuration Advanced Options>
+-- for more information.
+cedAdvancedOptions :: Lens' CreateElasticsearchDomain (HashMap Text Text)
+cedAdvancedOptions = lens _cedAdvancedOptions (\ s a -> s{_cedAdvancedOptions = a}) . _Default . _Map;
+
+-- | The name of the Elasticsearch domain that you are creating. Domain names
+-- are unique across the domains owned by an account within an AWS region.
+-- Domain names must start with a letter or number and can contain the
+-- following characters: a-z (lowercase), 0-9, and - (hyphen).
+cedDomainName :: Lens' CreateElasticsearchDomain Text
+cedDomainName = lens _cedDomainName (\ s a -> s{_cedDomainName = a});
+
+instance AWSRequest CreateElasticsearchDomain where
+        type Rs CreateElasticsearchDomain =
+             CreateElasticsearchDomainResponse
+        request = postJSON elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 CreateElasticsearchDomainResponse' <$>
+                   (x .?> "DomainStatus") <*> (pure (fromEnum s)))
+
+instance ToHeaders CreateElasticsearchDomain where
+        toHeaders = const mempty
+
+instance ToJSON CreateElasticsearchDomain where
+        toJSON CreateElasticsearchDomain'{..}
+          = object
+              (catMaybes
+                 [("EBSOptions" .=) <$> _cedEBSOptions,
+                  ("AccessPolicies" .=) <$> _cedAccessPolicies,
+                  ("ElasticsearchClusterConfig" .=) <$>
+                    _cedElasticsearchClusterConfig,
+                  ("SnapshotOptions" .=) <$> _cedSnapshotOptions,
+                  ("AdvancedOptions" .=) <$> _cedAdvancedOptions,
+                  Just ("DomainName" .= _cedDomainName)])
+
+instance ToPath CreateElasticsearchDomain where
+        toPath = const "/2015-01-01/es/domain"
+
+instance ToQuery CreateElasticsearchDomain where
+        toQuery = const mempty
+
+-- | The result of a 'CreateElasticsearchDomain' operation. Contains the
+-- status of the newly created Elasticsearch domain.
+--
+-- /See:/ 'createElasticsearchDomainResponse' smart constructor.
+data CreateElasticsearchDomainResponse = CreateElasticsearchDomainResponse'
+    { _cedrsDomainStatus   :: !(Maybe ElasticsearchDomainStatus)
+    , _cedrsResponseStatus :: !Int
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'CreateElasticsearchDomainResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'cedrsDomainStatus'
+--
+-- * 'cedrsResponseStatus'
+createElasticsearchDomainResponse
+    :: Int -- ^ 'cedrsResponseStatus'
+    -> CreateElasticsearchDomainResponse
+createElasticsearchDomainResponse pResponseStatus_ =
+    CreateElasticsearchDomainResponse'
+    { _cedrsDomainStatus = Nothing
+    , _cedrsResponseStatus = pResponseStatus_
+    }
+
+-- | The status of the newly created Elasticsearch domain.
+cedrsDomainStatus :: Lens' CreateElasticsearchDomainResponse (Maybe ElasticsearchDomainStatus)
+cedrsDomainStatus = lens _cedrsDomainStatus (\ s a -> s{_cedrsDomainStatus = a});
+
+-- | The response status code.
+cedrsResponseStatus :: Lens' CreateElasticsearchDomainResponse Int
+cedrsResponseStatus = lens _cedrsResponseStatus (\ s a -> s{_cedrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticSearch/DeleteElasticsearchDomain.hs b/gen/Network/AWS/ElasticSearch/DeleteElasticsearchDomain.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/DeleteElasticsearchDomain.hs
@@ -0,0 +1,127 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.DeleteElasticsearchDomain
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Permanently deletes the specified Elasticsearch domain and all of its
+-- data. Once a domain is deleted, it cannot be recovered.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-DeleteElasticsearchDomain.html AWS API Reference> for DeleteElasticsearchDomain.
+module Network.AWS.ElasticSearch.DeleteElasticsearchDomain
+    (
+    -- * Creating a Request
+      deleteElasticsearchDomain
+    , DeleteElasticsearchDomain
+    -- * Request Lenses
+    , dDomainName
+
+    -- * Destructuring the Response
+    , deleteElasticsearchDomainResponse
+    , DeleteElasticsearchDomainResponse
+    -- * Response Lenses
+    , delrsDomainStatus
+    , delrsResponseStatus
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'DeleteElasticsearchDomain'
+-- operation. Specifies the name of the Elasticsearch domain that you want
+-- to delete.
+--
+-- /See:/ 'deleteElasticsearchDomain' smart constructor.
+newtype DeleteElasticsearchDomain = DeleteElasticsearchDomain'
+    { _dDomainName :: Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DeleteElasticsearchDomain' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dDomainName'
+deleteElasticsearchDomain
+    :: Text -- ^ 'dDomainName'
+    -> DeleteElasticsearchDomain
+deleteElasticsearchDomain pDomainName_ =
+    DeleteElasticsearchDomain'
+    { _dDomainName = pDomainName_
+    }
+
+-- | The name of the Elasticsearch domain that you want to permanently
+-- delete.
+dDomainName :: Lens' DeleteElasticsearchDomain Text
+dDomainName = lens _dDomainName (\ s a -> s{_dDomainName = a});
+
+instance AWSRequest DeleteElasticsearchDomain where
+        type Rs DeleteElasticsearchDomain =
+             DeleteElasticsearchDomainResponse
+        request = delete elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 DeleteElasticsearchDomainResponse' <$>
+                   (x .?> "DomainStatus") <*> (pure (fromEnum s)))
+
+instance ToHeaders DeleteElasticsearchDomain where
+        toHeaders = const mempty
+
+instance ToPath DeleteElasticsearchDomain where
+        toPath DeleteElasticsearchDomain'{..}
+          = mconcat
+              ["/2015-01-01/es/domain/", toBS _dDomainName]
+
+instance ToQuery DeleteElasticsearchDomain where
+        toQuery = const mempty
+
+-- | The result of a 'DeleteElasticsearchDomain' request. Contains the status
+-- of the pending deletion, or no status if the domain and all of its
+-- resources have been deleted.
+--
+-- /See:/ 'deleteElasticsearchDomainResponse' smart constructor.
+data DeleteElasticsearchDomainResponse = DeleteElasticsearchDomainResponse'
+    { _delrsDomainStatus   :: !(Maybe ElasticsearchDomainStatus)
+    , _delrsResponseStatus :: !Int
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DeleteElasticsearchDomainResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'delrsDomainStatus'
+--
+-- * 'delrsResponseStatus'
+deleteElasticsearchDomainResponse
+    :: Int -- ^ 'delrsResponseStatus'
+    -> DeleteElasticsearchDomainResponse
+deleteElasticsearchDomainResponse pResponseStatus_ =
+    DeleteElasticsearchDomainResponse'
+    { _delrsDomainStatus = Nothing
+    , _delrsResponseStatus = pResponseStatus_
+    }
+
+-- | The status of the Elasticsearch domain being deleted.
+delrsDomainStatus :: Lens' DeleteElasticsearchDomainResponse (Maybe ElasticsearchDomainStatus)
+delrsDomainStatus = lens _delrsDomainStatus (\ s a -> s{_delrsDomainStatus = a});
+
+-- | The response status code.
+delrsResponseStatus :: Lens' DeleteElasticsearchDomainResponse Int
+delrsResponseStatus = lens _delrsResponseStatus (\ s a -> s{_delrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomain.hs b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomain.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomain.hs
@@ -0,0 +1,126 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.DescribeElasticsearchDomain
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Returns domain configuration information about the specified
+-- Elasticsearch domain, including the domain ID, domain endpoint, and
+-- domain ARN.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-DescribeElasticsearchDomain.html AWS API Reference> for DescribeElasticsearchDomain.
+module Network.AWS.ElasticSearch.DescribeElasticsearchDomain
+    (
+    -- * Creating a Request
+      describeElasticsearchDomain
+    , DescribeElasticsearchDomain
+    -- * Request Lenses
+    , dedDomainName
+
+    -- * Destructuring the Response
+    , describeElasticsearchDomainResponse
+    , DescribeElasticsearchDomainResponse
+    -- * Response Lenses
+    , dedrsResponseStatus
+    , dedrsDomainStatus
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'DescribeElasticsearchDomain'
+-- operation.
+--
+-- /See:/ 'describeElasticsearchDomain' smart constructor.
+newtype DescribeElasticsearchDomain = DescribeElasticsearchDomain'
+    { _dedDomainName :: Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomain' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dedDomainName'
+describeElasticsearchDomain
+    :: Text -- ^ 'dedDomainName'
+    -> DescribeElasticsearchDomain
+describeElasticsearchDomain pDomainName_ =
+    DescribeElasticsearchDomain'
+    { _dedDomainName = pDomainName_
+    }
+
+-- | The name of the Elasticsearch domain for which you want information.
+dedDomainName :: Lens' DescribeElasticsearchDomain Text
+dedDomainName = lens _dedDomainName (\ s a -> s{_dedDomainName = a});
+
+instance AWSRequest DescribeElasticsearchDomain where
+        type Rs DescribeElasticsearchDomain =
+             DescribeElasticsearchDomainResponse
+        request = get elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 DescribeElasticsearchDomainResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "DomainStatus"))
+
+instance ToHeaders DescribeElasticsearchDomain where
+        toHeaders = const mempty
+
+instance ToPath DescribeElasticsearchDomain where
+        toPath DescribeElasticsearchDomain'{..}
+          = mconcat
+              ["/2015-01-01/es/domain/", toBS _dedDomainName]
+
+instance ToQuery DescribeElasticsearchDomain where
+        toQuery = const mempty
+
+-- | The result of a 'DescribeElasticsearchDomain' request. Contains the
+-- status of the domain specified in the request.
+--
+-- /See:/ 'describeElasticsearchDomainResponse' smart constructor.
+data DescribeElasticsearchDomainResponse = DescribeElasticsearchDomainResponse'
+    { _dedrsResponseStatus :: !Int
+    , _dedrsDomainStatus   :: !ElasticsearchDomainStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomainResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dedrsResponseStatus'
+--
+-- * 'dedrsDomainStatus'
+describeElasticsearchDomainResponse
+    :: Int -- ^ 'dedrsResponseStatus'
+    -> ElasticsearchDomainStatus -- ^ 'dedrsDomainStatus'
+    -> DescribeElasticsearchDomainResponse
+describeElasticsearchDomainResponse pResponseStatus_ pDomainStatus_ =
+    DescribeElasticsearchDomainResponse'
+    { _dedrsResponseStatus = pResponseStatus_
+    , _dedrsDomainStatus = pDomainStatus_
+    }
+
+-- | The response status code.
+dedrsResponseStatus :: Lens' DescribeElasticsearchDomainResponse Int
+dedrsResponseStatus = lens _dedrsResponseStatus (\ s a -> s{_dedrsResponseStatus = a});
+
+-- | The current status of the Elasticsearch domain.
+dedrsDomainStatus :: Lens' DescribeElasticsearchDomainResponse ElasticsearchDomainStatus
+dedrsDomainStatus = lens _dedrsDomainStatus (\ s a -> s{_dedrsDomainStatus = a});
diff --git a/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomainConfig.hs b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomainConfig.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomainConfig.hs
@@ -0,0 +1,133 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.DescribeElasticsearchDomainConfig
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Provides cluster configuration information about the specified
+-- Elasticsearch domain, such as the state, creation date, update version,
+-- and update date for cluster options.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-DescribeElasticsearchDomainConfig.html AWS API Reference> for DescribeElasticsearchDomainConfig.
+module Network.AWS.ElasticSearch.DescribeElasticsearchDomainConfig
+    (
+    -- * Creating a Request
+      describeElasticsearchDomainConfig
+    , DescribeElasticsearchDomainConfig
+    -- * Request Lenses
+    , dedcDomainName
+
+    -- * Destructuring the Response
+    , describeElasticsearchDomainConfigResponse
+    , DescribeElasticsearchDomainConfigResponse
+    -- * Response Lenses
+    , dedcrsResponseStatus
+    , dedcrsDomainConfig
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'DescribeElasticsearchDomainConfig'
+-- operation. Specifies the domain name for which you want configuration
+-- information.
+--
+-- /See:/ 'describeElasticsearchDomainConfig' smart constructor.
+newtype DescribeElasticsearchDomainConfig = DescribeElasticsearchDomainConfig'
+    { _dedcDomainName :: Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomainConfig' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dedcDomainName'
+describeElasticsearchDomainConfig
+    :: Text -- ^ 'dedcDomainName'
+    -> DescribeElasticsearchDomainConfig
+describeElasticsearchDomainConfig pDomainName_ =
+    DescribeElasticsearchDomainConfig'
+    { _dedcDomainName = pDomainName_
+    }
+
+-- | The Elasticsearch domain that you want to get information about.
+dedcDomainName :: Lens' DescribeElasticsearchDomainConfig Text
+dedcDomainName = lens _dedcDomainName (\ s a -> s{_dedcDomainName = a});
+
+instance AWSRequest DescribeElasticsearchDomainConfig
+         where
+        type Rs DescribeElasticsearchDomainConfig =
+             DescribeElasticsearchDomainConfigResponse
+        request = get elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 DescribeElasticsearchDomainConfigResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "DomainConfig"))
+
+instance ToHeaders DescribeElasticsearchDomainConfig
+         where
+        toHeaders = const mempty
+
+instance ToPath DescribeElasticsearchDomainConfig
+         where
+        toPath DescribeElasticsearchDomainConfig'{..}
+          = mconcat
+              ["/2015-01-01/es/domain/", toBS _dedcDomainName,
+               "/config"]
+
+instance ToQuery DescribeElasticsearchDomainConfig
+         where
+        toQuery = const mempty
+
+-- | The result of a 'DescribeElasticsearchDomainConfig' request. Contains
+-- the configuration information of the requested domain.
+--
+-- /See:/ 'describeElasticsearchDomainConfigResponse' smart constructor.
+data DescribeElasticsearchDomainConfigResponse = DescribeElasticsearchDomainConfigResponse'
+    { _dedcrsResponseStatus :: !Int
+    , _dedcrsDomainConfig   :: !ElasticsearchDomainConfig
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomainConfigResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dedcrsResponseStatus'
+--
+-- * 'dedcrsDomainConfig'
+describeElasticsearchDomainConfigResponse
+    :: Int -- ^ 'dedcrsResponseStatus'
+    -> ElasticsearchDomainConfig -- ^ 'dedcrsDomainConfig'
+    -> DescribeElasticsearchDomainConfigResponse
+describeElasticsearchDomainConfigResponse pResponseStatus_ pDomainConfig_ =
+    DescribeElasticsearchDomainConfigResponse'
+    { _dedcrsResponseStatus = pResponseStatus_
+    , _dedcrsDomainConfig = pDomainConfig_
+    }
+
+-- | The response status code.
+dedcrsResponseStatus :: Lens' DescribeElasticsearchDomainConfigResponse Int
+dedcrsResponseStatus = lens _dedcrsResponseStatus (\ s a -> s{_dedcrsResponseStatus = a});
+
+-- | The configuration information of the domain requested in the
+-- 'DescribeElasticsearchDomainConfig' request.
+dedcrsDomainConfig :: Lens' DescribeElasticsearchDomainConfigResponse ElasticsearchDomainConfig
+dedcrsDomainConfig = lens _dedcrsDomainConfig (\ s a -> s{_dedcrsDomainConfig = a});
diff --git a/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomains.hs b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomains.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/DescribeElasticsearchDomains.hs
@@ -0,0 +1,131 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.DescribeElasticsearchDomains
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Returns domain configuration information about the specified
+-- Elasticsearch domains, including the domain ID, domain endpoint, and
+-- domain ARN.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-DescribeElasticsearchDomains.html AWS API Reference> for DescribeElasticsearchDomains.
+module Network.AWS.ElasticSearch.DescribeElasticsearchDomains
+    (
+    -- * Creating a Request
+      describeElasticsearchDomains
+    , DescribeElasticsearchDomains
+    -- * Request Lenses
+    , dedDomainNames
+
+    -- * Destructuring the Response
+    , describeElasticsearchDomainsResponse
+    , DescribeElasticsearchDomainsResponse
+    -- * Response Lenses
+    , drsResponseStatus
+    , drsDomainStatusList
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'DescribeElasticsearchDomains'
+-- operation. By default, the API returns the status of all Elasticsearch
+-- domains.
+--
+-- /See:/ 'describeElasticsearchDomains' smart constructor.
+newtype DescribeElasticsearchDomains = DescribeElasticsearchDomains'
+    { _dedDomainNames :: [Text]
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomains' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'dedDomainNames'
+describeElasticsearchDomains
+    :: DescribeElasticsearchDomains
+describeElasticsearchDomains =
+    DescribeElasticsearchDomains'
+    { _dedDomainNames = mempty
+    }
+
+-- | The Elasticsearch domains for which you want information.
+dedDomainNames :: Lens' DescribeElasticsearchDomains [Text]
+dedDomainNames = lens _dedDomainNames (\ s a -> s{_dedDomainNames = a}) . _Coerce;
+
+instance AWSRequest DescribeElasticsearchDomains
+         where
+        type Rs DescribeElasticsearchDomains =
+             DescribeElasticsearchDomainsResponse
+        request = postJSON elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 DescribeElasticsearchDomainsResponse' <$>
+                   (pure (fromEnum s)) <*>
+                     (x .?> "DomainStatusList" .!@ mempty))
+
+instance ToHeaders DescribeElasticsearchDomains where
+        toHeaders = const mempty
+
+instance ToJSON DescribeElasticsearchDomains where
+        toJSON DescribeElasticsearchDomains'{..}
+          = object
+              (catMaybes [Just ("DomainNames" .= _dedDomainNames)])
+
+instance ToPath DescribeElasticsearchDomains where
+        toPath = const "/2015-01-01/es/domain-info"
+
+instance ToQuery DescribeElasticsearchDomains where
+        toQuery = const mempty
+
+-- | The result of a 'DescribeElasticsearchDomains' request. Contains the
+-- status of the specified domains or all domains owned by the account.
+--
+-- /See:/ 'describeElasticsearchDomainsResponse' smart constructor.
+data DescribeElasticsearchDomainsResponse = DescribeElasticsearchDomainsResponse'
+    { _drsResponseStatus   :: !Int
+    , _drsDomainStatusList :: ![ElasticsearchDomainStatus]
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DescribeElasticsearchDomainsResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'drsResponseStatus'
+--
+-- * 'drsDomainStatusList'
+describeElasticsearchDomainsResponse
+    :: Int -- ^ 'drsResponseStatus'
+    -> DescribeElasticsearchDomainsResponse
+describeElasticsearchDomainsResponse pResponseStatus_ =
+    DescribeElasticsearchDomainsResponse'
+    { _drsResponseStatus = pResponseStatus_
+    , _drsDomainStatusList = mempty
+    }
+
+-- | The response status code.
+drsResponseStatus :: Lens' DescribeElasticsearchDomainsResponse Int
+drsResponseStatus = lens _drsResponseStatus (\ s a -> s{_drsResponseStatus = a});
+
+-- | The status of the domains requested in the
+-- 'DescribeElasticsearchDomains' request.
+drsDomainStatusList :: Lens' DescribeElasticsearchDomainsResponse [ElasticsearchDomainStatus]
+drsDomainStatusList = lens _drsDomainStatusList (\ s a -> s{_drsDomainStatusList = a}) . _Coerce;
diff --git a/gen/Network/AWS/ElasticSearch/ListDomainNames.hs b/gen/Network/AWS/ElasticSearch/ListDomainNames.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/ListDomainNames.hs
@@ -0,0 +1,106 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.ListDomainNames
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Returns the name of all Elasticsearch domains owned by the current
+-- user\'s account.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-ListDomainNames.html AWS API Reference> for ListDomainNames.
+module Network.AWS.ElasticSearch.ListDomainNames
+    (
+    -- * Creating a Request
+      listDomainNames
+    , ListDomainNames
+
+    -- * Destructuring the Response
+    , listDomainNamesResponse
+    , ListDomainNamesResponse
+    -- * Response Lenses
+    , ldnrsDomainNames
+    , ldnrsResponseStatus
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | /See:/ 'listDomainNames' smart constructor.
+data ListDomainNames =
+    ListDomainNames'
+    deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ListDomainNames' with the minimum fields required to make a request.
+--
+listDomainNames
+    :: ListDomainNames
+listDomainNames = ListDomainNames'
+
+instance AWSRequest ListDomainNames where
+        type Rs ListDomainNames = ListDomainNamesResponse
+        request = get elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 ListDomainNamesResponse' <$>
+                   (x .?> "DomainNames" .!@ mempty) <*>
+                     (pure (fromEnum s)))
+
+instance ToHeaders ListDomainNames where
+        toHeaders = const mempty
+
+instance ToPath ListDomainNames where
+        toPath = const "/2015-01-01/domain"
+
+instance ToQuery ListDomainNames where
+        toQuery = const mempty
+
+-- | The result of a 'ListDomainNames' operation. Contains the names of all
+-- Elasticsearch domains owned by this account.
+--
+-- /See:/ 'listDomainNamesResponse' smart constructor.
+data ListDomainNamesResponse = ListDomainNamesResponse'
+    { _ldnrsDomainNames    :: !(Maybe [DomainInfo])
+    , _ldnrsResponseStatus :: !Int
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ListDomainNamesResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'ldnrsDomainNames'
+--
+-- * 'ldnrsResponseStatus'
+listDomainNamesResponse
+    :: Int -- ^ 'ldnrsResponseStatus'
+    -> ListDomainNamesResponse
+listDomainNamesResponse pResponseStatus_ =
+    ListDomainNamesResponse'
+    { _ldnrsDomainNames = Nothing
+    , _ldnrsResponseStatus = pResponseStatus_
+    }
+
+-- | List of Elasticsearch domain names.
+ldnrsDomainNames :: Lens' ListDomainNamesResponse [DomainInfo]
+ldnrsDomainNames = lens _ldnrsDomainNames (\ s a -> s{_ldnrsDomainNames = a}) . _Default . _Coerce;
+
+-- | The response status code.
+ldnrsResponseStatus :: Lens' ListDomainNamesResponse Int
+ldnrsResponseStatus = lens _ldnrsResponseStatus (\ s a -> s{_ldnrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticSearch/ListTags.hs b/gen/Network/AWS/ElasticSearch/ListTags.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/ListTags.hs
@@ -0,0 +1,122 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.ListTags
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Returns all tags for the given Elasticsearch domain.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-ListTags.html AWS API Reference> for ListTags.
+module Network.AWS.ElasticSearch.ListTags
+    (
+    -- * Creating a Request
+      listTags
+    , ListTags
+    -- * Request Lenses
+    , ltARN
+
+    -- * Destructuring the Response
+    , listTagsResponse
+    , ListTagsResponse
+    -- * Response Lenses
+    , ltrsTagList
+    , ltrsResponseStatus
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'ListTags' operation. Specify the
+-- 'ARN' for the Elasticsearch domain to which the tags are attached that
+-- you want to view are attached.
+--
+-- /See:/ 'listTags' smart constructor.
+newtype ListTags = ListTags'
+    { _ltARN :: Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ListTags' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'ltARN'
+listTags
+    :: Text -- ^ 'ltARN'
+    -> ListTags
+listTags pARN_ =
+    ListTags'
+    { _ltARN = pARN_
+    }
+
+-- | Specify the 'ARN' for the Elasticsearch domain to which the tags are
+-- attached that you want to view.
+ltARN :: Lens' ListTags Text
+ltARN = lens _ltARN (\ s a -> s{_ltARN = a});
+
+instance AWSRequest ListTags where
+        type Rs ListTags = ListTagsResponse
+        request = get elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 ListTagsResponse' <$>
+                   (x .?> "TagList" .!@ mempty) <*> (pure (fromEnum s)))
+
+instance ToHeaders ListTags where
+        toHeaders = const mempty
+
+instance ToPath ListTags where
+        toPath = const "/2015-01-01/tags/"
+
+instance ToQuery ListTags where
+        toQuery ListTags'{..} = mconcat ["arn" =: _ltARN]
+
+-- | The result of a 'ListTags' operation. Contains tags for all requested
+-- Elasticsearch domains.
+--
+-- /See:/ 'listTagsResponse' smart constructor.
+data ListTagsResponse = ListTagsResponse'
+    { _ltrsTagList        :: !(Maybe [Tag])
+    , _ltrsResponseStatus :: !Int
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ListTagsResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'ltrsTagList'
+--
+-- * 'ltrsResponseStatus'
+listTagsResponse
+    :: Int -- ^ 'ltrsResponseStatus'
+    -> ListTagsResponse
+listTagsResponse pResponseStatus_ =
+    ListTagsResponse'
+    { _ltrsTagList = Nothing
+    , _ltrsResponseStatus = pResponseStatus_
+    }
+
+-- | List of 'Tag' for the requested Elasticsearch domain.
+ltrsTagList :: Lens' ListTagsResponse [Tag]
+ltrsTagList = lens _ltrsTagList (\ s a -> s{_ltrsTagList = a}) . _Default . _Coerce;
+
+-- | The response status code.
+ltrsResponseStatus :: Lens' ListTagsResponse Int
+ltrsResponseStatus = lens _ltrsResponseStatus (\ s a -> s{_ltrsResponseStatus = a});
diff --git a/gen/Network/AWS/ElasticSearch/RemoveTags.hs b/gen/Network/AWS/ElasticSearch/RemoveTags.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/RemoveTags.hs
@@ -0,0 +1,111 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.RemoveTags
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Removes the specified set of tags from the specified Elasticsearch
+-- domain.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-RemoveTags.html AWS API Reference> for RemoveTags.
+module Network.AWS.ElasticSearch.RemoveTags
+    (
+    -- * Creating a Request
+      removeTags
+    , RemoveTags
+    -- * Request Lenses
+    , rtARN
+    , rtTagKeys
+
+    -- * Destructuring the Response
+    , removeTagsResponse
+    , RemoveTagsResponse
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'RemoveTags' operation. Specify the
+-- 'ARN' for the Elasticsearch domain from which you want to remove the
+-- specified 'TagKey'.
+--
+-- /See:/ 'removeTags' smart constructor.
+data RemoveTags = RemoveTags'
+    { _rtARN     :: !Text
+    , _rtTagKeys :: ![Text]
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'RemoveTags' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'rtARN'
+--
+-- * 'rtTagKeys'
+removeTags
+    :: Text -- ^ 'rtARN'
+    -> RemoveTags
+removeTags pARN_ =
+    RemoveTags'
+    { _rtARN = pARN_
+    , _rtTagKeys = mempty
+    }
+
+-- | Specifies the 'ARN' for the Elasticsearch domain from which you want to
+-- delete the specified tags.
+rtARN :: Lens' RemoveTags Text
+rtARN = lens _rtARN (\ s a -> s{_rtARN = a});
+
+-- | Specifies the 'TagKey' list which you want to remove from the
+-- Elasticsearch domain.
+rtTagKeys :: Lens' RemoveTags [Text]
+rtTagKeys = lens _rtTagKeys (\ s a -> s{_rtTagKeys = a}) . _Coerce;
+
+instance AWSRequest RemoveTags where
+        type Rs RemoveTags = RemoveTagsResponse
+        request = postJSON elasticSearch
+        response = receiveNull RemoveTagsResponse'
+
+instance ToHeaders RemoveTags where
+        toHeaders = const mempty
+
+instance ToJSON RemoveTags where
+        toJSON RemoveTags'{..}
+          = object
+              (catMaybes
+                 [Just ("ARN" .= _rtARN),
+                  Just ("TagKeys" .= _rtTagKeys)])
+
+instance ToPath RemoveTags where
+        toPath = const "/2015-01-01/tags-removal"
+
+instance ToQuery RemoveTags where
+        toQuery = const mempty
+
+-- | /See:/ 'removeTagsResponse' smart constructor.
+data RemoveTagsResponse =
+    RemoveTagsResponse'
+    deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'RemoveTagsResponse' with the minimum fields required to make a request.
+--
+removeTagsResponse
+    :: RemoveTagsResponse
+removeTagsResponse = RemoveTagsResponse'
diff --git a/gen/Network/AWS/ElasticSearch/Types.hs b/gen/Network/AWS/ElasticSearch/Types.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/Types.hs
@@ -0,0 +1,217 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.Types
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Network.AWS.ElasticSearch.Types
+    (
+    -- * Service Configuration
+      elasticSearch
+
+    -- * Errors
+    , _ValidationException
+    , _ResourceAlreadyExistsException
+    , _BaseException
+    , _DisabledOperationException
+    , _InternalException
+    , _InvalidTypeException
+    , _ResourceNotFoundException
+    , _LimitExceededException
+
+    -- * ESPartitionInstanceType
+    , ESPartitionInstanceType (..)
+
+    -- * OptionState
+    , OptionState (..)
+
+    -- * VolumeType
+    , VolumeType (..)
+
+    -- * AccessPoliciesStatus
+    , AccessPoliciesStatus
+    , accessPoliciesStatus
+    , apsOptions
+    , apsStatus
+
+    -- * AdvancedOptionsStatus
+    , AdvancedOptionsStatus
+    , advancedOptionsStatus
+    , aosOptions
+    , aosStatus
+
+    -- * DomainInfo
+    , DomainInfo
+    , domainInfo
+    , diDomainName
+
+    -- * EBSOptions
+    , EBSOptions
+    , ebsOptions
+    , eoVolumeSize
+    , eoIOPS
+    , eoVolumeType
+    , eoEBSEnabled
+
+    -- * EBSOptionsStatus
+    , EBSOptionsStatus
+    , ebsOptionsStatus
+    , eosOptions
+    , eosStatus
+
+    -- * ElasticsearchClusterConfig
+    , ElasticsearchClusterConfig
+    , elasticsearchClusterConfig
+    , eccDedicatedMasterCount
+    , eccDedicatedMasterType
+    , eccDedicatedMasterEnabled
+    , eccInstanceCount
+    , eccZoneAwarenessEnabled
+    , eccInstanceType
+
+    -- * ElasticsearchClusterConfigStatus
+    , ElasticsearchClusterConfigStatus
+    , elasticsearchClusterConfigStatus
+    , eccsOptions
+    , eccsStatus
+
+    -- * ElasticsearchDomainConfig
+    , ElasticsearchDomainConfig
+    , elasticsearchDomainConfig
+    , edcEBSOptions
+    , edcAccessPolicies
+    , edcElasticsearchClusterConfig
+    , edcSnapshotOptions
+    , edcAdvancedOptions
+
+    -- * ElasticsearchDomainStatus
+    , ElasticsearchDomainStatus
+    , elasticsearchDomainStatus
+    , edsEBSOptions
+    , edsAccessPolicies
+    , edsCreated
+    , edsSnapshotOptions
+    , edsDeleted
+    , edsProcessing
+    , edsEndpoint
+    , edsAdvancedOptions
+    , edsDomainId
+    , edsDomainName
+    , edsARN
+    , edsElasticsearchClusterConfig
+
+    -- * OptionStatus
+    , OptionStatus
+    , optionStatus
+    , osPendingDeletion
+    , osUpdateVersion
+    , osCreationDate
+    , osUpdateDate
+    , osState
+
+    -- * SnapshotOptions
+    , SnapshotOptions
+    , snapshotOptions
+    , soAutomatedSnapshotStartHour
+
+    -- * SnapshotOptionsStatus
+    , SnapshotOptionsStatus
+    , snapshotOptionsStatus
+    , sosOptions
+    , sosStatus
+
+    -- * Tag
+    , Tag
+    , tag
+    , tagKey
+    , tagValue
+    ) where
+
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.ElasticSearch.Types.Sum
+import           Network.AWS.Prelude
+import           Network.AWS.Sign.V4
+
+-- | API version '2015-01-01' of the Amazon Elasticsearch Service SDK configuration.
+elasticSearch :: Service
+elasticSearch =
+    Service
+    { _svcAbbrev = "ElasticSearch"
+    , _svcSigner = v4
+    , _svcPrefix = "es"
+    , _svcVersion = "2015-01-01"
+    , _svcEndpoint = defaultEndpoint elasticSearch
+    , _svcTimeout = Just 70
+    , _svcCheck = statusSuccess
+    , _svcError = parseJSONError
+    , _svcRetry = retry
+    }
+  where
+    retry =
+        Exponential
+        { _retryBase = 5.0e-2
+        , _retryGrowth = 2
+        , _retryAttempts = 5
+        , _retryCheck = check
+        }
+    check e
+      | has (hasCode "ThrottlingException" . hasStatus 400) e =
+          Just "throttling_exception"
+      | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling"
+      | has (hasStatus 503) e = Just "service_unavailable"
+      | has (hasStatus 500) e = Just "general_server_error"
+      | has (hasStatus 509) e = Just "limit_exceeded"
+      | otherwise = Nothing
+
+-- | An exception for missing \/ invalid input fields. Gives http status code
+-- of 400.
+_ValidationException :: AsError a => Getting (First ServiceError) a ServiceError
+_ValidationException =
+    _ServiceError . hasStatus 400 . hasCode "ValidationException"
+
+-- | An exception for creating a resource that already exists. Gives http
+-- status code of 400.
+_ResourceAlreadyExistsException :: AsError a => Getting (First ServiceError) a ServiceError
+_ResourceAlreadyExistsException =
+    _ServiceError . hasStatus 409 . hasCode "ResourceAlreadyExistsException"
+
+-- | An error occurred while processing the request.
+_BaseException :: AsError a => Getting (First ServiceError) a ServiceError
+_BaseException = _ServiceError . hasCode "BaseException"
+
+-- | An error occured because the client wanted to access a not supported
+-- operation. Gives http status code of 409.
+_DisabledOperationException :: AsError a => Getting (First ServiceError) a ServiceError
+_DisabledOperationException =
+    _ServiceError . hasStatus 409 . hasCode "DisabledOperationException"
+
+-- | The request processing has failed because of an unknown error, exception
+-- or failure (the failure is internal to the service) . Gives http status
+-- code of 500.
+_InternalException :: AsError a => Getting (First ServiceError) a ServiceError
+_InternalException =
+    _ServiceError . hasStatus 500 . hasCode "InternalException"
+
+-- | An exception for trying to create or access sub-resource that is either
+-- invalid or not supported. Gives http status code of 409.
+_InvalidTypeException :: AsError a => Getting (First ServiceError) a ServiceError
+_InvalidTypeException =
+    _ServiceError . hasStatus 409 . hasCode "InvalidTypeException"
+
+-- | An exception for accessing or deleting a resource that does not exist.
+-- Gives http status code of 400.
+_ResourceNotFoundException :: AsError a => Getting (First ServiceError) a ServiceError
+_ResourceNotFoundException =
+    _ServiceError . hasStatus 409 . hasCode "ResourceNotFoundException"
+
+-- | An exception for trying to create more than allowed resources or
+-- sub-resources. Gives http status code of 409.
+_LimitExceededException :: AsError a => Getting (First ServiceError) a ServiceError
+_LimitExceededException =
+    _ServiceError . hasStatus 409 . hasCode "LimitExceededException"
diff --git a/gen/Network/AWS/ElasticSearch/Types/Product.hs b/gen/Network/AWS/ElasticSearch/Types/Product.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/Types/Product.hs
@@ -0,0 +1,806 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.Types.Product
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Network.AWS.ElasticSearch.Types.Product where
+
+import           Network.AWS.ElasticSearch.Types.Sum
+import           Network.AWS.Prelude
+
+-- | The configured access rules for the domain\'s document and search
+-- endpoints, and the current status of those rules.
+--
+-- /See:/ 'accessPoliciesStatus' smart constructor.
+data AccessPoliciesStatus = AccessPoliciesStatus'
+    { _apsOptions :: !Text
+    , _apsStatus  :: !OptionStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'AccessPoliciesStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'apsOptions'
+--
+-- * 'apsStatus'
+accessPoliciesStatus
+    :: Text -- ^ 'apsOptions'
+    -> OptionStatus -- ^ 'apsStatus'
+    -> AccessPoliciesStatus
+accessPoliciesStatus pOptions_ pStatus_ =
+    AccessPoliciesStatus'
+    { _apsOptions = pOptions_
+    , _apsStatus = pStatus_
+    }
+
+-- | The access policy configured for the Elasticsearch domain. Access
+-- policies may be resource-based, IP-based, or IAM-based. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-access-policies Configuring Access Policies>for
+-- more information.
+apsOptions :: Lens' AccessPoliciesStatus Text
+apsOptions = lens _apsOptions (\ s a -> s{_apsOptions = a});
+
+-- | The status of the access policy for the Elasticsearch domain. See
+-- 'OptionStatus' for the status information that\'s included.
+apsStatus :: Lens' AccessPoliciesStatus OptionStatus
+apsStatus = lens _apsStatus (\ s a -> s{_apsStatus = a});
+
+instance FromJSON AccessPoliciesStatus where
+        parseJSON
+          = withObject "AccessPoliciesStatus"
+              (\ x ->
+                 AccessPoliciesStatus' <$>
+                   (x .: "Options") <*> (x .: "Status"))
+
+-- | Status of the advanced options for the specified Elasticsearch domain.
+-- Currently, the following advanced options are available:
+--
+-- -   Option to allow references to indices in an HTTP request body. Must
+--     be 'false' when configuring access to individual sub-resources. By
+--     default, the value is 'true'. See
+--     <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options Configuration Advanced Options>
+--     for more information.
+-- -   Option to specify the percentage of heap space that is allocated to
+--     field data. By default, this setting is unbounded.
+--
+-- For more information, see
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options Configuring Advanced Options>.
+--
+-- /See:/ 'advancedOptionsStatus' smart constructor.
+data AdvancedOptionsStatus = AdvancedOptionsStatus'
+    { _aosOptions :: !(Map Text Text)
+    , _aosStatus  :: !OptionStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'AdvancedOptionsStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'aosOptions'
+--
+-- * 'aosStatus'
+advancedOptionsStatus
+    :: OptionStatus -- ^ 'aosStatus'
+    -> AdvancedOptionsStatus
+advancedOptionsStatus pStatus_ =
+    AdvancedOptionsStatus'
+    { _aosOptions = mempty
+    , _aosStatus = pStatus_
+    }
+
+-- | Specifies the status of advanced options for the specified Elasticsearch
+-- domain.
+aosOptions :: Lens' AdvancedOptionsStatus (HashMap Text Text)
+aosOptions = lens _aosOptions (\ s a -> s{_aosOptions = a}) . _Map;
+
+-- | Specifies the status of 'OptionStatus' for advanced options for the
+-- specified Elasticsearch domain.
+aosStatus :: Lens' AdvancedOptionsStatus OptionStatus
+aosStatus = lens _aosStatus (\ s a -> s{_aosStatus = a});
+
+instance FromJSON AdvancedOptionsStatus where
+        parseJSON
+          = withObject "AdvancedOptionsStatus"
+              (\ x ->
+                 AdvancedOptionsStatus' <$>
+                   (x .:? "Options" .!= mempty) <*> (x .: "Status"))
+
+-- | /See:/ 'domainInfo' smart constructor.
+newtype DomainInfo = DomainInfo'
+    { _diDomainName :: Maybe Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'DomainInfo' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'diDomainName'
+domainInfo
+    :: DomainInfo
+domainInfo =
+    DomainInfo'
+    { _diDomainName = Nothing
+    }
+
+-- | Specifies the 'DomainName'.
+diDomainName :: Lens' DomainInfo (Maybe Text)
+diDomainName = lens _diDomainName (\ s a -> s{_diDomainName = a});
+
+instance FromJSON DomainInfo where
+        parseJSON
+          = withObject "DomainInfo"
+              (\ x -> DomainInfo' <$> (x .:? "DomainName"))
+
+-- | Options to enable, disable, and specify the properties of EBS storage
+-- volumes. For more information, see
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-ebs Configuring EBS-based Storage>.
+--
+-- /See:/ 'ebsOptions' smart constructor.
+data EBSOptions = EBSOptions'
+    { _eoVolumeSize :: !(Maybe Int)
+    , _eoIOPS       :: !(Maybe Int)
+    , _eoVolumeType :: !(Maybe VolumeType)
+    , _eoEBSEnabled :: !(Maybe Bool)
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'EBSOptions' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'eoVolumeSize'
+--
+-- * 'eoIOPS'
+--
+-- * 'eoVolumeType'
+--
+-- * 'eoEBSEnabled'
+ebsOptions
+    :: EBSOptions
+ebsOptions =
+    EBSOptions'
+    { _eoVolumeSize = Nothing
+    , _eoIOPS = Nothing
+    , _eoVolumeType = Nothing
+    , _eoEBSEnabled = Nothing
+    }
+
+-- | Integer to specify the size of an EBS volume.
+eoVolumeSize :: Lens' EBSOptions (Maybe Int)
+eoVolumeSize = lens _eoVolumeSize (\ s a -> s{_eoVolumeSize = a});
+
+-- | Specifies the IOPD for a Provisioned IOPS EBS volume (SSD).
+eoIOPS :: Lens' EBSOptions (Maybe Int)
+eoIOPS = lens _eoIOPS (\ s a -> s{_eoIOPS = a});
+
+-- | Specifies the volume type for EBS-based storage.
+eoVolumeType :: Lens' EBSOptions (Maybe VolumeType)
+eoVolumeType = lens _eoVolumeType (\ s a -> s{_eoVolumeType = a});
+
+-- | Specifies whether EBS-based storage is enabled.
+eoEBSEnabled :: Lens' EBSOptions (Maybe Bool)
+eoEBSEnabled = lens _eoEBSEnabled (\ s a -> s{_eoEBSEnabled = a});
+
+instance FromJSON EBSOptions where
+        parseJSON
+          = withObject "EBSOptions"
+              (\ x ->
+                 EBSOptions' <$>
+                   (x .:? "VolumeSize") <*> (x .:? "Iops") <*>
+                     (x .:? "VolumeType")
+                     <*> (x .:? "EBSEnabled"))
+
+instance ToJSON EBSOptions where
+        toJSON EBSOptions'{..}
+          = object
+              (catMaybes
+                 [("VolumeSize" .=) <$> _eoVolumeSize,
+                  ("Iops" .=) <$> _eoIOPS,
+                  ("VolumeType" .=) <$> _eoVolumeType,
+                  ("EBSEnabled" .=) <$> _eoEBSEnabled])
+
+-- | Status of the EBS options for the specified Elasticsearch domain.
+--
+-- /See:/ 'ebsOptionsStatus' smart constructor.
+data EBSOptionsStatus = EBSOptionsStatus'
+    { _eosOptions :: !EBSOptions
+    , _eosStatus  :: !OptionStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'EBSOptionsStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'eosOptions'
+--
+-- * 'eosStatus'
+ebsOptionsStatus
+    :: EBSOptions -- ^ 'eosOptions'
+    -> OptionStatus -- ^ 'eosStatus'
+    -> EBSOptionsStatus
+ebsOptionsStatus pOptions_ pStatus_ =
+    EBSOptionsStatus'
+    { _eosOptions = pOptions_
+    , _eosStatus = pStatus_
+    }
+
+-- | Specifies the EBS options for the specified Elasticsearch domain.
+eosOptions :: Lens' EBSOptionsStatus EBSOptions
+eosOptions = lens _eosOptions (\ s a -> s{_eosOptions = a});
+
+-- | Specifies the status of the EBS options for the specified Elasticsearch
+-- domain.
+eosStatus :: Lens' EBSOptionsStatus OptionStatus
+eosStatus = lens _eosStatus (\ s a -> s{_eosStatus = a});
+
+instance FromJSON EBSOptionsStatus where
+        parseJSON
+          = withObject "EBSOptionsStatus"
+              (\ x ->
+                 EBSOptionsStatus' <$>
+                   (x .: "Options") <*> (x .: "Status"))
+
+-- | Specifies the configuration for the domain cluster, such as the type and
+-- number of instances.
+--
+-- /See:/ 'elasticsearchClusterConfig' smart constructor.
+data ElasticsearchClusterConfig = ElasticsearchClusterConfig'
+    { _eccDedicatedMasterCount   :: !(Maybe Int)
+    , _eccDedicatedMasterType    :: !(Maybe ESPartitionInstanceType)
+    , _eccDedicatedMasterEnabled :: !(Maybe Bool)
+    , _eccInstanceCount          :: !(Maybe Int)
+    , _eccZoneAwarenessEnabled   :: !(Maybe Bool)
+    , _eccInstanceType           :: !(Maybe ESPartitionInstanceType)
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ElasticsearchClusterConfig' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'eccDedicatedMasterCount'
+--
+-- * 'eccDedicatedMasterType'
+--
+-- * 'eccDedicatedMasterEnabled'
+--
+-- * 'eccInstanceCount'
+--
+-- * 'eccZoneAwarenessEnabled'
+--
+-- * 'eccInstanceType'
+elasticsearchClusterConfig
+    :: ElasticsearchClusterConfig
+elasticsearchClusterConfig =
+    ElasticsearchClusterConfig'
+    { _eccDedicatedMasterCount = Nothing
+    , _eccDedicatedMasterType = Nothing
+    , _eccDedicatedMasterEnabled = Nothing
+    , _eccInstanceCount = Nothing
+    , _eccZoneAwarenessEnabled = Nothing
+    , _eccInstanceType = Nothing
+    }
+
+-- | Total number of dedicated master nodes, active and on standby, for the
+-- cluster.
+eccDedicatedMasterCount :: Lens' ElasticsearchClusterConfig (Maybe Int)
+eccDedicatedMasterCount = lens _eccDedicatedMasterCount (\ s a -> s{_eccDedicatedMasterCount = a});
+
+-- | The instance type for a dedicated master node.
+eccDedicatedMasterType :: Lens' ElasticsearchClusterConfig (Maybe ESPartitionInstanceType)
+eccDedicatedMasterType = lens _eccDedicatedMasterType (\ s a -> s{_eccDedicatedMasterType = a});
+
+-- | A boolean value to indicate whether a dedicated master node is enabled.
+-- See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-managedomains.html#es-managedomains-dedicatedmasternodes About Dedicated Master Nodes>
+-- for more information.
+eccDedicatedMasterEnabled :: Lens' ElasticsearchClusterConfig (Maybe Bool)
+eccDedicatedMasterEnabled = lens _eccDedicatedMasterEnabled (\ s a -> s{_eccDedicatedMasterEnabled = a});
+
+-- | The number of instances in the specified domain cluster.
+eccInstanceCount :: Lens' ElasticsearchClusterConfig (Maybe Int)
+eccInstanceCount = lens _eccInstanceCount (\ s a -> s{_eccInstanceCount = a});
+
+-- | A boolean value to indicate whether zone awareness is enabled. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-managedomains.html#es-managedomains-zoneawareness About Zone Awareness>
+-- for more information.
+eccZoneAwarenessEnabled :: Lens' ElasticsearchClusterConfig (Maybe Bool)
+eccZoneAwarenessEnabled = lens _eccZoneAwarenessEnabled (\ s a -> s{_eccZoneAwarenessEnabled = a});
+
+-- | The instance type for an Elasticsearch cluster.
+eccInstanceType :: Lens' ElasticsearchClusterConfig (Maybe ESPartitionInstanceType)
+eccInstanceType = lens _eccInstanceType (\ s a -> s{_eccInstanceType = a});
+
+instance FromJSON ElasticsearchClusterConfig where
+        parseJSON
+          = withObject "ElasticsearchClusterConfig"
+              (\ x ->
+                 ElasticsearchClusterConfig' <$>
+                   (x .:? "DedicatedMasterCount") <*>
+                     (x .:? "DedicatedMasterType")
+                     <*> (x .:? "DedicatedMasterEnabled")
+                     <*> (x .:? "InstanceCount")
+                     <*> (x .:? "ZoneAwarenessEnabled")
+                     <*> (x .:? "InstanceType"))
+
+instance ToJSON ElasticsearchClusterConfig where
+        toJSON ElasticsearchClusterConfig'{..}
+          = object
+              (catMaybes
+                 [("DedicatedMasterCount" .=) <$>
+                    _eccDedicatedMasterCount,
+                  ("DedicatedMasterType" .=) <$>
+                    _eccDedicatedMasterType,
+                  ("DedicatedMasterEnabled" .=) <$>
+                    _eccDedicatedMasterEnabled,
+                  ("InstanceCount" .=) <$> _eccInstanceCount,
+                  ("ZoneAwarenessEnabled" .=) <$>
+                    _eccZoneAwarenessEnabled,
+                  ("InstanceType" .=) <$> _eccInstanceType])
+
+-- | Specifies the configuration status for the specified Elasticsearch
+-- domain.
+--
+-- /See:/ 'elasticsearchClusterConfigStatus' smart constructor.
+data ElasticsearchClusterConfigStatus = ElasticsearchClusterConfigStatus'
+    { _eccsOptions :: !ElasticsearchClusterConfig
+    , _eccsStatus  :: !OptionStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ElasticsearchClusterConfigStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'eccsOptions'
+--
+-- * 'eccsStatus'
+elasticsearchClusterConfigStatus
+    :: ElasticsearchClusterConfig -- ^ 'eccsOptions'
+    -> OptionStatus -- ^ 'eccsStatus'
+    -> ElasticsearchClusterConfigStatus
+elasticsearchClusterConfigStatus pOptions_ pStatus_ =
+    ElasticsearchClusterConfigStatus'
+    { _eccsOptions = pOptions_
+    , _eccsStatus = pStatus_
+    }
+
+-- | Specifies the cluster configuration for the specified Elasticsearch
+-- domain.
+eccsOptions :: Lens' ElasticsearchClusterConfigStatus ElasticsearchClusterConfig
+eccsOptions = lens _eccsOptions (\ s a -> s{_eccsOptions = a});
+
+-- | Specifies the status of the configuration for the specified
+-- Elasticsearch domain.
+eccsStatus :: Lens' ElasticsearchClusterConfigStatus OptionStatus
+eccsStatus = lens _eccsStatus (\ s a -> s{_eccsStatus = a});
+
+instance FromJSON ElasticsearchClusterConfigStatus
+         where
+        parseJSON
+          = withObject "ElasticsearchClusterConfigStatus"
+              (\ x ->
+                 ElasticsearchClusterConfigStatus' <$>
+                   (x .: "Options") <*> (x .: "Status"))
+
+-- | The configuration of an Elasticsearch domain.
+--
+-- /See:/ 'elasticsearchDomainConfig' smart constructor.
+data ElasticsearchDomainConfig = ElasticsearchDomainConfig'
+    { _edcEBSOptions                 :: !(Maybe EBSOptionsStatus)
+    , _edcAccessPolicies             :: !(Maybe AccessPoliciesStatus)
+    , _edcElasticsearchClusterConfig :: !(Maybe ElasticsearchClusterConfigStatus)
+    , _edcSnapshotOptions            :: !(Maybe SnapshotOptionsStatus)
+    , _edcAdvancedOptions            :: !(Maybe AdvancedOptionsStatus)
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ElasticsearchDomainConfig' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'edcEBSOptions'
+--
+-- * 'edcAccessPolicies'
+--
+-- * 'edcElasticsearchClusterConfig'
+--
+-- * 'edcSnapshotOptions'
+--
+-- * 'edcAdvancedOptions'
+elasticsearchDomainConfig
+    :: ElasticsearchDomainConfig
+elasticsearchDomainConfig =
+    ElasticsearchDomainConfig'
+    { _edcEBSOptions = Nothing
+    , _edcAccessPolicies = Nothing
+    , _edcElasticsearchClusterConfig = Nothing
+    , _edcSnapshotOptions = Nothing
+    , _edcAdvancedOptions = Nothing
+    }
+
+-- | Specifies the 'EBSOptions' for the Elasticsearch domain.
+edcEBSOptions :: Lens' ElasticsearchDomainConfig (Maybe EBSOptionsStatus)
+edcEBSOptions = lens _edcEBSOptions (\ s a -> s{_edcEBSOptions = a});
+
+-- | IAM access policy as a JSON-formatted string.
+edcAccessPolicies :: Lens' ElasticsearchDomainConfig (Maybe AccessPoliciesStatus)
+edcAccessPolicies = lens _edcAccessPolicies (\ s a -> s{_edcAccessPolicies = a});
+
+-- | Specifies the 'ElasticsearchClusterConfig' for the Elasticsearch domain.
+edcElasticsearchClusterConfig :: Lens' ElasticsearchDomainConfig (Maybe ElasticsearchClusterConfigStatus)
+edcElasticsearchClusterConfig = lens _edcElasticsearchClusterConfig (\ s a -> s{_edcElasticsearchClusterConfig = a});
+
+-- | Specifies the 'SnapshotOptions' for the Elasticsearch domain.
+edcSnapshotOptions :: Lens' ElasticsearchDomainConfig (Maybe SnapshotOptionsStatus)
+edcSnapshotOptions = lens _edcSnapshotOptions (\ s a -> s{_edcSnapshotOptions = a});
+
+-- | Specifies the 'AdvancedOptions' for the domain. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options Configuring Advanced Options>
+-- for more information.
+edcAdvancedOptions :: Lens' ElasticsearchDomainConfig (Maybe AdvancedOptionsStatus)
+edcAdvancedOptions = lens _edcAdvancedOptions (\ s a -> s{_edcAdvancedOptions = a});
+
+instance FromJSON ElasticsearchDomainConfig where
+        parseJSON
+          = withObject "ElasticsearchDomainConfig"
+              (\ x ->
+                 ElasticsearchDomainConfig' <$>
+                   (x .:? "EBSOptions") <*> (x .:? "AccessPolicies") <*>
+                     (x .:? "ElasticsearchClusterConfig")
+                     <*> (x .:? "SnapshotOptions")
+                     <*> (x .:? "AdvancedOptions"))
+
+-- | The current status of an Elasticsearch domain.
+--
+-- /See:/ 'elasticsearchDomainStatus' smart constructor.
+data ElasticsearchDomainStatus = ElasticsearchDomainStatus'
+    { _edsEBSOptions                 :: !(Maybe EBSOptions)
+    , _edsAccessPolicies             :: !(Maybe Text)
+    , _edsCreated                    :: !(Maybe Bool)
+    , _edsSnapshotOptions            :: !(Maybe SnapshotOptions)
+    , _edsDeleted                    :: !(Maybe Bool)
+    , _edsProcessing                 :: !(Maybe Bool)
+    , _edsEndpoint                   :: !(Maybe Text)
+    , _edsAdvancedOptions            :: !(Maybe (Map Text Text))
+    , _edsDomainId                   :: !Text
+    , _edsDomainName                 :: !Text
+    , _edsARN                        :: !Text
+    , _edsElasticsearchClusterConfig :: !ElasticsearchClusterConfig
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'ElasticsearchDomainStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'edsEBSOptions'
+--
+-- * 'edsAccessPolicies'
+--
+-- * 'edsCreated'
+--
+-- * 'edsSnapshotOptions'
+--
+-- * 'edsDeleted'
+--
+-- * 'edsProcessing'
+--
+-- * 'edsEndpoint'
+--
+-- * 'edsAdvancedOptions'
+--
+-- * 'edsDomainId'
+--
+-- * 'edsDomainName'
+--
+-- * 'edsARN'
+--
+-- * 'edsElasticsearchClusterConfig'
+elasticsearchDomainStatus
+    :: Text -- ^ 'edsDomainId'
+    -> Text -- ^ 'edsDomainName'
+    -> Text -- ^ 'edsARN'
+    -> ElasticsearchClusterConfig -- ^ 'edsElasticsearchClusterConfig'
+    -> ElasticsearchDomainStatus
+elasticsearchDomainStatus pDomainId_ pDomainName_ pARN_ pElasticsearchClusterConfig_ =
+    ElasticsearchDomainStatus'
+    { _edsEBSOptions = Nothing
+    , _edsAccessPolicies = Nothing
+    , _edsCreated = Nothing
+    , _edsSnapshotOptions = Nothing
+    , _edsDeleted = Nothing
+    , _edsProcessing = Nothing
+    , _edsEndpoint = Nothing
+    , _edsAdvancedOptions = Nothing
+    , _edsDomainId = pDomainId_
+    , _edsDomainName = pDomainName_
+    , _edsARN = pARN_
+    , _edsElasticsearchClusterConfig = pElasticsearchClusterConfig_
+    }
+
+-- | The 'EBSOptions' for the specified domain. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-ebs Configuring EBS-based Storage>
+-- for more information.
+edsEBSOptions :: Lens' ElasticsearchDomainStatus (Maybe EBSOptions)
+edsEBSOptions = lens _edsEBSOptions (\ s a -> s{_edsEBSOptions = a});
+
+-- | IAM access policy as a JSON-formatted string.
+edsAccessPolicies :: Lens' ElasticsearchDomainStatus (Maybe Text)
+edsAccessPolicies = lens _edsAccessPolicies (\ s a -> s{_edsAccessPolicies = a});
+
+-- | The domain creation status. 'True' if the creation of an Elasticsearch
+-- domain is complete. 'False' if domain creation is still in progress.
+edsCreated :: Lens' ElasticsearchDomainStatus (Maybe Bool)
+edsCreated = lens _edsCreated (\ s a -> s{_edsCreated = a});
+
+-- | Specifies the status of the 'SnapshotOptions'
+edsSnapshotOptions :: Lens' ElasticsearchDomainStatus (Maybe SnapshotOptions)
+edsSnapshotOptions = lens _edsSnapshotOptions (\ s a -> s{_edsSnapshotOptions = a});
+
+-- | The domain deletion status. 'True' if a delete request has been received
+-- for the domain but resource cleanup is still in progress. 'False' if the
+-- domain has not been deleted. Once domain deletion is complete, the
+-- status of the domain is no longer returned.
+edsDeleted :: Lens' ElasticsearchDomainStatus (Maybe Bool)
+edsDeleted = lens _edsDeleted (\ s a -> s{_edsDeleted = a});
+
+-- | The status of the Elasticsearch domain configuration. 'True' if Amazon
+-- Elasticsearch Service is processing configuration changes. 'False' if
+-- the configuration is active.
+edsProcessing :: Lens' ElasticsearchDomainStatus (Maybe Bool)
+edsProcessing = lens _edsProcessing (\ s a -> s{_edsProcessing = a});
+
+-- | The Elasticsearch domain endpoint that you use to submit index and
+-- search requests.
+edsEndpoint :: Lens' ElasticsearchDomainStatus (Maybe Text)
+edsEndpoint = lens _edsEndpoint (\ s a -> s{_edsEndpoint = a});
+
+-- | Specifies the status of the 'AdvancedOptions'
+edsAdvancedOptions :: Lens' ElasticsearchDomainStatus (HashMap Text Text)
+edsAdvancedOptions = lens _edsAdvancedOptions (\ s a -> s{_edsAdvancedOptions = a}) . _Default . _Map;
+
+-- | The unique identifier for the specified Elasticsearch domain.
+edsDomainId :: Lens' ElasticsearchDomainStatus Text
+edsDomainId = lens _edsDomainId (\ s a -> s{_edsDomainId = a});
+
+-- | The name of an Elasticsearch domain. Domain names are unique across the
+-- domains owned by an account within an AWS region. Domain names start
+-- with a letter or number and can contain the following characters: a-z
+-- (lowercase), 0-9, and - (hyphen).
+edsDomainName :: Lens' ElasticsearchDomainStatus Text
+edsDomainName = lens _edsDomainName (\ s a -> s{_edsDomainName = a});
+
+-- | The Amazon resource name (ARN) of an Elasticsearch domain. See
+-- <http://docs.aws.amazon.com/IAM/latest/UserGuide/index.html?Using_Identifiers.html Identifiers for IAM Entities>
+-- in /Using AWS Identity and Access Management/ for more information.
+edsARN :: Lens' ElasticsearchDomainStatus Text
+edsARN = lens _edsARN (\ s a -> s{_edsARN = a});
+
+-- | The type and number of instances in the domain cluster.
+edsElasticsearchClusterConfig :: Lens' ElasticsearchDomainStatus ElasticsearchClusterConfig
+edsElasticsearchClusterConfig = lens _edsElasticsearchClusterConfig (\ s a -> s{_edsElasticsearchClusterConfig = a});
+
+instance FromJSON ElasticsearchDomainStatus where
+        parseJSON
+          = withObject "ElasticsearchDomainStatus"
+              (\ x ->
+                 ElasticsearchDomainStatus' <$>
+                   (x .:? "EBSOptions") <*> (x .:? "AccessPolicies") <*>
+                     (x .:? "Created")
+                     <*> (x .:? "SnapshotOptions")
+                     <*> (x .:? "Deleted")
+                     <*> (x .:? "Processing")
+                     <*> (x .:? "Endpoint")
+                     <*> (x .:? "AdvancedOptions" .!= mempty)
+                     <*> (x .: "DomainId")
+                     <*> (x .: "DomainName")
+                     <*> (x .: "ARN")
+                     <*> (x .: "ElasticsearchClusterConfig"))
+
+-- | Provides the current status of the entity.
+--
+-- /See:/ 'optionStatus' smart constructor.
+data OptionStatus = OptionStatus'
+    { _osPendingDeletion :: !(Maybe Bool)
+    , _osUpdateVersion   :: !(Maybe Nat)
+    , _osCreationDate    :: !POSIX
+    , _osUpdateDate      :: !POSIX
+    , _osState           :: !OptionState
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'OptionStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'osPendingDeletion'
+--
+-- * 'osUpdateVersion'
+--
+-- * 'osCreationDate'
+--
+-- * 'osUpdateDate'
+--
+-- * 'osState'
+optionStatus
+    :: UTCTime -- ^ 'osCreationDate'
+    -> UTCTime -- ^ 'osUpdateDate'
+    -> OptionState -- ^ 'osState'
+    -> OptionStatus
+optionStatus pCreationDate_ pUpdateDate_ pState_ =
+    OptionStatus'
+    { _osPendingDeletion = Nothing
+    , _osUpdateVersion = Nothing
+    , _osCreationDate = _Time # pCreationDate_
+    , _osUpdateDate = _Time # pUpdateDate_
+    , _osState = pState_
+    }
+
+-- | Indicates whether the Elasticsearch domain is being deleted.
+osPendingDeletion :: Lens' OptionStatus (Maybe Bool)
+osPendingDeletion = lens _osPendingDeletion (\ s a -> s{_osPendingDeletion = a});
+
+-- | Specifies the latest version for the entity.
+osUpdateVersion :: Lens' OptionStatus (Maybe Natural)
+osUpdateVersion = lens _osUpdateVersion (\ s a -> s{_osUpdateVersion = a}) . mapping _Nat;
+
+-- | Timestamp which tells the creation date for the entity.
+osCreationDate :: Lens' OptionStatus UTCTime
+osCreationDate = lens _osCreationDate (\ s a -> s{_osCreationDate = a}) . _Time;
+
+-- | Timestamp which tells the last updated time for the entity.
+osUpdateDate :: Lens' OptionStatus UTCTime
+osUpdateDate = lens _osUpdateDate (\ s a -> s{_osUpdateDate = a}) . _Time;
+
+-- | Provides the 'OptionState' for the Elasticsearch domain.
+osState :: Lens' OptionStatus OptionState
+osState = lens _osState (\ s a -> s{_osState = a});
+
+instance FromJSON OptionStatus where
+        parseJSON
+          = withObject "OptionStatus"
+              (\ x ->
+                 OptionStatus' <$>
+                   (x .:? "PendingDeletion") <*> (x .:? "UpdateVersion")
+                     <*> (x .: "CreationDate")
+                     <*> (x .: "UpdateDate")
+                     <*> (x .: "State"))
+
+-- | Specifies the time, in UTC format, when the service takes a daily
+-- automated snapshot of the specified Elasticsearch domain. Default value
+-- is '0' hours.
+--
+-- /See:/ 'snapshotOptions' smart constructor.
+newtype SnapshotOptions = SnapshotOptions'
+    { _soAutomatedSnapshotStartHour :: Maybe Int
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'SnapshotOptions' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'soAutomatedSnapshotStartHour'
+snapshotOptions
+    :: SnapshotOptions
+snapshotOptions =
+    SnapshotOptions'
+    { _soAutomatedSnapshotStartHour = Nothing
+    }
+
+-- | Specifies the time, in UTC format, when the service takes a daily
+-- automated snapshot of the specified Elasticsearch domain. Default value
+-- is '0' hours.
+soAutomatedSnapshotStartHour :: Lens' SnapshotOptions (Maybe Int)
+soAutomatedSnapshotStartHour = lens _soAutomatedSnapshotStartHour (\ s a -> s{_soAutomatedSnapshotStartHour = a});
+
+instance FromJSON SnapshotOptions where
+        parseJSON
+          = withObject "SnapshotOptions"
+              (\ x ->
+                 SnapshotOptions' <$>
+                   (x .:? "AutomatedSnapshotStartHour"))
+
+instance ToJSON SnapshotOptions where
+        toJSON SnapshotOptions'{..}
+          = object
+              (catMaybes
+                 [("AutomatedSnapshotStartHour" .=) <$>
+                    _soAutomatedSnapshotStartHour])
+
+-- | Status of a daily automated snapshot.
+--
+-- /See:/ 'snapshotOptionsStatus' smart constructor.
+data SnapshotOptionsStatus = SnapshotOptionsStatus'
+    { _sosOptions :: !SnapshotOptions
+    , _sosStatus  :: !OptionStatus
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'SnapshotOptionsStatus' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'sosOptions'
+--
+-- * 'sosStatus'
+snapshotOptionsStatus
+    :: SnapshotOptions -- ^ 'sosOptions'
+    -> OptionStatus -- ^ 'sosStatus'
+    -> SnapshotOptionsStatus
+snapshotOptionsStatus pOptions_ pStatus_ =
+    SnapshotOptionsStatus'
+    { _sosOptions = pOptions_
+    , _sosStatus = pStatus_
+    }
+
+-- | Specifies the daily snapshot options specified for the Elasticsearch
+-- domain.
+sosOptions :: Lens' SnapshotOptionsStatus SnapshotOptions
+sosOptions = lens _sosOptions (\ s a -> s{_sosOptions = a});
+
+-- | Specifies the status of a daily automated snapshot.
+sosStatus :: Lens' SnapshotOptionsStatus OptionStatus
+sosStatus = lens _sosStatus (\ s a -> s{_sosStatus = a});
+
+instance FromJSON SnapshotOptionsStatus where
+        parseJSON
+          = withObject "SnapshotOptionsStatus"
+              (\ x ->
+                 SnapshotOptionsStatus' <$>
+                   (x .: "Options") <*> (x .: "Status"))
+
+-- | Specifies a key value pair for a resource tag.
+--
+-- /See:/ 'tag' smart constructor.
+data Tag = Tag'
+    { _tagKey   :: !Text
+    , _tagValue :: !Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'Tag' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'tagKey'
+--
+-- * 'tagValue'
+tag
+    :: Text -- ^ 'tagKey'
+    -> Text -- ^ 'tagValue'
+    -> Tag
+tag pKey_ pValue_ =
+    Tag'
+    { _tagKey = pKey_
+    , _tagValue = pValue_
+    }
+
+-- | Specifies the 'TagKey', the name of the tag. Tag keys must be unique for
+-- the Elasticsearch domain to which they are attached.
+tagKey :: Lens' Tag Text
+tagKey = lens _tagKey (\ s a -> s{_tagKey = a});
+
+-- | Specifies the 'TagValue', the value assigned to the corresponding tag
+-- key. Tag values can be null and do not have to be unique in a tag set.
+-- For example, you can have a key value pair in a tag set of
+-- 'project : Trinity' and 'cost-center : Trinity'
+tagValue :: Lens' Tag Text
+tagValue = lens _tagValue (\ s a -> s{_tagValue = a});
+
+instance FromJSON Tag where
+        parseJSON
+          = withObject "Tag"
+              (\ x -> Tag' <$> (x .: "Key") <*> (x .: "Value"))
+
+instance ToJSON Tag where
+        toJSON Tag'{..}
+          = object
+              (catMaybes
+                 [Just ("Key" .= _tagKey),
+                  Just ("Value" .= _tagValue)])
diff --git a/gen/Network/AWS/ElasticSearch/Types/Sum.hs b/gen/Network/AWS/ElasticSearch/Types/Sum.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/Types/Sum.hs
@@ -0,0 +1,151 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE LambdaCase         #-}
+{-# LANGUAGE OverloadedStrings  #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.Types.Sum
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Network.AWS.ElasticSearch.Types.Sum where
+
+import           Network.AWS.Prelude
+
+data ESPartitionInstanceType
+    = I2_2XLarge_Elasticsearch
+    | I2_XLarge_Elasticsearch
+    | M3_2XLarge_Elasticsearch
+    | M3_Large_Elasticsearch
+    | M3_Medium_Elasticsearch
+    | M3_XLarge_Elasticsearch
+    | R3_2XLarge_Elasticsearch
+    | R3_4XLarge_Elasticsearch
+    | R3_8XLarge_Elasticsearch
+    | R3_Large_Elasticsearch
+    | R3_XLarge_Elasticsearch
+    | T2_Medium_Elasticsearch
+    | T2_Micro_Elasticsearch
+    | T2_Small_Elasticsearch
+    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+
+instance FromText ESPartitionInstanceType where
+    parser = takeLowerText >>= \case
+        "i2.2xlarge.elasticsearch" -> pure I2_2XLarge_Elasticsearch
+        "i2.xlarge.elasticsearch" -> pure I2_XLarge_Elasticsearch
+        "m3.2xlarge.elasticsearch" -> pure M3_2XLarge_Elasticsearch
+        "m3.large.elasticsearch" -> pure M3_Large_Elasticsearch
+        "m3.medium.elasticsearch" -> pure M3_Medium_Elasticsearch
+        "m3.xlarge.elasticsearch" -> pure M3_XLarge_Elasticsearch
+        "r3.2xlarge.elasticsearch" -> pure R3_2XLarge_Elasticsearch
+        "r3.4xlarge.elasticsearch" -> pure R3_4XLarge_Elasticsearch
+        "r3.8xlarge.elasticsearch" -> pure R3_8XLarge_Elasticsearch
+        "r3.large.elasticsearch" -> pure R3_Large_Elasticsearch
+        "r3.xlarge.elasticsearch" -> pure R3_XLarge_Elasticsearch
+        "t2.medium.elasticsearch" -> pure T2_Medium_Elasticsearch
+        "t2.micro.elasticsearch" -> pure T2_Micro_Elasticsearch
+        "t2.small.elasticsearch" -> pure T2_Small_Elasticsearch
+        e -> fromTextError $ "Failure parsing ESPartitionInstanceType from value: '" <> e
+           <> "'. Accepted values: i2.2xlarge.elasticsearch, i2.xlarge.elasticsearch, m3.2xlarge.elasticsearch, m3.large.elasticsearch, m3.medium.elasticsearch, m3.xlarge.elasticsearch, r3.2xlarge.elasticsearch, r3.4xlarge.elasticsearch, r3.8xlarge.elasticsearch, r3.large.elasticsearch, r3.xlarge.elasticsearch, t2.medium.elasticsearch, t2.micro.elasticsearch, t2.small.elasticsearch"
+
+instance ToText ESPartitionInstanceType where
+    toText = \case
+        I2_2XLarge_Elasticsearch -> "i2.2xlarge.elasticsearch"
+        I2_XLarge_Elasticsearch -> "i2.xlarge.elasticsearch"
+        M3_2XLarge_Elasticsearch -> "m3.2xlarge.elasticsearch"
+        M3_Large_Elasticsearch -> "m3.large.elasticsearch"
+        M3_Medium_Elasticsearch -> "m3.medium.elasticsearch"
+        M3_XLarge_Elasticsearch -> "m3.xlarge.elasticsearch"
+        R3_2XLarge_Elasticsearch -> "r3.2xlarge.elasticsearch"
+        R3_4XLarge_Elasticsearch -> "r3.4xlarge.elasticsearch"
+        R3_8XLarge_Elasticsearch -> "r3.8xlarge.elasticsearch"
+        R3_Large_Elasticsearch -> "r3.large.elasticsearch"
+        R3_XLarge_Elasticsearch -> "r3.xlarge.elasticsearch"
+        T2_Medium_Elasticsearch -> "t2.medium.elasticsearch"
+        T2_Micro_Elasticsearch -> "t2.micro.elasticsearch"
+        T2_Small_Elasticsearch -> "t2.small.elasticsearch"
+
+instance Hashable     ESPartitionInstanceType
+instance ToByteString ESPartitionInstanceType
+instance ToQuery      ESPartitionInstanceType
+instance ToHeader     ESPartitionInstanceType
+
+instance ToJSON ESPartitionInstanceType where
+    toJSON = toJSONText
+
+instance FromJSON ESPartitionInstanceType where
+    parseJSON = parseJSONText "ESPartitionInstanceType"
+
+-- | The state of a requested change. One of the following:
+--
+-- -   Processing: The request change is still in-process.
+-- -   Active: The request change is processed and deployed to the
+--     Elasticsearch domain.
+data OptionState
+    = Active
+    | Processing
+    | RequiresIndexDocuments
+    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+
+instance FromText OptionState where
+    parser = takeLowerText >>= \case
+        "active" -> pure Active
+        "processing" -> pure Processing
+        "requiresindexdocuments" -> pure RequiresIndexDocuments
+        e -> fromTextError $ "Failure parsing OptionState from value: '" <> e
+           <> "'. Accepted values: Active, Processing, RequiresIndexDocuments"
+
+instance ToText OptionState where
+    toText = \case
+        Active -> "Active"
+        Processing -> "Processing"
+        RequiresIndexDocuments -> "RequiresIndexDocuments"
+
+instance Hashable     OptionState
+instance ToByteString OptionState
+instance ToQuery      OptionState
+instance ToHeader     OptionState
+
+instance FromJSON OptionState where
+    parseJSON = parseJSONText "OptionState"
+
+-- | The type of EBS volume, standard, gp2, or io1. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-ebs Configuring EBS-based Storage>for
+-- more information.
+data VolumeType
+    = GP2
+    | IO1
+    | Standard
+    deriving (Eq,Ord,Read,Show,Enum,Data,Typeable,Generic)
+
+instance FromText VolumeType where
+    parser = takeLowerText >>= \case
+        "gp2" -> pure GP2
+        "io1" -> pure IO1
+        "standard" -> pure Standard
+        e -> fromTextError $ "Failure parsing VolumeType from value: '" <> e
+           <> "'. Accepted values: gp2, io1, standard"
+
+instance ToText VolumeType where
+    toText = \case
+        GP2 -> "gp2"
+        IO1 -> "io1"
+        Standard -> "standard"
+
+instance Hashable     VolumeType
+instance ToByteString VolumeType
+instance ToQuery      VolumeType
+instance ToHeader     VolumeType
+
+instance ToJSON VolumeType where
+    toJSON = toJSONText
+
+instance FromJSON VolumeType where
+    parseJSON = parseJSONText "VolumeType"
diff --git a/gen/Network/AWS/ElasticSearch/UpdateElasticsearchDomainConfig.hs b/gen/Network/AWS/ElasticSearch/UpdateElasticsearchDomainConfig.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/UpdateElasticsearchDomainConfig.hs
@@ -0,0 +1,192 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveGeneric      #-}
+{-# LANGUAGE OverloadedStrings  #-}
+{-# LANGUAGE RecordWildCards    #-}
+{-# LANGUAGE TypeFamilies       #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-unused-binds   #-}
+{-# OPTIONS_GHC -fno-warn-unused-matches #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.UpdateElasticsearchDomainConfig
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+-- Modifies the cluster configuration of the specified Elasticsearch
+-- domain, setting as setting the instance type and the number of
+-- instances.
+--
+-- /See:/ <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-configuration-api.html#es-configuration-api-actions-UpdateElasticsearchDomainConfig.html AWS API Reference> for UpdateElasticsearchDomainConfig.
+module Network.AWS.ElasticSearch.UpdateElasticsearchDomainConfig
+    (
+    -- * Creating a Request
+      updateElasticsearchDomainConfig
+    , UpdateElasticsearchDomainConfig
+    -- * Request Lenses
+    , uedcEBSOptions
+    , uedcAccessPolicies
+    , uedcElasticsearchClusterConfig
+    , uedcSnapshotOptions
+    , uedcAdvancedOptions
+    , uedcDomainName
+
+    -- * Destructuring the Response
+    , updateElasticsearchDomainConfigResponse
+    , UpdateElasticsearchDomainConfigResponse
+    -- * Response Lenses
+    , uedcrsResponseStatus
+    , uedcrsDomainConfig
+    ) where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.ElasticSearch.Types.Product
+import           Network.AWS.Prelude
+import           Network.AWS.Request
+import           Network.AWS.Response
+
+-- | Container for the parameters to the 'UpdateElasticsearchDomain'
+-- operation. Specifies the type and number of instances in the domain
+-- cluster.
+--
+-- /See:/ 'updateElasticsearchDomainConfig' smart constructor.
+data UpdateElasticsearchDomainConfig = UpdateElasticsearchDomainConfig'
+    { _uedcEBSOptions                 :: !(Maybe EBSOptions)
+    , _uedcAccessPolicies             :: !(Maybe Text)
+    , _uedcElasticsearchClusterConfig :: !(Maybe ElasticsearchClusterConfig)
+    , _uedcSnapshotOptions            :: !(Maybe SnapshotOptions)
+    , _uedcAdvancedOptions            :: !(Maybe (Map Text Text))
+    , _uedcDomainName                 :: !Text
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'UpdateElasticsearchDomainConfig' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'uedcEBSOptions'
+--
+-- * 'uedcAccessPolicies'
+--
+-- * 'uedcElasticsearchClusterConfig'
+--
+-- * 'uedcSnapshotOptions'
+--
+-- * 'uedcAdvancedOptions'
+--
+-- * 'uedcDomainName'
+updateElasticsearchDomainConfig
+    :: Text -- ^ 'uedcDomainName'
+    -> UpdateElasticsearchDomainConfig
+updateElasticsearchDomainConfig pDomainName_ =
+    UpdateElasticsearchDomainConfig'
+    { _uedcEBSOptions = Nothing
+    , _uedcAccessPolicies = Nothing
+    , _uedcElasticsearchClusterConfig = Nothing
+    , _uedcSnapshotOptions = Nothing
+    , _uedcAdvancedOptions = Nothing
+    , _uedcDomainName = pDomainName_
+    }
+
+-- | Specify the type and size of the EBS volume that you want to use.
+uedcEBSOptions :: Lens' UpdateElasticsearchDomainConfig (Maybe EBSOptions)
+uedcEBSOptions = lens _uedcEBSOptions (\ s a -> s{_uedcEBSOptions = a});
+
+-- | IAM access policy as a JSON-formatted string.
+uedcAccessPolicies :: Lens' UpdateElasticsearchDomainConfig (Maybe Text)
+uedcAccessPolicies = lens _uedcAccessPolicies (\ s a -> s{_uedcAccessPolicies = a});
+
+-- | The type and number of instances to instantiate for the domain cluster.
+uedcElasticsearchClusterConfig :: Lens' UpdateElasticsearchDomainConfig (Maybe ElasticsearchClusterConfig)
+uedcElasticsearchClusterConfig = lens _uedcElasticsearchClusterConfig (\ s a -> s{_uedcElasticsearchClusterConfig = a});
+
+-- | Option to set the time, in UTC format, for the daily automated snapshot.
+-- Default value is '0' hours.
+uedcSnapshotOptions :: Lens' UpdateElasticsearchDomainConfig (Maybe SnapshotOptions)
+uedcSnapshotOptions = lens _uedcSnapshotOptions (\ s a -> s{_uedcSnapshotOptions = a});
+
+-- | Modifies the advanced option to allow references to indices in an HTTP
+-- request body. Must be 'false' when configuring access to individual
+-- sub-resources. By default, the value is 'true'. See
+-- <http://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-createupdatedomains.html#es-createdomain-configure-advanced-options Configuration Advanced Options>
+-- for more information.
+uedcAdvancedOptions :: Lens' UpdateElasticsearchDomainConfig (HashMap Text Text)
+uedcAdvancedOptions = lens _uedcAdvancedOptions (\ s a -> s{_uedcAdvancedOptions = a}) . _Default . _Map;
+
+-- | The name of the Elasticsearch domain that you are updating.
+uedcDomainName :: Lens' UpdateElasticsearchDomainConfig Text
+uedcDomainName = lens _uedcDomainName (\ s a -> s{_uedcDomainName = a});
+
+instance AWSRequest UpdateElasticsearchDomainConfig
+         where
+        type Rs UpdateElasticsearchDomainConfig =
+             UpdateElasticsearchDomainConfigResponse
+        request = postJSON elasticSearch
+        response
+          = receiveJSON
+              (\ s h x ->
+                 UpdateElasticsearchDomainConfigResponse' <$>
+                   (pure (fromEnum s)) <*> (x .:> "DomainConfig"))
+
+instance ToHeaders UpdateElasticsearchDomainConfig
+         where
+        toHeaders = const mempty
+
+instance ToJSON UpdateElasticsearchDomainConfig where
+        toJSON UpdateElasticsearchDomainConfig'{..}
+          = object
+              (catMaybes
+                 [("EBSOptions" .=) <$> _uedcEBSOptions,
+                  ("AccessPolicies" .=) <$> _uedcAccessPolicies,
+                  ("ElasticsearchClusterConfig" .=) <$>
+                    _uedcElasticsearchClusterConfig,
+                  ("SnapshotOptions" .=) <$> _uedcSnapshotOptions,
+                  ("AdvancedOptions" .=) <$> _uedcAdvancedOptions])
+
+instance ToPath UpdateElasticsearchDomainConfig where
+        toPath UpdateElasticsearchDomainConfig'{..}
+          = mconcat
+              ["/2015-01-01/es/domain/", toBS _uedcDomainName,
+               "/config"]
+
+instance ToQuery UpdateElasticsearchDomainConfig
+         where
+        toQuery = const mempty
+
+-- | The result of an 'UpdateElasticsearchDomain' request. Contains the
+-- status of the Elasticsearch domain being updated.
+--
+-- /See:/ 'updateElasticsearchDomainConfigResponse' smart constructor.
+data UpdateElasticsearchDomainConfigResponse = UpdateElasticsearchDomainConfigResponse'
+    { _uedcrsResponseStatus :: !Int
+    , _uedcrsDomainConfig   :: !ElasticsearchDomainConfig
+    } deriving (Eq,Read,Show,Data,Typeable,Generic)
+
+-- | Creates a value of 'UpdateElasticsearchDomainConfigResponse' with the minimum fields required to make a request.
+--
+-- Use one of the following lenses to modify other fields as desired:
+--
+-- * 'uedcrsResponseStatus'
+--
+-- * 'uedcrsDomainConfig'
+updateElasticsearchDomainConfigResponse
+    :: Int -- ^ 'uedcrsResponseStatus'
+    -> ElasticsearchDomainConfig -- ^ 'uedcrsDomainConfig'
+    -> UpdateElasticsearchDomainConfigResponse
+updateElasticsearchDomainConfigResponse pResponseStatus_ pDomainConfig_ =
+    UpdateElasticsearchDomainConfigResponse'
+    { _uedcrsResponseStatus = pResponseStatus_
+    , _uedcrsDomainConfig = pDomainConfig_
+    }
+
+-- | The response status code.
+uedcrsResponseStatus :: Lens' UpdateElasticsearchDomainConfigResponse Int
+uedcrsResponseStatus = lens _uedcrsResponseStatus (\ s a -> s{_uedcrsResponseStatus = a});
+
+-- | The status of the updated Elasticsearch domain.
+uedcrsDomainConfig :: Lens' UpdateElasticsearchDomainConfigResponse ElasticsearchDomainConfig
+uedcrsDomainConfig = lens _uedcrsDomainConfig (\ s a -> s{_uedcrsDomainConfig = a});
diff --git a/gen/Network/AWS/ElasticSearch/Waiters.hs b/gen/Network/AWS/ElasticSearch/Waiters.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticSearch/Waiters.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeFamilies      #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Network.AWS.ElasticSearch.Waiters
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Network.AWS.ElasticSearch.Waiters where
+
+import           Network.AWS.ElasticSearch.Types
+import           Network.AWS.Prelude
+import           Network.AWS.Waiter
diff --git a/test/Main.hs b/test/Main.hs
new file mode 100644
--- /dev/null
+++ b/test/Main.hs
@@ -0,0 +1,21 @@
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- |
+-- Module      : Main
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Main (main) where
+
+import Test.Tasty
+import Test.AWS.ElasticSearch
+import Test.AWS.ElasticSearch.Internal
+
+main :: IO ()
+main = defaultMain $ testGroup "ElasticSearch"
+    [ testGroup "tests"    tests
+    , testGroup "fixtures" fixtures
+    ]
diff --git a/test/Test/AWS/ElasticSearch.hs b/test/Test/AWS/ElasticSearch.hs
new file mode 100644
--- /dev/null
+++ b/test/Test/AWS/ElasticSearch.hs
@@ -0,0 +1,23 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Test.AWS.ElasticSearch
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+module Test.AWS.ElasticSearch where
+
+import           Test.AWS.Prelude
+
+tests :: [TestTree]
+tests = []
+
+fixtures :: [TestTree]
+fixtures = []
diff --git a/test/Test/AWS/ElasticSearch/Internal.hs b/test/Test/AWS/ElasticSearch/Internal.hs
new file mode 100644
--- /dev/null
+++ b/test/Test/AWS/ElasticSearch/Internal.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Test.AWS.ElasticSearch.Internal
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : This Source Code Form is subject to the terms of
+--               the Mozilla Public License, v. 2.0.
+--               A copy of the MPL can be found in the LICENSE file or
+--               you can obtain it at http://mozilla.org/MPL/2.0/.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : experimental
+-- Portability : non-portable (GHC extensions)
+
+module Test.AWS.ElasticSearch.Internal where
+
+import           Test.AWS.Prelude
diff --git a/test/Test/AWS/Gen/ElasticSearch.hs b/test/Test/AWS/Gen/ElasticSearch.hs
new file mode 100644
--- /dev/null
+++ b/test/Test/AWS/Gen/ElasticSearch.hs
@@ -0,0 +1,219 @@
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+{-# OPTIONS_GHC -fno-warn-orphans        #-}
+
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- |
+-- Module      : Test.AWS.Gen.ElasticSearch
+-- Copyright   : (c) 2013-2015 Brendan Hay
+-- License     : Mozilla Public License, v. 2.0.
+-- Maintainer  : Brendan Hay <brendan.g.hay@gmail.com>
+-- Stability   : auto-generated
+-- Portability : non-portable (GHC extensions)
+--
+module Test.AWS.Gen.ElasticSearch where
+
+import Data.Proxy
+import Test.AWS.Fixture
+import Test.AWS.Prelude
+import Test.Tasty
+import Network.AWS.ElasticSearch
+import Test.AWS.ElasticSearch.Internal
+
+-- Auto-generated: the actual test selection needs to be manually placed into
+-- the top-level so that real test data can be incrementally added.
+--
+-- This commented snippet is what the entire set should look like:
+
+-- fixtures :: TestTree
+-- fixtures =
+--     [ testGroup "request"
+--         [ testCreateElasticsearchDomain $
+--             createElasticsearchDomain
+--
+--         , testRemoveTags $
+--             removeTags
+--
+--         , testDescribeElasticsearchDomains $
+--             describeElasticsearchDomains
+--
+--         , testDescribeElasticsearchDomain $
+--             describeElasticsearchDomain
+--
+--         , testListDomainNames $
+--             listDomainNames
+--
+--         , testDescribeElasticsearchDomainConfig $
+--             describeElasticsearchDomainConfig
+--
+--         , testDeleteElasticsearchDomain $
+--             deleteElasticsearchDomain
+--
+--         , testUpdateElasticsearchDomainConfig $
+--             updateElasticsearchDomainConfig
+--
+--         , testAddTags $
+--             addTags
+--
+--         , testListTags $
+--             listTags
+--
+--           ]
+
+--     , testGroup "response"
+--         [ testCreateElasticsearchDomainResponse $
+--             createElasticsearchDomainResponse
+--
+--         , testRemoveTagsResponse $
+--             removeTagsResponse
+--
+--         , testDescribeElasticsearchDomainsResponse $
+--             describeElasticsearchDomainsResponse
+--
+--         , testDescribeElasticsearchDomainResponse $
+--             describeElasticsearchDomainResponse
+--
+--         , testListDomainNamesResponse $
+--             listDomainNamesResponse
+--
+--         , testDescribeElasticsearchDomainConfigResponse $
+--             describeElasticsearchDomainConfigResponse
+--
+--         , testDeleteElasticsearchDomainResponse $
+--             deleteElasticsearchDomainResponse
+--
+--         , testUpdateElasticsearchDomainConfigResponse $
+--             updateElasticsearchDomainConfigResponse
+--
+--         , testAddTagsResponse $
+--             addTagsResponse
+--
+--         , testListTagsResponse $
+--             listTagsResponse
+--
+--           ]
+--     ]
+
+-- Requests
+
+testCreateElasticsearchDomain :: CreateElasticsearchDomain -> TestTree
+testCreateElasticsearchDomain = req
+    "CreateElasticsearchDomain"
+    "fixture/CreateElasticsearchDomain.yaml"
+
+testRemoveTags :: RemoveTags -> TestTree
+testRemoveTags = req
+    "RemoveTags"
+    "fixture/RemoveTags.yaml"
+
+testDescribeElasticsearchDomains :: DescribeElasticsearchDomains -> TestTree
+testDescribeElasticsearchDomains = req
+    "DescribeElasticsearchDomains"
+    "fixture/DescribeElasticsearchDomains.yaml"
+
+testDescribeElasticsearchDomain :: DescribeElasticsearchDomain -> TestTree
+testDescribeElasticsearchDomain = req
+    "DescribeElasticsearchDomain"
+    "fixture/DescribeElasticsearchDomain.yaml"
+
+testListDomainNames :: ListDomainNames -> TestTree
+testListDomainNames = req
+    "ListDomainNames"
+    "fixture/ListDomainNames.yaml"
+
+testDescribeElasticsearchDomainConfig :: DescribeElasticsearchDomainConfig -> TestTree
+testDescribeElasticsearchDomainConfig = req
+    "DescribeElasticsearchDomainConfig"
+    "fixture/DescribeElasticsearchDomainConfig.yaml"
+
+testDeleteElasticsearchDomain :: DeleteElasticsearchDomain -> TestTree
+testDeleteElasticsearchDomain = req
+    "DeleteElasticsearchDomain"
+    "fixture/DeleteElasticsearchDomain.yaml"
+
+testUpdateElasticsearchDomainConfig :: UpdateElasticsearchDomainConfig -> TestTree
+testUpdateElasticsearchDomainConfig = req
+    "UpdateElasticsearchDomainConfig"
+    "fixture/UpdateElasticsearchDomainConfig.yaml"
+
+testAddTags :: AddTags -> TestTree
+testAddTags = req
+    "AddTags"
+    "fixture/AddTags.yaml"
+
+testListTags :: ListTags -> TestTree
+testListTags = req
+    "ListTags"
+    "fixture/ListTags.yaml"
+
+-- Responses
+
+testCreateElasticsearchDomainResponse :: CreateElasticsearchDomainResponse -> TestTree
+testCreateElasticsearchDomainResponse = res
+    "CreateElasticsearchDomainResponse"
+    "fixture/CreateElasticsearchDomainResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy CreateElasticsearchDomain)
+
+testRemoveTagsResponse :: RemoveTagsResponse -> TestTree
+testRemoveTagsResponse = res
+    "RemoveTagsResponse"
+    "fixture/RemoveTagsResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy RemoveTags)
+
+testDescribeElasticsearchDomainsResponse :: DescribeElasticsearchDomainsResponse -> TestTree
+testDescribeElasticsearchDomainsResponse = res
+    "DescribeElasticsearchDomainsResponse"
+    "fixture/DescribeElasticsearchDomainsResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy DescribeElasticsearchDomains)
+
+testDescribeElasticsearchDomainResponse :: DescribeElasticsearchDomainResponse -> TestTree
+testDescribeElasticsearchDomainResponse = res
+    "DescribeElasticsearchDomainResponse"
+    "fixture/DescribeElasticsearchDomainResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy DescribeElasticsearchDomain)
+
+testListDomainNamesResponse :: ListDomainNamesResponse -> TestTree
+testListDomainNamesResponse = res
+    "ListDomainNamesResponse"
+    "fixture/ListDomainNamesResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy ListDomainNames)
+
+testDescribeElasticsearchDomainConfigResponse :: DescribeElasticsearchDomainConfigResponse -> TestTree
+testDescribeElasticsearchDomainConfigResponse = res
+    "DescribeElasticsearchDomainConfigResponse"
+    "fixture/DescribeElasticsearchDomainConfigResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy DescribeElasticsearchDomainConfig)
+
+testDeleteElasticsearchDomainResponse :: DeleteElasticsearchDomainResponse -> TestTree
+testDeleteElasticsearchDomainResponse = res
+    "DeleteElasticsearchDomainResponse"
+    "fixture/DeleteElasticsearchDomainResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy DeleteElasticsearchDomain)
+
+testUpdateElasticsearchDomainConfigResponse :: UpdateElasticsearchDomainConfigResponse -> TestTree
+testUpdateElasticsearchDomainConfigResponse = res
+    "UpdateElasticsearchDomainConfigResponse"
+    "fixture/UpdateElasticsearchDomainConfigResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy UpdateElasticsearchDomainConfig)
+
+testAddTagsResponse :: AddTagsResponse -> TestTree
+testAddTagsResponse = res
+    "AddTagsResponse"
+    "fixture/AddTagsResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy AddTags)
+
+testListTagsResponse :: ListTagsResponse -> TestTree
+testListTagsResponse = res
+    "ListTagsResponse"
+    "fixture/ListTagsResponse.proto"
+    elasticSearch
+    (Proxy :: Proxy ListTags)
