Merge branch 'release/1.3.6' into develop

arbor · Nov 21, 2015 · 882b377 · 882b377
2 parents 4bd2578 + 06ef3ac
commit 882b377
Show file tree

Hide file tree

Showing 238 changed files with 3,634 additions and 913 deletions.
diff --git a/amazonka-apigateway/README.md b/amazonka-apigateway/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.5`
+`1.3.6`
 
 
 ## Description

diff --git a/amazonka-apigateway/amazonka-apigateway.cabal b/amazonka-apigateway/amazonka-apigateway.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-apigateway
-version:               1.3.5
+version:               1.3.6
 synopsis:              Amazon API Gateway SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -122,7 +122,7 @@ library
         , Network.AWS.APIGateway.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.5.*
+          amazonka-core == 1.3.6.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-apigateway-test
@@ -142,9 +142,9 @@ test-suite amazonka-apigateway-test
         , Test.AWS.APIGateway.Internal
 
     build-depends:
-          amazonka-core == 1.3.5.*
-        , amazonka-test == 1.3.5.*
-        , amazonka-apigateway == 1.3.5.*
+          amazonka-core == 1.3.6.*
+        , amazonka-test == 1.3.6.*
+        , amazonka-apigateway == 1.3.6.*
         , base
         , bytestring
         , lens

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway.hs
@@ -414,6 +414,7 @@ module Network.AWS.APIGateway
     , Stage
     , stage
     , sDeploymentId
+    , sVariables
     , sClientCertificateId
     , sCreatedDate
     , sCacheClusterStatus

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/CreateDeployment.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/CreateDeployment.hs
@@ -29,6 +29,7 @@ module Network.AWS.APIGateway.CreateDeployment
     , CreateDeployment
     -- * Request Lenses
     , cdStageDescription
+    , cdVariables
     , cdCacheClusterSize
     , cdCacheClusterEnabled
     , cdDescription
@@ -56,6 +57,7 @@ import           Network.AWS.Response
 -- /See:/ 'createDeployment' smart constructor.
 data CreateDeployment = CreateDeployment'
     { _cdStageDescription    :: !(Maybe Text)
+    , _cdVariables           :: !(Maybe (Map Text Text))
     , _cdCacheClusterSize    :: !(Maybe CacheClusterSize)
     , _cdCacheClusterEnabled :: !(Maybe Bool)
     , _cdDescription         :: !(Maybe Text)
@@ -69,6 +71,8 @@ data CreateDeployment = CreateDeployment'
 --
 -- * 'cdStageDescription'
 --
+-- * 'cdVariables'
+--
 -- * 'cdCacheClusterSize'
 --
 -- * 'cdCacheClusterEnabled'
@@ -85,6 +89,7 @@ createDeployment
 createDeployment pRestAPIId_ pStageName_ =
     CreateDeployment'
     { _cdStageDescription = Nothing
+    , _cdVariables = Nothing
     , _cdCacheClusterSize = Nothing
     , _cdCacheClusterEnabled = Nothing
     , _cdDescription = Nothing
@@ -97,6 +102,12 @@ createDeployment pRestAPIId_ pStageName_ =
 cdStageDescription :: Lens' CreateDeployment (Maybe Text)
 cdStageDescription = lens _cdStageDescription (\ s a -> s{_cdStageDescription = a});
 
+-- | A map that defines the stage variables for the Stage resource that is
+-- associated with the new deployment. Variable names can have alphabetic
+-- characters, and the values must match [A-Za-z0-9-._~:\/?#&=,]+
+cdVariables :: Lens' CreateDeployment (HashMap Text Text)
+cdVariables = lens _cdVariables (\ s a -> s{_cdVariables = a}) . _Default . _Map;
+
 -- | Specifies the cache cluster size for the Stage resource specified in the
 -- input, if a cache cluster is enabled.
 cdCacheClusterSize :: Lens' CreateDeployment (Maybe CacheClusterSize)
@@ -131,6 +142,7 @@ instance ToJSON CreateDeployment where
           = object
               (catMaybes
                  [("stageDescription" .=) <$> _cdStageDescription,
+                  ("variables" .=) <$> _cdVariables,
                   ("cacheClusterSize" .=) <$> _cdCacheClusterSize,
                   ("cacheClusterEnabled" .=) <$>
                     _cdCacheClusterEnabled,

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/CreateStage.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/CreateStage.hs
@@ -27,6 +27,7 @@ module Network.AWS.APIGateway.CreateStage
       createStage
     , CreateStage
     -- * Request Lenses
+    , csVariables
     , csCacheClusterSize
     , csCacheClusterEnabled
     , csDescription
@@ -39,6 +40,7 @@ module Network.AWS.APIGateway.CreateStage
     , Stage
     -- * Response Lenses
     , sDeploymentId
+    , sVariables
     , sClientCertificateId
     , sCreatedDate
     , sCacheClusterStatus
@@ -60,7 +62,8 @@ import           Network.AWS.Response
 --
 -- /See:/ 'createStage' smart constructor.
 data CreateStage = CreateStage'
-    { _csCacheClusterSize    :: !(Maybe CacheClusterSize)
+    { _csVariables           :: !(Maybe (Map Text Text))
+    , _csCacheClusterSize    :: !(Maybe CacheClusterSize)
     , _csCacheClusterEnabled :: !(Maybe Bool)
     , _csDescription         :: !(Maybe Text)
     , _csRestAPIId           :: !Text
@@ -72,6 +75,8 @@ data CreateStage = CreateStage'
 --
 -- Use one of the following lenses to modify other fields as desired:
 --
+-- * 'csVariables'
+--
 -- * 'csCacheClusterSize'
 --
 -- * 'csCacheClusterEnabled'
@@ -90,14 +95,21 @@ createStage
     -> CreateStage
 createStage pRestAPIId_ pStageName_ pDeploymentId_ =
     CreateStage'
-    { _csCacheClusterSize = Nothing
+    { _csVariables = Nothing
+    , _csCacheClusterSize = Nothing
     , _csCacheClusterEnabled = Nothing
     , _csDescription = Nothing
     , _csRestAPIId = pRestAPIId_
     , _csStageName = pStageName_
     , _csDeploymentId = pDeploymentId_
     }
 
+-- | A map that defines the stage variables for the new Stage resource.
+-- Variable names can have alphabetic characters, and the values must match
+-- [A-Za-z0-9-._~:\/?#&=,]+
+csVariables :: Lens' CreateStage (HashMap Text Text)
+csVariables = lens _csVariables (\ s a -> s{_csVariables = a}) . _Default . _Map;
+
 -- | The stage\'s cache cluster size.
 csCacheClusterSize :: Lens' CreateStage (Maybe CacheClusterSize)
 csCacheClusterSize = lens _csCacheClusterSize (\ s a -> s{_csCacheClusterSize = a});
@@ -134,7 +146,8 @@ instance ToJSON CreateStage where
         toJSON CreateStage'{..}
           = object
               (catMaybes
-                 [("cacheClusterSize" .=) <$> _csCacheClusterSize,
+                 [("variables" .=) <$> _csVariables,
+                  ("cacheClusterSize" .=) <$> _csCacheClusterSize,
                   ("cacheClusterEnabled" .=) <$>
                     _csCacheClusterEnabled,
                   ("description" .=) <$> _csDescription,

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/GetStage.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/GetStage.hs
@@ -35,6 +35,7 @@ module Network.AWS.APIGateway.GetStage
     , Stage
     -- * Response Lenses
     , sDeploymentId
+    , sVariables
     , sClientCertificateId
     , sCreatedDate
     , sCacheClusterStatus

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/TestInvokeMethod.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/TestInvokeMethod.hs
@@ -30,6 +30,7 @@ module Network.AWS.APIGateway.TestInvokeMethod
     , timPathWithQueryString
     , timBody
     , timClientCertificateId
+    , timStageVariables
     , timHeaders
     , timRestAPIId
     , timResourceId
@@ -58,6 +59,7 @@ data TestInvokeMethod = TestInvokeMethod'
     { _timPathWithQueryString :: !(Maybe Text)
     , _timBody                :: !(Maybe Text)
     , _timClientCertificateId :: !(Maybe Text)
+    , _timStageVariables      :: !(Maybe (Map Text Text))
     , _timHeaders             :: !(Maybe (Map Text Text))
     , _timRestAPIId           :: !Text
     , _timResourceId          :: !Text
@@ -74,6 +76,8 @@ data TestInvokeMethod = TestInvokeMethod'
 --
 -- * 'timClientCertificateId'
 --
+-- * 'timStageVariables'
+--
 -- * 'timHeaders'
 --
 -- * 'timRestAPIId'
@@ -91,6 +95,7 @@ testInvokeMethod pRestAPIId_ pResourceId_ pHttpMethod_ =
     { _timPathWithQueryString = Nothing
     , _timBody = Nothing
     , _timClientCertificateId = Nothing
+    , _timStageVariables = Nothing
     , _timHeaders = Nothing
     , _timRestAPIId = pRestAPIId_
     , _timResourceId = pResourceId_
@@ -109,6 +114,10 @@ timBody = lens _timBody (\ s a -> s{_timBody = a});
 timClientCertificateId :: Lens' TestInvokeMethod (Maybe Text)
 timClientCertificateId = lens _timClientCertificateId (\ s a -> s{_timClientCertificateId = a});
 
+-- | Undocumented member.
+timStageVariables :: Lens' TestInvokeMethod (HashMap Text Text)
+timStageVariables = lens _timStageVariables (\ s a -> s{_timStageVariables = a}) . _Default . _Map;
+
 -- | Undocumented member.
 timHeaders :: Lens' TestInvokeMethod (HashMap Text Text)
 timHeaders = lens _timHeaders (\ s a -> s{_timHeaders = a}) . _Default . _Map;
@@ -149,6 +158,7 @@ instance ToJSON TestInvokeMethod where
                   ("body" .=) <$> _timBody,
                   ("clientCertificateId" .=) <$>
                     _timClientCertificateId,
+                  ("stageVariables" .=) <$> _timStageVariables,
                   ("headers" .=) <$> _timHeaders])
 
 instance ToPath TestInvokeMethod where

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/Types.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/Types.hs
@@ -180,6 +180,7 @@ module Network.AWS.APIGateway.Types
     , Stage
     , stage
     , sDeploymentId
+    , sVariables
     , sClientCertificateId
     , sCreatedDate
     , sCacheClusterStatus

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/Types/Product.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/Types/Product.hs
@@ -1146,6 +1146,7 @@ instance FromJSON RestAPI where
 -- /See:/ 'stage' smart constructor.
 data Stage = Stage'
     { _sDeploymentId        :: !(Maybe Text)
+    , _sVariables           :: !(Maybe (Map Text Text))
     , _sClientCertificateId :: !(Maybe Text)
     , _sCreatedDate         :: !(Maybe POSIX)
     , _sCacheClusterStatus  :: !(Maybe CacheClusterStatus)
@@ -1163,6 +1164,8 @@ data Stage = Stage'
 --
 -- * 'sDeploymentId'
 --
+-- * 'sVariables'
+--
 -- * 'sClientCertificateId'
 --
 -- * 'sCreatedDate'
@@ -1185,6 +1188,7 @@ stage
 stage =
     Stage'
     { _sDeploymentId = Nothing
+    , _sVariables = Nothing
     , _sClientCertificateId = Nothing
     , _sCreatedDate = Nothing
     , _sCacheClusterStatus = Nothing
@@ -1200,6 +1204,12 @@ stage =
 sDeploymentId :: Lens' Stage (Maybe Text)
 sDeploymentId = lens _sDeploymentId (\ s a -> s{_sDeploymentId = a});
 
+-- | A map that defines the stage variables for a Stage resource. Variable
+-- names can have alphabetic characters, and the values must match
+-- [A-Za-z0-9-._~:\/?#&=,]+
+sVariables :: Lens' Stage (HashMap Text Text)
+sVariables = lens _sVariables (\ s a -> s{_sVariables = a}) . _Default . _Map;
+
 -- | Undocumented member.
 sClientCertificateId :: Lens' Stage (Maybe Text)
 sClientCertificateId = lens _sClientCertificateId (\ s a -> s{_sClientCertificateId = a});
@@ -1248,7 +1258,8 @@ instance FromJSON Stage where
               (\ x ->
                  Stage' <$>
                    (x .:? "deploymentId") <*>
-                     (x .:? "clientCertificateId")
+                     (x .:? "variables" .!= mempty)
+                     <*> (x .:? "clientCertificateId")
                      <*> (x .:? "createdDate")
                      <*> (x .:? "cacheClusterStatus")
                      <*> (x .:? "methodSettings" .!= mempty)

diff --git a/amazonka-apigateway/gen/Network/AWS/APIGateway/UpdateStage.hs b/amazonka-apigateway/gen/Network/AWS/APIGateway/UpdateStage.hs
@@ -36,6 +36,7 @@ module Network.AWS.APIGateway.UpdateStage
     , Stage
     -- * Response Lenses
     , sDeploymentId
+    , sVariables
     , sClientCertificateId
     , sCreatedDate
     , sCacheClusterStatus

diff --git a/amazonka-autoscaling/README.md b/amazonka-autoscaling/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.5`
+`1.3.6`
 
 
 ## Description

