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-config.cabal b/amazonka-config.cabal --- a/amazonka-config.cabal +++ b/amazonka-config.cabal @@ -1,5 +1,5 @@ name: amazonka-config -version: 1.1.0 +version: 1.2.0 synopsis: Amazon Config SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -88,7 +88,7 @@ , Network.AWS.Config.Types.Sum build-depends: - amazonka-core == 1.1.0.* + amazonka-core == 1.2.0.* , base >= 4.7 && < 5 test-suite amazonka-config-test @@ -107,9 +107,9 @@ , Test.AWS.Config.Internal build-depends: - amazonka-core == 1.1.0 - , amazonka-test == 1.1.0 - , amazonka-config == 1.1.0 + amazonka-core == 1.2.0 + , amazonka-test == 1.2.0 + , amazonka-config == 1.2.0 , base , bytestring , lens diff --git a/gen/Network/AWS/Config.hs b/gen/Network/AWS/Config.hs --- a/gen/Network/AWS/Config.hs +++ b/gen/Network/AWS/Config.hs @@ -44,8 +44,8 @@ -- /See:/ module Network.AWS.Config ( - -- * Service - Config + -- * Service Configuration + config -- * Errors -- $errors diff --git a/gen/Network/AWS/Config/DeleteDeliveryChannel.hs b/gen/Network/AWS/Config/DeleteDeliveryChannel.hs --- a/gen/Network/AWS/Config/DeleteDeliveryChannel.hs +++ b/gen/Network/AWS/Config/DeleteDeliveryChannel.hs @@ -71,10 +71,9 @@ ddcDeliveryChannelName = lens _ddcDeliveryChannelName (\ s a -> s{_ddcDeliveryChannelName = a}); instance AWSRequest DeleteDeliveryChannel where - type Sv DeleteDeliveryChannel = Config type Rs DeleteDeliveryChannel = DeleteDeliveryChannelResponse - request = postJSON + request = postJSON config response = receiveNull DeleteDeliveryChannelResponse' instance ToHeaders DeleteDeliveryChannel where @@ -90,7 +89,9 @@ instance ToJSON DeleteDeliveryChannel where toJSON DeleteDeliveryChannel'{..} = object - ["DeliveryChannelName" .= _ddcDeliveryChannelName] + (catMaybes + [Just + ("DeliveryChannelName" .= _ddcDeliveryChannelName)]) instance ToPath DeleteDeliveryChannel where toPath = const "/" diff --git a/gen/Network/AWS/Config/DeliverConfigSnapshot.hs b/gen/Network/AWS/Config/DeliverConfigSnapshot.hs --- a/gen/Network/AWS/Config/DeliverConfigSnapshot.hs +++ b/gen/Network/AWS/Config/DeliverConfigSnapshot.hs @@ -78,10 +78,9 @@ dcsDeliveryChannelName = lens _dcsDeliveryChannelName (\ s a -> s{_dcsDeliveryChannelName = a}); instance AWSRequest DeliverConfigSnapshot where - type Sv DeliverConfigSnapshot = Config type Rs DeliverConfigSnapshot = DeliverConfigSnapshotResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -101,7 +100,9 @@ instance ToJSON DeliverConfigSnapshot where toJSON DeliverConfigSnapshot'{..} = object - ["deliveryChannelName" .= _dcsDeliveryChannelName] + (catMaybes + [Just + ("deliveryChannelName" .= _dcsDeliveryChannelName)]) instance ToPath DeliverConfigSnapshot where toPath = const "/" diff --git a/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs b/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs --- a/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs +++ b/gen/Network/AWS/Config/DescribeConfigurationRecorderStatus.hs @@ -74,10 +74,9 @@ instance AWSRequest DescribeConfigurationRecorderStatus where - type Sv DescribeConfigurationRecorderStatus = Config type Rs DescribeConfigurationRecorderStatus = DescribeConfigurationRecorderStatusResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -100,8 +99,9 @@ where toJSON DescribeConfigurationRecorderStatus'{..} = object - ["ConfigurationRecorderNames" .= - _dcrsConfigurationRecorderNames] + (catMaybes + [("ConfigurationRecorderNames" .=) <$> + _dcrsConfigurationRecorderNames]) instance ToPath DescribeConfigurationRecorderStatus where diff --git a/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs b/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs --- a/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs +++ b/gen/Network/AWS/Config/DescribeConfigurationRecorders.hs @@ -72,10 +72,9 @@ instance AWSRequest DescribeConfigurationRecorders where - type Sv DescribeConfigurationRecorders = Config type Rs DescribeConfigurationRecorders = DescribeConfigurationRecordersResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -97,8 +96,9 @@ instance ToJSON DescribeConfigurationRecorders where toJSON DescribeConfigurationRecorders'{..} = object - ["ConfigurationRecorderNames" .= - _dcrConfigurationRecorderNames] + (catMaybes + [("ConfigurationRecorderNames" .=) <$> + _dcrConfigurationRecorderNames]) instance ToPath DescribeConfigurationRecorders where toPath = const "/" diff --git a/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs b/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs --- a/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs +++ b/gen/Network/AWS/Config/DescribeDeliveryChannelStatus.hs @@ -72,10 +72,9 @@ instance AWSRequest DescribeDeliveryChannelStatus where - type Sv DescribeDeliveryChannelStatus = Config type Rs DescribeDeliveryChannelStatus = DescribeDeliveryChannelStatusResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -97,7 +96,9 @@ instance ToJSON DescribeDeliveryChannelStatus where toJSON DescribeDeliveryChannelStatus'{..} = object - ["DeliveryChannelNames" .= _ddcsDeliveryChannelNames] + (catMaybes + [("DeliveryChannelNames" .=) <$> + _ddcsDeliveryChannelNames]) instance ToPath DescribeDeliveryChannelStatus where toPath = const "/" diff --git a/gen/Network/AWS/Config/DescribeDeliveryChannels.hs b/gen/Network/AWS/Config/DescribeDeliveryChannels.hs --- a/gen/Network/AWS/Config/DescribeDeliveryChannels.hs +++ b/gen/Network/AWS/Config/DescribeDeliveryChannels.hs @@ -71,10 +71,9 @@ ddcDeliveryChannelNames = lens _ddcDeliveryChannelNames (\ s a -> s{_ddcDeliveryChannelNames = a}) . _Default . _Coerce; instance AWSRequest DescribeDeliveryChannels where - type Sv DescribeDeliveryChannels = Config type Rs DescribeDeliveryChannels = DescribeDeliveryChannelsResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -95,7 +94,9 @@ instance ToJSON DescribeDeliveryChannels where toJSON DescribeDeliveryChannels'{..} = object - ["DeliveryChannelNames" .= _ddcDeliveryChannelNames] + (catMaybes + [("DeliveryChannelNames" .=) <$> + _ddcDeliveryChannelNames]) instance ToPath DescribeDeliveryChannels where toPath = const "/" diff --git a/gen/Network/AWS/Config/GetResourceConfigHistory.hs b/gen/Network/AWS/Config/GetResourceConfigHistory.hs --- a/gen/Network/AWS/Config/GetResourceConfigHistory.hs +++ b/gen/Network/AWS/Config/GetResourceConfigHistory.hs @@ -139,10 +139,9 @@ grchResourceId = lens _grchResourceId (\ s a -> s{_grchResourceId = a}); instance AWSRequest GetResourceConfigHistory where - type Sv GetResourceConfigHistory = Config type Rs GetResourceConfigHistory = GetResourceConfigHistoryResponse - request = postJSON + request = postJSON config response = receiveJSON (\ s h x -> @@ -164,12 +163,15 @@ instance ToJSON GetResourceConfigHistory where toJSON GetResourceConfigHistory'{..} = object - ["chronologicalOrder" .= _grchChronologicalOrder, - "nextToken" .= _grchNextToken, "limit" .= _grchLimit, - "laterTime" .= _grchLaterTime, - "earlierTime" .= _grchEarlierTime, - "resourceType" .= _grchResourceType, - "resourceId" .= _grchResourceId] + (catMaybes + [("chronologicalOrder" .=) <$> + _grchChronologicalOrder, + ("nextToken" .=) <$> _grchNextToken, + ("limit" .=) <$> _grchLimit, + ("laterTime" .=) <$> _grchLaterTime, + ("earlierTime" .=) <$> _grchEarlierTime, + Just ("resourceType" .= _grchResourceType), + Just ("resourceId" .= _grchResourceId)]) instance ToPath GetResourceConfigHistory where toPath = const "/" diff --git a/gen/Network/AWS/Config/PutConfigurationRecorder.hs b/gen/Network/AWS/Config/PutConfigurationRecorder.hs --- a/gen/Network/AWS/Config/PutConfigurationRecorder.hs +++ b/gen/Network/AWS/Config/PutConfigurationRecorder.hs @@ -77,10 +77,9 @@ pcrConfigurationRecorder = lens _pcrConfigurationRecorder (\ s a -> s{_pcrConfigurationRecorder = a}); instance AWSRequest PutConfigurationRecorder where - type Sv PutConfigurationRecorder = Config type Rs PutConfigurationRecorder = PutConfigurationRecorderResponse - request = postJSON + request = postJSON config response = receiveNull PutConfigurationRecorderResponse' @@ -97,8 +96,10 @@ instance ToJSON PutConfigurationRecorder where toJSON PutConfigurationRecorder'{..} = object - ["ConfigurationRecorder" .= - _pcrConfigurationRecorder] + (catMaybes + [Just + ("ConfigurationRecorder" .= + _pcrConfigurationRecorder)]) instance ToPath PutConfigurationRecorder where toPath = const "/" diff --git a/gen/Network/AWS/Config/PutDeliveryChannel.hs b/gen/Network/AWS/Config/PutDeliveryChannel.hs --- a/gen/Network/AWS/Config/PutDeliveryChannel.hs +++ b/gen/Network/AWS/Config/PutDeliveryChannel.hs @@ -77,10 +77,9 @@ pdcDeliveryChannel = lens _pdcDeliveryChannel (\ s a -> s{_pdcDeliveryChannel = a}); instance AWSRequest PutDeliveryChannel where - type Sv PutDeliveryChannel = Config type Rs PutDeliveryChannel = PutDeliveryChannelResponse - request = postJSON + request = postJSON config response = receiveNull PutDeliveryChannelResponse' instance ToHeaders PutDeliveryChannel where @@ -95,7 +94,9 @@ instance ToJSON PutDeliveryChannel where toJSON PutDeliveryChannel'{..} - = object ["DeliveryChannel" .= _pdcDeliveryChannel] + = object + (catMaybes + [Just ("DeliveryChannel" .= _pdcDeliveryChannel)]) instance ToPath PutDeliveryChannel where toPath = const "/" diff --git a/gen/Network/AWS/Config/StartConfigurationRecorder.hs b/gen/Network/AWS/Config/StartConfigurationRecorder.hs --- a/gen/Network/AWS/Config/StartConfigurationRecorder.hs +++ b/gen/Network/AWS/Config/StartConfigurationRecorder.hs @@ -70,10 +70,9 @@ sConfigurationRecorderName = lens _sConfigurationRecorderName (\ s a -> s{_sConfigurationRecorderName = a}); instance AWSRequest StartConfigurationRecorder where - type Sv StartConfigurationRecorder = Config type Rs StartConfigurationRecorder = StartConfigurationRecorderResponse - request = postJSON + request = postJSON config response = receiveNull StartConfigurationRecorderResponse' @@ -90,8 +89,10 @@ instance ToJSON StartConfigurationRecorder where toJSON StartConfigurationRecorder'{..} = object - ["ConfigurationRecorderName" .= - _sConfigurationRecorderName] + (catMaybes + [Just + ("ConfigurationRecorderName" .= + _sConfigurationRecorderName)]) instance ToPath StartConfigurationRecorder where toPath = const "/" diff --git a/gen/Network/AWS/Config/StopConfigurationRecorder.hs b/gen/Network/AWS/Config/StopConfigurationRecorder.hs --- a/gen/Network/AWS/Config/StopConfigurationRecorder.hs +++ b/gen/Network/AWS/Config/StopConfigurationRecorder.hs @@ -67,10 +67,9 @@ scrConfigurationRecorderName = lens _scrConfigurationRecorderName (\ s a -> s{_scrConfigurationRecorderName = a}); instance AWSRequest StopConfigurationRecorder where - type Sv StopConfigurationRecorder = Config type Rs StopConfigurationRecorder = StopConfigurationRecorderResponse - request = postJSON + request = postJSON config response = receiveNull StopConfigurationRecorderResponse' @@ -87,8 +86,10 @@ instance ToJSON StopConfigurationRecorder where toJSON StopConfigurationRecorder'{..} = object - ["ConfigurationRecorderName" .= - _scrConfigurationRecorderName] + (catMaybes + [Just + ("ConfigurationRecorderName" .= + _scrConfigurationRecorderName)]) instance ToPath StopConfigurationRecorder where toPath = const "/" diff --git a/gen/Network/AWS/Config/Types.hs b/gen/Network/AWS/Config/Types.hs --- a/gen/Network/AWS/Config/Types.hs +++ b/gen/Network/AWS/Config/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.Config.Types ( - -- * Service - Config + -- * Service Configuration + config -- * Errors , _ValidationException @@ -144,39 +143,36 @@ import Network.AWS.Prelude import Network.AWS.Sign.V4 --- | Version @2014-11-12@ of the Amazon Config SDK. -data Config - -instance AWSService Config where - type Sg Config = V4 - service = const svc - where - svc = - Service - { _svcAbbrev = "Config" - , _svcPrefix = "config" - , _svcVersion = "2014-11-12" - , _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 '2014-11-12' of the Amazon Config SDK configuration. +config :: Service +config = + Service + { _svcAbbrev = "Config" + , _svcSigner = v4 + , _svcPrefix = "config" + , _svcVersion = "2014-11-12" + , _svcEndpoint = defaultEndpoint config + , _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 requested action is not valid. _ValidationException :: AsError a => Getting (First ServiceError) a ServiceError diff --git a/gen/Network/AWS/Config/Types/Product.hs b/gen/Network/AWS/Config/Types/Product.hs --- a/gen/Network/AWS/Config/Types/Product.hs +++ b/gen/Network/AWS/Config/Types/Product.hs @@ -2,7 +2,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} @@ -377,9 +376,10 @@ instance ToJSON ConfigurationRecorder where toJSON ConfigurationRecorder'{..} = object - ["name" .= _crName, - "recordingGroup" .= _crRecordingGroup, - "roleARN" .= _crRoleARN] + (catMaybes + [("name" .=) <$> _crName, + ("recordingGroup" .=) <$> _crRecordingGroup, + ("roleARN" .=) <$> _crRoleARN]) -- | The current status of the configuration recorder. -- @@ -537,9 +537,11 @@ instance ToJSON DeliveryChannel where toJSON DeliveryChannel'{..} = object - ["s3KeyPrefix" .= _dcS3KeyPrefix, - "snsTopicARN" .= _dcSnsTopicARN, "name" .= _dcName, - "s3BucketName" .= _dcS3BucketName] + (catMaybes + [("s3KeyPrefix" .=) <$> _dcS3KeyPrefix, + ("snsTopicARN" .=) <$> _dcSnsTopicARN, + ("name" .=) <$> _dcName, + ("s3BucketName" .=) <$> _dcS3BucketName]) -- | The status of a specified delivery channel. -- @@ -658,8 +660,9 @@ instance ToJSON RecordingGroup where toJSON RecordingGroup'{..} = object - ["allSupported" .= _rgAllSupported, - "resourceTypes" .= _rgResourceTypes] + (catMaybes + [("allSupported" .=) <$> _rgAllSupported, + ("resourceTypes" .=) <$> _rgResourceTypes]) -- | The relationship of the related resource to the main resource. -- diff --git a/test/Test/AWS/Gen/Config.hs b/test/Test/AWS/Gen/Config.hs --- a/test/Test/AWS/Gen/Config.hs +++ b/test/Test/AWS/Gen/Config.hs @@ -163,64 +163,75 @@ testGetResourceConfigHistoryResponse = res "GetResourceConfigHistoryResponse" "fixture/GetResourceConfigHistoryResponse" + config (Proxy :: Proxy GetResourceConfigHistory) testStopConfigurationRecorderResponse :: StopConfigurationRecorderResponse -> TestTree testStopConfigurationRecorderResponse = res "StopConfigurationRecorderResponse" "fixture/StopConfigurationRecorderResponse" + config (Proxy :: Proxy StopConfigurationRecorder) testDeliverConfigSnapshotResponse :: DeliverConfigSnapshotResponse -> TestTree testDeliverConfigSnapshotResponse = res "DeliverConfigSnapshotResponse" "fixture/DeliverConfigSnapshotResponse" + config (Proxy :: Proxy DeliverConfigSnapshot) testDescribeConfigurationRecordersResponse :: DescribeConfigurationRecordersResponse -> TestTree testDescribeConfigurationRecordersResponse = res "DescribeConfigurationRecordersResponse" "fixture/DescribeConfigurationRecordersResponse" + config (Proxy :: Proxy DescribeConfigurationRecorders) testStartConfigurationRecorderResponse :: StartConfigurationRecorderResponse -> TestTree testStartConfigurationRecorderResponse = res "StartConfigurationRecorderResponse" "fixture/StartConfigurationRecorderResponse" + config (Proxy :: Proxy StartConfigurationRecorder) testDescribeConfigurationRecorderStatusResponse :: DescribeConfigurationRecorderStatusResponse -> TestTree testDescribeConfigurationRecorderStatusResponse = res "DescribeConfigurationRecorderStatusResponse" "fixture/DescribeConfigurationRecorderStatusResponse" + config (Proxy :: Proxy DescribeConfigurationRecorderStatus) testPutConfigurationRecorderResponse :: PutConfigurationRecorderResponse -> TestTree testPutConfigurationRecorderResponse = res "PutConfigurationRecorderResponse" "fixture/PutConfigurationRecorderResponse" + config (Proxy :: Proxy PutConfigurationRecorder) testDeleteDeliveryChannelResponse :: DeleteDeliveryChannelResponse -> TestTree testDeleteDeliveryChannelResponse = res "DeleteDeliveryChannelResponse" "fixture/DeleteDeliveryChannelResponse" + config (Proxy :: Proxy DeleteDeliveryChannel) testPutDeliveryChannelResponse :: PutDeliveryChannelResponse -> TestTree testPutDeliveryChannelResponse = res "PutDeliveryChannelResponse" "fixture/PutDeliveryChannelResponse" + config (Proxy :: Proxy PutDeliveryChannel) testDescribeDeliveryChannelStatusResponse :: DescribeDeliveryChannelStatusResponse -> TestTree testDescribeDeliveryChannelStatusResponse = res "DescribeDeliveryChannelStatusResponse" "fixture/DescribeDeliveryChannelStatusResponse" + config (Proxy :: Proxy DescribeDeliveryChannelStatus) testDescribeDeliveryChannelsResponse :: DescribeDeliveryChannelsResponse -> TestTree testDescribeDeliveryChannelsResponse = res "DescribeDeliveryChannelsResponse" "fixture/DescribeDeliveryChannelsResponse" + config (Proxy :: Proxy DescribeDeliveryChannels)