aws-sdk-guardduty 1.35.1 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eff2859a16e01960d8fc96ff79bf0708654a4acffef3d614779f67ace8524c1
-  data.tar.gz: '039e5deba9bc98a62e2cb6cc1b8d05a11c66ef33e78802aa5adf3b011e8ee5ad'
+  metadata.gz: 425dc70d854ceb12718b2d40a6837f94f1c338690796813915ce9fc89855113a
+  data.tar.gz: 8059e9f22e06c76bc38de1a3ff67780563f618623f6669dec2fddba6112a1ea2
 SHA512:
-  metadata.gz: 6695fe0941cefc0c9d86d00cb21c8bc46922ec959be36a4e9e6397f8a959fc31e37e55c688f580208f2dfe677de4a7bb42a7e3ce6f7da31201d14765a5975dfb
-  data.tar.gz: 583b6e76f3182210ec1e6d7243a8a87138a5a07e7992aab97c6755453ff371063c28d6966a5dfa49afa9d123717c2f44523299ead6a4c63786020e062c001ce2
+  metadata.gz: d7ed9bb5d82948973e48d38d429f64d7cbc67528360722b8311b97cc8bf10a9087038fdab7ab60c65c17ea4b8195aa0209d5cb1f6045f2fb66b471cb110079b5
+  data.tar.gz: 6239acd12842d9d6fc8fcddefd83f396a255eb88623a4a11f377ac099d8784274b50a239cac6b0eff2657bba81e7ef279183a127be04b49e2a1767e25abca1fa

data/lib/aws-sdk-guardduty.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -42,9 +44,9 @@ require_relative 'aws-sdk-guardduty/customizations'
 #
 # See {Errors} for more information.
 #
-# @service
+# @!group service
 module Aws::GuardDuty
 
-  GEM_VERSION = '1.35.1'
+  GEM_VERSION = '1.40.0'
 
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -83,13 +85,28 @@ module Aws::GuardDuty
     #     * `Aws::Credentials` - Used for configuring static, non-refreshing
     #       credentials.
     #
+    #     * `Aws::SharedCredentials` - Used for loading static credentials from a
+    #       shared file, such as `~/.aws/config`.
+    #
+    #     * `Aws::AssumeRoleCredentials` - Used when you need to assume a role.
+    #
+    #     * `Aws::AssumeRoleWebIdentityCredentials` - Used when you need to
+    #       assume a role after providing credentials via the web.
+    #
+    #     * `Aws::SSOCredentials` - Used for loading credentials from AWS SSO using an
+    #       access token generated from `aws login`.
+    #
+    #     * `Aws::ProcessCredentials` - Used for loading credentials from a
+    #       process that outputs to stdout.
+    #
     #     * `Aws::InstanceProfileCredentials` - Used for loading credentials
     #       from an EC2 IMDS on an EC2 instance.
     #
-    #     * `Aws::SharedCredentials` - Used for loading credentials from a
-    #       shared file, such as `~/.aws/config`.
+    #     * `Aws::ECSCredentials` - Used for loading credentials from
+    #       instances running in ECS.
     #
-    #     * `Aws::AssumeRoleCredentials` - Used when you need to assume a role.
+    #     * `Aws::CognitoIdentityCredentials` - Used for loading credentials
+    #       from the Cognito Identity service.
     #
     #     When `:credentials` are not configured directly, the following
     #     locations will be searched for credentials:
@@ -99,10 +116,10 @@ module Aws::GuardDuty
     #     * ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_SECRET_ACCESS_KEY']
     #     * `~/.aws/credentials`
     #     * `~/.aws/config`
-    #     * EC2 IMDS instance profile - When used by default, the timeouts are
-    #       very aggressive. Construct and pass an instance of
-    #       `Aws::InstanceProfileCredentails` to enable retries and extended
-    #       timeouts.
+    #     * EC2/ECS IMDS instance profile - When used by default, the timeouts
+    #       are very aggressive. Construct and pass an instance of
+    #       `Aws::InstanceProfileCredentails` or `Aws::ECSCredentials` to
+    #       enable retries and extended timeouts.
     #
     #   @option options [required, String] :region
     #     The AWS region to connect to.  The configured `:region` is
@@ -378,7 +395,8 @@ module Aws::GuardDuty
     # Creates a single Amazon GuardDuty detector. A detector is a resource
     # that represents the GuardDuty service. To start using GuardDuty, you
     # must create a detector in each Region where you enable the service.
-    # You can have only one detector per account per Region.
+    # You can have only one detector per account per Region. All data
+    # sources are enabled in a new detector by default.
     #
     # @option params [required, Boolean] :enable
     #   A Boolean value that specifies whether the detector is to be enabled.
@@ -393,6 +411,10 @@ module Aws::GuardDuty
     #   An enum value that specifies how frequently updated findings are
     #   exported.
     #
+    # @option params [Types::DataSourceConfigurations] :data_sources
+    #   An object that describes which data sources will be enabled for the
+    #   detector.
+    #
     # @option params [Hash<String,String>] :tags
     #   The tags to be added to a new detector resource.
     #
@@ -406,6 +428,11 @@ module Aws::GuardDuty
     #     enable: false, # required
     #     client_token: "ClientToken",
     #     finding_publishing_frequency: "FIFTEEN_MINUTES", # accepts FIFTEEN_MINUTES, ONE_HOUR, SIX_HOURS
+    #     data_sources: {
+    #       s3_logs: {
+    #         enable: false, # required
+    #       },
+    #     },
     #     tags: {
     #       "TagKey" => "TagValue",
     #     },
@@ -687,8 +714,22 @@ module Aws::GuardDuty
     end
 
     # Creates member accounts of the current AWS account by specifying a
-    # list of AWS account IDs. The current AWS account can then invite these
-    # members to manage GuardDuty in their accounts.
+    # list of AWS account IDs. This step is a prerequisite for managing the
+    # associated member accounts either by invitation or through an
+    # organization.
+    #
+    # When using `Create Members` as an organizations delegated
+    # administrator this action will enable GuardDuty in the added member
+    # accounts, with the exception of the organization master account, which
+    # must enable GuardDuty prior to being added as a member.
+    #
+    # If you are adding accounts by invitation use this action after
+    # GuardDuty has been enabled in potential member accounts and before
+    # using [ `Invite Members` ][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/guardduty/latest/APIReference/API_InviteMembers.html
     #
     # @option params [required, String] :detector_id
     #   The unique ID of the detector of the GuardDuty account that you want
