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-importexport.cabal b/amazonka-importexport.cabal --- a/amazonka-importexport.cabal +++ b/amazonka-importexport.cabal @@ -1,5 +1,5 @@ name: amazonka-importexport -version: 1.1.0 +version: 1.2.0 synopsis: Amazon Import/Export SDK. homepage: https://github.com/brendanhay/amazonka license: OtherLicense @@ -61,7 +61,7 @@ , Network.AWS.ImportExport.Types.Sum build-depends: - amazonka-core == 1.1.0.* + amazonka-core == 1.2.0.* , base >= 4.7 && < 5 test-suite amazonka-importexport-test @@ -80,9 +80,9 @@ , Test.AWS.ImportExport.Internal build-depends: - amazonka-core == 1.1.0 - , amazonka-test == 1.1.0 - , amazonka-importexport == 1.1.0 + amazonka-core == 1.2.0 + , amazonka-test == 1.2.0 + , amazonka-importexport == 1.2.0 , base , bytestring , lens diff --git a/gen/Network/AWS/ImportExport.hs b/gen/Network/AWS/ImportExport.hs --- a/gen/Network/AWS/ImportExport.hs +++ b/gen/Network/AWS/ImportExport.hs @@ -22,8 +22,8 @@ -- /See:/ module Network.AWS.ImportExport ( - -- * Service - ImportExport + -- * Service Configuration + importExport -- * Errors -- $errors diff --git a/gen/Network/AWS/ImportExport/CancelJob.hs b/gen/Network/AWS/ImportExport/CancelJob.hs --- a/gen/Network/AWS/ImportExport/CancelJob.hs +++ b/gen/Network/AWS/ImportExport/CancelJob.hs @@ -78,9 +78,8 @@ cJobId = lens _cJobId (\ s a -> s{_cJobId = a}); instance AWSRequest CancelJob where - type Sv CancelJob = ImportExport type Rs CancelJob = CancelJobResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "CancelJobResult" (\ s h x -> diff --git a/gen/Network/AWS/ImportExport/CreateJob.hs b/gen/Network/AWS/ImportExport/CreateJob.hs --- a/gen/Network/AWS/ImportExport/CreateJob.hs +++ b/gen/Network/AWS/ImportExport/CreateJob.hs @@ -116,9 +116,8 @@ cjValidateOnly = lens _cjValidateOnly (\ s a -> s{_cjValidateOnly = a}); instance AWSRequest CreateJob where - type Sv CreateJob = ImportExport type Rs CreateJob = CreateJobResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "CreateJobResult" (\ s h x -> diff --git a/gen/Network/AWS/ImportExport/GetShippingLabel.hs b/gen/Network/AWS/ImportExport/GetShippingLabel.hs --- a/gen/Network/AWS/ImportExport/GetShippingLabel.hs +++ b/gen/Network/AWS/ImportExport/GetShippingLabel.hs @@ -166,9 +166,8 @@ gslJobIds = lens _gslJobIds (\ s a -> s{_gslJobIds = a}) . _Coerce; instance AWSRequest GetShippingLabel where - type Sv GetShippingLabel = ImportExport type Rs GetShippingLabel = GetShippingLabelResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "GetShippingLabelResult" (\ s h x -> diff --git a/gen/Network/AWS/ImportExport/GetStatus.hs b/gen/Network/AWS/ImportExport/GetStatus.hs --- a/gen/Network/AWS/ImportExport/GetStatus.hs +++ b/gen/Network/AWS/ImportExport/GetStatus.hs @@ -95,9 +95,8 @@ gsJobId = lens _gsJobId (\ s a -> s{_gsJobId = a}); instance AWSRequest GetStatus where - type Sv GetStatus = ImportExport type Rs GetStatus = GetStatusResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "GetStatusResult" (\ s h x -> diff --git a/gen/Network/AWS/ImportExport/ListJobs.hs b/gen/Network/AWS/ImportExport/ListJobs.hs --- a/gen/Network/AWS/ImportExport/ListJobs.hs +++ b/gen/Network/AWS/ImportExport/ListJobs.hs @@ -102,9 +102,8 @@ ljMarker .~ rs ^? ljrsJobs . _last . jobJobId instance AWSRequest ListJobs where - type Sv ListJobs = ImportExport type Rs ListJobs = ListJobsResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "ListJobsResult" (\ s h x -> diff --git a/gen/Network/AWS/ImportExport/Types.hs b/gen/Network/AWS/ImportExport/Types.hs --- a/gen/Network/AWS/ImportExport/Types.hs +++ b/gen/Network/AWS/ImportExport/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.ImportExport.Types ( - -- * Service - ImportExport + -- * Service Configuration + importExport -- * Errors , _InvalidJobIdException @@ -61,39 +60,36 @@ import Network.AWS.Prelude import Network.AWS.Sign.V2 --- | Version @2010-06-01@ of the Amazon Import/Export SDK. -data ImportExport - -instance AWSService ImportExport where - type Sg ImportExport = V2 - service = const svc - where - svc = - Service - { _svcAbbrev = "ImportExport" - , _svcPrefix = "importexport" - , _svcVersion = "2010-06-01" - , _svcEndpoint = defaultEndpoint svc - , _svcTimeout = Just 70 - , _svcStatus = statusSuccess - , _svcError = parseXMLError - , _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 '2010-06-01' of the Amazon Import/Export SDK configuration. +importExport :: Service +importExport = + Service + { _svcAbbrev = "ImportExport" + , _svcSigner = v2 + , _svcPrefix = "importexport" + , _svcVersion = "2010-06-01" + , _svcEndpoint = defaultEndpoint importExport + , _svcTimeout = Just 70 + , _svcCheck = statusSuccess + , _svcError = parseXMLError + , _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 JOBID was missing, not found, or not associated with the AWS -- account. diff --git a/gen/Network/AWS/ImportExport/Types/Product.hs b/gen/Network/AWS/ImportExport/Types/Product.hs --- a/gen/Network/AWS/ImportExport/Types/Product.hs +++ b/gen/Network/AWS/ImportExport/Types/Product.hs @@ -2,7 +2,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# LANGUAGE TypeFamilies #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} diff --git a/gen/Network/AWS/ImportExport/UpdateJob.hs b/gen/Network/AWS/ImportExport/UpdateJob.hs --- a/gen/Network/AWS/ImportExport/UpdateJob.hs +++ b/gen/Network/AWS/ImportExport/UpdateJob.hs @@ -113,9 +113,8 @@ ujValidateOnly = lens _ujValidateOnly (\ s a -> s{_ujValidateOnly = a}); instance AWSRequest UpdateJob where - type Sv UpdateJob = ImportExport type Rs UpdateJob = UpdateJobResponse - request = postQuery + request = postQuery importExport response = receiveXMLWrapper "UpdateJobResult" (\ s h x -> diff --git a/test/Test/AWS/Gen/ImportExport.hs b/test/Test/AWS/Gen/ImportExport.hs --- a/test/Test/AWS/Gen/ImportExport.hs +++ b/test/Test/AWS/Gen/ImportExport.hs @@ -108,34 +108,40 @@ testGetShippingLabelResponse = res "GetShippingLabelResponse" "fixture/GetShippingLabelResponse" + importExport (Proxy :: Proxy GetShippingLabel) testCreateJobResponse :: CreateJobResponse -> TestTree testCreateJobResponse = res "CreateJobResponse" "fixture/CreateJobResponse" + importExport (Proxy :: Proxy CreateJob) testListJobsResponse :: ListJobsResponse -> TestTree testListJobsResponse = res "ListJobsResponse" "fixture/ListJobsResponse" + importExport (Proxy :: Proxy ListJobs) testUpdateJobResponse :: UpdateJobResponse -> TestTree testUpdateJobResponse = res "UpdateJobResponse" "fixture/UpdateJobResponse" + importExport (Proxy :: Proxy UpdateJob) testGetStatusResponse :: GetStatusResponse -> TestTree testGetStatusResponse = res "GetStatusResponse" "fixture/GetStatusResponse" + importExport (Proxy :: Proxy GetStatus) testCancelJobResponse :: CancelJobResponse -> TestTree testCancelJobResponse = res "CancelJobResponse" "fixture/CancelJobResponse" + importExport (Proxy :: Proxy CancelJob)