diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Version -`1.3.7` +`1.4.0` ## Description @@ -16,7 +16,7 @@ Provides AWS Marketplace business intelligence data on-demand. Documentation is available via [Hackage](http://hackage.haskell.org/package/amazonka-marketplace-analytics) -and the [AWS API Reference](http://docs.aws.amazon.com/marketplace). +and the [AWS API Reference](https://aws.amazon.com/documentation/). The types from this library are intended to be used with [amazonka](http://hackage.haskell.org/package/amazonka), which provides mechanisms for specifying AuthN/AuthZ information and sending requests. diff --git a/amazonka-marketplace-analytics.cabal b/amazonka-marketplace-analytics.cabal --- a/amazonka-marketplace-analytics.cabal +++ b/amazonka-marketplace-analytics.cabal @@ -1,5 +1,5 @@ name: amazonka-marketplace-analytics -version: 1.3.7 +version: 1.4.0 synopsis: Amazon Marketplace Commerce Analytics SDK. homepage: https://github.com/brendanhay/amazonka bug-reports: https://github.com/brendanhay/amazonka/issues @@ -7,7 +7,7 @@ license-file: LICENSE author: Brendan Hay maintainer: Brendan Hay -copyright: Copyright (c) 2013-2015 Brendan Hay +copyright: Copyright (c) 2013-2016 Brendan Hay category: Network, AWS, Cloud, Distributed Computing build-type: Simple cabal-version: >= 1.10 @@ -26,7 +26,7 @@ such as or . . - See "Network.AWS.MarketplaceAnalytics" and the + See "Network.AWS.MarketplaceAnalytics" or to get started. source-repository head @@ -50,7 +50,7 @@ , Network.AWS.MarketplaceAnalytics.Types.Sum build-depends: - amazonka-core == 1.3.7.* + amazonka-core == 1.4.0.* , base >= 4.7 && < 5 test-suite amazonka-marketplace-analytics-test @@ -70,9 +70,9 @@ , Test.AWS.MarketplaceAnalytics.Internal build-depends: - amazonka-core == 1.3.7.* - , amazonka-test == 1.3.7.* - , amazonka-marketplace-analytics == 1.3.7.* + amazonka-core == 1.4.0.* + , amazonka-test == 1.4.0.* + , amazonka-marketplace-analytics == 1.4.0.* , base , bytestring , tasty diff --git a/gen/Network/AWS/MarketplaceAnalytics.hs b/gen/Network/AWS/MarketplaceAnalytics.hs --- a/gen/Network/AWS/MarketplaceAnalytics.hs +++ b/gen/Network/AWS/MarketplaceAnalytics.hs @@ -5,15 +5,13 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated -- Portability : non-portable (GHC extensions) -- -- Provides AWS Marketplace business intelligence data on-demand. --- --- /See:/ module Network.AWS.MarketplaceAnalytics ( -- * Service Configuration diff --git a/gen/Network/AWS/MarketplaceAnalytics/GenerateDataSet.hs b/gen/Network/AWS/MarketplaceAnalytics/GenerateDataSet.hs --- a/gen/Network/AWS/MarketplaceAnalytics/GenerateDataSet.hs +++ b/gen/Network/AWS/MarketplaceAnalytics/GenerateDataSet.hs @@ -12,7 +12,7 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics.GenerateDataSet --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated @@ -28,16 +28,15 @@ -- exists (e.g. if the same data set is requested twice), the original file -- will be overwritten by the new file. Requires a Role with an attached -- permissions policy providing Allow permissions for the following --- actions: s3:PutObject, s3:getBucketLocation, sns:SetRegion, --- sns:ListTopics, sns:Publish, iam:GetRolePolicy. --- --- /See:/ for GenerateDataSet. +-- actions: s3:PutObject, s3:GetBucketLocation, sns:GetTopicAttributes, +-- sns:Publish, iam:GetRolePolicy. module Network.AWS.MarketplaceAnalytics.GenerateDataSet ( -- * Creating a Request generateDataSet , GenerateDataSet -- * Request Lenses + , gdsCustomerDefinedValues , gdsDestinationS3Prefix , gdsDataSetType , gdsDataSetPublicationDate @@ -64,7 +63,8 @@ -- -- /See:/ 'generateDataSet' smart constructor. data GenerateDataSet = GenerateDataSet' - { _gdsDestinationS3Prefix :: !(Maybe Text) + { _gdsCustomerDefinedValues :: !(Maybe (Map Text Text)) + , _gdsDestinationS3Prefix :: !(Maybe Text) , _gdsDataSetType :: !DataSetType , _gdsDataSetPublicationDate :: !POSIX , _gdsRoleNameARN :: !Text @@ -76,6 +76,8 @@ -- -- Use one of the following lenses to modify other fields as desired: -- +-- * 'gdsCustomerDefinedValues' +-- -- * 'gdsDestinationS3Prefix' -- -- * 'gdsDataSetType' @@ -96,7 +98,8 @@ -> GenerateDataSet generateDataSet pDataSetType_ pDataSetPublicationDate_ pRoleNameARN_ pDestinationS3BucketName_ pSnsTopicARN_ = GenerateDataSet' - { _gdsDestinationS3Prefix = Nothing + { _gdsCustomerDefinedValues = Nothing + , _gdsDestinationS3Prefix = Nothing , _gdsDataSetType = pDataSetType_ , _gdsDataSetPublicationDate = _Time # pDataSetPublicationDate_ , _gdsRoleNameARN = pRoleNameARN_ @@ -104,27 +107,88 @@ , _gdsSnsTopicARN = pSnsTopicARN_ } --- | Undocumented member. +-- | (Optional) Key-value pairs which will be returned, unmodified, in the +-- Amazon SNS notification message and the data set metadata file. These +-- key-value pairs can be used to correlated responses with tracking +-- information from other systems. +gdsCustomerDefinedValues :: Lens' GenerateDataSet (HashMap Text Text) +gdsCustomerDefinedValues = lens _gdsCustomerDefinedValues (\ s a -> s{_gdsCustomerDefinedValues = a}) . _Default . _Map; + +-- | (Optional) The desired S3 prefix for the published data set, similar to +-- a directory path in standard file systems. For example, if given the +-- bucket name \"mybucket\" and the prefix \"myprefix\/mydatasets\", the +-- output file \"outputfile\" would be published to +-- \"s3:\/\/mybucket\/myprefix\/mydatasets\/outputfile\". If the prefix +-- directory structure does not exist, it will be created. If no prefix is +-- provided, the data set will be published to the S3 bucket root. gdsDestinationS3Prefix :: Lens' GenerateDataSet (Maybe Text) gdsDestinationS3Prefix = lens _gdsDestinationS3Prefix (\ s a -> s{_gdsDestinationS3Prefix = a}); --- | Undocumented member. +-- | The desired data set type. +-- +-- - /customer_subscriber_hourly_monthly_subscriptions/ - Available daily +-- by 5:00 PM Pacific Time since 2014-07-21. +-- - /customer_subscriber_annual_subscriptions/ - Available daily by 5:00 +-- PM Pacific Time since 2014-07-21. +-- - /daily_business_usage_by_instance_type/ - Available daily by 5:00 PM +-- Pacific Time since 2015-01-26. +-- - /daily_business_fees/ - Available daily by 5:00 PM Pacific Time +-- since 2015-01-26. +-- - /daily_business_free_trial_conversions/ - Available daily by 5:00 PM +-- Pacific Time since 2015-01-26. +-- - /daily_business_new_instances/ - Available daily by 5:00 PM Pacific +-- Time since 2015-01-26. +-- - /daily_business_new_product_subscribers/ - Available daily by 5:00 +-- PM Pacific Time since 2015-01-26. +-- - /daily_business_canceled_product_subscribers/ - Available daily by +-- 5:00 PM Pacific Time since 2015-01-26. +-- - /monthly_revenue_billing_and_revenue_data/ - Available monthly on +-- the 4th day of the month by 5:00 PM Pacific Time since 2015-02. +-- - /monthly_revenue_annual_subscriptions/ - Available monthly on the +-- 4th day of the month by 5:00 PM Pacific Time since 2015-02. +-- - /disbursed_amount_by_product/ - Available every 30 days by 5:00 PM +-- Pacific Time since 2015-01-26. +-- - /disbursed_amount_by_product_with_uncollected_funds/ -This data set +-- is only available from 2012-04-19 until 2015-01-25. After +-- 2015-01-25, this data set was split into three data sets: +-- disbursed_amount_by_product, +-- disbursed_amount_by_age_of_uncollected_funds, and +-- disbursed_amount_by_age_of_disbursed_funds. +-- - /disbursed_amount_by_customer_geo/ - Available every 30 days by 5:00 +-- PM Pacific Time since 2012-04-19. +-- - /disbursed_amount_by_age_of_uncollected_funds/ - Available every 30 +-- days by 5:00 PM Pacific Time since 2015-01-26. +-- - /disbursed_amount_by_age_of_disbursed_funds/ - Available every 30 +-- days by 5:00 PM Pacific Time since 2015-01-26. +-- - /customer_profile_by_industry/ - Available daily by 5:00 PM Pacific +-- Time since 2015-10-01. +-- - /customer_profile_by_revenue/ - Available daily by 5:00 PM Pacific +-- Time since 2015-10-01. +-- - /customer_profile_by_geography/ - Available daily by 5:00 PM Pacific +-- Time since 2015-10-01. gdsDataSetType :: Lens' GenerateDataSet DataSetType gdsDataSetType = lens _gdsDataSetType (\ s a -> s{_gdsDataSetType = a}); --- | Undocumented member. +-- | The date a data set was published. For daily data sets, provide a date +-- with day-level granularity for the desired day. For weekly data sets, +-- provide a date with day-level granularity within the desired week (the +-- day value will be ignored). For monthly data sets, provide a date with +-- month-level granularity for the desired month (the day value will be +-- ignored). gdsDataSetPublicationDate :: Lens' GenerateDataSet UTCTime gdsDataSetPublicationDate = lens _gdsDataSetPublicationDate (\ s a -> s{_gdsDataSetPublicationDate = a}) . _Time; --- | Undocumented member. +-- | The Amazon Resource Name (ARN) of the Role with an attached permissions +-- policy to interact with the provided AWS services. gdsRoleNameARN :: Lens' GenerateDataSet Text gdsRoleNameARN = lens _gdsRoleNameARN (\ s a -> s{_gdsRoleNameARN = a}); --- | Undocumented member. +-- | The name (friendly name, not ARN) of the destination S3 bucket. gdsDestinationS3BucketName :: Lens' GenerateDataSet Text gdsDestinationS3BucketName = lens _gdsDestinationS3BucketName (\ s a -> s{_gdsDestinationS3BucketName = a}); --- | Undocumented member. +-- | Amazon Resource Name (ARN) for the SNS Topic that will be notified when +-- the data set has been published or if an error has occurred. gdsSnsTopicARN :: Lens' GenerateDataSet Text gdsSnsTopicARN = lens _gdsSnsTopicARN (\ s a -> s{_gdsSnsTopicARN = a}); @@ -137,6 +201,8 @@ GenerateDataSetResponse' <$> (x .?> "dataSetRequestId") <*> (pure (fromEnum s))) +instance Hashable GenerateDataSet + instance ToHeaders GenerateDataSet where toHeaders = const @@ -151,7 +217,9 @@ toJSON GenerateDataSet'{..} = object (catMaybes - [("destinationS3Prefix" .=) <$> + [("customerDefinedValues" .=) <$> + _gdsCustomerDefinedValues, + ("destinationS3Prefix" .=) <$> _gdsDestinationS3Prefix, Just ("dataSetType" .= _gdsDataSetType), Just @@ -193,7 +261,9 @@ , _gdsrsResponseStatus = pResponseStatus_ } --- | Undocumented member. +-- | A unique identifier representing a specific request to the +-- GenerateDataSet operation. This identifier can be used to correlate a +-- request with notifications from the SNS topic. gdsrsDataSetRequestId :: Lens' GenerateDataSetResponse (Maybe Text) gdsrsDataSetRequestId = lens _gdsrsDataSetRequestId (\ s a -> s{_gdsrsDataSetRequestId = a}); diff --git a/gen/Network/AWS/MarketplaceAnalytics/Types.hs b/gen/Network/AWS/MarketplaceAnalytics/Types.hs --- a/gen/Network/AWS/MarketplaceAnalytics/Types.hs +++ b/gen/Network/AWS/MarketplaceAnalytics/Types.hs @@ -4,7 +4,7 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics.Types --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated @@ -51,6 +51,7 @@ , _retryCheck = check } check e + | has (hasStatus 429) e = Just "too_many_requests" | has (hasCode "ThrottlingException" . hasStatus 400) e = Just "throttling_exception" | has (hasCode "Throttling" . hasStatus 400) e = Just "throttling" diff --git a/gen/Network/AWS/MarketplaceAnalytics/Types/Product.hs b/gen/Network/AWS/MarketplaceAnalytics/Types/Product.hs --- a/gen/Network/AWS/MarketplaceAnalytics/Types/Product.hs +++ b/gen/Network/AWS/MarketplaceAnalytics/Types/Product.hs @@ -9,7 +9,7 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics.Types.Product --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated diff --git a/gen/Network/AWS/MarketplaceAnalytics/Types/Sum.hs b/gen/Network/AWS/MarketplaceAnalytics/Types/Sum.hs --- a/gen/Network/AWS/MarketplaceAnalytics/Types/Sum.hs +++ b/gen/Network/AWS/MarketplaceAnalytics/Types/Sum.hs @@ -9,7 +9,7 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics.Types.Sum --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated @@ -19,9 +19,9 @@ import Network.AWS.Prelude --- | The type of the data set to publish. data DataSetType - = CustomerProfileByIndustry + = CustomerProfileByGeography + | CustomerProfileByIndustry | CustomerProfileByRevenue | CustomerSubscriberAnnualSubscriptions | CustomerSubscriberHourlyMonthlySubscriptions @@ -35,12 +35,14 @@ | DisbursedAmountByAgeOfUncollectedFunds | DisbursedAmountByCustomerGeo | DisbursedAmountByProduct + | DisbursedAmountByProductWithUncollectedFunds | MonthlyRevenueAnnualSubscriptions | MonthlyRevenueBillingAndRevenueData deriving (Eq,Ord,Read,Show,Enum,Bounded,Data,Typeable,Generic) instance FromText DataSetType where parser = takeLowerText >>= \case + "customer_profile_by_geography" -> pure CustomerProfileByGeography "customer_profile_by_industry" -> pure CustomerProfileByIndustry "customer_profile_by_revenue" -> pure CustomerProfileByRevenue "customer_subscriber_annual_subscriptions" -> pure CustomerSubscriberAnnualSubscriptions @@ -55,13 +57,15 @@ "disbursed_amount_by_age_of_uncollected_funds" -> pure DisbursedAmountByAgeOfUncollectedFunds "disbursed_amount_by_customer_geo" -> pure DisbursedAmountByCustomerGeo "disbursed_amount_by_product" -> pure DisbursedAmountByProduct + "disbursed_amount_by_product_with_uncollected_funds" -> pure DisbursedAmountByProductWithUncollectedFunds "monthly_revenue_annual_subscriptions" -> pure MonthlyRevenueAnnualSubscriptions "monthly_revenue_billing_and_revenue_data" -> pure MonthlyRevenueBillingAndRevenueData e -> fromTextError $ "Failure parsing DataSetType from value: '" <> e - <> "'. Accepted values: customer_profile_by_industry, customer_profile_by_revenue, customer_subscriber_annual_subscriptions, customer_subscriber_hourly_monthly_subscriptions, daily_business_canceled_product_subscribers, daily_business_fees, daily_business_free_trial_conversions, daily_business_new_instances, daily_business_new_product_subscribers, daily_business_usage_by_instance_type, disbursed_amount_by_age_of_disbursed_funds, disbursed_amount_by_age_of_uncollected_funds, disbursed_amount_by_customer_geo, disbursed_amount_by_product, monthly_revenue_annual_subscriptions, monthly_revenue_billing_and_revenue_data" + <> "'. Accepted values: customer_profile_by_geography, customer_profile_by_industry, customer_profile_by_revenue, customer_subscriber_annual_subscriptions, customer_subscriber_hourly_monthly_subscriptions, daily_business_canceled_product_subscribers, daily_business_fees, daily_business_free_trial_conversions, daily_business_new_instances, daily_business_new_product_subscribers, daily_business_usage_by_instance_type, disbursed_amount_by_age_of_disbursed_funds, disbursed_amount_by_age_of_uncollected_funds, disbursed_amount_by_customer_geo, disbursed_amount_by_product, disbursed_amount_by_product_with_uncollected_funds, monthly_revenue_annual_subscriptions, monthly_revenue_billing_and_revenue_data" instance ToText DataSetType where toText = \case + CustomerProfileByGeography -> "customer_profile_by_geography" CustomerProfileByIndustry -> "customer_profile_by_industry" CustomerProfileByRevenue -> "customer_profile_by_revenue" CustomerSubscriberAnnualSubscriptions -> "customer_subscriber_annual_subscriptions" @@ -76,6 +80,7 @@ DisbursedAmountByAgeOfUncollectedFunds -> "disbursed_amount_by_age_of_uncollected_funds" DisbursedAmountByCustomerGeo -> "disbursed_amount_by_customer_geo" DisbursedAmountByProduct -> "disbursed_amount_by_product" + DisbursedAmountByProductWithUncollectedFunds -> "disbursed_amount_by_product_with_uncollected_funds" MonthlyRevenueAnnualSubscriptions -> "monthly_revenue_annual_subscriptions" MonthlyRevenueBillingAndRevenueData -> "monthly_revenue_billing_and_revenue_data" diff --git a/gen/Network/AWS/MarketplaceAnalytics/Waiters.hs b/gen/Network/AWS/MarketplaceAnalytics/Waiters.hs --- a/gen/Network/AWS/MarketplaceAnalytics/Waiters.hs +++ b/gen/Network/AWS/MarketplaceAnalytics/Waiters.hs @@ -7,7 +7,7 @@ -- | -- Module : Network.AWS.MarketplaceAnalytics.Waiters --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated diff --git a/test/Main.hs b/test/Main.hs --- a/test/Main.hs +++ b/test/Main.hs @@ -2,7 +2,7 @@ -- | -- Module : Main --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated diff --git a/test/Test/AWS/Gen/MarketplaceAnalytics.hs b/test/Test/AWS/Gen/MarketplaceAnalytics.hs --- a/test/Test/AWS/Gen/MarketplaceAnalytics.hs +++ b/test/Test/AWS/Gen/MarketplaceAnalytics.hs @@ -5,7 +5,7 @@ -- | -- Module : Test.AWS.Gen.MarketplaceAnalytics --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : Mozilla Public License, v. 2.0. -- Maintainer : Brendan Hay -- Stability : auto-generated diff --git a/test/Test/AWS/MarketplaceAnalytics.hs b/test/Test/AWS/MarketplaceAnalytics.hs --- a/test/Test/AWS/MarketplaceAnalytics.hs +++ b/test/Test/AWS/MarketplaceAnalytics.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-unused-imports #-} -- Module : Test.AWS.MarketplaceAnalytics --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : This Source Code Form is subject to the terms of -- the Mozilla Public License, v. 2.0. -- A copy of the MPL can be found in the LICENSE file or diff --git a/test/Test/AWS/MarketplaceAnalytics/Internal.hs b/test/Test/AWS/MarketplaceAnalytics/Internal.hs --- a/test/Test/AWS/MarketplaceAnalytics/Internal.hs +++ b/test/Test/AWS/MarketplaceAnalytics/Internal.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-unused-imports #-} -- Module : Test.AWS.MarketplaceAnalytics.Internal --- Copyright : (c) 2013-2015 Brendan Hay +-- Copyright : (c) 2013-2016 Brendan Hay -- License : This Source Code Form is subject to the terms of -- the Mozilla Public License, v. 2.0. -- A copy of the MPL can be found in the LICENSE file or