diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.1.0` +`1.2.0` ## Description diff --git a/amazonka-kinesis.cabal b/amazonka-kinesis.cabal --- a/amazonka-kinesis.cabal +++ b/amazonka-kinesis.cabal @@ -1,5 +1,5 @@ name: amazonka-kinesis -version: 1.1.0 +version: 1.2.0 synopsis: Amazon Kinesis SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -65,7 +65,7 @@ , Network.AWS.Kinesis.Types.Sum build-depends: - amazonka-core == 1.1.0.* + amazonka-core == 1.2.0.* , base >= 4.7 && < 5 test-suite amazonka-kinesis-test @@ -84,9 +84,9 @@ , Test.AWS.Kinesis.Internal build-depends: - amazonka-core == 1.1.0 - , amazonka-test == 1.1.0 - , amazonka-kinesis == 1.1.0 + amazonka-core == 1.2.0 + , amazonka-test == 1.2.0 + , amazonka-kinesis == 1.2.0 , base , bytestring , lens diff --git a/gen/Network/AWS/Kinesis.hs b/gen/Network/AWS/Kinesis.hs --- a/gen/Network/AWS/Kinesis.hs +++ b/gen/Network/AWS/Kinesis.hs @@ -19,8 +19,8 @@ -- /See:/ module Network.AWS.Kinesis ( - -- * Service - Kinesis + -- * Service Configuration + kinesis -- * Errors -- $errors diff --git a/gen/Network/AWS/Kinesis/AddTagsToStream.hs b/gen/Network/AWS/Kinesis/AddTagsToStream.hs --- a/gen/Network/AWS/Kinesis/AddTagsToStream.hs +++ b/gen/Network/AWS/Kinesis/AddTagsToStream.hs @@ -78,9 +78,8 @@ attsTags = lens _attsTags (\ s a -> s{_attsTags = a}) . _Map; instance AWSRequest AddTagsToStream where - type Sv AddTagsToStream = Kinesis type Rs AddTagsToStream = AddTagsToStreamResponse - request = postJSON + request = postJSON kinesis response = receiveNull AddTagsToStreamResponse' instance ToHeaders AddTagsToStream where @@ -95,8 +94,9 @@ instance ToJSON AddTagsToStream where toJSON AddTagsToStream'{..} = object - ["StreamName" .= _attsStreamName, - "Tags" .= _attsTags] + (catMaybes + [Just ("StreamName" .= _attsStreamName), + Just ("Tags" .= _attsTags)]) instance ToPath AddTagsToStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/CreateStream.hs b/gen/Network/AWS/Kinesis/CreateStream.hs --- a/gen/Network/AWS/Kinesis/CreateStream.hs +++ b/gen/Network/AWS/Kinesis/CreateStream.hs @@ -124,9 +124,8 @@ csShardCount = lens _csShardCount (\ s a -> s{_csShardCount = a}) . _Nat; instance AWSRequest CreateStream where - type Sv CreateStream = Kinesis type Rs CreateStream = CreateStreamResponse - request = postJSON + request = postJSON kinesis response = receiveNull CreateStreamResponse' instance ToHeaders CreateStream where @@ -141,8 +140,9 @@ instance ToJSON CreateStream where toJSON CreateStream'{..} = object - ["StreamName" .= _csStreamName, - "ShardCount" .= _csShardCount] + (catMaybes + [Just ("StreamName" .= _csStreamName), + Just ("ShardCount" .= _csShardCount)]) instance ToPath CreateStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/DeleteStream.hs b/gen/Network/AWS/Kinesis/DeleteStream.hs --- a/gen/Network/AWS/Kinesis/DeleteStream.hs +++ b/gen/Network/AWS/Kinesis/DeleteStream.hs @@ -84,9 +84,8 @@ dsStreamName = lens _dsStreamName (\ s a -> s{_dsStreamName = a}); instance AWSRequest DeleteStream where - type Sv DeleteStream = Kinesis type Rs DeleteStream = DeleteStreamResponse - request = postJSON + request = postJSON kinesis response = receiveNull DeleteStreamResponse' instance ToHeaders DeleteStream where @@ -100,7 +99,8 @@ instance ToJSON DeleteStream where toJSON DeleteStream'{..} - = object ["StreamName" .= _dsStreamName] + = object + (catMaybes [Just ("StreamName" .= _dsStreamName)]) instance ToPath DeleteStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/DescribeStream.hs b/gen/Network/AWS/Kinesis/DescribeStream.hs --- a/gen/Network/AWS/Kinesis/DescribeStream.hs +++ b/gen/Network/AWS/Kinesis/DescribeStream.hs @@ -126,9 +126,8 @@ dsrsStreamDescription . sdShards . _last . sShardId instance AWSRequest DescribeStream where - type Sv DescribeStream = Kinesis type Rs DescribeStream = DescribeStreamResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -147,8 +146,11 @@ instance ToJSON DescribeStream where toJSON DescribeStream'{..} = object - ["ExclusiveStartShardId" .= _dExclusiveStartShardId, - "Limit" .= _dLimit, "StreamName" .= _dStreamName] + (catMaybes + [("ExclusiveStartShardId" .=) <$> + _dExclusiveStartShardId, + ("Limit" .=) <$> _dLimit, + Just ("StreamName" .= _dStreamName)]) instance ToPath DescribeStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/GetRecords.hs b/gen/Network/AWS/Kinesis/GetRecords.hs --- a/gen/Network/AWS/Kinesis/GetRecords.hs +++ b/gen/Network/AWS/Kinesis/GetRecords.hs @@ -130,9 +130,8 @@ grShardIterator = lens _grShardIterator (\ s a -> s{_grShardIterator = a}); instance AWSRequest GetRecords where - type Sv GetRecords = Kinesis type Rs GetRecords = GetRecordsResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -154,8 +153,9 @@ instance ToJSON GetRecords where toJSON GetRecords'{..} = object - ["Limit" .= _grLimit, - "ShardIterator" .= _grShardIterator] + (catMaybes + [("Limit" .=) <$> _grLimit, + Just ("ShardIterator" .= _grShardIterator)]) instance ToPath GetRecords where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/GetShardIterator.hs b/gen/Network/AWS/Kinesis/GetShardIterator.hs --- a/gen/Network/AWS/Kinesis/GetShardIterator.hs +++ b/gen/Network/AWS/Kinesis/GetShardIterator.hs @@ -150,9 +150,8 @@ gsiShardIteratorType = lens _gsiShardIteratorType (\ s a -> s{_gsiShardIteratorType = a}); instance AWSRequest GetShardIterator where - type Sv GetShardIterator = Kinesis type Rs GetShardIterator = GetShardIteratorResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -171,11 +170,12 @@ instance ToJSON GetShardIterator where toJSON GetShardIterator'{..} = object - ["StartingSequenceNumber" .= - _gsiStartingSequenceNumber, - "StreamName" .= _gsiStreamName, - "ShardId" .= _gsiShardId, - "ShardIteratorType" .= _gsiShardIteratorType] + (catMaybes + [("StartingSequenceNumber" .=) <$> + _gsiStartingSequenceNumber, + Just ("StreamName" .= _gsiStreamName), + Just ("ShardId" .= _gsiShardId), + Just ("ShardIteratorType" .= _gsiShardIteratorType)]) instance ToPath GetShardIterator where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/ListStreams.hs b/gen/Network/AWS/Kinesis/ListStreams.hs --- a/gen/Network/AWS/Kinesis/ListStreams.hs +++ b/gen/Network/AWS/Kinesis/ListStreams.hs @@ -105,9 +105,8 @@ rs ^? lsrsStreamNames . _last instance AWSRequest ListStreams where - type Sv ListStreams = Kinesis type Rs ListStreams = ListStreamsResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -128,9 +127,10 @@ instance ToJSON ListStreams where toJSON ListStreams'{..} = object - ["Limit" .= _lsLimit, - "ExclusiveStartStreamName" .= - _lsExclusiveStartStreamName] + (catMaybes + [("Limit" .=) <$> _lsLimit, + ("ExclusiveStartStreamName" .=) <$> + _lsExclusiveStartStreamName]) instance ToPath ListStreams where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/ListTagsForStream.hs b/gen/Network/AWS/Kinesis/ListTagsForStream.hs --- a/gen/Network/AWS/Kinesis/ListTagsForStream.hs +++ b/gen/Network/AWS/Kinesis/ListTagsForStream.hs @@ -92,9 +92,8 @@ ltfsStreamName = lens _ltfsStreamName (\ s a -> s{_ltfsStreamName = a}); instance AWSRequest ListTagsForStream where - type Sv ListTagsForStream = Kinesis type Rs ListTagsForStream = ListTagsForStreamResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -114,9 +113,11 @@ instance ToJSON ListTagsForStream where toJSON ListTagsForStream'{..} = object - ["Limit" .= _ltfsLimit, - "ExclusiveStartTagKey" .= _ltfsExclusiveStartTagKey, - "StreamName" .= _ltfsStreamName] + (catMaybes + [("Limit" .=) <$> _ltfsLimit, + ("ExclusiveStartTagKey" .=) <$> + _ltfsExclusiveStartTagKey, + Just ("StreamName" .= _ltfsStreamName)]) instance ToPath ListTagsForStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/MergeShards.hs b/gen/Network/AWS/Kinesis/MergeShards.hs --- a/gen/Network/AWS/Kinesis/MergeShards.hs +++ b/gen/Network/AWS/Kinesis/MergeShards.hs @@ -125,9 +125,8 @@ msAdjacentShardToMerge = lens _msAdjacentShardToMerge (\ s a -> s{_msAdjacentShardToMerge = a}); instance AWSRequest MergeShards where - type Sv MergeShards = Kinesis type Rs MergeShards = MergeShardsResponse - request = postJSON + request = postJSON kinesis response = receiveNull MergeShardsResponse' instance ToHeaders MergeShards where @@ -142,9 +141,11 @@ instance ToJSON MergeShards where toJSON MergeShards'{..} = object - ["StreamName" .= _msStreamName, - "ShardToMerge" .= _msShardToMerge, - "AdjacentShardToMerge" .= _msAdjacentShardToMerge] + (catMaybes + [Just ("StreamName" .= _msStreamName), + Just ("ShardToMerge" .= _msShardToMerge), + Just + ("AdjacentShardToMerge" .= _msAdjacentShardToMerge)]) instance ToPath MergeShards where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/PutRecord.hs b/gen/Network/AWS/Kinesis/PutRecord.hs --- a/gen/Network/AWS/Kinesis/PutRecord.hs +++ b/gen/Network/AWS/Kinesis/PutRecord.hs @@ -170,9 +170,8 @@ prPartitionKey = lens _prPartitionKey (\ s a -> s{_prPartitionKey = a}); instance AWSRequest PutRecord where - type Sv PutRecord = Kinesis type Rs PutRecord = PutRecordResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -192,11 +191,13 @@ instance ToJSON PutRecord where toJSON PutRecord'{..} = object - ["ExplicitHashKey" .= _prExplicitHashKey, - "SequenceNumberForOrdering" .= - _prSequenceNumberForOrdering, - "StreamName" .= _prStreamName, "Data" .= _prData, - "PartitionKey" .= _prPartitionKey] + (catMaybes + [("ExplicitHashKey" .=) <$> _prExplicitHashKey, + ("SequenceNumberForOrdering" .=) <$> + _prSequenceNumberForOrdering, + Just ("StreamName" .= _prStreamName), + Just ("Data" .= _prData), + Just ("PartitionKey" .= _prPartitionKey)]) instance ToPath PutRecord where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/PutRecords.hs b/gen/Network/AWS/Kinesis/PutRecords.hs --- a/gen/Network/AWS/Kinesis/PutRecords.hs +++ b/gen/Network/AWS/Kinesis/PutRecords.hs @@ -137,9 +137,8 @@ pStreamName = lens _pStreamName (\ s a -> s{_pStreamName = a}); instance AWSRequest PutRecords where - type Sv PutRecords = Kinesis type Rs PutRecords = PutRecordsResponse - request = postJSON + request = postJSON kinesis response = receiveJSON (\ s h x -> @@ -159,8 +158,9 @@ instance ToJSON PutRecords where toJSON PutRecords'{..} = object - ["Records" .= _pRecordEntries, - "StreamName" .= _pStreamName] + (catMaybes + [Just ("Records" .= _pRecordEntries), + Just ("StreamName" .= _pStreamName)]) instance ToPath PutRecords where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs b/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs --- a/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs +++ b/gen/Network/AWS/Kinesis/RemoveTagsFromStream.hs @@ -77,10 +77,9 @@ rtfsTagKeys = lens _rtfsTagKeys (\ s a -> s{_rtfsTagKeys = a}) . _List1; instance AWSRequest RemoveTagsFromStream where - type Sv RemoveTagsFromStream = Kinesis type Rs RemoveTagsFromStream = RemoveTagsFromStreamResponse - request = postJSON + request = postJSON kinesis response = receiveNull RemoveTagsFromStreamResponse' instance ToHeaders RemoveTagsFromStream where @@ -96,8 +95,9 @@ instance ToJSON RemoveTagsFromStream where toJSON RemoveTagsFromStream'{..} = object - ["StreamName" .= _rtfsStreamName, - "TagKeys" .= _rtfsTagKeys] + (catMaybes + [Just ("StreamName" .= _rtfsStreamName), + Just ("TagKeys" .= _rtfsTagKeys)]) instance ToPath RemoveTagsFromStream where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/SplitShard.hs b/gen/Network/AWS/Kinesis/SplitShard.hs --- a/gen/Network/AWS/Kinesis/SplitShard.hs +++ b/gen/Network/AWS/Kinesis/SplitShard.hs @@ -140,9 +140,8 @@ ssNewStartingHashKey = lens _ssNewStartingHashKey (\ s a -> s{_ssNewStartingHashKey = a}); instance AWSRequest SplitShard where - type Sv SplitShard = Kinesis type Rs SplitShard = SplitShardResponse - request = postJSON + request = postJSON kinesis response = receiveNull SplitShardResponse' instance ToHeaders SplitShard where @@ -157,9 +156,11 @@ instance ToJSON SplitShard where toJSON SplitShard'{..} = object - ["StreamName" .= _ssStreamName, - "ShardToSplit" .= _ssShardToSplit, - "NewStartingHashKey" .= _ssNewStartingHashKey] + (catMaybes + [Just ("StreamName" .= _ssStreamName), + Just ("ShardToSplit" .= _ssShardToSplit), + Just + ("NewStartingHashKey" .= _ssNewStartingHashKey)]) instance ToPath SplitShard where toPath = const "/" diff --git a/gen/Network/AWS/Kinesis/Types.hs b/gen/Network/AWS/Kinesis/Types.hs --- a/gen/Network/AWS/Kinesis/Types.hs +++ b/gen/Network/AWS/Kinesis/Types.hs @@ -1,5 +1,4 @@ {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE TypeFamilies #-} -- Derived from AWS service descriptions, licensed under Apache 2.0. @@ -13,8 +12,8 @@ -- module Network.AWS.Kinesis.Types ( - -- * Service - Kinesis + -- * Service Configuration + kinesis -- * Errors , _ExpiredIteratorException @@ -94,39 +93,36 @@ import Network.AWS.Prelude import Network.AWS.Sign.V4 --- | Version @2013-12-02@ of the Amazon Kinesis SDK. -data Kinesis - -instance AWSService Kinesis where - type Sg Kinesis = V4 - service = const svc - where - svc = - Service - { _svcAbbrev = "Kinesis" - , _svcPrefix = "kinesis" - , _svcVersion = "2013-12-02" - , _svcEndpoint = defaultEndpoint svc - , _svcTimeout = Just 70 - , _svcStatus = statusSuccess - , _svcError = parseJSONError - , _svcRetry = retry - } - retry = - Exponential - { _retryBase = 5.0e-2 - , _retryGrowth = 2 - , _retryAttempts = 5 - , _retryCheck = check - } - check e - | has (hasCode "ThrottlingException" . hasStatus 400) e = - Just "throttling_exception" - | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling" - | has (hasStatus 503) e = Just "service_unavailable" - | has (hasStatus 500) e = Just "general_server_error" - | has (hasStatus 509) e = Just "limit_exceeded" - | otherwise = Nothing +-- | API version '2013-12-02' of the Amazon Kinesis SDK configuration. +kinesis :: Service +kinesis = + Service + { _svcAbbrev = "Kinesis" + , _svcSigner = v4 + , _svcPrefix = "kinesis" + , _svcVersion = "2013-12-02" + , _svcEndpoint = defaultEndpoint kinesis + , _svcTimeout = Just 70 + , _svcCheck = statusSuccess + , _svcError = parseJSONError + , _svcRetry = retry + } + where + retry = + Exponential + { _retryBase = 5.0e-2 + , _retryGrowth = 2 + , _retryAttempts = 5 + , _retryCheck = check + } + check e + | has (hasCode "ThrottlingException" . hasStatus 400) e = + Just "throttling_exception" + | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling" + | has (hasStatus 503) e = Just "service_unavailable" + | has (hasStatus 500) e = Just "general_server_error" + | has (hasStatus 509) e = Just "limit_exceeded" + | otherwise = Nothing -- | The provided iterator exceeds the maximum age allowed. _ExpiredIteratorException :: AsError a => Getting (First ServiceError) a ServiceError diff --git a/gen/Network/AWS/Kinesis/Types/Product.hs b/gen/Network/AWS/Kinesis/Types/Product.hs --- a/gen/Network/AWS/Kinesis/Types/Product.hs +++ b/gen/Network/AWS/Kinesis/Types/Product.hs @@ -2,7 +2,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} @@ -123,9 +122,10 @@ instance ToJSON PutRecordsRequestEntry where toJSON PutRecordsRequestEntry'{..} = object - ["ExplicitHashKey" .= _prreExplicitHashKey, - "Data" .= _prreData, - "PartitionKey" .= _prrePartitionKey] + (catMaybes + [("ExplicitHashKey" .=) <$> _prreExplicitHashKey, + Just ("Data" .= _prreData), + Just ("PartitionKey" .= _prrePartitionKey)]) -- | Represents the result of an individual record from a 'PutRecords' -- request. A record that is successfully added to your Amazon Kinesis diff --git a/test/Test/AWS/Gen/Kinesis.hs b/test/Test/AWS/Gen/Kinesis.hs --- a/test/Test/AWS/Gen/Kinesis.hs +++ b/test/Test/AWS/Gen/Kinesis.hs @@ -185,76 +185,89 @@ testPutRecordResponse = res "PutRecordResponse" "fixture/PutRecordResponse" + kinesis (Proxy :: Proxy PutRecord) testMergeShardsResponse :: MergeShardsResponse -> TestTree testMergeShardsResponse = res "MergeShardsResponse" "fixture/MergeShardsResponse" + kinesis (Proxy :: Proxy MergeShards) testGetRecordsResponse :: GetRecordsResponse -> TestTree testGetRecordsResponse = res "GetRecordsResponse" "fixture/GetRecordsResponse" + kinesis (Proxy :: Proxy GetRecords) testGetShardIteratorResponse :: GetShardIteratorResponse -> TestTree testGetShardIteratorResponse = res "GetShardIteratorResponse" "fixture/GetShardIteratorResponse" + kinesis (Proxy :: Proxy GetShardIterator) testListTagsForStreamResponse :: ListTagsForStreamResponse -> TestTree testListTagsForStreamResponse = res "ListTagsForStreamResponse" "fixture/ListTagsForStreamResponse" + kinesis (Proxy :: Proxy ListTagsForStream) testAddTagsToStreamResponse :: AddTagsToStreamResponse -> TestTree testAddTagsToStreamResponse = res "AddTagsToStreamResponse" "fixture/AddTagsToStreamResponse" + kinesis (Proxy :: Proxy AddTagsToStream) testPutRecordsResponse :: PutRecordsResponse -> TestTree testPutRecordsResponse = res "PutRecordsResponse" "fixture/PutRecordsResponse" + kinesis (Proxy :: Proxy PutRecords) testDeleteStreamResponse :: DeleteStreamResponse -> TestTree testDeleteStreamResponse = res "DeleteStreamResponse" "fixture/DeleteStreamResponse" + kinesis (Proxy :: Proxy DeleteStream) testRemoveTagsFromStreamResponse :: RemoveTagsFromStreamResponse -> TestTree testRemoveTagsFromStreamResponse = res "RemoveTagsFromStreamResponse" "fixture/RemoveTagsFromStreamResponse" + kinesis (Proxy :: Proxy RemoveTagsFromStream) testListStreamsResponse :: ListStreamsResponse -> TestTree testListStreamsResponse = res "ListStreamsResponse" "fixture/ListStreamsResponse" + kinesis (Proxy :: Proxy ListStreams) testCreateStreamResponse :: CreateStreamResponse -> TestTree testCreateStreamResponse = res "CreateStreamResponse" "fixture/CreateStreamResponse" + kinesis (Proxy :: Proxy CreateStream) testSplitShardResponse :: SplitShardResponse -> TestTree testSplitShardResponse = res "SplitShardResponse" "fixture/SplitShardResponse" + kinesis (Proxy :: Proxy SplitShard) testDescribeStreamResponse :: DescribeStreamResponse -> TestTree testDescribeStreamResponse = res "DescribeStreamResponse" "fixture/DescribeStreamResponse" + kinesis (Proxy :: Proxy DescribeStream)