aws-sdk-macie2 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afdd5b3484a8aad185f6e4196ec27505b74baf4b8ce9e4243a38b092846665b6
-  data.tar.gz: cc475b438b162af54d33535cc7c2882bde6913e71bd721118510d9d7ddfd426f
+  metadata.gz: a86fdd452db57654374b53a7009d91c7b6f714c2677daa38503f2a7c8e9c39da
+  data.tar.gz: 3898f3e57324d170f322b32c20d0cd0a1bf0f42e5ea9ce03d22c02554a853e9c
 SHA512:
-  metadata.gz: a9782b47f9ee136cda1143e57f4fe4aa8d1476ccb19a8a287cdd46d8951d5a7a9d1236b7b8edb864fbe3dbc07a86f0822008785579b20ec15363c657ce2a1fc6
-  data.tar.gz: 5ebae6c8af1ca0b2529fa7af0ed24ffb15df6c3d5c3cd5bcca5dfaf7a608d76c44ca51bff22ee9ee2ebe97eaf91ad95145f2892cb76b8b75cbd92870e158a49d
+  metadata.gz: 1b5013cfb0156624d929aeaa7c0c438349c9db7cf22f5589477037daccf5551eb58887e97c1977b8d5206d6c577ad4576b782e67836dd4db2f196f1cd959f859
+  data.tar.gz: 7cda3ea6156623c2953475de1f657605a3f1324f762b95bfb6266a7d1c8c8911d326be468b56788ba54ba937d86a16fd117dca87595fdf52ed952f66ea1083ab

data/lib/aws-sdk-macie2.rb

@@ -48,6 +48,6 @@ require_relative 'aws-sdk-macie2/customizations'
 # @!group service
 module Aws::Macie2
 
-  GEM_VERSION = '1.21.0'
+  GEM_VERSION = '1.22.0'
 
 end

data/lib/aws-sdk-macie2/client.rb

@@ -949,6 +949,8 @@ module Aws::Macie2
     #   resp.buckets[0].replication_details.replicated_externally #=> Boolean
     #   resp.buckets[0].replication_details.replication_accounts #=> Array
     #   resp.buckets[0].replication_details.replication_accounts[0] #=> String
+    #   resp.buckets[0].server_side_encryption.kms_master_key_id #=> String
+    #   resp.buckets[0].server_side_encryption.type #=> String, one of "NONE", "AES256", "aws:kms"
     #   resp.buckets[0].shared_access #=> String, one of "EXTERNAL", "INTERNAL", "NOT_SHARED", "UNKNOWN"
     #   resp.buckets[0].size_in_bytes #=> Integer
     #   resp.buckets[0].size_in_bytes_compressed #=> Integer
@@ -1791,13 +1793,18 @@ module Aws::Macie2
     # @option params [String] :next_token
     #
     # @option params [Types::UsageStatisticsSortBy] :sort_by
-    #   Specifies criteria for sorting the results of a query for account
-    #   quotas and usage data.
+    #   Specifies criteria for sorting the results of a query for Amazon Macie
+    #   account quotas and usage data.
+    #
+    # @option params [String] :time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
     #
     # @return [Types::GetUsageStatisticsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::GetUsageStatisticsResponse#next_token #next_token} => String
     #   * {Types::GetUsageStatisticsResponse#records #records} => Array<Types::UsageRecord>
+    #   * {Types::GetUsageStatisticsResponse#time_range #time_range} => String
     #
     # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
     #
@@ -1817,6 +1824,7 @@ module Aws::Macie2
     #       key: "accountId", # accepts accountId, total, serviceLimitValue, freeTrialStartDate
     #       order_by: "ASC", # accepts ASC, DESC
     #     },
+    #     time_range: "MONTH_TO_DATE", # accepts MONTH_TO_DATE, PAST_30_DAYS
     #   })
     #
     # @example Response structure
@@ -1832,6 +1840,7 @@ module Aws::Macie2
     #   resp.records[0].usage[0].service_limit.unit #=> String, one of "TERABYTES"
     #   resp.records[0].usage[0].service_limit.value #=> Integer
     #   resp.records[0].usage[0].type #=> String, one of "DATA_INVENTORY_EVALUATION", "SENSITIVE_DATA_DISCOVERY"