@@ -1114,6 +1155,7 @@ module Aws::GuardDuty
     #
     #   * {Types::DescribeOrganizationConfigurationResponse#auto_enable #auto_enable} => Boolean
     #   * {Types::DescribeOrganizationConfigurationResponse#member_account_limit_reached #member_account_limit_reached} => Boolean
+    #   * {Types::DescribeOrganizationConfigurationResponse#data_sources #data_sources} => Types::OrganizationDataSourceConfigurationsResult
     #
     # @example Request syntax with placeholder values
     #
@@ -1125,6 +1167,7 @@ module Aws::GuardDuty
     #
     #   resp.auto_enable #=> Boolean
     #   resp.member_account_limit_reached #=> Boolean
+    #   resp.data_sources.s3_logs.auto_enable #=> Boolean
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/DescribeOrganizationConfiguration AWS API Documentation
     #
@@ -1298,6 +1341,7 @@ module Aws::GuardDuty
     #   * {Types::GetDetectorResponse#service_role #service_role} => String
     #   * {Types::GetDetectorResponse#status #status} => String
     #   * {Types::GetDetectorResponse#updated_at #updated_at} => String
+    #   * {Types::GetDetectorResponse#data_sources #data_sources} => Types::DataSourceConfigurationsResult
     #   * {Types::GetDetectorResponse#tags #tags} => Hash&lt;String,String&gt;
     #
     # @example Request syntax with placeholder values
@@ -1313,6 +1357,10 @@ module Aws::GuardDuty
     #   resp.service_role #=> String
     #   resp.status #=> String, one of "ENABLED", "DISABLED"
     #   resp.updated_at #=> String
+    #   resp.data_sources.cloud_trail.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.data_sources.dns_logs.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.data_sources.flow_logs.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.data_sources.s3_logs.status #=> String, one of "ENABLED", "DISABLED"
     #   resp.tags #=> Hash
     #   resp.tags["TagKey"] #=> String
     #
@@ -1489,6 +1537,7 @@ module Aws::GuardDuty
     #   resp.findings[0].service.action.aws_api_call_action.api #=> String
     #   resp.findings[0].service.action.aws_api_call_action.caller_type #=> String
     #   resp.findings[0].service.action.aws_api_call_action.domain_details.domain #=> String
+    #   resp.findings[0].service.action.aws_api_call_action.error_code #=> String
     #   resp.findings[0].service.action.aws_api_call_action.remote_ip_details.city.city_name #=> String
     #   resp.findings[0].service.action.aws_api_call_action.remote_ip_details.country.country_code #=> String
     #   resp.findings[0].service.action.aws_api_call_action.remote_ip_details.country.country_name #=> String
@@ -1710,6 +1759,48 @@ module Aws::GuardDuty
       req.send_request(options)
     end
 
+    # Describes which data sources are enabled for the member account's
+    # detector.
+    #
+    # @option params [required, String] :detector_id
+    #   The detector ID for the master account.
+    #
+    # @option params [required, Array<String>] :account_ids
+    #   The account ID of the member account.
+    #
+    # @return [Types::GetMemberDetectorsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetMemberDetectorsResponse#member_data_source_configurations #member_data_source_configurations} => Array&lt;Types::MemberDataSourceConfiguration&gt;
+    #   * {Types::GetMemberDetectorsResponse#unprocessed_accounts #unprocessed_accounts} => Array&lt;Types::UnprocessedAccount&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_member_detectors({
+    #     detector_id: "DetectorId", # required
+    #     account_ids: ["AccountId"], # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.member_data_source_configurations #=> Array
+    #   resp.member_data_source_configurations[0].account_id #=> String
+    #   resp.member_data_source_configurations[0].data_sources.cloud_trail.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.member_data_source_configurations[0].data_sources.dns_logs.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.member_data_source_configurations[0].data_sources.flow_logs.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.member_data_source_configurations[0].data_sources.s3_logs.status #=> String, one of "ENABLED", "DISABLED"
+    #   resp.unprocessed_accounts #=> Array
+    #   resp.unprocessed_accounts[0].account_id #=> String
+    #   resp.unprocessed_accounts[0].result #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetMemberDetectors AWS API Documentation
+    #
+    # @overload get_member_detectors(params = {})
+    # @param [Hash] params ({})
+    def get_member_detectors(params = {}, options = {})
+      req = build_request(:get_member_detectors, params)
+      req.send_request(options)
+    end
+
     # Retrieves GuardDuty member accounts (to the current GuardDuty master
     # account) specified by the account IDs.
     #
@@ -1799,6 +1890,92 @@ module Aws::GuardDuty
       req.send_request(options)
     end
 
