diff --git a/amazonka-elasticbeanstalk.cabal b/amazonka-elasticbeanstalk.cabal
--- a/amazonka-elasticbeanstalk.cabal
+++ b/amazonka-elasticbeanstalk.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-elasticbeanstalk
-version:               0.3.3
+version:               0.3.4
 synopsis:              Amazon Elastic Beanstalk SDK.
 homepage:              https://github.com/brendanhay/amazonka
 license:               OtherLicense
@@ -42,6 +42,7 @@
 
     exposed-modules:
           Network.AWS.ElasticBeanstalk
+        , Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
         , Network.AWS.ElasticBeanstalk.CheckDNSAvailability
         , Network.AWS.ElasticBeanstalk.CreateApplication
         , Network.AWS.ElasticBeanstalk.CreateApplicationVersion
@@ -76,5 +77,5 @@
     other-modules:
 
     build-depends:
-          amazonka-core == 0.3.3.*
+          amazonka-core == 0.3.4.*
         , base          >= 4.7     && < 5
diff --git a/gen/Network/AWS/ElasticBeanstalk.hs b/gen/Network/AWS/ElasticBeanstalk.hs
--- a/gen/Network/AWS/ElasticBeanstalk.hs
+++ b/gen/Network/AWS/ElasticBeanstalk.hs
@@ -21,7 +21,8 @@
 -- is no additional charge for Elastic Beanstalk - you pay only for the AWS
 -- resources needed to store and run your applications.
 module Network.AWS.ElasticBeanstalk