+    #   resp.time_range #=> String, one of "MONTH_TO_DATE", "PAST_30_DAYS"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatistics AWS API Documentation
     #
@@ -1844,12 +1853,22 @@ module Aws::Macie2
 
     # Retrieves (queries) aggregated usage data for an account.
     #
+    # @option params [String] :time_range
+    #
     # @return [Types::GetUsageTotalsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
+    #   * {Types::GetUsageTotalsResponse#time_range #time_range} => String
     #   * {Types::GetUsageTotalsResponse#usage_totals #usage_totals} => Array<Types::UsageTotal>
     #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_usage_totals({
+    #     time_range: "__string",
+    #   })
+    #
     # @example Response structure
     #
+    #   resp.time_range #=> String, one of "MONTH_TO_DATE", "PAST_30_DAYS"
     #   resp.usage_totals #=> Array
     #   resp.usage_totals[0].currency #=> String, one of "USD"
     #   resp.usage_totals[0].estimated_cost #=> String
@@ -2544,7 +2563,7 @@ module Aws::Macie2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-macie2'
-      context[:gem_version] = '1.21.0'
+      context[:gem_version] = '1.22.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-macie2/client_api.rb

@@ -39,6 +39,7 @@ module Aws::Macie2
     BucketPermissionConfiguration = Shapes::StructureShape.new(name: 'BucketPermissionConfiguration')
     BucketPolicy = Shapes::StructureShape.new(name: 'BucketPolicy')
     BucketPublicAccess = Shapes::StructureShape.new(name: 'BucketPublicAccess')
+    BucketServerSideEncryption = Shapes::StructureShape.new(name: 'BucketServerSideEncryption')
     BucketSortCriteria = Shapes::StructureShape.new(name: 'BucketSortCriteria')
     Cell = Shapes::StructureShape.new(name: 'Cell')
     Cells = Shapes::ListShape.new(name: 'Cells')
@@ -239,6 +240,8 @@ module Aws::Macie2
     TestCustomDataIdentifierRequest = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierRequest')
     TestCustomDataIdentifierResponse = Shapes::StructureShape.new(name: 'TestCustomDataIdentifierResponse')
     ThrottlingException = Shapes::StructureShape.new(name: 'ThrottlingException')
+    TimeRange = Shapes::StringShape.new(name: 'TimeRange')
+    Type = Shapes::StringShape.new(name: 'Type')
     Unit = Shapes::StringShape.new(name: 'Unit')
     UnprocessedAccount = Shapes::StructureShape.new(name: 'UnprocessedAccount')
     UntagResourceRequest = Shapes::StructureShape.new(name: 'UntagResourceRequest')
@@ -410,6 +413,7 @@ module Aws::Macie2
     BucketMetadata.add_member(:public_access, Shapes::ShapeRef.new(shape: BucketPublicAccess, location_name: "publicAccess"))
     BucketMetadata.add_member(:region, Shapes::ShapeRef.new(shape: __string, location_name: "region"))
     BucketMetadata.add_member(:replication_details, Shapes::ShapeRef.new(shape: ReplicationDetails, location_name: "replicationDetails"))
+    BucketMetadata.add_member(:server_side_encryption, Shapes::ShapeRef.new(shape: BucketServerSideEncryption, location_name: "serverSideEncryption"))
     BucketMetadata.add_member(:shared_access, Shapes::ShapeRef.new(shape: SharedAccess, location_name: "sharedAccess"))
     BucketMetadata.add_member(:size_in_bytes, Shapes::ShapeRef.new(shape: __long, location_name: "sizeInBytes"))
     BucketMetadata.add_member(:size_in_bytes_compressed, Shapes::ShapeRef.new(shape: __long, location_name: "sizeInBytesCompressed"))
@@ -431,6 +435,10 @@ module Aws::Macie2
     BucketPublicAccess.add_member(:permission_configuration, Shapes::ShapeRef.new(shape: BucketPermissionConfiguration, location_name: "permissionConfiguration"))
     BucketPublicAccess.struct_class = Types::BucketPublicAccess
 