+    # Lists Amazon GuardDuty usage statistics over the last 30 days for the
+    # specified detector ID. For newly enabled detectors or data sources the
+    # cost returned will include only the usage so far under 30 days, this
+    # may differ from the cost metrics in the console, which projects usage
+    # over 30 days to provide a monthly cost estimate. For more information
+    # see [Understanding How Usage Costs are Calculated][1].
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/guardduty/latest/ug/monitoring_costs.html#usage-calculations
+    #
+    # @option params [required, String] :detector_id
+    #   The ID of the detector that specifies the GuardDuty service whose
+    #   usage statistics you want to retrieve.
+    #
+    # @option params [required, String] :usage_statistic_type
+    #   The type of usage statistics to retrieve.
+    #
+    # @option params [required, Types::UsageCriteria] :usage_criteria
+    #   Represents the criteria used for querying usage.
+    #
+    # @option params [String] :unit
+    #   The currency unit you would like to view your usage statistics in.
+    #   Current valid values are USD.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in the response.
+    #
+    # @option params [String] :next_token
+    #   A token to use for paginating results that are returned in the
+    #   response. Set the value of this parameter to null for the first
+    #   request to a list action. For subsequent calls, use the NextToken
+    #   value returned from the previous request to continue listing results
+    #   after the first page.
+    #
+    # @return [Types::GetUsageStatisticsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetUsageStatisticsResponse#usage_statistics #usage_statistics} => Types::UsageStatistics
+    #   * {Types::GetUsageStatisticsResponse#next_token #next_token} => String
+    #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_usage_statistics({
+    #     detector_id: "DetectorId", # required
+    #     usage_statistic_type: "SUM_BY_ACCOUNT", # required, accepts SUM_BY_ACCOUNT, SUM_BY_DATA_SOURCE, SUM_BY_RESOURCE, TOP_RESOURCES
+    #     usage_criteria: { # required
+    #       account_ids: ["AccountId"],
+    #       data_sources: ["FLOW_LOGS"], # required, accepts FLOW_LOGS, CLOUD_TRAIL, DNS_LOGS, S3_LOGS
+    #       resources: ["String"],
+    #     },
+    #     unit: "String",
+    #     max_results: 1,
+    #     next_token: "String",
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.usage_statistics.sum_by_account #=> Array
+    #   resp.usage_statistics.sum_by_account[0].account_id #=> String
+    #   resp.usage_statistics.sum_by_account[0].total.amount #=> String
+    #   resp.usage_statistics.sum_by_account[0].total.unit #=> String
+    #   resp.usage_statistics.sum_by_data_source #=> Array
+    #   resp.usage_statistics.sum_by_data_source[0].data_source #=> String, one of "FLOW_LOGS", "CLOUD_TRAIL", "DNS_LOGS", "S3_LOGS"
+    #   resp.usage_statistics.sum_by_data_source[0].total.amount #=> String
+    #   resp.usage_statistics.sum_by_data_source[0].total.unit #=> String
+    #   resp.usage_statistics.sum_by_resource #=> Array
+    #   resp.usage_statistics.sum_by_resource[0].resource #=> String
+    #   resp.usage_statistics.sum_by_resource[0].total.amount #=> String
+    #   resp.usage_statistics.sum_by_resource[0].total.unit #=> String
+    #   resp.usage_statistics.top_resources #=> Array
+    #   resp.usage_statistics.top_resources[0].resource #=> String
+    #   resp.usage_statistics.top_resources[0].total.amount #=> String
+    #   resp.usage_statistics.top_resources[0].total.unit #=> String
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/GetUsageStatistics AWS API Documentation
+    #
+    # @overload get_usage_statistics(params = {})
+    # @param [Hash] params ({})
+    def get_usage_statistics(params = {}, options = {})
+      req = build_request(:get_usage_statistics, params)
+      req.send_request(options)
+    end
+
     # Invites other AWS accounts (created as members of the current AWS
     # account by CreateMembers) to enable GuardDuty, and allow the current
     # AWS account to view and manage these accounts' GuardDuty findings on
@@ -1814,12 +1991,12 @@ module Aws::GuardDuty
     #
     # @option params [Boolean] :disable_email_notification
     #   A Boolean value that specifies whether you want to disable email
-    #   notification to the accounts that you’re inviting to GuardDuty as
+    #   notification to the accounts that you are inviting to GuardDuty as
     #   members.
     #
     # @option params [String] :message
     #   The invitation message that you want to send to the accounts that
-    #   you’re inviting to GuardDuty as members.
+    #   you're inviting to GuardDuty as members.
     #
     # @return [Types::InviteMembersResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -2618,6 +2795,9 @@ module Aws::GuardDuty
     #   An enum value that specifies how frequently findings are exported,
     #   such as to CloudWatch Events.
     #
+    # @option params [Types::DataSourceConfigurations] :data_sources
+    #   An object that describes which data sources will be updated.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
@@ -2626,6 +2806,11 @@ module Aws::GuardDuty
     #     detector_id: "DetectorId", # required
     #     enable: false,
     #     finding_publishing_frequency: "FIFTEEN_MINUTES", # accepts FIFTEEN_MINUTES, ONE_HOUR, SIX_HOURS
+    #     data_sources: {
+    #       s3_logs: {
+    #         enable: false, # required
+    #       },
+    #     },
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateDetector AWS API Documentation
@@ -2783,6 +2968,48 @@ module Aws::GuardDuty
       req.send_request(options)
     end
 
+    # Contains information on member accounts to be updated.
+    #
+    # @option params [required, String] :detector_id
+    #   The detector ID of the master account.
+    #
+    # @option params [required, Array<String>] :account_ids
+    #   A list of member account IDs to be updated.
+    #
+    # @option params [Types::DataSourceConfigurations] :data_sources
+    #   An object describes which data sources will be updated.
+    #
+    # @return [Types::UpdateMemberDetectorsResponse] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::UpdateMemberDetectorsResponse#unprocessed_accounts #unprocessed_accounts} => Array&lt;Types::UnprocessedAccount&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.update_member_detectors({
+    #     detector_id: "DetectorId", # required
+    #     account_ids: ["AccountId"], # required
+    #     data_sources: {
+    #       s3_logs: {
+    #         enable: false, # required
+    #       },
+    #     },
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.unprocessed_accounts #=> Array
+    #   resp.unprocessed_accounts[0].account_id #=> String
+    #   resp.unprocessed_accounts[0].result #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateMemberDetectors AWS API Documentation
+    #
+    # @overload update_member_detectors(params = {})
+    # @param [Hash] params ({})
+    def update_member_detectors(params = {}, options = {})
+      req = build_request(:update_member_detectors, params)
+      req.send_request(options)
+    end
+
     # Updates the delegated administrator account with the values provided.
     #
     # @option params [required, String] :detector_id
@@ -2792,6 +3019,9 @@ module Aws::GuardDuty
     #   Indicates whether to automatically enable member accounts in the
     #   organization.
     #
+    # @option params [Types::OrganizationDataSourceConfigurations] :data_sources
+    #   An object describes which data sources will be updated.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     # @example Request syntax with placeholder values
@@ -2799,6 +3029,11 @@ module Aws::GuardDuty
     #   resp = client.update_organization_configuration({
     #     detector_id: "DetectorId", # required
     #     auto_enable: false, # required
