diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.3.0` +`1.3.1` ## 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.0 +version: 1.3.1 synopsis: Amazon CloudFront SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -80,7 +80,7 @@ , Network.AWS.CloudFront.Types.Sum build-depends: - amazonka-core == 1.3.0.* + amazonka-core == 1.3.1.* , base >= 4.7 && < 5 test-suite amazonka-cloudfront-test @@ -100,9 +100,9 @@ , Test.AWS.CloudFront.Internal build-depends: - amazonka-core == 1.3.0.* - , amazonka-test == 1.3.0.* - , amazonka-cloudfront == 1.3.0.* + amazonka-core == 1.3.1.* + , amazonka-test == 1.3.1.* + , amazonka-cloudfront == 1.3.1.* , base , bytestring , lens 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 @@ -179,6 +179,15 @@ -- * Waiters -- $waiters + -- ** StreamingDistributionDeployed + , streamingDistributionDeployed + + -- ** DistributionDeployed + , distributionDeployed + + -- ** InvalidationCompleted + , invalidationCompleted + -- * Operations -- $operations @@ -203,7 +212,7 @@ -- ** DeleteCloudFrontOriginAccessIdentity , module Network.AWS.CloudFront.DeleteCloudFrontOriginAccessIdentity - -- ** ListStreamingDistributions + -- ** ListStreamingDistributions (Paginated) , module Network.AWS.CloudFront.ListStreamingDistributions -- ** GetStreamingDistributionConfig @@ -218,13 +227,13 @@ -- ** CreateCloudFrontOriginAccessIdentity , module Network.AWS.CloudFront.CreateCloudFrontOriginAccessIdentity - -- ** ListCloudFrontOriginAccessIdentities + -- ** ListCloudFrontOriginAccessIdentities (Paginated) , module Network.AWS.CloudFront.ListCloudFrontOriginAccessIdentities -- ** GetInvalidation , module Network.AWS.CloudFront.GetInvalidation - -- ** ListInvalidations + -- ** ListInvalidations (Paginated) , module Network.AWS.CloudFront.ListInvalidations -- ** CreateInvalidation @@ -242,7 +251,7 @@ -- ** DeleteDistribution , module Network.AWS.CloudFront.DeleteDistribution - -- ** ListDistributions + -- ** ListDistributions (Paginated) , module Network.AWS.CloudFront.ListDistributions -- * Types 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 @@ -21,6 +21,8 @@ -- List origin access identities. -- -- /See:/ for ListCloudFrontOriginAccessIdentities. +-- +-- This operation returns paginated results. module Network.AWS.CloudFront.ListCloudFrontOriginAccessIdentities ( -- * Creating a Request @@ -40,6 +42,7 @@ import Network.AWS.CloudFront.Types import Network.AWS.CloudFront.Types.Product +import Network.AWS.Pager import Network.AWS.Prelude import Network.AWS.Request import Network.AWS.Response @@ -79,6 +82,26 @@ -- body. lcfoaiMaxItems :: Lens' ListCloudFrontOriginAccessIdentities (Maybe Text) lcfoaiMaxItems = lens _lcfoaiMaxItems (\ s a -> s{_lcfoaiMaxItems = a}); + +instance AWSPager + ListCloudFrontOriginAccessIdentities where + page rq rs + | stop + (rs ^. + lcfoairsCloudFrontOriginAccessIdentityList . + cfoailIsTruncated) + = Nothing + | isNothing + (rs ^? + lcfoairsCloudFrontOriginAccessIdentityList . + cfoailNextMarker . _Just) + = Nothing + | otherwise = + Just $ rq & + lcfoaiMarker .~ + rs ^? + lcfoairsCloudFrontOriginAccessIdentityList . + cfoailNextMarker . _Just instance AWSRequest 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 @@ -21,6 +21,8 @@ -- List distributions. -- -- /See:/ for ListDistributions. +-- +-- This operation returns paginated results. module Network.AWS.CloudFront.ListDistributions ( -- * Creating a Request @@ -40,6 +42,7 @@ import Network.AWS.CloudFront.Types import Network.AWS.CloudFront.Types.Product +import Network.AWS.Pager import Network.AWS.Prelude import Network.AWS.Request import Network.AWS.Response @@ -78,6 +81,18 @@ -- | The maximum number of distributions you want in the response body. ldMaxItems :: Lens' ListDistributions (Maybe Text) ldMaxItems = lens _ldMaxItems (\ s a -> s{_ldMaxItems = a}); + +instance AWSPager ListDistributions where + page rq rs + | stop (rs ^. ldrsDistributionList . dlIsTruncated) = + Nothing + | isNothing + (rs ^? ldrsDistributionList . dlNextMarker . _Just) + = Nothing + | otherwise = + Just $ rq & + ldMarker .~ + rs ^? ldrsDistributionList . dlNextMarker . _Just instance AWSRequest ListDistributions where type Rs ListDistributions = ListDistributionsResponse 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 @@ -21,6 +21,8 @@ -- List invalidation batches. -- -- /See:/ for ListInvalidations. +-- +-- This operation returns paginated results. module Network.AWS.CloudFront.ListInvalidations ( -- * Creating a Request @@ -41,6 +43,7 @@ import Network.AWS.CloudFront.Types import Network.AWS.CloudFront.Types.Product +import Network.AWS.Pager import Network.AWS.Prelude import Network.AWS.Request import Network.AWS.Response @@ -91,6 +94,18 @@ -- | The distribution\'s id. liDistributionId :: Lens' ListInvalidations Text liDistributionId = lens _liDistributionId (\ s a -> s{_liDistributionId = a}); + +instance AWSPager ListInvalidations where + page rq rs + | stop (rs ^. lirsInvalidationList . ilIsTruncated) = + Nothing + | isNothing + (rs ^? lirsInvalidationList . ilNextMarker . _Just) + = Nothing + | otherwise = + Just $ rq & + liMarker .~ + rs ^? lirsInvalidationList . ilNextMarker . _Just instance AWSRequest ListInvalidations where type Rs ListInvalidations = ListInvalidationsResponse 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 @@ -21,6 +21,8 @@ -- List streaming distributions. -- -- /See:/ for ListStreamingDistributions. +-- +-- This operation returns paginated results. module Network.AWS.CloudFront.ListStreamingDistributions ( -- * Creating a Request @@ -40,6 +42,7 @@ import Network.AWS.CloudFront.Types import Network.AWS.CloudFront.Types.Product +import Network.AWS.Pager import Network.AWS.Prelude import Network.AWS.Request import Network.AWS.Response @@ -79,6 +82,24 @@ -- body. lsdMaxItems :: Lens' ListStreamingDistributions (Maybe Text) lsdMaxItems = lens _lsdMaxItems (\ s a -> s{_lsdMaxItems = a}); + +instance AWSPager ListStreamingDistributions where + page rq rs + | stop + (rs ^. + lsdrsStreamingDistributionList . sdlIsTruncated) + = Nothing + | isNothing + (rs ^? + lsdrsStreamingDistributionList . + sdlNextMarker . _Just) + = Nothing + | otherwise = + Just $ rq & + lsdMarker .~ + rs ^? + lsdrsStreamingDistributionList . + sdlNextMarker . _Just instance AWSRequest ListStreamingDistributions where type Rs ListStreamingDistributions = diff --git a/gen/Network/AWS/CloudFront/Waiters.hs b/gen/Network/AWS/CloudFront/Waiters.hs --- a/gen/Network/AWS/CloudFront/Waiters.hs +++ b/gen/Network/AWS/CloudFront/Waiters.hs @@ -15,6 +15,52 @@ -- module Network.AWS.CloudFront.Waiters where +import Network.AWS.CloudFront.GetDistribution +import Network.AWS.CloudFront.GetInvalidation +import Network.AWS.CloudFront.GetStreamingDistribution import Network.AWS.CloudFront.Types import Network.AWS.Prelude import Network.AWS.Waiter + +-- | Polls 'Network.AWS.CloudFront.GetStreamingDistribution' every 60 seconds until a +-- successful state is reached. An error is returned after 25 failed checks. +streamingDistributionDeployed :: Wait GetStreamingDistribution +streamingDistributionDeployed = + Wait + { _waitName = "StreamingDistributionDeployed" + , _waitAttempts = 25 + , _waitDelay = 60 + , _waitAcceptors = [ matchAll + "Deployed" + AcceptSuccess + (gsdrsStreamingDistribution . + _Just . sdStatus . to toTextCI)] + } + +-- | Polls 'Network.AWS.CloudFront.GetDistribution' every 60 seconds until a +-- successful state is reached. An error is returned after 25 failed checks. +distributionDeployed :: Wait GetDistribution +distributionDeployed = + Wait + { _waitName = "DistributionDeployed" + , _waitAttempts = 25 + , _waitDelay = 60 + , _waitAcceptors = [ matchAll + "Deployed" + AcceptSuccess + (gdrsDistribution . _Just . dStatus . to toTextCI)] + } + +-- | Polls 'Network.AWS.CloudFront.GetInvalidation' every 20 seconds until a +-- successful state is reached. An error is returned after 60 failed checks. +invalidationCompleted :: Wait GetInvalidation +invalidationCompleted = + Wait + { _waitName = "InvalidationCompleted" + , _waitAttempts = 60 + , _waitDelay = 20 + , _waitAcceptors = [ matchAll + "Completed" + AcceptSuccess + (girsInvalidation . _Just . iStatus . to toTextCI)] + }