+    BucketServerSideEncryption.add_member(:kms_master_key_id, Shapes::ShapeRef.new(shape: __string, location_name: "kmsMasterKeyId"))
+    BucketServerSideEncryption.add_member(:type, Shapes::ShapeRef.new(shape: Type, location_name: "type"))
+    BucketServerSideEncryption.struct_class = Types::BucketServerSideEncryption
+
     BucketSortCriteria.add_member(:attribute_name, Shapes::ShapeRef.new(shape: __string, location_name: "attributeName"))
     BucketSortCriteria.add_member(:order_by, Shapes::ShapeRef.new(shape: OrderBy, location_name: "orderBy"))
     BucketSortCriteria.struct_class = Types::BucketSortCriteria
@@ -824,14 +832,18 @@ module Aws::Macie2
     GetUsageStatisticsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: __integer, location_name: "maxResults"))
     GetUsageStatisticsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     GetUsageStatisticsRequest.add_member(:sort_by, Shapes::ShapeRef.new(shape: UsageStatisticsSortBy, location_name: "sortBy"))
+    GetUsageStatisticsRequest.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageStatisticsRequest.struct_class = Types::GetUsageStatisticsRequest
 
     GetUsageStatisticsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: __string, location_name: "nextToken"))
     GetUsageStatisticsResponse.add_member(:records, Shapes::ShapeRef.new(shape: __listOfUsageRecord, location_name: "records"))
+    GetUsageStatisticsResponse.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageStatisticsResponse.struct_class = Types::GetUsageStatisticsResponse
 
+    GetUsageTotalsRequest.add_member(:time_range, Shapes::ShapeRef.new(shape: __string, location: "querystring", location_name: "timeRange"))
     GetUsageTotalsRequest.struct_class = Types::GetUsageTotalsRequest
 
+    GetUsageTotalsResponse.add_member(:time_range, Shapes::ShapeRef.new(shape: TimeRange, location_name: "timeRange"))
     GetUsageTotalsResponse.add_member(:usage_totals, Shapes::ShapeRef.new(shape: __listOfUsageTotal, location_name: "usageTotals"))
     GetUsageTotalsResponse.struct_class = Types::GetUsageTotalsResponse
 

data/lib/aws-sdk-macie2/types.rb

@@ -97,7 +97,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides information about account-level permissions settings that
+    # Provides information about the account-level permissions settings that
     # apply to an S3 bucket.
     #
     # @!attribute [rw] block_public_access
@@ -365,7 +365,8 @@ module Aws::Macie2
     end
 
     # Provides information about the number of S3 buckets that use certain
-    # types of server-side encryption or don't encrypt objects by default.
+    # types of server-side encryption by default or don't encrypt new
+    # objects by default.
     #
     # @!attribute [rw] kms_managed
     #   @return [Integer]
@@ -551,6 +552,18 @@ module Aws::Macie2
     #   accounts and, if so, which accounts.
     #   @return [Types::ReplicationDetails]
     #
+    # @!attribute [rw] server_side_encryption
+    #   Provides information about the default server-side encryption
+    #   settings for an S3 bucket. For detailed information about these
+    #   settings, see [Setting default server-side encryption behavior for
+    #   Amazon S3 buckets][1] in the *Amazon Simple Storage Service User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html
+    #   @return [Types::BucketServerSideEncryption]
+    #
     # @!attribute [rw] shared_access
     #   @return [String]
     #
@@ -598,6 +611,7 @@ module Aws::Macie2
       :public_access,
       :region,
       :replication_details,
+      :server_side_encryption,
       :shared_access,
       :size_in_bytes,
       :size_in_bytes_compressed,
@@ -613,8 +627,8 @@ module Aws::Macie2
     # permissions settings for an S3 bucket.
     #
     # @!attribute [rw] account_level_permissions
-    #   Provides information about account-level permissions settings that
-    #   apply to an S3 bucket.
+    #   Provides information about the account-level permissions settings
+    #   that apply to an S3 bucket.
     #   @return [Types::AccountLevelPermissions]
     #
     # @!attribute [rw] bucket_level_permissions
@@ -669,6 +683,30 @@ module Aws::Macie2
       include Aws::Structure
     end
 