+    #     data_sources: {
+    #       s3_logs: {
+    #         auto_enable: false, # required
+    #       },
+    #     },
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/guardduty-2017-11-28/UpdateOrganizationConfiguration AWS API Documentation
@@ -2902,7 +3137,7 @@ module Aws::GuardDuty
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-guardduty'
-      context[:gem_version] = '1.35.1'
+      context[:gem_version] = '1.40.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
@@ -34,6 +36,7 @@ module Aws::GuardDuty
     BucketPolicy = Shapes::StructureShape.new(name: 'BucketPolicy')
     City = Shapes::StructureShape.new(name: 'City')
     ClientToken = Shapes::StringShape.new(name: 'ClientToken')
+    CloudTrailConfigurationResult = Shapes::StructureShape.new(name: 'CloudTrailConfigurationResult')
     Condition = Shapes::StructureShape.new(name: 'Condition')
     CountBySeverity = Shapes::MapShape.new(name: 'CountBySeverity')
     Country = Shapes::StructureShape.new(name: 'Country')
@@ -52,6 +55,12 @@ module Aws::GuardDuty
     CreateThreatIntelSetRequest = Shapes::StructureShape.new(name: 'CreateThreatIntelSetRequest')
     CreateThreatIntelSetResponse = Shapes::StructureShape.new(name: 'CreateThreatIntelSetResponse')
     Criterion = Shapes::MapShape.new(name: 'Criterion')
+    DNSLogsConfigurationResult = Shapes::StructureShape.new(name: 'DNSLogsConfigurationResult')
+    DataSource = Shapes::StringShape.new(name: 'DataSource')
+    DataSourceConfigurations = Shapes::StructureShape.new(name: 'DataSourceConfigurations')
+    DataSourceConfigurationsResult = Shapes::StructureShape.new(name: 'DataSourceConfigurationsResult')
+    DataSourceList = Shapes::ListShape.new(name: 'DataSourceList')
+    DataSourceStatus = Shapes::StringShape.new(name: 'DataSourceStatus')
     DeclineInvitationsRequest = Shapes::StructureShape.new(name: 'DeclineInvitationsRequest')
     DeclineInvitationsResponse = Shapes::StructureShape.new(name: 'DeclineInvitationsResponse')
     DefaultServerSideEncryption = Shapes::StructureShape.new(name: 'DefaultServerSideEncryption')
@@ -112,6 +121,7 @@ module Aws::GuardDuty
     FindingType = Shapes::StringShape.new(name: 'FindingType')
     FindingTypes = Shapes::ListShape.new(name: 'FindingTypes')
     Findings = Shapes::ListShape.new(name: 'Findings')
+    FlowLogsConfigurationResult = Shapes::StructureShape.new(name: 'FlowLogsConfigurationResult')
     GeoLocation = Shapes::StructureShape.new(name: 'GeoLocation')
     GetDetectorRequest = Shapes::StructureShape.new(name: 'GetDetectorRequest')
     GetDetectorResponse = Shapes::StructureShape.new(name: 'GetDetectorResponse')
@@ -127,10 +137,14 @@ module Aws::GuardDuty
     GetInvitationsCountResponse = Shapes::StructureShape.new(name: 'GetInvitationsCountResponse')
     GetMasterAccountRequest = Shapes::StructureShape.new(name: 'GetMasterAccountRequest')
     GetMasterAccountResponse = Shapes::StructureShape.new(name: 'GetMasterAccountResponse')
+    GetMemberDetectorsRequest = Shapes::StructureShape.new(name: 'GetMemberDetectorsRequest')
+    GetMemberDetectorsResponse = Shapes::StructureShape.new(name: 'GetMemberDetectorsResponse')
     GetMembersRequest = Shapes::StructureShape.new(name: 'GetMembersRequest')
     GetMembersResponse = Shapes::StructureShape.new(name: 'GetMembersResponse')
     GetThreatIntelSetRequest = Shapes::StructureShape.new(name: 'GetThreatIntelSetRequest')
     GetThreatIntelSetResponse = Shapes::StructureShape.new(name: 'GetThreatIntelSetResponse')
+    GetUsageStatisticsRequest = Shapes::StructureShape.new(name: 'GetUsageStatisticsRequest')
+    GetUsageStatisticsResponse = Shapes::StructureShape.new(name: 'GetUsageStatisticsResponse')
     GuardDutyArn = Shapes::StringShape.new(name: 'GuardDutyArn')
     IamInstanceProfile = Shapes::StructureShape.new(name: 'IamInstanceProfile')
     InstanceDetails = Shapes::StructureShape.new(name: 'InstanceDetails')
@@ -171,6 +185,8 @@ module Aws::GuardDuty
     Master = Shapes::StructureShape.new(name: 'Master')
     MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
     Member = Shapes::StructureShape.new(name: 'Member')
+    MemberDataSourceConfiguration = Shapes::StructureShape.new(name: 'MemberDataSourceConfiguration')
+    MemberDataSourceConfigurations = Shapes::ListShape.new(name: 'MemberDataSourceConfigurations')
     Members = Shapes::ListShape.new(name: 'Members')
     Name = Shapes::StringShape.new(name: 'Name')
     Neq = Shapes::ListShape.new(name: 'Neq')
@@ -180,6 +196,10 @@ module Aws::GuardDuty
     NotEquals = Shapes::ListShape.new(name: 'NotEquals')
     OrderBy = Shapes::StringShape.new(name: 'OrderBy')
     Organization = Shapes::StructureShape.new(name: 'Organization')
+    OrganizationDataSourceConfigurations = Shapes::StructureShape.new(name: 'OrganizationDataSourceConfigurations')
+    OrganizationDataSourceConfigurationsResult = Shapes::StructureShape.new(name: 'OrganizationDataSourceConfigurationsResult')
+    OrganizationS3LogsConfiguration = Shapes::StructureShape.new(name: 'OrganizationS3LogsConfiguration')
+    OrganizationS3LogsConfigurationResult = Shapes::StructureShape.new(name: 'OrganizationS3LogsConfigurationResult')
     Owner = Shapes::StructureShape.new(name: 'Owner')
     PermissionConfiguration = Shapes::StructureShape.new(name: 'PermissionConfiguration')
     PortProbeAction = Shapes::StructureShape.new(name: 'PortProbeAction')