-    ( module Network.AWS.ElasticBeanstalk.CheckDNSAvailability
+    ( module Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
+    , module Network.AWS.ElasticBeanstalk.CheckDNSAvailability
     , module Network.AWS.ElasticBeanstalk.CreateApplication
     , module Network.AWS.ElasticBeanstalk.CreateApplicationVersion
     , module Network.AWS.ElasticBeanstalk.CreateConfigurationTemplate
@@ -53,6 +54,7 @@
     , module Network.AWS.ElasticBeanstalk.ValidateConfigurationSettings
     ) where
 
+import Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
 import Network.AWS.ElasticBeanstalk.CheckDNSAvailability
 import Network.AWS.ElasticBeanstalk.CreateApplication
 import Network.AWS.ElasticBeanstalk.CreateApplicationVersion
diff --git a/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs b/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs
new file mode 100644
--- /dev/null
+++ b/gen/Network/AWS/ElasticBeanstalk/AbortEnvironmentUpdate.hs
@@ -0,0 +1,103 @@
+{-# LANGUAGE DataKinds                   #-}
+{-# LANGUAGE DeriveGeneric               #-}
+{-# LANGUAGE FlexibleInstances           #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving  #-}
+{-# LANGUAGE LambdaCase                  #-}
+{-# LANGUAGE NoImplicitPrelude           #-}
+{-# LANGUAGE OverloadedStrings           #-}
+{-# LANGUAGE RecordWildCards             #-}
+{-# LANGUAGE TypeFamilies                #-}
+
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
+-- Module      : Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
+-- Copyright   : (c) 2013-2014 Brendan Hay <brendan.g.hay@gmail.com>
+-- 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)
+--
+-- Derived from AWS service descriptions, licensed under Apache 2.0.
+
+-- | Cancels in-progress environment configuration update or application version
+-- deployment.
+--
+-- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_AbortEnvironmentUpdate.html>
+module Network.AWS.ElasticBeanstalk.AbortEnvironmentUpdate
+    (
+    -- * Request
+      AbortEnvironmentUpdate
+    -- ** Request constructor
+    , abortEnvironmentUpdate
+    -- ** Request lenses
+    , aeuEnvironmentId
+    , aeuEnvironmentName
+
+    -- * Response
+    , AbortEnvironmentUpdateResponse
+    -- ** Response constructor
+    , abortEnvironmentUpdateResponse
+    ) where
+
+import Network.AWS.Prelude
+import Network.AWS.Request.Query
+import Network.AWS.ElasticBeanstalk.Types
+import qualified GHC.Exts
+
+data AbortEnvironmentUpdate = AbortEnvironmentUpdate
+    { _aeuEnvironmentId   :: Maybe Text
+    , _aeuEnvironmentName :: Maybe Text
+    } deriving (Eq, Ord, Read, Show)
+
+-- | 'AbortEnvironmentUpdate' constructor.
+--
+-- The fields accessible through corresponding lenses are:
+--
+-- * 'aeuEnvironmentId' @::@ 'Maybe' 'Text'
+--
+-- * 'aeuEnvironmentName' @::@ 'Maybe' 'Text'
+--
+abortEnvironmentUpdate :: AbortEnvironmentUpdate
+abortEnvironmentUpdate = AbortEnvironmentUpdate
+    { _aeuEnvironmentId   = Nothing
+    , _aeuEnvironmentName = Nothing
+    }
+
+-- | This specifies the ID of the environment with the in-progress update that you
+-- want to cancel.
+aeuEnvironmentId :: Lens' AbortEnvironmentUpdate (Maybe Text)
+aeuEnvironmentId = lens _aeuEnvironmentId (\s a -> s { _aeuEnvironmentId = a })
+
+-- | This specifies the name of the environment with the in-progress update that
+-- you want to cancel.
+aeuEnvironmentName :: Lens' AbortEnvironmentUpdate (Maybe Text)
+aeuEnvironmentName =
+    lens _aeuEnvironmentName (\s a -> s { _aeuEnvironmentName = a })
+
+data AbortEnvironmentUpdateResponse = AbortEnvironmentUpdateResponse
+    deriving (Eq, Ord, Read, Show, Generic)
+
+-- | 'AbortEnvironmentUpdateResponse' constructor.
+abortEnvironmentUpdateResponse :: AbortEnvironmentUpdateResponse
+abortEnvironmentUpdateResponse = AbortEnvironmentUpdateResponse
+
+instance ToPath AbortEnvironmentUpdate where
+    toPath = const "/"
+
+instance ToQuery AbortEnvironmentUpdate where
+    toQuery AbortEnvironmentUpdate{..} = mconcat
+        [ "EnvironmentId"   =? _aeuEnvironmentId
+        , "EnvironmentName" =? _aeuEnvironmentName
+        ]
+
+instance ToHeaders AbortEnvironmentUpdate
+
+instance AWSRequest AbortEnvironmentUpdate where
+    type Sv AbortEnvironmentUpdate = ElasticBeanstalk
+    type Rs AbortEnvironmentUpdate = AbortEnvironmentUpdateResponse
+
+    request  = post "AbortEnvironmentUpdate"
+    response = nullResponse AbortEnvironmentUpdateResponse
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplication.hs
@@ -25,8 +25,6 @@
 -- | Creates an application that has one configuration template named 'default' and
 -- no application versions.
 --
---
---
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_CreateApplication.html>
 module Network.AWS.ElasticBeanstalk.CreateApplication
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateApplicationVersion.hs
@@ -24,6 +24,11 @@
 
 -- | Creates an application version for the specified application.
 --
+-- Once you create an application version with a specified Amazon S3 bucket and
+-- key location, you cannot change that Amazon S3 location. If you change the
+-- Amazon S3 location, you receive an exception when you attempt to launch an
+-- environment from the application version.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_CreateApplicationVersion.html>
 module Network.AWS.ElasticBeanstalk.CreateApplicationVersion
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/CreateEnvironment.hs
@@ -50,6 +50,7 @@
     -- ** Response constructor
     , createEnvironmentResponse
     -- ** Response lenses
+    , cerAbortableOperationInProgress
     , cerApplicationName
     , cerCNAME
     , cerDateCreated
@@ -207,33 +208,36 @@
 -- If the specified application has no associated application versions, AWS
 -- Elastic Beanstalk 'UpdateEnvironment' returns an 'InvalidParameterValue' error.
 --
--- Default: If not specified, AWS Elastic Beanstalk attempts to launch the sample application in the container
--- .
+-- Default: If not specified, AWS Elastic Beanstalk attempts to launch the
+-- sample application in the container.
 ceVersionLabel :: Lens' CreateEnvironment (Maybe Text)
 ceVersionLabel = lens _ceVersionLabel (\s a -> s { _ceVersionLabel = a })
 
 data CreateEnvironmentResponse = CreateEnvironmentResponse
-    { _cerApplicationName   :: Maybe Text
-    , _cerCNAME             :: Maybe Text
-    , _cerDateCreated       :: Maybe ISO8601
-    , _cerDateUpdated       :: Maybe ISO8601
-    , _cerDescription       :: Maybe Text
-    , _cerEndpointURL       :: Maybe Text
-    , _cerEnvironmentId     :: Maybe Text
-    , _cerEnvironmentName   :: Maybe Text
-    , _cerHealth            :: Maybe EnvironmentHealth
-    , _cerResources         :: Maybe EnvironmentResourcesDescription
-    , _cerSolutionStackName :: Maybe Text
-    , _cerStatus            :: Maybe EnvironmentStatus
-    , _cerTemplateName      :: Maybe Text
-    , _cerTier              :: Maybe EnvironmentTier
-    , _cerVersionLabel      :: Maybe Text
+    { _cerAbortableOperationInProgress :: Maybe Bool
+    , _cerApplicationName              :: Maybe Text
+    , _cerCNAME                        :: Maybe Text
+    , _cerDateCreated                  :: Maybe ISO8601
+    , _cerDateUpdated                  :: Maybe ISO8601
+    , _cerDescription                  :: Maybe Text
+    , _cerEndpointURL                  :: Maybe Text
+    , _cerEnvironmentId                :: Maybe Text
+    , _cerEnvironmentName              :: Maybe Text
+    , _cerHealth                       :: Maybe EnvironmentHealth
+    , _cerResources                    :: Maybe EnvironmentResourcesDescription
+    , _cerSolutionStackName            :: Maybe Text
+    , _cerStatus                       :: Maybe EnvironmentStatus
+    , _cerTemplateName                 :: Maybe Text
+    , _cerTier                         :: Maybe EnvironmentTier
+    , _cerVersionLabel                 :: Maybe Text
     } deriving (Eq, Read, Show)
 
 -- | 'CreateEnvironmentResponse' constructor.
 --
 -- The fields accessible through corresponding lenses are:
 --
+-- * 'cerAbortableOperationInProgress' @::@ 'Maybe' 'Bool'
+--
 -- * 'cerApplicationName' @::@ 'Maybe' 'Text'
 --
 -- * 'cerCNAME' @::@ 'Maybe' 'Text'
@@ -266,23 +270,31 @@
 --
 createEnvironmentResponse :: CreateEnvironmentResponse
 createEnvironmentResponse = CreateEnvironmentResponse
-    { _cerEnvironmentName   = Nothing
-    , _cerEnvironmentId     = Nothing
-    , _cerApplicationName   = Nothing
-    , _cerVersionLabel      = Nothing
-    , _cerSolutionStackName = Nothing
-    , _cerTemplateName      = Nothing
-    , _cerDescription       = Nothing
-    , _cerEndpointURL       = Nothing
-    , _cerCNAME             = Nothing
-    , _cerDateCreated       = Nothing
-    , _cerDateUpdated       = Nothing
-    , _cerStatus            = Nothing
-    , _cerHealth            = Nothing
-    , _cerResources         = Nothing
-    , _cerTier              = Nothing
+    { _cerEnvironmentName              = Nothing
+    , _cerEnvironmentId                = Nothing
+    , _cerApplicationName              = Nothing
+    , _cerVersionLabel                 = Nothing
+    , _cerSolutionStackName            = Nothing
+    , _cerTemplateName                 = Nothing
+    , _cerDescription                  = Nothing
+    , _cerEndpointURL                  = Nothing
+    , _cerCNAME                        = Nothing
+    , _cerDateCreated                  = Nothing
+    , _cerDateUpdated                  = Nothing
+    , _cerStatus                       = Nothing
+    , _cerAbortableOperationInProgress = Nothing
+    , _cerHealth                       = Nothing
+    , _cerResources                    = Nothing
+    , _cerTier                         = Nothing
     }
 
+-- | Lists in-progress environment updates and application version deployments
+-- that you can cancel.
+cerAbortableOperationInProgress :: Lens' CreateEnvironmentResponse (Maybe Bool)
+cerAbortableOperationInProgress =
+    lens _cerAbortableOperationInProgress
+        (\s a -> s { _cerAbortableOperationInProgress = a })
+
 -- | The name of the application associated with this environment.
 cerApplicationName :: Lens' CreateEnvironmentResponse (Maybe Text)
 cerApplicationName =
@@ -399,7 +411,8 @@
 
 instance FromXML CreateEnvironmentResponse where
     parseXML = withElement "CreateEnvironmentResult" $ \x -> CreateEnvironmentResponse
-        <$> x .@? "ApplicationName"
+        <$> x .@? "AbortableOperationInProgress"
+        <*> x .@? "ApplicationName"
         <*> x .@? "CNAME"
         <*> x .@? "DateCreated"
         <*> x .@? "DateUpdated"
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplication.hs
@@ -26,6 +26,8 @@
 -- configurations. The application versions will not be deleted from your Amazon
 -- S3 bucket.
 --
+-- You cannot delete an application that has a running environment.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DeleteApplication.html>
 module Network.AWS.ElasticBeanstalk.DeleteApplication
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteApplicationVersion.hs
@@ -24,6 +24,9 @@
 
 -- | Deletes the specified version from the specified application.
 --
+-- You cannot delete an application version that is associated with a running
+-- environment.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DeleteApplicationVersion.html>
 module Network.AWS.ElasticBeanstalk.DeleteApplicationVersion
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DeleteConfigurationTemplate.hs
@@ -24,6 +24,10 @@
 
 -- | Deletes the specified configuration template.
 --
+-- When you launch an environment using a configuration template, the
+-- environment gets a copy of the template. You can delete or modify the
+-- environment's copy of the template without affecting the running environment.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DeleteConfigurationTemplate.html>
 module Network.AWS.ElasticBeanstalk.DeleteConfigurationTemplate
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
--- a/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/DescribeEvents.hs
@@ -24,6 +24,8 @@
 
 -- | Returns list of event descriptions matching criteria up to the last 6 weeks.
 --
+-- This action returns the most recent 1,000 events from the specified 'NextToken'.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_DescribeEvents.html>
 module Network.AWS.ElasticBeanstalk.DescribeEvents
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
--- a/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/RequestEnvironmentInfo.hs
@@ -26,7 +26,13 @@
 -- deployed environment.
 --
 -- Setting the 'InfoType' to 'tail' compiles the last lines from the application
--- server log files of every Amazon EC2 instance in your environment. Use 'RetrieveEnvironmentInfo' to access the compiled information.
+-- server log files of every Amazon EC2 instance in your environment.
+--
+-- Setting the 'InfoType' to 'bundle' compresses the application server log files
+-- for every Amazon EC2 instance into a '.zip' file. Legacy and .NET containers do
+-- not support bundle logs.
+--
+-- Use 'RetrieveEnvironmentInfo' to obtain the set of logs.
 --
 -- Related Topics
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/TerminateEnvironment.hs
@@ -41,6 +41,7 @@
     -- ** Response constructor
     , terminateEnvironmentResponse
     -- ** Response lenses
+    , terAbortableOperationInProgress
     , terApplicationName
     , terCNAME
     , terDateCreated
@@ -123,27 +124,30 @@
     lens _teTerminateResources (\s a -> s { _teTerminateResources = a })
 
 data TerminateEnvironmentResponse = TerminateEnvironmentResponse
-    { _terApplicationName   :: Maybe Text
-    , _terCNAME             :: Maybe Text
-    , _terDateCreated       :: Maybe ISO8601
-    , _terDateUpdated       :: Maybe ISO8601
-    , _terDescription       :: Maybe Text
-    , _terEndpointURL       :: Maybe Text
-    , _terEnvironmentId     :: Maybe Text
-    , _terEnvironmentName   :: Maybe Text
-    , _terHealth            :: Maybe EnvironmentHealth
-    , _terResources         :: Maybe EnvironmentResourcesDescription
-    , _terSolutionStackName :: Maybe Text
-    , _terStatus            :: Maybe EnvironmentStatus
-    , _terTemplateName      :: Maybe Text
-    , _terTier              :: Maybe EnvironmentTier
-    , _terVersionLabel      :: Maybe Text
+    { _terAbortableOperationInProgress :: Maybe Bool
+    , _terApplicationName              :: Maybe Text
+    , _terCNAME                        :: Maybe Text
+    , _terDateCreated                  :: Maybe ISO8601
+    , _terDateUpdated                  :: Maybe ISO8601
+    , _terDescription                  :: Maybe Text
+    , _terEndpointURL                  :: Maybe Text
+    , _terEnvironmentId                :: Maybe Text
+    , _terEnvironmentName              :: Maybe Text
+    , _terHealth                       :: Maybe EnvironmentHealth
+    , _terResources                    :: Maybe EnvironmentResourcesDescription
+    , _terSolutionStackName            :: Maybe Text
+    , _terStatus                       :: Maybe EnvironmentStatus
+    , _terTemplateName                 :: Maybe Text
+    , _terTier                         :: Maybe EnvironmentTier
+    , _terVersionLabel                 :: Maybe Text
     } deriving (Eq, Read, Show)
 
 -- | 'TerminateEnvironmentResponse' constructor.
 --
 -- The fields accessible through corresponding lenses are:
 --
+-- * 'terAbortableOperationInProgress' @::@ 'Maybe' 'Bool'
+--
 -- * 'terApplicationName' @::@ 'Maybe' 'Text'
 --
 -- * 'terCNAME' @::@ 'Maybe' 'Text'
@@ -176,23 +180,31 @@
 --
 terminateEnvironmentResponse :: TerminateEnvironmentResponse
 terminateEnvironmentResponse = TerminateEnvironmentResponse
-    { _terEnvironmentName   = Nothing
-    , _terEnvironmentId     = Nothing
-    , _terApplicationName   = Nothing
-    , _terVersionLabel      = Nothing
-    , _terSolutionStackName = Nothing
-    , _terTemplateName      = Nothing
-    , _terDescription       = Nothing
-    , _terEndpointURL       = Nothing
-    , _terCNAME             = Nothing
-    , _terDateCreated       = Nothing
-    , _terDateUpdated       = Nothing
-    , _terStatus            = Nothing
-    , _terHealth            = Nothing
-    , _terResources         = Nothing
-    , _terTier              = Nothing
+    { _terEnvironmentName              = Nothing
+    , _terEnvironmentId                = Nothing
+    , _terApplicationName              = Nothing
+    , _terVersionLabel                 = Nothing
+    , _terSolutionStackName            = Nothing
+    , _terTemplateName                 = Nothing
+    , _terDescription                  = Nothing
+    , _terEndpointURL                  = Nothing
+    , _terCNAME                        = Nothing
+    , _terDateCreated                  = Nothing
+    , _terDateUpdated                  = Nothing
+    , _terStatus                       = Nothing
+    , _terAbortableOperationInProgress = Nothing
+    , _terHealth                       = Nothing
+    , _terResources                    = Nothing
+    , _terTier                         = Nothing
     }
 
+-- | Lists in-progress environment updates and application version deployments
+-- that you can cancel.
+terAbortableOperationInProgress :: Lens' TerminateEnvironmentResponse (Maybe Bool)
+terAbortableOperationInProgress =
+    lens _terAbortableOperationInProgress
+        (\s a -> s { _terAbortableOperationInProgress = a })
+
 -- | The name of the application associated with this environment.
 terApplicationName :: Lens' TerminateEnvironmentResponse (Maybe Text)
 terApplicationName =
@@ -301,7 +313,8 @@
 
 instance FromXML TerminateEnvironmentResponse where
     parseXML = withElement "TerminateEnvironmentResult" $ \x -> TerminateEnvironmentResponse
-        <$> x .@? "ApplicationName"
+        <$> x .@? "AbortableOperationInProgress"
+        <*> x .@? "ApplicationName"
         <*> x .@? "CNAME"
         <*> x .@? "DateCreated"
         <*> x .@? "DateUpdated"
diff --git a/gen/Network/AWS/ElasticBeanstalk/Types.hs b/gen/Network/AWS/ElasticBeanstalk/Types.hs
--- a/gen/Network/AWS/ElasticBeanstalk/Types.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/Types.hs
@@ -232,6 +232,7 @@
     -- * EnvironmentDescription
     , EnvironmentDescription
     , environmentDescription
+    , ed1AbortableOperationInProgress
     , ed1ApplicationName
     , ed1CNAME
     , ed1DateCreated
@@ -1843,19 +1844,23 @@
         ]
 
 data EnvironmentInfoType
-    = Tail' -- ^ tail
+    = Bundle -- ^ bundle
+    | Tail'  -- ^ tail
       deriving (Eq, Ord, Read, Show, Generic, Enum)
 
 instance Hashable EnvironmentInfoType
 
 instance FromText EnvironmentInfoType where
     parser = takeLowerText >>= \case
-        "tail" -> pure Tail'
-        e      -> fail $
+        "bundle" -> pure Bundle
+        "tail"   -> pure Tail'
+        e        -> fail $
             "Failure parsing EnvironmentInfoType from " ++ show e
 
 instance ToText EnvironmentInfoType where
-    toText Tail' = "tail"
+    toText = \case
+        Bundle -> "bundle"
+        Tail'  -> "tail"
 
 instance ToByteString EnvironmentInfoType
 instance ToHeader     EnvironmentInfoType
@@ -1865,27 +1870,30 @@
     parseXML = parseXMLText "EnvironmentInfoType"
 
 data EnvironmentDescription = EnvironmentDescription
-    { _ed1ApplicationName   :: Maybe Text
-    , _ed1CNAME             :: Maybe Text
-    , _ed1DateCreated       :: Maybe ISO8601
-    , _ed1DateUpdated       :: Maybe ISO8601
-    , _ed1Description       :: Maybe Text
-    , _ed1EndpointURL       :: Maybe Text
-    , _ed1EnvironmentId     :: Maybe Text
-    , _ed1EnvironmentName   :: Maybe Text
-    , _ed1Health            :: Maybe EnvironmentHealth
-    , _ed1Resources         :: Maybe EnvironmentResourcesDescription
-    , _ed1SolutionStackName :: Maybe Text
-    , _ed1Status            :: Maybe EnvironmentStatus
-    , _ed1TemplateName      :: Maybe Text
-    , _ed1Tier              :: Maybe EnvironmentTier
-    , _ed1VersionLabel      :: Maybe Text
+    { _ed1AbortableOperationInProgress :: Maybe Bool
+    , _ed1ApplicationName              :: Maybe Text
+    , _ed1CNAME                        :: Maybe Text
+    , _ed1DateCreated                  :: Maybe ISO8601
+    , _ed1DateUpdated                  :: Maybe ISO8601
+    , _ed1Description                  :: Maybe Text
+    , _ed1EndpointURL                  :: Maybe Text
+    , _ed1EnvironmentId                :: Maybe Text
+    , _ed1EnvironmentName              :: Maybe Text
+    , _ed1Health                       :: Maybe EnvironmentHealth
+    , _ed1Resources                    :: Maybe EnvironmentResourcesDescription
+    , _ed1SolutionStackName            :: Maybe Text
+    , _ed1Status                       :: Maybe EnvironmentStatus
+    , _ed1TemplateName                 :: Maybe Text
+    , _ed1Tier                         :: Maybe EnvironmentTier
+    , _ed1VersionLabel                 :: Maybe Text
     } deriving (Eq, Read, Show)
 
 -- | 'EnvironmentDescription' constructor.
 --
 -- The fields accessible through corresponding lenses are:
 --
+-- * 'ed1AbortableOperationInProgress' @::@ 'Maybe' 'Bool'
+--
 -- * 'ed1ApplicationName' @::@ 'Maybe' 'Text'
 --
 -- * 'ed1CNAME' @::@ 'Maybe' 'Text'
@@ -1918,23 +1926,31 @@
 --
 environmentDescription :: EnvironmentDescription
 environmentDescription = EnvironmentDescription
-    { _ed1EnvironmentName   = Nothing
-    , _ed1EnvironmentId     = Nothing
-    , _ed1ApplicationName   = Nothing
-    , _ed1VersionLabel      = Nothing
-    , _ed1SolutionStackName = Nothing
-    , _ed1TemplateName      = Nothing
-    , _ed1Description       = Nothing
-    , _ed1EndpointURL       = Nothing
-    , _ed1CNAME             = Nothing
-    , _ed1DateCreated       = Nothing
-    , _ed1DateUpdated       = Nothing
-    , _ed1Status            = Nothing
-    , _ed1Health            = Nothing
-    , _ed1Resources         = Nothing
-    , _ed1Tier              = Nothing
+    { _ed1EnvironmentName              = Nothing
+    , _ed1EnvironmentId                = Nothing
+    , _ed1ApplicationName              = Nothing
+    , _ed1VersionLabel                 = Nothing
+    , _ed1SolutionStackName            = Nothing
+    , _ed1TemplateName                 = Nothing
+    , _ed1Description                  = Nothing
+    , _ed1EndpointURL                  = Nothing
+    , _ed1CNAME                        = Nothing
+    , _ed1DateCreated                  = Nothing
+    , _ed1DateUpdated                  = Nothing
+    , _ed1Status                       = Nothing
+    , _ed1AbortableOperationInProgress = Nothing
+    , _ed1Health                       = Nothing
+    , _ed1Resources                    = Nothing
+    , _ed1Tier                         = Nothing
     }
 
+-- | Lists in-progress environment updates and application version deployments
+-- that you can cancel.
+ed1AbortableOperationInProgress :: Lens' EnvironmentDescription (Maybe Bool)
+ed1AbortableOperationInProgress =
+    lens _ed1AbortableOperationInProgress
+        (\s a -> s { _ed1AbortableOperationInProgress = a })
+
 -- | The name of the application associated with this environment.
 ed1ApplicationName :: Lens' EnvironmentDescription (Maybe Text)
 ed1ApplicationName =
@@ -2024,7 +2040,8 @@
 
 instance FromXML EnvironmentDescription where
     parseXML x = EnvironmentDescription
-        <$> x .@? "ApplicationName"
+        <$> x .@? "AbortableOperationInProgress"
+        <*> x .@? "ApplicationName"
         <*> x .@? "CNAME"
         <*> x .@? "DateCreated"
         <*> x .@? "DateUpdated"
@@ -2042,21 +2059,22 @@
 
 instance ToQuery EnvironmentDescription where
     toQuery EnvironmentDescription{..} = mconcat
-        [ "ApplicationName"   =? _ed1ApplicationName
-        , "CNAME"             =? _ed1CNAME
-        , "DateCreated"       =? _ed1DateCreated
-        , "DateUpdated"       =? _ed1DateUpdated
-        , "Description"       =? _ed1Description
-        , "EndpointURL"       =? _ed1EndpointURL
-        , "EnvironmentId"     =? _ed1EnvironmentId
-        , "EnvironmentName"   =? _ed1EnvironmentName
-        , "Health"            =? _ed1Health
-        , "Resources"         =? _ed1Resources
-        , "SolutionStackName" =? _ed1SolutionStackName
-        , "Status"            =? _ed1Status
-        , "TemplateName"      =? _ed1TemplateName
-        , "Tier"              =? _ed1Tier
-        , "VersionLabel"      =? _ed1VersionLabel
+        [ "AbortableOperationInProgress" =? _ed1AbortableOperationInProgress
+        , "ApplicationName"              =? _ed1ApplicationName
+        , "CNAME"                        =? _ed1CNAME
+        , "DateCreated"                  =? _ed1DateCreated
+        , "DateUpdated"                  =? _ed1DateUpdated
+        , "Description"                  =? _ed1Description
+        , "EndpointURL"                  =? _ed1EndpointURL
+        , "EnvironmentId"                =? _ed1EnvironmentId
+        , "EnvironmentName"              =? _ed1EnvironmentName
+        , "Health"                       =? _ed1Health
+        , "Resources"                    =? _ed1Resources
+        , "SolutionStackName"            =? _ed1SolutionStackName
+        , "Status"                       =? _ed1Status
+        , "TemplateName"                 =? _ed1TemplateName
+        , "Tier"                         =? _ed1Tier
+        , "VersionLabel"                 =? _ed1VersionLabel
         ]
 
 data Listener = Listener
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplication.hs
@@ -24,6 +24,9 @@
 
 -- | Updates the specified application to have the specified properties.
 --
+-- If a property (for example, 'description') is not provided, the value remains
+-- unchanged. To clear these properties, specify an empty string.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_UpdateApplication.html>
 module Network.AWS.ElasticBeanstalk.UpdateApplication
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateApplicationVersion.hs
@@ -24,6 +24,9 @@
 
 -- | Updates the specified application version to have the specified properties.
 --
+-- If a property (for example, 'description') is not provided, the value remains
+-- unchanged. To clear properties, specify an empty string.
+--
 -- <http://docs.aws.amazon.com/elasticbeanstalk/latest/api/API_UpdateApplicationVersion.html>
 module Network.AWS.ElasticBeanstalk.UpdateApplicationVersion
     (
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateConfigurationTemplate.hs
@@ -25,7 +25,9 @@
 -- | Updates the specified configuration template to have the specified
 -- properties or configuration option values.
 --
--- Related Topics
+-- If a property (for example, 'ApplicationName') is not provided, its value
+-- remains unchanged. To clear such properties, specify an empty string.  Related Topics
+--
 --
 -- 'DescribeConfigurationOptions'
 --
diff --git a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
--- a/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
+++ b/gen/Network/AWS/ElasticBeanstalk/UpdateEnvironment.hs
@@ -46,6 +46,7 @@
     , ueEnvironmentName
     , ueOptionSettings
     , ueOptionsToRemove
+    , ueSolutionStackName
     , ueTemplateName
     , ueTier
     , ueVersionLabel
@@ -55,6 +56,7 @@
     -- ** Response constructor
     , updateEnvironmentResponse
     -- ** Response lenses
+    , uerAbortableOperationInProgress
     , uerApplicationName
     , uerCNAME
     , uerDateCreated
@@ -78,14 +80,15 @@
 import qualified GHC.Exts
 
 data UpdateEnvironment = UpdateEnvironment
-    { _ueDescription     :: Maybe Text
-    , _ueEnvironmentId   :: Maybe Text
-    , _ueEnvironmentName :: Maybe Text
-    , _ueOptionSettings  :: List "member" ConfigurationOptionSetting
-    , _ueOptionsToRemove :: List "member" OptionSpecification
-    , _ueTemplateName    :: Maybe Text
-    , _ueTier            :: Maybe EnvironmentTier
-    , _ueVersionLabel    :: Maybe Text
+    { _ueDescription       :: Maybe Text
+    , _ueEnvironmentId     :: Maybe Text
+    , _ueEnvironmentName   :: Maybe Text
+    , _ueOptionSettings    :: List "member" ConfigurationOptionSetting
+    , _ueOptionsToRemove   :: List "member" OptionSpecification
+    , _ueSolutionStackName :: Maybe Text
+    , _ueTemplateName      :: Maybe Text
+    , _ueTier              :: Maybe EnvironmentTier
+    , _ueVersionLabel      :: Maybe Text
     } deriving (Eq, Read, Show)
 
 -- | 'UpdateEnvironment' constructor.
@@ -102,6 +105,8 @@
 --
 -- * 'ueOptionsToRemove' @::@ ['OptionSpecification']
 --
+-- * 'ueSolutionStackName' @::@ 'Maybe' 'Text'
+--
 -- * 'ueTemplateName' @::@ 'Maybe' 'Text'
 --
 -- * 'ueTier' @::@ 'Maybe' 'EnvironmentTier'
@@ -110,14 +115,15 @@
 --
 updateEnvironment :: UpdateEnvironment
 updateEnvironment = UpdateEnvironment
-    { _ueEnvironmentId   = Nothing
-    , _ueEnvironmentName = Nothing
-    , _ueDescription     = Nothing
-    , _ueTier            = Nothing
-    , _ueVersionLabel    = Nothing
-    , _ueTemplateName    = Nothing
-    , _ueOptionSettings  = mempty
-    , _ueOptionsToRemove = mempty
+    { _ueEnvironmentId     = Nothing
+    , _ueEnvironmentName   = Nothing
+    , _ueDescription       = Nothing
+    , _ueTier              = Nothing
+    , _ueVersionLabel      = Nothing
+    , _ueTemplateName      = Nothing
+    , _ueSolutionStackName = Nothing
+    , _ueOptionSettings    = mempty
+    , _ueOptionsToRemove   = mempty
     }
 
 -- | If this parameter is specified, AWS Elastic Beanstalk updates the
@@ -156,6 +162,12 @@
     lens _ueOptionsToRemove (\s a -> s { _ueOptionsToRemove = a })
         . _List
 
+-- | This specifies the platform version that the environment will run after the
+-- environment is updated.
+ueSolutionStackName :: Lens' UpdateEnvironment (Maybe Text)
+ueSolutionStackName =
+    lens _ueSolutionStackName (\s a -> s { _ueSolutionStackName = a })
+
 -- | If this parameter is specified, AWS Elastic Beanstalk deploys this
 -- configuration template to the environment. If no such configuration template
 -- is found, AWS Elastic Beanstalk returns an 'InvalidParameterValue' error.
@@ -176,27 +188,30 @@
 ueVersionLabel = lens _ueVersionLabel (\s a -> s { _ueVersionLabel = a })
 
 data UpdateEnvironmentResponse = UpdateEnvironmentResponse
-    { _uerApplicationName   :: Maybe Text
-    , _uerCNAME             :: Maybe Text
-    , _uerDateCreated       :: Maybe ISO8601
-    , _uerDateUpdated       :: Maybe ISO8601
-    , _uerDescription       :: Maybe Text
-    , _uerEndpointURL       :: Maybe Text
-    , _uerEnvironmentId     :: Maybe Text
-    , _uerEnvironmentName   :: Maybe Text
-    , _uerHealth            :: Maybe EnvironmentHealth
-    , _uerResources         :: Maybe EnvironmentResourcesDescription
-    , _uerSolutionStackName :: Maybe Text
-    , _uerStatus            :: Maybe EnvironmentStatus
-    , _uerTemplateName      :: Maybe Text
-    , _uerTier              :: Maybe EnvironmentTier
-    , _uerVersionLabel      :: Maybe Text
+    { _uerAbortableOperationInProgress :: Maybe Bool
+    , _uerApplicationName              :: Maybe Text
+    , _uerCNAME                        :: Maybe Text
+    , _uerDateCreated                  :: Maybe ISO8601
+    , _uerDateUpdated                  :: Maybe ISO8601
+    , _uerDescription                  :: Maybe Text
+    , _uerEndpointURL                  :: Maybe Text
+    , _uerEnvironmentId                :: Maybe Text
+    , _uerEnvironmentName              :: Maybe Text
+    , _uerHealth                       :: Maybe EnvironmentHealth
+    , _uerResources                    :: Maybe EnvironmentResourcesDescription
+    , _uerSolutionStackName            :: Maybe Text
+    , _uerStatus                       :: Maybe EnvironmentStatus
+    , _uerTemplateName                 :: Maybe Text
+    , _uerTier                         :: Maybe EnvironmentTier
+    , _uerVersionLabel                 :: Maybe Text
     } deriving (Eq, Read, Show)
 
 -- | 'UpdateEnvironmentResponse' constructor.
 --
 -- The fields accessible through corresponding lenses are:
 --
+-- * 'uerAbortableOperationInProgress' @::@ 'Maybe' 'Bool'
+--
 -- * 'uerApplicationName' @::@ 'Maybe' 'Text'
 --
 -- * 'uerCNAME' @::@ 'Maybe' 'Text'
@@ -229,23 +244,31 @@
 --
 updateEnvironmentResponse :: UpdateEnvironmentResponse
 updateEnvironmentResponse = UpdateEnvironmentResponse
-    { _uerEnvironmentName   = Nothing
-    , _uerEnvironmentId     = Nothing
-    , _uerApplicationName   = Nothing
-    , _uerVersionLabel      = Nothing
-    , _uerSolutionStackName = Nothing
-    , _uerTemplateName      = Nothing
-    , _uerDescription       = Nothing
-    , _uerEndpointURL       = Nothing
-    , _uerCNAME             = Nothing
-    , _uerDateCreated       = Nothing
-    , _uerDateUpdated       = Nothing
-    , _uerStatus            = Nothing
-    , _uerHealth            = Nothing
-    , _uerResources         = Nothing
-    , _uerTier              = Nothing
+    { _uerEnvironmentName              = Nothing
+    , _uerEnvironmentId                = Nothing
+    , _uerApplicationName              = Nothing
+    , _uerVersionLabel                 = Nothing
+    , _uerSolutionStackName            = Nothing
+    , _uerTemplateName                 = Nothing
+    , _uerDescription                  = Nothing
+    , _uerEndpointURL                  = Nothing
+    , _uerCNAME                        = Nothing
+    , _uerDateCreated                  = Nothing
+    , _uerDateUpdated                  = Nothing
+    , _uerStatus                       = Nothing
+    , _uerAbortableOperationInProgress = Nothing
+    , _uerHealth                       = Nothing
+    , _uerResources                    = Nothing
+    , _uerTier                         = Nothing
     }
 
+-- | Lists in-progress environment updates and application version deployments
+-- that you can cancel.
+uerAbortableOperationInProgress :: Lens' UpdateEnvironmentResponse (Maybe Bool)
+uerAbortableOperationInProgress =
+    lens _uerAbortableOperationInProgress
+        (\s a -> s { _uerAbortableOperationInProgress = a })
+
 -- | The name of the application associated with this environment.
 uerApplicationName :: Lens' UpdateEnvironmentResponse (Maybe Text)
 uerApplicationName =
@@ -338,14 +361,15 @@
 
 instance ToQuery UpdateEnvironment where
     toQuery UpdateEnvironment{..} = mconcat
-        [ "Description"     =? _ueDescription
-        , "EnvironmentId"   =? _ueEnvironmentId
-        , "EnvironmentName" =? _ueEnvironmentName
-        , "OptionSettings"  =? _ueOptionSettings
-        , "OptionsToRemove" =? _ueOptionsToRemove
-        , "TemplateName"    =? _ueTemplateName
-        , "Tier"            =? _ueTier
-        , "VersionLabel"    =? _ueVersionLabel
+        [ "Description"       =? _ueDescription
+        , "EnvironmentId"     =? _ueEnvironmentId
+        , "EnvironmentName"   =? _ueEnvironmentName
+        , "OptionSettings"    =? _ueOptionSettings
+        , "OptionsToRemove"   =? _ueOptionsToRemove
+        , "SolutionStackName" =? _ueSolutionStackName
+        , "TemplateName"      =? _ueTemplateName
+        , "Tier"              =? _ueTier
+        , "VersionLabel"      =? _ueVersionLabel
         ]
 
 instance ToHeaders UpdateEnvironment
@@ -359,7 +383,8 @@
 
 instance FromXML UpdateEnvironmentResponse where
     parseXML = withElement "UpdateEnvironmentResult" $ \x -> UpdateEnvironmentResponse
-        <$> x .@? "ApplicationName"
+        <$> x .@? "AbortableOperationInProgress"
+        <*> x .@? "ApplicationName"
         <*> x .@? "CNAME"
         <*> x .@? "DateCreated"
         <*> x .@? "DateUpdated"