+    # Provides information about the default server-side encryption settings
+    # for an S3 bucket. For detailed information about these settings, see
+    # [Setting default server-side encryption behavior for Amazon S3
+    # buckets][1] in the *Amazon Simple Storage Service User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html
+    #
+    # @!attribute [rw] kms_master_key_id
+    #   @return [String]
+    #
+    # @!attribute [rw] type
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/BucketServerSideEncryption AWS API Documentation
+    #
+    class BucketServerSideEncryption < Struct.new(
+      :kms_master_key_id,
+      :type)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Specifies criteria for sorting the results of a query for information
     # about S3 buckets.
     #
@@ -2306,8 +2344,8 @@ module Aws::Macie2
     #
     # @!attribute [rw] bucket_count_by_encryption_type
     #   Provides information about the number of S3 buckets that use certain
-    #   types of server-side encryption or don't encrypt objects by
-    #   default.
+    #   types of server-side encryption by default or don't encrypt new
+    #   objects by default.
     #   @return [Types::BucketCountByEncryptionType]
     #
     # @!attribute [rw] bucket_count_by_shared_access_type
@@ -2801,8 +2839,8 @@ module Aws::Macie2
     end
 
     # Specifies criteria for filtering, sorting, and paginating the results
-    # of a query for quotas and aggregated usage data for one or more
-    # accounts.
+    # of a query for quotas and aggregated usage data for one or more Amazon
+    # Macie accounts.
     #
     # @note When making an API call, you may pass GetUsageStatisticsRequest
     #   data as a hash:
@@ -2821,6 +2859,7 @@ module Aws::Macie2
     #           key: "accountId", # accepts accountId, total, serviceLimitValue, freeTrialStartDate
     #           order_by: "ASC", # accepts ASC, DESC
     #         },
+    #         time_range: "MONTH_TO_DATE", # accepts MONTH_TO_DATE, PAST_30_DAYS
     #       }
     #
     # @!attribute [rw] filter_by
@@ -2833,23 +2872,29 @@ module Aws::Macie2
     #   @return [String]
     #
     # @!attribute [rw] sort_by
-    #   Specifies criteria for sorting the results of a query for account
-    #   quotas and usage data.
+    #   Specifies criteria for sorting the results of a query for Amazon
+    #   Macie account quotas and usage data.
     #   @return [Types::UsageStatisticsSortBy]
     #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatisticsRequest AWS API Documentation
     #
     class GetUsageStatisticsRequest < Struct.new(
       :filter_by,
       :max_results,
       :next_token,
-      :sort_by)
+      :sort_by,
+      :time_range)
       SENSITIVE = []
       include Aws::Structure
     end
 
     # Provides the results of a query that retrieved quotas and aggregated
-    # usage data for one or more accounts.
+    # usage data for one or more Amazon Macie accounts.
     #
     # @!attribute [rw] next_token
     #   @return [String]
@@ -2857,23 +2902,46 @@ module Aws::Macie2
     # @!attribute [rw] records
     #   @return [Array<Types::UsageRecord>]
     #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageStatisticsResponse AWS API Documentation
     #
     class GetUsageStatisticsResponse < Struct.new(
       :next_token,
-      :records)
+      :records,
+      :time_range)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @api private
+    # @note When making an API call, you may pass GetUsageTotalsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         time_range: "__string",
+    #       }
+    #
+    # @!attribute [rw] time_range
+    #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageTotalsRequest AWS API Documentation
     #
-    class GetUsageTotalsRequest < Aws::EmptyStructure; end
+    class GetUsageTotalsRequest < Struct.new(
+      :time_range)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
     # Provides the results of a query that retrieved aggregated usage data
-    # for an account during the past 30 days.
+    # for an Amazon Macie account.
+    #
+    # @!attribute [rw] time_range
+    #   An inclusive time period that Amazon Macie usage data applies to.
+    #   Possible values are:
+    #   @return [String]
     #
     # @!attribute [rw] usage_totals
     #   @return [Array<Types::UsageTotal>]
@@ -2881,6 +2949,7 @@ module Aws::Macie2
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/GetUsageTotalsResponse AWS API Documentation
     #
     class GetUsageTotalsResponse < Struct.new(
+      :time_range,
       :usage_totals)
       SENSITIVE = []
       include Aws::Structure