@@ -194,8 +214,11 @@ module Aws::GuardDuty
     RemoteIpDetails = Shapes::StructureShape.new(name: 'RemoteIpDetails')
     RemotePortDetails = Shapes::StructureShape.new(name: 'RemotePortDetails')
     Resource = Shapes::StructureShape.new(name: 'Resource')
+    ResourceList = Shapes::ListShape.new(name: 'ResourceList')
     S3BucketDetail = Shapes::StructureShape.new(name: 'S3BucketDetail')
     S3BucketDetails = Shapes::ListShape.new(name: 'S3BucketDetails')
+    S3LogsConfiguration = Shapes::StructureShape.new(name: 'S3LogsConfiguration')
+    S3LogsConfigurationResult = Shapes::StructureShape.new(name: 'S3LogsConfigurationResult')
     SecurityGroup = Shapes::StructureShape.new(name: 'SecurityGroup')
     SecurityGroups = Shapes::ListShape.new(name: 'SecurityGroups')
     Service = Shapes::StructureShape.new(name: 'Service')
@@ -220,6 +243,7 @@ module Aws::GuardDuty
     ThreatIntelligenceDetails = Shapes::ListShape.new(name: 'ThreatIntelligenceDetails')
     ThreatNames = Shapes::ListShape.new(name: 'ThreatNames')
     Timestamp = Shapes::TimestampShape.new(name: 'Timestamp')
+    Total = Shapes::StructureShape.new(name: 'Total')
     UnarchiveFindingsRequest = Shapes::StructureShape.new(name: 'UnarchiveFindingsRequest')
     UnarchiveFindingsResponse = Shapes::StructureShape.new(name: 'UnarchiveFindingsResponse')
     UnprocessedAccount = Shapes::StructureShape.new(name: 'UnprocessedAccount')
@@ -234,12 +258,23 @@ module Aws::GuardDuty
     UpdateFindingsFeedbackResponse = Shapes::StructureShape.new(name: 'UpdateFindingsFeedbackResponse')
     UpdateIPSetRequest = Shapes::StructureShape.new(name: 'UpdateIPSetRequest')
     UpdateIPSetResponse = Shapes::StructureShape.new(name: 'UpdateIPSetResponse')
+    UpdateMemberDetectorsRequest = Shapes::StructureShape.new(name: 'UpdateMemberDetectorsRequest')
+    UpdateMemberDetectorsResponse = Shapes::StructureShape.new(name: 'UpdateMemberDetectorsResponse')
     UpdateOrganizationConfigurationRequest = Shapes::StructureShape.new(name: 'UpdateOrganizationConfigurationRequest')
     UpdateOrganizationConfigurationResponse = Shapes::StructureShape.new(name: 'UpdateOrganizationConfigurationResponse')
     UpdatePublishingDestinationRequest = Shapes::StructureShape.new(name: 'UpdatePublishingDestinationRequest')
     UpdatePublishingDestinationResponse = Shapes::StructureShape.new(name: 'UpdatePublishingDestinationResponse')
     UpdateThreatIntelSetRequest = Shapes::StructureShape.new(name: 'UpdateThreatIntelSetRequest')
     UpdateThreatIntelSetResponse = Shapes::StructureShape.new(name: 'UpdateThreatIntelSetResponse')
+    UsageAccountResult = Shapes::StructureShape.new(name: 'UsageAccountResult')
+    UsageAccountResultList = Shapes::ListShape.new(name: 'UsageAccountResultList')
+    UsageCriteria = Shapes::StructureShape.new(name: 'UsageCriteria')
+    UsageDataSourceResult = Shapes::StructureShape.new(name: 'UsageDataSourceResult')
+    UsageDataSourceResultList = Shapes::ListShape.new(name: 'UsageDataSourceResultList')
+    UsageResourceResult = Shapes::StructureShape.new(name: 'UsageResourceResult')
+    UsageResourceResultList = Shapes::ListShape.new(name: 'UsageResourceResultList')
+    UsageStatisticType = Shapes::StringShape.new(name: 'UsageStatisticType')
+    UsageStatistics = Shapes::StructureShape.new(name: 'UsageStatistics')
 
     AcceptInvitationRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
     AcceptInvitationRequest.add_member(:master_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "masterId"))
@@ -291,6 +326,7 @@ module Aws::GuardDuty
     AwsApiCallAction.add_member(:api, Shapes::ShapeRef.new(shape: String, location_name: "api"))
     AwsApiCallAction.add_member(:caller_type, Shapes::ShapeRef.new(shape: String, location_name: "callerType"))
     AwsApiCallAction.add_member(:domain_details, Shapes::ShapeRef.new(shape: DomainDetails, location_name: "domainDetails"))
+    AwsApiCallAction.add_member(:error_code, Shapes::ShapeRef.new(shape: String, location_name: "errorCode"))
     AwsApiCallAction.add_member(:remote_ip_details, Shapes::ShapeRef.new(shape: RemoteIpDetails, location_name: "remoteIpDetails"))
     AwsApiCallAction.add_member(:service_name, Shapes::ShapeRef.new(shape: String, location_name: "serviceName"))
     AwsApiCallAction.struct_class = Types::AwsApiCallAction
@@ -317,6 +353,9 @@ module Aws::GuardDuty
     City.add_member(:city_name, Shapes::ShapeRef.new(shape: String, location_name: "cityName"))
     City.struct_class = Types::City
 
+    CloudTrailConfigurationResult.add_member(:status, Shapes::ShapeRef.new(shape: DataSourceStatus, required: true, location_name: "status"))
+    CloudTrailConfigurationResult.struct_class = Types::CloudTrailConfigurationResult
+
     Condition.add_member(:eq, Shapes::ShapeRef.new(shape: Eq, deprecated: true, location_name: "eq"))
     Condition.add_member(:neq, Shapes::ShapeRef.new(shape: Neq, deprecated: true, location_name: "neq"))
     Condition.add_member(:gt, Shapes::ShapeRef.new(shape: Integer, deprecated: true, location_name: "gt"))
