diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.2.0.2` +`1.3.0` ## Description diff --git a/amazonka-cloudsearch-domains.cabal b/amazonka-cloudsearch-domains.cabal --- a/amazonka-cloudsearch-domains.cabal +++ b/amazonka-cloudsearch-domains.cabal @@ -1,5 +1,5 @@ name: amazonka-cloudsearch-domains -version: 1.2.0.2 +version: 1.3.0 synopsis: Amazon CloudSearch Domain SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -63,7 +63,7 @@ , Network.AWS.CloudSearchDomains.Types.Sum build-depends: - amazonka-core == 1.2.0.* + amazonka-core == 1.3.0.* , base >= 4.7 && < 5 test-suite amazonka-cloudsearch-domains-test @@ -83,9 +83,9 @@ , Test.AWS.CloudSearchDomains.Internal build-depends: - amazonka-core == 1.2.0.* - , amazonka-test == 1.2.0.* - , amazonka-cloudsearch-domains == 1.2.0.* + amazonka-core == 1.3.0.* + , amazonka-test == 1.3.0.* + , amazonka-cloudsearch-domains == 1.3.0.* , base , bytestring , lens diff --git a/gen/Network/AWS/CloudSearchDomains.hs b/gen/Network/AWS/CloudSearchDomains.hs --- a/gen/Network/AWS/CloudSearchDomains.hs +++ b/gen/Network/AWS/CloudSearchDomains.hs @@ -97,8 +97,8 @@ -- ** SearchStatus , SearchStatus , searchStatus - , ssRid - , ssTimems + , sRid + , sTimems -- ** SuggestModel , SuggestModel @@ -110,8 +110,8 @@ -- ** SuggestStatus , SuggestStatus , suggestStatus - , sRid - , sTimems + , ssRid + , ssTimems -- ** SuggestionMatch , SuggestionMatch diff --git a/gen/Network/AWS/CloudSearchDomains/Search.hs b/gen/Network/AWS/CloudSearchDomains/Search.hs --- a/gen/Network/AWS/CloudSearchDomains/Search.hs +++ b/gen/Network/AWS/CloudSearchDomains/Search.hs @@ -53,11 +53,11 @@ -- * Request Lenses , seaExpr , seaCursor - , seaFilterQuery , seaReturn , seaQueryOptions - , seaQueryParser + , seaFilterQuery , seaSize + , seaQueryParser , seaStart , seaHighlight , seaSort @@ -69,9 +69,10 @@ , searchResponse , SearchResponse -- * Response Lenses + , searsStatus , searsFacets , searsHits - , searsStatus + , searsResponseStatus ) where import Network.AWS.CloudSearchDomains.Types @@ -86,11 +87,11 @@ data Search = Search' { _seaExpr :: !(Maybe Text) , _seaCursor :: !(Maybe Text) - , _seaFilterQuery :: !(Maybe Text) , _seaReturn :: !(Maybe Text) , _seaQueryOptions :: !(Maybe Text) - , _seaQueryParser :: !(Maybe QueryParser) + , _seaFilterQuery :: !(Maybe Text) , _seaSize :: !(Maybe Integer) + , _seaQueryParser :: !(Maybe QueryParser) , _seaStart :: !(Maybe Integer) , _seaHighlight :: !(Maybe Text) , _seaSort :: !(Maybe Text) @@ -107,16 +108,16 @@ -- -- * 'seaCursor' -- --- * 'seaFilterQuery' --- -- * 'seaReturn' -- -- * 'seaQueryOptions' -- --- * 'seaQueryParser' +-- * 'seaFilterQuery' -- -- * 'seaSize' -- +-- * 'seaQueryParser' +-- -- * 'seaStart' -- -- * 'seaHighlight' @@ -135,11 +136,11 @@ Search' { _seaExpr = Nothing , _seaCursor = Nothing - , _seaFilterQuery = Nothing , _seaReturn = Nothing , _seaQueryOptions = Nothing - , _seaQueryParser = Nothing + , _seaFilterQuery = Nothing , _seaSize = Nothing + , _seaQueryParser = Nothing , _seaStart = Nothing , _seaHighlight = Nothing , _seaSort = Nothing @@ -178,20 +179,6 @@ seaCursor :: Lens' Search (Maybe Text) seaCursor = lens _seaCursor (\ s a -> s{_seaCursor = a}); --- | Specifies a structured query that filters the results of a search --- without affecting how the results are scored and sorted. You use --- 'filterQuery' in conjunction with the 'query' parameter to filter the --- documents that match the constraints specified in the 'query' parameter. --- Specifying a filter controls only which matching documents are included --- in the results, it has no effect on how they are scored and sorted. The --- 'filterQuery' parameter supports the full structured query syntax. --- --- For more information about using filters, see --- --- in the /Amazon CloudSearch Developer Guide/. -seaFilterQuery :: Lens' Search (Maybe Text) -seaFilterQuery = lens _seaFilterQuery (\ s a -> s{_seaFilterQuery = a}); - -- | Specifies the field and expression values to include in the response. -- Multiple fields or expressions are specified as a comma-separated list. -- By default, a search response includes all return enabled fields @@ -299,6 +286,24 @@ seaQueryOptions :: Lens' Search (Maybe Text) seaQueryOptions = lens _seaQueryOptions (\ s a -> s{_seaQueryOptions = a}); +-- | Specifies a structured query that filters the results of a search +-- without affecting how the results are scored and sorted. You use +-- 'filterQuery' in conjunction with the 'query' parameter to filter the +-- documents that match the constraints specified in the 'query' parameter. +-- Specifying a filter controls only which matching documents are included +-- in the results, it has no effect on how they are scored and sorted. The +-- 'filterQuery' parameter supports the full structured query syntax. +-- +-- For more information about using filters, see +-- +-- in the /Amazon CloudSearch Developer Guide/. +seaFilterQuery :: Lens' Search (Maybe Text) +seaFilterQuery = lens _seaFilterQuery (\ s a -> s{_seaFilterQuery = a}); + +-- | Specifies the maximum number of search hits to include in the response. +seaSize :: Lens' Search (Maybe Integer) +seaSize = lens _seaSize (\ s a -> s{_seaSize = a}); + -- | Specifies which query parser to use to process the request. If -- 'queryParser' is not specified, Amazon CloudSearch uses the 'simple' -- query parser. @@ -335,10 +340,6 @@ seaQueryParser :: Lens' Search (Maybe QueryParser) seaQueryParser = lens _seaQueryParser (\ s a -> s{_seaQueryParser = a}); --- | Specifies the maximum number of search hits to include in the response. -seaSize :: Lens' Search (Maybe Integer) -seaSize = lens _seaSize (\ s a -> s{_seaSize = a}); - -- | Specifies the offset of the first search hit you want to return. Note -- that the result set is zero-based; the first result is at index 0. You -- can specify either the 'start' or 'cursor' parameter in a request, they @@ -491,8 +492,9 @@ = receiveJSON (\ s h x -> SearchResponse' <$> - (x .?> "facets" .!@ mempty) <*> (x .?> "hits") <*> - (pure (fromEnum s))) + (x .?> "status") <*> (x .?> "facets" .!@ mempty) <*> + (x .?> "hits") + <*> (pure (fromEnum s))) instance ToHeaders Search where toHeaders @@ -508,13 +510,13 @@ toQuery Search'{..} = mconcat ["expr" =: _seaExpr, "cursor" =: _seaCursor, - "fq" =: _seaFilterQuery, "return" =: _seaReturn, + "return" =: _seaReturn, "q.options" =: _seaQueryOptions, - "q.parser" =: _seaQueryParser, "size" =: _seaSize, - "start" =: _seaStart, "highlight" =: _seaHighlight, - "sort" =: _seaSort, "facet" =: _seaFacet, - "partial" =: _seaPartial, "q" =: _seaQuery, - "format=sdk&pretty=true"] + "fq" =: _seaFilterQuery, "size" =: _seaSize, + "q.parser" =: _seaQueryParser, "start" =: _seaStart, + "highlight" =: _seaHighlight, "sort" =: _seaSort, + "facet" =: _seaFacet, "partial" =: _seaPartial, + "q" =: _seaQuery, "format=sdk&pretty=true"] -- | The result of a 'Search' request. Contains the documents that match the -- specified search criteria and any requested fields, highlights, and @@ -522,30 +524,38 @@ -- -- /See:/ 'searchResponse' smart constructor. data SearchResponse = SearchResponse' - { _searsFacets :: !(Maybe (Map Text BucketInfo)) - , _searsHits :: !(Maybe Hits) - , _searsStatus :: !Int + { _searsStatus :: !(Maybe SearchStatus) + , _searsFacets :: !(Maybe (Map Text BucketInfo)) + , _searsHits :: !(Maybe Hits) + , _searsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SearchResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- +-- * 'searsStatus' +-- -- * 'searsFacets' -- -- * 'searsHits' -- --- * 'searsStatus' +-- * 'searsResponseStatus' searchResponse - :: Int -- ^ 'searsStatus' + :: Int -- ^ 'searsResponseStatus' -> SearchResponse -searchResponse pStatus_ = +searchResponse pResponseStatus_ = SearchResponse' - { _searsFacets = Nothing + { _searsStatus = Nothing + , _searsFacets = Nothing , _searsHits = Nothing - , _searsStatus = pStatus_ + , _searsResponseStatus = pResponseStatus_ } +-- | The status information returned for the search request. +searsStatus :: Lens' SearchResponse (Maybe SearchStatus) +searsStatus = lens _searsStatus (\ s a -> s{_searsStatus = a}); + -- | The requested facet information. searsFacets :: Lens' SearchResponse (HashMap Text BucketInfo) searsFacets = lens _searsFacets (\ s a -> s{_searsFacets = a}) . _Default . _Map; @@ -555,5 +565,5 @@ searsHits = lens _searsHits (\ s a -> s{_searsHits = a}); -- | The response status code. -searsStatus :: Lens' SearchResponse Int -searsStatus = lens _searsStatus (\ s a -> s{_searsStatus = a}); +searsResponseStatus :: Lens' SearchResponse Int +searsResponseStatus = lens _searsResponseStatus (\ s a -> s{_searsResponseStatus = a}); diff --git a/gen/Network/AWS/CloudSearchDomains/Suggest.hs b/gen/Network/AWS/CloudSearchDomains/Suggest.hs --- a/gen/Network/AWS/CloudSearchDomains/Suggest.hs +++ b/gen/Network/AWS/CloudSearchDomains/Suggest.hs @@ -55,6 +55,7 @@ -- * Response Lenses , srsSuggest , srsStatus + , srsResponseStatus ) where import Network.AWS.CloudSearchDomains.Types @@ -111,7 +112,8 @@ = receiveJSON (\ s h x -> SuggestResponse' <$> - (x .?> "suggest") <*> (pure (fromEnum s))) + (x .?> "suggest") <*> (x .?> "status") <*> + (pure (fromEnum s))) instance ToHeaders Suggest where toHeaders @@ -133,8 +135,9 @@ -- -- /See:/ 'suggestResponse' smart constructor. data SuggestResponse = SuggestResponse' - { _srsSuggest :: !(Maybe SuggestModel) - , _srsStatus :: !Int + { _srsSuggest :: !(Maybe SuggestModel) + , _srsStatus :: !(Maybe SuggestStatus) + , _srsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SuggestResponse' with the minimum fields required to make a request. @@ -144,19 +147,27 @@ -- * 'srsSuggest' -- -- * 'srsStatus' +-- +-- * 'srsResponseStatus' suggestResponse - :: Int -- ^ 'srsStatus' + :: Int -- ^ 'srsResponseStatus' -> SuggestResponse -suggestResponse pStatus_ = +suggestResponse pResponseStatus_ = SuggestResponse' { _srsSuggest = Nothing - , _srsStatus = pStatus_ + , _srsStatus = Nothing + , _srsResponseStatus = pResponseStatus_ } -- | Container for the matching search suggestion information. srsSuggest :: Lens' SuggestResponse (Maybe SuggestModel) srsSuggest = lens _srsSuggest (\ s a -> s{_srsSuggest = a}); --- | The response status code. -srsStatus :: Lens' SuggestResponse Int +-- | The status of a 'SuggestRequest'. Contains the resource ID ('rid') and +-- how long it took to process the request ('timems'). +srsStatus :: Lens' SuggestResponse (Maybe SuggestStatus) srsStatus = lens _srsStatus (\ s a -> s{_srsStatus = a}); + +-- | The response status code. +srsResponseStatus :: Lens' SuggestResponse Int +srsResponseStatus = lens _srsResponseStatus (\ s a -> s{_srsResponseStatus = a}); diff --git a/gen/Network/AWS/CloudSearchDomains/Types.hs b/gen/Network/AWS/CloudSearchDomains/Types.hs --- a/gen/Network/AWS/CloudSearchDomains/Types.hs +++ b/gen/Network/AWS/CloudSearchDomains/Types.hs @@ -60,8 +60,8 @@ -- * SearchStatus , SearchStatus , searchStatus - , ssRid - , ssTimems + , sRid + , sTimems -- * SuggestModel , SuggestModel @@ -73,8 +73,8 @@ -- * SuggestStatus , SuggestStatus , suggestStatus - , sRid - , sTimems + , ssRid + , ssTimems -- * SuggestionMatch , SuggestionMatch diff --git a/gen/Network/AWS/CloudSearchDomains/Types/Product.hs b/gen/Network/AWS/CloudSearchDomains/Types/Product.hs --- a/gen/Network/AWS/CloudSearchDomains/Types/Product.hs +++ b/gen/Network/AWS/CloudSearchDomains/Types/Product.hs @@ -235,32 +235,32 @@ -- -- /See:/ 'searchStatus' smart constructor. data SearchStatus = SearchStatus' - { _ssRid :: !(Maybe Text) - , _ssTimems :: !(Maybe Integer) + { _sRid :: !(Maybe Text) + , _sTimems :: !(Maybe Integer) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SearchStatus' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'ssRid' +-- * 'sRid' -- --- * 'ssTimems' +-- * 'sTimems' searchStatus :: SearchStatus searchStatus = SearchStatus' - { _ssRid = Nothing - , _ssTimems = Nothing + { _sRid = Nothing + , _sTimems = Nothing } -- | The encrypted resource ID for the request. -ssRid :: Lens' SearchStatus (Maybe Text) -ssRid = lens _ssRid (\ s a -> s{_ssRid = a}); +sRid :: Lens' SearchStatus (Maybe Text) +sRid = lens _sRid (\ s a -> s{_sRid = a}); -- | How long it took to process the request, in milliseconds. -ssTimems :: Lens' SearchStatus (Maybe Integer) -ssTimems = lens _ssTimems (\ s a -> s{_ssTimems = a}); +sTimems :: Lens' SearchStatus (Maybe Integer) +sTimems = lens _sTimems (\ s a -> s{_sTimems = a}); instance FromJSON SearchStatus where parseJSON @@ -321,32 +321,32 @@ -- -- /See:/ 'suggestStatus' smart constructor. data SuggestStatus = SuggestStatus' - { _sRid :: !(Maybe Text) - , _sTimems :: !(Maybe Integer) + { _ssRid :: !(Maybe Text) + , _ssTimems :: !(Maybe Integer) } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'SuggestStatus' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- --- * 'sRid' +-- * 'ssRid' -- --- * 'sTimems' +-- * 'ssTimems' suggestStatus :: SuggestStatus suggestStatus = SuggestStatus' - { _sRid = Nothing - , _sTimems = Nothing + { _ssRid = Nothing + , _ssTimems = Nothing } -- | The encrypted resource ID for the request. -sRid :: Lens' SuggestStatus (Maybe Text) -sRid = lens _sRid (\ s a -> s{_sRid = a}); +ssRid :: Lens' SuggestStatus (Maybe Text) +ssRid = lens _ssRid (\ s a -> s{_ssRid = a}); -- | How long it took to process the request, in milliseconds. -sTimems :: Lens' SuggestStatus (Maybe Integer) -sTimems = lens _sTimems (\ s a -> s{_sTimems = a}); +ssTimems :: Lens' SuggestStatus (Maybe Integer) +ssTimems = lens _ssTimems (\ s a -> s{_ssTimems = a}); instance FromJSON SuggestStatus where parseJSON diff --git a/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs b/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs --- a/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs +++ b/gen/Network/AWS/CloudSearchDomains/UploadDocuments.hs @@ -59,10 +59,11 @@ , uploadDocumentsResponse , UploadDocumentsResponse -- * Response Lenses + , udrsStatus , udrsAdds , udrsWarnings , udrsDeletes - , udrsStatus + , udrsResponseStatus ) where import Network.AWS.CloudSearchDomains.Types @@ -115,8 +116,9 @@ = receiveJSON (\ s h x -> UploadDocumentsResponse' <$> - (x .?> "adds") <*> (x .?> "warnings" .!@ mempty) <*> - (x .?> "deletes") + (x .?> "status") <*> (x .?> "adds") <*> + (x .?> "warnings" .!@ mempty) + <*> (x .?> "deletes") <*> (pure (fromEnum s))) instance ToBody UploadDocuments where @@ -139,34 +141,42 @@ -- -- /See:/ 'uploadDocumentsResponse' smart constructor. data UploadDocumentsResponse = UploadDocumentsResponse' - { _udrsAdds :: !(Maybe Integer) - , _udrsWarnings :: !(Maybe [DocumentServiceWarning]) - , _udrsDeletes :: !(Maybe Integer) - , _udrsStatus :: !Int + { _udrsStatus :: !(Maybe Text) + , _udrsAdds :: !(Maybe Integer) + , _udrsWarnings :: !(Maybe [DocumentServiceWarning]) + , _udrsDeletes :: !(Maybe Integer) + , _udrsResponseStatus :: !Int } deriving (Eq,Read,Show,Data,Typeable,Generic) -- | Creates a value of 'UploadDocumentsResponse' with the minimum fields required to make a request. -- -- Use one of the following lenses to modify other fields as desired: -- +-- * 'udrsStatus' +-- -- * 'udrsAdds' -- -- * 'udrsWarnings' -- -- * 'udrsDeletes' -- --- * 'udrsStatus' +-- * 'udrsResponseStatus' uploadDocumentsResponse - :: Int -- ^ 'udrsStatus' + :: Int -- ^ 'udrsResponseStatus' -> UploadDocumentsResponse -uploadDocumentsResponse pStatus_ = +uploadDocumentsResponse pResponseStatus_ = UploadDocumentsResponse' - { _udrsAdds = Nothing + { _udrsStatus = Nothing + , _udrsAdds = Nothing , _udrsWarnings = Nothing , _udrsDeletes = Nothing - , _udrsStatus = pStatus_ + , _udrsResponseStatus = pResponseStatus_ } +-- | The status of an 'UploadDocumentsRequest'. +udrsStatus :: Lens' UploadDocumentsResponse (Maybe Text) +udrsStatus = lens _udrsStatus (\ s a -> s{_udrsStatus = a}); + -- | The number of documents that were added to the search domain. udrsAdds :: Lens' UploadDocumentsResponse (Maybe Integer) udrsAdds = lens _udrsAdds (\ s a -> s{_udrsAdds = a}); @@ -181,5 +191,5 @@ udrsDeletes = lens _udrsDeletes (\ s a -> s{_udrsDeletes = a}); -- | The response status code. -udrsStatus :: Lens' UploadDocumentsResponse Int -udrsStatus = lens _udrsStatus (\ s a -> s{_udrsStatus = a}); +udrsResponseStatus :: Lens' UploadDocumentsResponse Int +udrsResponseStatus = lens _udrsResponseStatus (\ s a -> s{_udrsResponseStatus = a});