@@ -4579,7 +4648,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies a current quota for an account.
+    # Specifies a current quota for an Amazon Macie account.
     #
     # @!attribute [rw] is_service_limited
     #   @return [Boolean]
@@ -5215,23 +5284,23 @@ module Aws::Macie2
     class UpdateOrganizationConfigurationResponse < Aws::EmptyStructure; end
 
     # Provides data for a specific usage metric and the corresponding quota
-    # for an account. The value for the metric is an aggregated value that
-    # reports usage during the past 30 days.
+    # for an Amazon Macie account.
     #
     # @!attribute [rw] currency
-    #   The type of currency that data for a usage metric is reported in.
-    #   Possible values are:
+    #   The type of currency that the data for an Amazon Macie usage metric
+    #   is reported in. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] estimated_cost
     #   @return [String]
     #
     # @!attribute [rw] service_limit
-    #   Specifies a current quota for an account.
+    #   Specifies a current quota for an Amazon Macie account.
     #   @return [Types::ServiceLimit]
     #
     # @!attribute [rw] type
-    #   The name of a usage metric for an account. Possible values are:
+    #   The name of an Amazon Macie usage metric for an account. Possible
+    #   values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UsageByAccount AWS API Documentation
@@ -5245,7 +5314,7 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides quota and aggregated usage data for an account.
+    # Provides quota and aggregated usage data for an Amazon Macie account.
     #
     # @!attribute [rw] account_id
     #   @return [String]
@@ -5266,8 +5335,9 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies a condition for filtering the results of a query for account
-    # quotas and usage data.
+    # Specifies a condition for filtering the results of a query for the
+    # quotas and usage data that applies to one or more Amazon Macie
+    # accounts.
     #
     # @note When making an API call, you may pass UsageStatisticsFilter
     #   data as a hash:
@@ -5280,12 +5350,13 @@ module Aws::Macie2
     #
     # @!attribute [rw] comparator
     #   The operator to use in a condition that filters the results of a
-    #   query for account quotas and usage data. Valid values are:
+    #   query for Amazon Macie account quotas and usage data. Valid values
+    #   are:
     #   @return [String]
     #
     # @!attribute [rw] key
     #   The field to use in a condition that filters the results of a query
-    #   for account quotas and usage data. Valid values are:
+    #   for Amazon Macie account quotas and usage data. Valid values are:
     #   @return [String]
     #
     # @!attribute [rw] values
@@ -5301,8 +5372,8 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Specifies criteria for sorting the results of a query for account
-    # quotas and usage data.
+    # Specifies criteria for sorting the results of a query for Amazon Macie
+    # account quotas and usage data.
     #
     # @note When making an API call, you may pass UsageStatisticsSortBy
     #   data as a hash:
@@ -5313,8 +5384,8 @@ module Aws::Macie2
     #       }
     #
     # @!attribute [rw] key
-    #   The field to use to sort the results of a query for account quotas
-    #   and usage data. Valid values are:
+    #   The field to use to sort the results of a query for Amazon Macie
+    #   account quotas and usage data. Valid values are:
     #   @return [String]
     #
     # @!attribute [rw] order_by
@@ -5329,19 +5400,22 @@ module Aws::Macie2
       include Aws::Structure
     end
 
-    # Provides aggregated data for a usage metric. The value for the metric
-    # reports usage data for an account during the past 30 days.
+    # Provides aggregated data for an Amazon Macie usage metric. The value
+    # for the metric reports estimated usage data for an account for the
+    # preceding 30 days or the current calendar month to date, depending on
+    # the time period (timeRange) specified in the request.
     #
     # @!attribute [rw] currency
-    #   The type of currency that data for a usage metric is reported in.
-    #   Possible values are:
+    #   The type of currency that the data for an Amazon Macie usage metric
+    #   is reported in. Possible values are:
     #   @return [String]
     #
     # @!attribute [rw] estimated_cost
     #   @return [String]
     #
     # @!attribute [rw] type
-    #   The name of a usage metric for an account. Possible values are:
+    #   The name of an Amazon Macie usage metric for an account. Possible
+    #   values are:
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/macie2-2020-01-01/UsageTotal AWS API Documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-macie2
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core