@@ -341,6 +380,7 @@ module Aws::GuardDuty
     CreateDetectorRequest.add_member(:enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "enable"))
     CreateDetectorRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: ClientToken, location_name: "clientToken", metadata: {"idempotencyToken"=>true}))
     CreateDetectorRequest.add_member(:finding_publishing_frequency, Shapes::ShapeRef.new(shape: FindingPublishingFrequency, location_name: "findingPublishingFrequency"))
+    CreateDetectorRequest.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceConfigurations, location_name: "dataSources"))
     CreateDetectorRequest.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     CreateDetectorRequest.struct_class = Types::CreateDetectorRequest
 
@@ -409,6 +449,20 @@ module Aws::GuardDuty
     Criterion.key = Shapes::ShapeRef.new(shape: String)
     Criterion.value = Shapes::ShapeRef.new(shape: Condition)
 
+    DNSLogsConfigurationResult.add_member(:status, Shapes::ShapeRef.new(shape: DataSourceStatus, required: true, location_name: "status"))
+    DNSLogsConfigurationResult.struct_class = Types::DNSLogsConfigurationResult
+
+    DataSourceConfigurations.add_member(:s3_logs, Shapes::ShapeRef.new(shape: S3LogsConfiguration, location_name: "s3Logs"))
+    DataSourceConfigurations.struct_class = Types::DataSourceConfigurations
+
+    DataSourceConfigurationsResult.add_member(:cloud_trail, Shapes::ShapeRef.new(shape: CloudTrailConfigurationResult, required: true, location_name: "cloudTrail"))
+    DataSourceConfigurationsResult.add_member(:dns_logs, Shapes::ShapeRef.new(shape: DNSLogsConfigurationResult, required: true, location_name: "dnsLogs"))
+    DataSourceConfigurationsResult.add_member(:flow_logs, Shapes::ShapeRef.new(shape: FlowLogsConfigurationResult, required: true, location_name: "flowLogs"))
+    DataSourceConfigurationsResult.add_member(:s3_logs, Shapes::ShapeRef.new(shape: S3LogsConfigurationResult, required: true, location_name: "s3Logs"))
+    DataSourceConfigurationsResult.struct_class = Types::DataSourceConfigurationsResult
+
+    DataSourceList.member = Shapes::ShapeRef.new(shape: DataSource)
+
     DeclineInvitationsRequest.add_member(:account_ids, Shapes::ShapeRef.new(shape: AccountIds, required: true, location_name: "accountIds"))
     DeclineInvitationsRequest.struct_class = Types::DeclineInvitationsRequest
 
@@ -466,6 +520,7 @@ module Aws::GuardDuty
 
     DescribeOrganizationConfigurationResponse.add_member(:auto_enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "autoEnable"))
     DescribeOrganizationConfigurationResponse.add_member(:member_account_limit_reached, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "memberAccountLimitReached"))
+    DescribeOrganizationConfigurationResponse.add_member(:data_sources, Shapes::ShapeRef.new(shape: OrganizationDataSourceConfigurationsResult, location_name: "dataSources"))
     DescribeOrganizationConfigurationResponse.struct_class = Types::DescribeOrganizationConfigurationResponse
 
     DescribePublishingDestinationRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
@@ -560,6 +615,9 @@ module Aws::GuardDuty
 
     Findings.member = Shapes::ShapeRef.new(shape: Finding)
 
+    FlowLogsConfigurationResult.add_member(:status, Shapes::ShapeRef.new(shape: DataSourceStatus, required: true, location_name: "status"))
+    FlowLogsConfigurationResult.struct_class = Types::FlowLogsConfigurationResult
+
     GeoLocation.add_member(:lat, Shapes::ShapeRef.new(shape: Double, location_name: "lat"))
     GeoLocation.add_member(:lon, Shapes::ShapeRef.new(shape: Double, location_name: "lon"))
     GeoLocation.struct_class = Types::GeoLocation
@@ -572,6 +630,7 @@ module Aws::GuardDuty
     GetDetectorResponse.add_member(:service_role, Shapes::ShapeRef.new(shape: String, required: true, location_name: "serviceRole"))
     GetDetectorResponse.add_member(:status, Shapes::ShapeRef.new(shape: DetectorStatus, required: true, location_name: "status"))
     GetDetectorResponse.add_member(:updated_at, Shapes::ShapeRef.new(shape: String, location_name: "updatedAt"))
+    GetDetectorResponse.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceConfigurationsResult, location_name: "dataSources"))
     GetDetectorResponse.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     GetDetectorResponse.struct_class = Types::GetDetectorResponse
 
@@ -625,6 +684,14 @@ module Aws::GuardDuty
     GetMasterAccountResponse.add_member(:master, Shapes::ShapeRef.new(shape: Master, required: true, location_name: "master"))
     GetMasterAccountResponse.struct_class = Types::GetMasterAccountResponse
 
+    GetMemberDetectorsRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
+    GetMemberDetectorsRequest.add_member(:account_ids, Shapes::ShapeRef.new(shape: AccountIds, required: true, location_name: "accountIds"))
+    GetMemberDetectorsRequest.struct_class = Types::GetMemberDetectorsRequest
+
+    GetMemberDetectorsResponse.add_member(:member_data_source_configurations, Shapes::ShapeRef.new(shape: MemberDataSourceConfigurations, required: true, location_name: "members"))
+    GetMemberDetectorsResponse.add_member(:unprocessed_accounts, Shapes::ShapeRef.new(shape: UnprocessedAccounts, required: true, location_name: "unprocessedAccounts"))
+    GetMemberDetectorsResponse.struct_class = Types::GetMemberDetectorsResponse
+
     GetMembersRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
     GetMembersRequest.add_member(:account_ids, Shapes::ShapeRef.new(shape: AccountIds, required: true, location_name: "accountIds"))
     GetMembersRequest.struct_class = Types::GetMembersRequest
@@ -644,6 +711,18 @@ module Aws::GuardDuty
     GetThreatIntelSetResponse.add_member(:tags, Shapes::ShapeRef.new(shape: TagMap, location_name: "tags"))
     GetThreatIntelSetResponse.struct_class = Types::GetThreatIntelSetResponse
 