diff --git a/amazonka-autoscaling/amazonka-autoscaling.cabal b/amazonka-autoscaling/amazonka-autoscaling.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-autoscaling
-version:               1.3.5
+version:               1.3.6
 synopsis:              Amazon Auto Scaling SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -102,7 +102,7 @@ library
         , Network.AWS.AutoScaling.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.5.*
+          amazonka-core == 1.3.6.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-autoscaling-test
@@ -122,9 +122,9 @@ test-suite amazonka-autoscaling-test
         , Test.AWS.AutoScaling.Internal
 
     build-depends:
-          amazonka-core == 1.3.5.*
-        , amazonka-test == 1.3.5.*
-        , amazonka-autoscaling == 1.3.5.*
+          amazonka-core == 1.3.6.*
+        , amazonka-test == 1.3.6.*
+        , amazonka-autoscaling == 1.3.6.*
         , base
         , bytestring
         , lens

diff --git a/amazonka-cloudformation/README.md b/amazonka-cloudformation/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.5`
+`1.3.6`
 
 
 ## Description

diff --git a/amazonka-cloudformation/amazonka-cloudformation.cabal b/amazonka-cloudformation/amazonka-cloudformation.cabal
@@ -1,5 +1,5 @@
 name:                  amazonka-cloudformation
-version:               1.3.5
+version:               1.3.6
 synopsis:              Amazon CloudFormation SDK.
 homepage:              https://github.com/brendanhay/amazonka
 bug-reports:           https://github.com/brendanhay/amazonka/issues
@@ -88,7 +88,7 @@ library
         , Network.AWS.CloudFormation.Types.Sum
 
     build-depends:
-          amazonka-core == 1.3.5.*
+          amazonka-core == 1.3.6.*
         , base          >= 4.7     && < 5
 
 test-suite amazonka-cloudformation-test
@@ -108,9 +108,9 @@ test-suite amazonka-cloudformation-test
         , Test.AWS.CloudFormation.Internal
 
     build-depends:
-          amazonka-core == 1.3.5.*
-        , amazonka-test == 1.3.5.*
-        , amazonka-cloudformation == 1.3.5.*
+          amazonka-core == 1.3.6.*
+        , amazonka-test == 1.3.6.*
+        , amazonka-cloudformation == 1.3.6.*
         , base
         , bytestring
         , lens

diff --git a/amazonka-cloudfront/README.md b/amazonka-cloudfront/README.md
@@ -8,7 +8,7 @@
 
 ## Version
 
-`1.3.5`
+`1.3.6`
 
 
 ## Description
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     ## Version
-    `1.3.5`
+    `1.3.6`
     ## Description
@@ Expand Down @@