diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -365,9 +365,3 @@ for such a notice. You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.3.2` +`1.3.3` ## Description diff --git a/amazonka-cloudfront.cabal b/amazonka-cloudfront.cabal --- a/amazonka-cloudfront.cabal +++ b/amazonka-cloudfront.cabal @@ -1,5 +1,5 @@ name: amazonka-cloudfront -version: 1.3.2 +version: 1.3.3 synopsis: Amazon CloudFront SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -67,6 +67,7 @@ , Network.AWS.CloudFront.GetStreamingDistributionConfig , Network.AWS.CloudFront.ListCloudFrontOriginAccessIdentities , Network.AWS.CloudFront.ListDistributions + , Network.AWS.CloudFront.ListDistributionsByWebACLId , Network.AWS.CloudFront.ListInvalidations , Network.AWS.CloudFront.ListStreamingDistributions , Network.AWS.CloudFront.Types @@ -80,7 +81,7 @@ , Network.AWS.CloudFront.Types.Sum build-depends: - amazonka-core == 1.3.2.* + amazonka-core == 1.3.3.* , base >= 4.7 && < 5 test-suite amazonka-cloudfront-test @@ -100,9 +101,9 @@ , Test.AWS.CloudFront.Internal build-depends: - amazonka-core == 1.3.2.* - , amazonka-test == 1.3.2.* - , amazonka-cloudfront == 1.3.2.* + amazonka-core == 1.3.3.* + , amazonka-test == 1.3.3.* + , amazonka-cloudfront == 1.3.3.* , base , bytestring , lens diff --git a/fixture/ListDistributionsByWebACLId.yaml b/fixture/ListDistributionsByWebACLId.yaml new file mode 100644 --- /dev/null +++ b/fixture/ListDistributionsByWebACLId.yaml diff --git a/fixture/ListDistributionsByWebACLIdResponse.proto b/fixture/ListDistributionsByWebACLIdResponse.proto new file mode 100644 --- /dev/null +++ b/fixture/ListDistributionsByWebACLIdResponse.proto diff --git a/gen/Network/AWS/CloudFront.hs b/gen/Network/AWS/CloudFront.hs --- a/gen/Network/AWS/CloudFront.hs +++ b/gen/Network/AWS/CloudFront.hs @@ -59,6 +59,9 @@ -- ** TooManyInvalidationsInProgress , _TooManyInvalidationsInProgress + -- ** InvalidWebACLId + , _InvalidWebACLId + -- ** TooManyDistributionCNAMEs , _TooManyDistributionCNAMEs @@ -251,6 +254,9 @@ -- ** DeleteDistribution , module Network.AWS.CloudFront.DeleteDistribution + -- ** ListDistributionsByWebACLId + , module Network.AWS.CloudFront.ListDistributionsByWebACLId + -- ** ListDistributions (Paginated) , module Network.AWS.CloudFront.ListDistributions @@ -420,6 +426,7 @@ , dcDefaultRootObject , dcPriceClass , dcCustomErrorResponses + , dcWebACLId , dcViewerCertificate , dcRestrictions , dcLogging @@ -457,6 +464,7 @@ , dsEnabled , dsViewerCertificate , dsRestrictions + , dsWebACLId -- ** ForwardedValues , ForwardedValues @@ -651,6 +659,7 @@ import Network.AWS.CloudFront.GetStreamingDistributionConfig import Network.AWS.CloudFront.ListCloudFrontOriginAccessIdentities import Network.AWS.CloudFront.ListDistributions +import Network.AWS.CloudFront.ListDistributionsByWebACLId import Network.AWS.CloudFront.ListInvalidations import Network.AWS.CloudFront.ListStreamingDistributions import Network.AWS.CloudFront.Types diff --git a/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs --- a/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs +++ b/gen/Network/AWS/CloudFront/CreateCloudFrontOriginAccessIdentity.hs @@ -86,7 +86,7 @@ CreateCloudFrontOriginAccessIdentity where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}CloudFrontOriginAccessIdentityConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}CloudFrontOriginAccessIdentityConfig" . _ccfoaiCloudFrontOriginAccessIdentityConfig @@ -98,7 +98,7 @@ where toPath = const - "/2015-04-17/origin-access-identity/cloudfront" + "/2015-07-27/origin-access-identity/cloudfront" instance ToQuery CreateCloudFrontOriginAccessIdentity where diff --git a/gen/Network/AWS/CloudFront/CreateDistribution.hs b/gen/Network/AWS/CloudFront/CreateDistribution.hs --- a/gen/Network/AWS/CloudFront/CreateDistribution.hs +++ b/gen/Network/AWS/CloudFront/CreateDistribution.hs @@ -84,7 +84,7 @@ instance ToElement CreateDistribution where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}DistributionConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}DistributionConfig" . _cdDistributionConfig @@ -92,7 +92,7 @@ toHeaders = const mempty instance ToPath CreateDistribution where - toPath = const "/2015-04-17/distribution" + toPath = const "/2015-07-27/distribution" instance ToQuery CreateDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/CreateInvalidation.hs b/gen/Network/AWS/CloudFront/CreateInvalidation.hs --- a/gen/Network/AWS/CloudFront/CreateInvalidation.hs +++ b/gen/Network/AWS/CloudFront/CreateInvalidation.hs @@ -92,7 +92,7 @@ instance ToElement CreateInvalidation where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}InvalidationBatch" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}InvalidationBatch" . _ciInvalidationBatch @@ -102,7 +102,7 @@ instance ToPath CreateInvalidation where toPath CreateInvalidation'{..} = mconcat - ["/2015-04-17/distribution/", toBS _ciDistributionId, + ["/2015-07-27/distribution/", toBS _ciDistributionId, "/invalidation"] instance ToQuery CreateInvalidation where diff --git a/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs b/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs --- a/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs +++ b/gen/Network/AWS/CloudFront/CreateStreamingDistribution.hs @@ -84,7 +84,7 @@ instance ToElement CreateStreamingDistribution where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}StreamingDistributionConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}StreamingDistributionConfig" . _csdStreamingDistributionConfig @@ -92,7 +92,7 @@ toHeaders = const mempty instance ToPath CreateStreamingDistribution where - toPath = const "/2015-04-17/streaming-distribution" + toPath = const "/2015-07-27/streaming-distribution" instance ToQuery CreateStreamingDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs --- a/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs +++ b/gen/Network/AWS/CloudFront/DeleteCloudFrontOriginAccessIdentity.hs @@ -92,7 +92,7 @@ where toPath DeleteCloudFrontOriginAccessIdentity'{..} = mconcat - ["/2015-04-17/origin-access-identity/cloudfront/", + ["/2015-07-27/origin-access-identity/cloudfront/", toBS _dcfoaiId] instance ToQuery DeleteCloudFrontOriginAccessIdentity diff --git a/gen/Network/AWS/CloudFront/DeleteDistribution.hs b/gen/Network/AWS/CloudFront/DeleteDistribution.hs --- a/gen/Network/AWS/CloudFront/DeleteDistribution.hs +++ b/gen/Network/AWS/CloudFront/DeleteDistribution.hs @@ -86,7 +86,7 @@ instance ToPath DeleteDistribution where toPath DeleteDistribution'{..} - = mconcat ["/2015-04-17/distribution/", toBS _ddId] + = mconcat ["/2015-07-27/distribution/", toBS _ddId] instance ToQuery DeleteDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs b/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs --- a/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs +++ b/gen/Network/AWS/CloudFront/DeleteStreamingDistribution.hs @@ -88,7 +88,7 @@ instance ToPath DeleteStreamingDistribution where toPath DeleteStreamingDistribution'{..} = mconcat - ["/2015-04-17/streaming-distribution/", toBS _dsdId] + ["/2015-07-27/streaming-distribution/", toBS _dsdId] instance ToQuery DeleteStreamingDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs --- a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs +++ b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentity.hs @@ -88,7 +88,7 @@ where toPath GetCloudFrontOriginAccessIdentity'{..} = mconcat - ["/2015-04-17/origin-access-identity/cloudfront/", + ["/2015-07-27/origin-access-identity/cloudfront/", toBS _gcfoaiId] instance ToQuery GetCloudFrontOriginAccessIdentity diff --git a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs --- a/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs +++ b/gen/Network/AWS/CloudFront/GetCloudFrontOriginAccessIdentityConfig.hs @@ -88,7 +88,7 @@ GetCloudFrontOriginAccessIdentityConfig where toPath GetCloudFrontOriginAccessIdentityConfig'{..} = mconcat - ["/2015-04-17/origin-access-identity/cloudfront/", + ["/2015-07-27/origin-access-identity/cloudfront/", toBS _gcfoaicId, "/config"] instance ToQuery diff --git a/gen/Network/AWS/CloudFront/GetDistribution.hs b/gen/Network/AWS/CloudFront/GetDistribution.hs --- a/gen/Network/AWS/CloudFront/GetDistribution.hs +++ b/gen/Network/AWS/CloudFront/GetDistribution.hs @@ -83,7 +83,7 @@ instance ToPath GetDistribution where toPath GetDistribution'{..} - = mconcat ["/2015-04-17/distribution/", toBS _gdId] + = mconcat ["/2015-07-27/distribution/", toBS _gdId] instance ToQuery GetDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/GetDistributionConfig.hs b/gen/Network/AWS/CloudFront/GetDistributionConfig.hs --- a/gen/Network/AWS/CloudFront/GetDistributionConfig.hs +++ b/gen/Network/AWS/CloudFront/GetDistributionConfig.hs @@ -85,7 +85,7 @@ instance ToPath GetDistributionConfig where toPath GetDistributionConfig'{..} = mconcat - ["/2015-04-17/distribution/", toBS _gdcId, "/config"] + ["/2015-07-27/distribution/", toBS _gdcId, "/config"] instance ToQuery GetDistributionConfig where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/GetInvalidation.hs b/gen/Network/AWS/CloudFront/GetInvalidation.hs --- a/gen/Network/AWS/CloudFront/GetInvalidation.hs +++ b/gen/Network/AWS/CloudFront/GetInvalidation.hs @@ -92,7 +92,7 @@ instance ToPath GetInvalidation where toPath GetInvalidation'{..} = mconcat - ["/2015-04-17/distribution/", toBS _giDistributionId, + ["/2015-07-27/distribution/", toBS _giDistributionId, "/invalidation/", toBS _giId] instance ToQuery GetInvalidation where diff --git a/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs b/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs --- a/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs +++ b/gen/Network/AWS/CloudFront/GetStreamingDistribution.hs @@ -85,7 +85,7 @@ instance ToPath GetStreamingDistribution where toPath GetStreamingDistribution'{..} = mconcat - ["/2015-04-17/streaming-distribution/", toBS _gsdId] + ["/2015-07-27/streaming-distribution/", toBS _gsdId] instance ToQuery GetStreamingDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs b/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs --- a/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs +++ b/gen/Network/AWS/CloudFront/GetStreamingDistributionConfig.hs @@ -87,7 +87,7 @@ instance ToPath GetStreamingDistributionConfig where toPath GetStreamingDistributionConfig'{..} = mconcat - ["/2015-04-17/streaming-distribution/", toBS _gsdcId, + ["/2015-07-27/streaming-distribution/", toBS _gsdcId, "/config"] instance ToQuery GetStreamingDistributionConfig where diff --git a/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs b/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs --- a/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs +++ b/gen/Network/AWS/CloudFront/ListCloudFrontOriginAccessIdentities.hs @@ -122,7 +122,7 @@ where toPath = const - "/2015-04-17/origin-access-identity/cloudfront" + "/2015-07-27/origin-access-identity/cloudfront" instance ToQuery ListCloudFrontOriginAccessIdentities where diff --git a/gen/Network/AWS/CloudFront/ListDistributions.hs b/gen/Network/AWS/CloudFront/ListDistributions.hs --- a/gen/Network/AWS/CloudFront/ListDistributions.hs +++ b/gen/Network/AWS/CloudFront/ListDistributions.hs @@ -70,15 +70,16 @@ , _ldMaxItems = Nothing } --- | Use this when paginating results to indicate where to begin in your list --- of distributions. The results include distributions in the list that --- occur after the marker. To get the next page of results, set the Marker --- to the value of the NextMarker from the current page\'s response (which --- is also the ID of the last distribution on that page). +-- | Use Marker and MaxItems to control pagination of results. If you have +-- more than MaxItems distributions that satisfy the request, the response +-- includes a NextMarker element. To get the next page of results, submit +-- another request. For the value of Marker, specify the value of +-- NextMarker from the last response. (For the first request, omit Marker.) ldMarker :: Lens' ListDistributions (Maybe Text) ldMarker = lens _ldMarker (\ s a -> s{_ldMarker = a}); --- | The maximum number of distributions you want in the response body. +-- | The maximum number of distributions that you want CloudFront to return +-- in the response body. The maximum and default values are both 100. ldMaxItems :: Lens' ListDistributions (Maybe Text) ldMaxItems = lens _ldMaxItems (\ s a -> s{_ldMaxItems = a}); @@ -107,7 +108,7 @@ toHeaders = const mempty instance ToPath ListDistributions where - toPath = const "/2015-04-17/distribution" + toPath = const "/2015-07-27/distribution" instance ToQuery ListDistributions where toQuery ListDistributions'{..} diff --git a/gen/Network/AWS/CloudFront/ListDistributionsByWebACLId.hs b/gen/Network/AWS/CloudFront/ListDistributionsByWebACLId.hs new file mode 100644 --- /dev/null +++ b/gen/Network/AWS/CloudFront/ListDistributionsByWebACLId.hs @@ -0,0 +1,153 @@ +{-# 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.CloudFront.ListDistributionsByWebACLId +-- Copyright : (c) 2013-2015 Brendan Hay +-- License : Mozilla Public License, v. 2.0. +-- Maintainer : Brendan Hay +-- Stability : auto-generated +-- Portability : non-portable (GHC extensions) +-- +-- List the distributions that are associated with a specified AWS WAF web +-- ACL. +-- +-- /See:/ for ListDistributionsByWebACLId. +module Network.AWS.CloudFront.ListDistributionsByWebACLId + ( + -- * Creating a Request + listDistributionsByWebACLId + , ListDistributionsByWebACLId + -- * Request Lenses + , ldbwaiMarker + , ldbwaiMaxItems + , ldbwaiWebACLId + + -- * Destructuring the Response + , listDistributionsByWebACLIdResponse + , ListDistributionsByWebACLIdResponse + -- * Response Lenses + , ldbwairsDistributionList + , ldbwairsResponseStatus + ) where + +import Network.AWS.CloudFront.Types +import Network.AWS.CloudFront.Types.Product +import Network.AWS.Prelude +import Network.AWS.Request +import Network.AWS.Response + +-- | The request to list distributions that are associated with a specified +-- AWS WAF web ACL. +-- +-- /See:/ 'listDistributionsByWebACLId' smart constructor. +data ListDistributionsByWebACLId = ListDistributionsByWebACLId' + { _ldbwaiMarker :: !(Maybe Text) + , _ldbwaiMaxItems :: !(Maybe Text) + , _ldbwaiWebACLId :: !Text + } deriving (Eq,Read,Show,Data,Typeable,Generic) + +-- | Creates a value of 'ListDistributionsByWebACLId' with the minimum fields required to make a request. +-- +-- Use one of the following lenses to modify other fields as desired: +-- +-- * 'ldbwaiMarker' +-- +-- * 'ldbwaiMaxItems' +-- +-- * 'ldbwaiWebACLId' +listDistributionsByWebACLId + :: Text -- ^ 'ldbwaiWebACLId' + -> ListDistributionsByWebACLId +listDistributionsByWebACLId pWebACLId_ = + ListDistributionsByWebACLId' + { _ldbwaiMarker = Nothing + , _ldbwaiMaxItems = Nothing + , _ldbwaiWebACLId = pWebACLId_ + } + +-- | Use Marker and MaxItems to control pagination of results. If you have +-- more than MaxItems distributions that satisfy the request, the response +-- includes a NextMarker element. To get the next page of results, submit +-- another request. For the value of Marker, specify the value of +-- NextMarker from the last response. (For the first request, omit Marker.) +ldbwaiMarker :: Lens' ListDistributionsByWebACLId (Maybe Text) +ldbwaiMarker = lens _ldbwaiMarker (\ s a -> s{_ldbwaiMarker = a}); + +-- | The maximum number of distributions that you want CloudFront to return +-- in the response body. The maximum and default values are both 100. +ldbwaiMaxItems :: Lens' ListDistributionsByWebACLId (Maybe Text) +ldbwaiMaxItems = lens _ldbwaiMaxItems (\ s a -> s{_ldbwaiMaxItems = a}); + +-- | The Id of the AWS WAF web ACL for which you want to list the associated +-- distributions. If you specify \"null\" for the Id, the request returns a +-- list of the distributions that aren\'t associated with a web ACL. +ldbwaiWebACLId :: Lens' ListDistributionsByWebACLId Text +ldbwaiWebACLId = lens _ldbwaiWebACLId (\ s a -> s{_ldbwaiWebACLId = a}); + +instance AWSRequest ListDistributionsByWebACLId where + type Rs ListDistributionsByWebACLId = + ListDistributionsByWebACLIdResponse + request = get cloudFront + response + = receiveXML + (\ s h x -> + ListDistributionsByWebACLIdResponse' <$> + (parseXML x) <*> (pure (fromEnum s))) + +instance ToHeaders ListDistributionsByWebACLId where + toHeaders = const mempty + +instance ToPath ListDistributionsByWebACLId where + toPath ListDistributionsByWebACLId'{..} + = mconcat + ["/2015-07-27/distributionsByWebACLId/", + toBS _ldbwaiWebACLId] + +instance ToQuery ListDistributionsByWebACLId where + toQuery ListDistributionsByWebACLId'{..} + = mconcat + ["Marker" =: _ldbwaiMarker, + "MaxItems" =: _ldbwaiMaxItems] + +-- | The response to a request to list the distributions that are associated +-- with a specified AWS WAF web ACL. +-- +-- /See:/ 'listDistributionsByWebACLIdResponse' smart constructor. +data ListDistributionsByWebACLIdResponse = ListDistributionsByWebACLIdResponse' + { _ldbwairsDistributionList :: !(Maybe DistributionList) + , _ldbwairsResponseStatus :: !Int + } deriving (Eq,Read,Show,Data,Typeable,Generic) + +-- | Creates a value of 'ListDistributionsByWebACLIdResponse' with the minimum fields required to make a request. +-- +-- Use one of the following lenses to modify other fields as desired: +-- +-- * 'ldbwairsDistributionList' +-- +-- * 'ldbwairsResponseStatus' +listDistributionsByWebACLIdResponse + :: Int -- ^ 'ldbwairsResponseStatus' + -> ListDistributionsByWebACLIdResponse +listDistributionsByWebACLIdResponse pResponseStatus_ = + ListDistributionsByWebACLIdResponse' + { _ldbwairsDistributionList = Nothing + , _ldbwairsResponseStatus = pResponseStatus_ + } + +-- | The DistributionList type. +ldbwairsDistributionList :: Lens' ListDistributionsByWebACLIdResponse (Maybe DistributionList) +ldbwairsDistributionList = lens _ldbwairsDistributionList (\ s a -> s{_ldbwairsDistributionList = a}); + +-- | The response status code. +ldbwairsResponseStatus :: Lens' ListDistributionsByWebACLIdResponse Int +ldbwairsResponseStatus = lens _ldbwairsResponseStatus (\ s a -> s{_ldbwairsResponseStatus = a}); diff --git a/gen/Network/AWS/CloudFront/ListInvalidations.hs b/gen/Network/AWS/CloudFront/ListInvalidations.hs --- a/gen/Network/AWS/CloudFront/ListInvalidations.hs +++ b/gen/Network/AWS/CloudFront/ListInvalidations.hs @@ -122,7 +122,7 @@ instance ToPath ListInvalidations where toPath ListInvalidations'{..} = mconcat - ["/2015-04-17/distribution/", toBS _liDistributionId, + ["/2015-07-27/distribution/", toBS _liDistributionId, "/invalidation"] instance ToQuery ListInvalidations where diff --git a/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs b/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs --- a/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs +++ b/gen/Network/AWS/CloudFront/ListStreamingDistributions.hs @@ -115,7 +115,7 @@ toHeaders = const mempty instance ToPath ListStreamingDistributions where - toPath = const "/2015-04-17/streaming-distribution" + toPath = const "/2015-07-27/streaming-distribution" instance ToQuery ListStreamingDistributions where toQuery ListStreamingDistributions'{..} diff --git a/gen/Network/AWS/CloudFront/Types.hs b/gen/Network/AWS/CloudFront/Types.hs --- a/gen/Network/AWS/CloudFront/Types.hs +++ b/gen/Network/AWS/CloudFront/Types.hs @@ -25,6 +25,7 @@ , _InconsistentQuantities , _InvalidArgument , _TooManyInvalidationsInProgress + , _InvalidWebACLId , _TooManyDistributionCNAMEs , _NoSuchCloudFrontOriginAccessIdentity , _CloudFrontOriginAccessIdentityInUse @@ -229,6 +230,7 @@ , dcDefaultRootObject , dcPriceClass , dcCustomErrorResponses + , dcWebACLId , dcViewerCertificate , dcRestrictions , dcLogging @@ -266,6 +268,7 @@ , dsEnabled , dsViewerCertificate , dsRestrictions + , dsWebACLId -- * ForwardedValues , ForwardedValues @@ -449,14 +452,14 @@ import Network.AWS.Prelude import Network.AWS.Sign.V4 --- | API version '2015-04-17' of the Amazon CloudFront SDK configuration. +-- | API version '2015-07-27' of the Amazon CloudFront SDK configuration. cloudFront :: Service cloudFront = Service { _svcAbbrev = "CloudFront" , _svcSigner = v4 , _svcPrefix = "cloudfront" - , _svcVersion = "2015-04-17" + , _svcVersion = "2015-07-27" , _svcEndpoint = defaultEndpoint cloudFront , _svcTimeout = Just 70 , _svcCheck = statusSuccess @@ -525,6 +528,10 @@ _TooManyInvalidationsInProgress :: AsError a => Getting (First ServiceError) a ServiceError _TooManyInvalidationsInProgress = _ServiceError . hasStatus 400 . hasCode "TooManyInvalidationsInProgress" + +-- | Prism for InvalidWebACLId' errors. +_InvalidWebACLId :: AsError a => Getting (First ServiceError) a ServiceError +_InvalidWebACLId = _ServiceError . hasStatus 400 . hasCode "InvalidWebACLId" -- | Your request contains more CNAMEs than are allowed per distribution. _TooManyDistributionCNAMEs :: AsError a => Getting (First ServiceError) a ServiceError diff --git a/gen/Network/AWS/CloudFront/Types/Product.hs b/gen/Network/AWS/CloudFront/Types/Product.hs --- a/gen/Network/AWS/CloudFront/Types/Product.hs +++ b/gen/Network/AWS/CloudFront/Types/Product.hs @@ -1278,6 +1278,7 @@ , _dcDefaultRootObject :: !(Maybe Text) , _dcPriceClass :: !(Maybe PriceClass) , _dcCustomErrorResponses :: !(Maybe CustomErrorResponses) + , _dcWebACLId :: !(Maybe Text) , _dcViewerCertificate :: !(Maybe ViewerCertificate) , _dcRestrictions :: !(Maybe Restrictions) , _dcLogging :: !(Maybe LoggingConfig) @@ -1301,6 +1302,8 @@ -- -- * 'dcCustomErrorResponses' -- +-- * 'dcWebACLId' +-- -- * 'dcViewerCertificate' -- -- * 'dcRestrictions' @@ -1331,6 +1334,7 @@ , _dcDefaultRootObject = Nothing , _dcPriceClass = Nothing , _dcCustomErrorResponses = Nothing + , _dcWebACLId = Nothing , _dcViewerCertificate = Nothing , _dcRestrictions = Nothing , _dcLogging = Nothing @@ -1370,6 +1374,11 @@ dcCustomErrorResponses :: Lens' DistributionConfig (Maybe CustomErrorResponses) dcCustomErrorResponses = lens _dcCustomErrorResponses (\ s a -> s{_dcCustomErrorResponses = a}); +-- | (Optional) If you\'re using AWS WAF to filter CloudFront requests, the +-- Id of the AWS WAF web ACL that is associated with the distribution. +dcWebACLId :: Lens' DistributionConfig (Maybe Text) +dcWebACLId = lens _dcWebACLId (\ s a -> s{_dcWebACLId = a}); + -- | Undocumented member. dcViewerCertificate :: Lens' DistributionConfig (Maybe ViewerCertificate) dcViewerCertificate = lens _dcViewerCertificate (\ s a -> s{_dcViewerCertificate = a}); @@ -1427,6 +1436,7 @@ (x .@? "Aliases") <*> (x .@? "DefaultRootObject") <*> (x .@? "PriceClass") <*> (x .@? "CustomErrorResponses") + <*> (x .@? "WebACLId") <*> (x .@? "ViewerCertificate") <*> (x .@? "Restrictions") <*> (x .@? "Logging") @@ -1444,6 +1454,7 @@ "DefaultRootObject" @= _dcDefaultRootObject, "PriceClass" @= _dcPriceClass, "CustomErrorResponses" @= _dcCustomErrorResponses, + "WebACLId" @= _dcWebACLId, "ViewerCertificate" @= _dcViewerCertificate, "Restrictions" @= _dcRestrictions, "Logging" @= _dcLogging, @@ -1556,6 +1567,7 @@ , _dsEnabled :: !Bool , _dsViewerCertificate :: !ViewerCertificate , _dsRestrictions :: !Restrictions + , _dsWebACLId :: !Text } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'DistributionSummary' with the minimum fields required to make a request. @@ -1589,6 +1601,8 @@ -- * 'dsViewerCertificate' -- -- * 'dsRestrictions' +-- +-- * 'dsWebACLId' distributionSummary :: Text -- ^ 'dsId' -> Text -- ^ 'dsStatus' @@ -1604,8 +1618,9 @@ -> Bool -- ^ 'dsEnabled' -> ViewerCertificate -- ^ 'dsViewerCertificate' -> Restrictions -- ^ 'dsRestrictions' + -> Text -- ^ 'dsWebACLId' -> DistributionSummary -distributionSummary pId_ pStatus_ pLastModifiedTime_ pDomainName_ pAliases_ pOrigins_ pDefaultCacheBehavior_ pCacheBehaviors_ pCustomErrorResponses_ pComment_ pPriceClass_ pEnabled_ pViewerCertificate_ pRestrictions_ = +distributionSummary pId_ pStatus_ pLastModifiedTime_ pDomainName_ pAliases_ pOrigins_ pDefaultCacheBehavior_ pCacheBehaviors_ pCustomErrorResponses_ pComment_ pPriceClass_ pEnabled_ pViewerCertificate_ pRestrictions_ pWebACLId_ = DistributionSummary' { _dsId = pId_ , _dsStatus = pStatus_ @@ -1621,6 +1636,7 @@ , _dsEnabled = pEnabled_ , _dsViewerCertificate = pViewerCertificate_ , _dsRestrictions = pRestrictions_ + , _dsWebACLId = pWebACLId_ } -- | The identifier for the distribution. For example: EDFDVBD632BHDS5. @@ -1688,6 +1704,10 @@ dsRestrictions :: Lens' DistributionSummary Restrictions dsRestrictions = lens _dsRestrictions (\ s a -> s{_dsRestrictions = a}); +-- | The Web ACL Id (if any) associated with the distribution. +dsWebACLId :: Lens' DistributionSummary Text +dsWebACLId = lens _dsWebACLId (\ s a -> s{_dsWebACLId = a}); + instance FromXML DistributionSummary where parseXML x = DistributionSummary' <$> @@ -1704,6 +1724,7 @@ <*> (x .@ "Enabled") <*> (x .@ "ViewerCertificate") <*> (x .@ "Restrictions") + <*> (x .@ "WebACLId") -- | A complex type that specifies how CloudFront handles query strings, -- cookies and headers. diff --git a/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs b/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs --- a/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs +++ b/gen/Network/AWS/CloudFront/UpdateCloudFrontOriginAccessIdentity.hs @@ -104,7 +104,7 @@ UpdateCloudFrontOriginAccessIdentity where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}CloudFrontOriginAccessIdentityConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}CloudFrontOriginAccessIdentityConfig" . _ucfoaiCloudFrontOriginAccessIdentityConfig @@ -117,7 +117,7 @@ where toPath UpdateCloudFrontOriginAccessIdentity'{..} = mconcat - ["/2015-04-17/origin-access-identity/cloudfront/", + ["/2015-07-27/origin-access-identity/cloudfront/", toBS _ucfoaiId, "/config"] instance ToQuery UpdateCloudFrontOriginAccessIdentity diff --git a/gen/Network/AWS/CloudFront/UpdateDistribution.hs b/gen/Network/AWS/CloudFront/UpdateDistribution.hs --- a/gen/Network/AWS/CloudFront/UpdateDistribution.hs +++ b/gen/Network/AWS/CloudFront/UpdateDistribution.hs @@ -102,7 +102,7 @@ instance ToElement UpdateDistribution where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}DistributionConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}DistributionConfig" . _udDistributionConfig @@ -113,7 +113,7 @@ instance ToPath UpdateDistribution where toPath UpdateDistribution'{..} = mconcat - ["/2015-04-17/distribution/", toBS _udId, "/config"] + ["/2015-07-27/distribution/", toBS _udId, "/config"] instance ToQuery UpdateDistribution where toQuery = const mempty diff --git a/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs b/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs --- a/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs +++ b/gen/Network/AWS/CloudFront/UpdateStreamingDistribution.hs @@ -102,7 +102,7 @@ instance ToElement UpdateStreamingDistribution where toElement = mkElement - "{http://cloudfront.amazonaws.com/doc/2015-04-17/}StreamingDistributionConfig" + "{http://cloudfront.amazonaws.com/doc/2015-07-27/}StreamingDistributionConfig" . _usdStreamingDistributionConfig @@ -113,7 +113,7 @@ instance ToPath UpdateStreamingDistribution where toPath UpdateStreamingDistribution'{..} = mconcat - ["/2015-04-17/streaming-distribution/", toBS _usdId, + ["/2015-07-27/streaming-distribution/", toBS _usdId, "/config"] instance ToQuery UpdateStreamingDistribution where diff --git a/test/Test/AWS/Gen/CloudFront.hs b/test/Test/AWS/Gen/CloudFront.hs --- a/test/Test/AWS/Gen/CloudFront.hs +++ b/test/Test/AWS/Gen/CloudFront.hs @@ -88,6 +88,9 @@ -- , testDeleteDistribution $ -- deleteDistribution -- +-- , testListDistributionsByWebACLId $ +-- listDistributionsByWebACLId +-- -- , testListDistributions $ -- listDistributions -- @@ -154,6 +157,9 @@ -- , testDeleteDistributionResponse $ -- deleteDistributionResponse -- +-- , testListDistributionsByWebACLIdResponse $ +-- listDistributionsByWebACLIdResponse +-- -- , testListDistributionsResponse $ -- listDistributionsResponse -- @@ -262,6 +268,11 @@ "DeleteDistribution" "fixture/DeleteDistribution.yaml" +testListDistributionsByWebACLId :: ListDistributionsByWebACLId -> TestTree +testListDistributionsByWebACLId = req + "ListDistributionsByWebACLId" + "fixture/ListDistributionsByWebACLId.yaml" + testListDistributions :: ListDistributions -> TestTree testListDistributions = req "ListDistributions" @@ -408,6 +419,13 @@ "fixture/DeleteDistributionResponse.proto" cloudFront (Proxy :: Proxy DeleteDistribution) + +testListDistributionsByWebACLIdResponse :: ListDistributionsByWebACLIdResponse -> TestTree +testListDistributionsByWebACLIdResponse = res + "ListDistributionsByWebACLIdResponse" + "fixture/ListDistributionsByWebACLIdResponse.proto" + cloudFront + (Proxy :: Proxy ListDistributionsByWebACLId) testListDistributionsResponse :: ListDistributionsResponse -> TestTree testListDistributionsResponse = res