+    GetUsageStatisticsRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
+    GetUsageStatisticsRequest.add_member(:usage_statistic_type, Shapes::ShapeRef.new(shape: UsageStatisticType, required: true, location_name: "usageStatisticsType"))
+    GetUsageStatisticsRequest.add_member(:usage_criteria, Shapes::ShapeRef.new(shape: UsageCriteria, required: true, location_name: "usageCriteria"))
+    GetUsageStatisticsRequest.add_member(:unit, Shapes::ShapeRef.new(shape: String, location_name: "unit"))
+    GetUsageStatisticsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location_name: "maxResults"))
+    GetUsageStatisticsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetUsageStatisticsRequest.struct_class = Types::GetUsageStatisticsRequest
+
+    GetUsageStatisticsResponse.add_member(:usage_statistics, Shapes::ShapeRef.new(shape: UsageStatistics, location_name: "usageStatistics"))
+    GetUsageStatisticsResponse.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetUsageStatisticsResponse.struct_class = Types::GetUsageStatisticsResponse
+
     IamInstanceProfile.add_member(:arn, Shapes::ShapeRef.new(shape: String, location_name: "arn"))
     IamInstanceProfile.add_member(:id, Shapes::ShapeRef.new(shape: String, location_name: "id"))
     IamInstanceProfile.struct_class = Types::IamInstanceProfile
@@ -797,6 +876,12 @@ module Aws::GuardDuty
     Member.add_member(:updated_at, Shapes::ShapeRef.new(shape: String, required: true, location_name: "updatedAt"))
     Member.struct_class = Types::Member
 
+    MemberDataSourceConfiguration.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, required: true, location_name: "accountId"))
+    MemberDataSourceConfiguration.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceConfigurationsResult, required: true, location_name: "dataSources"))
+    MemberDataSourceConfiguration.struct_class = Types::MemberDataSourceConfiguration
+
+    MemberDataSourceConfigurations.member = Shapes::ShapeRef.new(shape: MemberDataSourceConfiguration)
+
     Members.member = Shapes::ShapeRef.new(shape: Member)
 
     Neq.member = Shapes::ShapeRef.new(shape: String)
@@ -832,6 +917,18 @@ module Aws::GuardDuty
     Organization.add_member(:org, Shapes::ShapeRef.new(shape: String, location_name: "org"))
     Organization.struct_class = Types::Organization
 
+    OrganizationDataSourceConfigurations.add_member(:s3_logs, Shapes::ShapeRef.new(shape: OrganizationS3LogsConfiguration, location_name: "s3Logs"))
+    OrganizationDataSourceConfigurations.struct_class = Types::OrganizationDataSourceConfigurations
+
+    OrganizationDataSourceConfigurationsResult.add_member(:s3_logs, Shapes::ShapeRef.new(shape: OrganizationS3LogsConfigurationResult, required: true, location_name: "s3Logs"))
+    OrganizationDataSourceConfigurationsResult.struct_class = Types::OrganizationDataSourceConfigurationsResult
+
+    OrganizationS3LogsConfiguration.add_member(:auto_enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "autoEnable"))
+    OrganizationS3LogsConfiguration.struct_class = Types::OrganizationS3LogsConfiguration
+
+    OrganizationS3LogsConfigurationResult.add_member(:auto_enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "autoEnable"))
+    OrganizationS3LogsConfigurationResult.struct_class = Types::OrganizationS3LogsConfigurationResult
+
     Owner.add_member(:id, Shapes::ShapeRef.new(shape: String, location_name: "id"))
     Owner.struct_class = Types::Owner
 
@@ -883,6 +980,8 @@ module Aws::GuardDuty
     Resource.add_member(:resource_type, Shapes::ShapeRef.new(shape: String, location_name: "resourceType"))
     Resource.struct_class = Types::Resource
 
+    ResourceList.member = Shapes::ShapeRef.new(shape: String)
+
     S3BucketDetail.add_member(:arn, Shapes::ShapeRef.new(shape: String, location_name: "arn"))
     S3BucketDetail.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
     S3BucketDetail.add_member(:type, Shapes::ShapeRef.new(shape: String, location_name: "type"))
@@ -895,6 +994,12 @@ module Aws::GuardDuty
 
     S3BucketDetails.member = Shapes::ShapeRef.new(shape: S3BucketDetail)
 
+    S3LogsConfiguration.add_member(:enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "enable"))
+    S3LogsConfiguration.struct_class = Types::S3LogsConfiguration
+
+    S3LogsConfigurationResult.add_member(:status, Shapes::ShapeRef.new(shape: DataSourceStatus, required: true, location_name: "status"))
+    S3LogsConfigurationResult.struct_class = Types::S3LogsConfigurationResult
+
     SecurityGroup.add_member(:group_id, Shapes::ShapeRef.new(shape: String, location_name: "groupId"))
     SecurityGroup.add_member(:group_name, Shapes::ShapeRef.new(shape: String, location_name: "groupName"))
     SecurityGroup.struct_class = Types::SecurityGroup
@@ -958,6 +1063,10 @@ module Aws::GuardDuty
 
     ThreatNames.member = Shapes::ShapeRef.new(shape: String)
 
+    Total.add_member(:amount, Shapes::ShapeRef.new(shape: String, location_name: "amount"))
+    Total.add_member(:unit, Shapes::ShapeRef.new(shape: String, location_name: "unit"))
+    Total.struct_class = Types::Total
+
     UnarchiveFindingsRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
     UnarchiveFindingsRequest.add_member(:finding_ids, Shapes::ShapeRef.new(shape: FindingIds, required: true, location_name: "findingIds"))
     UnarchiveFindingsRequest.struct_class = Types::UnarchiveFindingsRequest
@@ -979,6 +1088,7 @@ module Aws::GuardDuty
     UpdateDetectorRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
     UpdateDetectorRequest.add_member(:enable, Shapes::ShapeRef.new(shape: Boolean, location_name: "enable"))
     UpdateDetectorRequest.add_member(:finding_publishing_frequency, Shapes::ShapeRef.new(shape: FindingPublishingFrequency, location_name: "findingPublishingFrequency"))
+    UpdateDetectorRequest.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceConfigurations, location_name: "dataSources"))
     UpdateDetectorRequest.struct_class = Types::UpdateDetectorRequest
 
     UpdateDetectorResponse.struct_class = Types::UpdateDetectorResponse
@@ -1011,8 +1121,17 @@ module Aws::GuardDuty
 
     UpdateIPSetResponse.struct_class = Types::UpdateIPSetResponse
 
+    UpdateMemberDetectorsRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
+    UpdateMemberDetectorsRequest.add_member(:account_ids, Shapes::ShapeRef.new(shape: AccountIds, required: true, location_name: "accountIds"))
+    UpdateMemberDetectorsRequest.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceConfigurations, location_name: "dataSources"))
+    UpdateMemberDetectorsRequest.struct_class = Types::UpdateMemberDetectorsRequest
+
+    UpdateMemberDetectorsResponse.add_member(:unprocessed_accounts, Shapes::ShapeRef.new(shape: UnprocessedAccounts, required: true, location_name: "unprocessedAccounts"))
+    UpdateMemberDetectorsResponse.struct_class = Types::UpdateMemberDetectorsResponse
+
     UpdateOrganizationConfigurationRequest.add_member(:detector_id, Shapes::ShapeRef.new(shape: DetectorId, required: true, location: "uri", location_name: "detectorId"))
     UpdateOrganizationConfigurationRequest.add_member(:auto_enable, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "autoEnable"))
+    UpdateOrganizationConfigurationRequest.add_member(:data_sources, Shapes::ShapeRef.new(shape: OrganizationDataSourceConfigurations, location_name: "dataSources"))
     UpdateOrganizationConfigurationRequest.struct_class = Types::UpdateOrganizationConfigurationRequest
 
     UpdateOrganizationConfigurationResponse.struct_class = Types::UpdateOrganizationConfigurationResponse
@@ -1033,6 +1152,35 @@ module Aws::GuardDuty
 
     UpdateThreatIntelSetResponse.struct_class = Types::UpdateThreatIntelSetResponse
 
+    UsageAccountResult.add_member(:account_id, Shapes::ShapeRef.new(shape: AccountId, location_name: "accountId"))
+    UsageAccountResult.add_member(:total, Shapes::ShapeRef.new(shape: Total, location_name: "total"))
+    UsageAccountResult.struct_class = Types::UsageAccountResult
+
+    UsageAccountResultList.member = Shapes::ShapeRef.new(shape: UsageAccountResult)
+
+    UsageCriteria.add_member(:account_ids, Shapes::ShapeRef.new(shape: AccountIds, location_name: "accountIds"))
+    UsageCriteria.add_member(:data_sources, Shapes::ShapeRef.new(shape: DataSourceList, required: true, location_name: "dataSources"))
+    UsageCriteria.add_member(:resources, Shapes::ShapeRef.new(shape: ResourceList, location_name: "resources"))
+    UsageCriteria.struct_class = Types::UsageCriteria
+
+    UsageDataSourceResult.add_member(:data_source, Shapes::ShapeRef.new(shape: DataSource, location_name: "dataSource"))
+    UsageDataSourceResult.add_member(:total, Shapes::ShapeRef.new(shape: Total, location_name: "total"))
+    UsageDataSourceResult.struct_class = Types::UsageDataSourceResult
+
+    UsageDataSourceResultList.member = Shapes::ShapeRef.new(shape: UsageDataSourceResult)
+
+    UsageResourceResult.add_member(:resource, Shapes::ShapeRef.new(shape: String, location_name: "resource"))
+    UsageResourceResult.add_member(:total, Shapes::ShapeRef.new(shape: Total, location_name: "total"))
+    UsageResourceResult.struct_class = Types::UsageResourceResult
+
+    UsageResourceResultList.member = Shapes::ShapeRef.new(shape: UsageResourceResult)
+
+    UsageStatistics.add_member(:sum_by_account, Shapes::ShapeRef.new(shape: UsageAccountResultList, location_name: "sumByAccount"))
+    UsageStatistics.add_member(:sum_by_data_source, Shapes::ShapeRef.new(shape: UsageDataSourceResultList, location_name: "sumByDataSource"))
+    UsageStatistics.add_member(:sum_by_resource, Shapes::ShapeRef.new(shape: UsageResourceResultList, location_name: "sumByResource"))
+    UsageStatistics.add_member(:top_resources, Shapes::ShapeRef.new(shape: UsageResourceResultList, location_name: "topResources"))
+    UsageStatistics.struct_class = Types::UsageStatistics
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|
@@ -1351,6 +1499,16 @@ module Aws::GuardDuty
         o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
       end)
 
+      api.add_operation(:get_member_detectors, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetMemberDetectors"
+        o.http_method = "POST"
+        o.http_request_uri = "/detector/{detectorId}/member/detector/get"
+        o.input = Shapes::ShapeRef.new(shape: GetMemberDetectorsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetMemberDetectorsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: BadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
+      end)
+
       api.add_operation(:get_members, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetMembers"
         o.http_method = "POST"
@@ -1371,6 +1529,22 @@ module Aws::GuardDuty
         o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
       end)
 
+      api.add_operation(:get_usage_statistics, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetUsageStatistics"
+        o.http_method = "POST"
+        o.http_request_uri = "/detector/{detectorId}/usage/statistics"
+        o.input = Shapes::ShapeRef.new(shape: GetUsageStatisticsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetUsageStatisticsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: BadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:invite_members, Seahorse::Model::Operation.new.tap do |o|
         o.name = "InviteMembers"
         o.http_method = "POST"
@@ -1625,6 +1799,16 @@ module Aws::GuardDuty
         o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
       end)
 
+      api.add_operation(:update_member_detectors, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "UpdateMemberDetectors"
+        o.http_method = "POST"
+        o.http_request_uri = "/detector/{detectorId}/member/detector/update"
+        o.input = Shapes::ShapeRef.new(shape: UpdateMemberDetectorsRequest)
+        o.output = Shapes::ShapeRef.new(shape: UpdateMemberDetectorsResponse)
+        o.errors << Shapes::ShapeRef.new(shape: BadRequestException)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerErrorException)
+      end)
+
       api.add_operation(:update_organization_configuration, Seahorse::Model::Operation.new.tap do |o|
         o.name = "UpdateOrganizationConfiguration"
         o.http_method = "POST"