aws-sdk-securityhub 1.40.0 → 1.46.0

data/lib/aws-sdk-securityhub/errors.rb

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

data/lib/aws-sdk-securityhub/resource.rb

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,13 +3,44 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
 module Aws::SecurityHub
   module Types
 
+    # @note When making an API call, you may pass AcceptAdministratorInvitationRequest
+    #   data as a hash:
+    #
+    #       {
+    #         administrator_id: "NonEmptyString", # required
+    #         invitation_id: "NonEmptyString", # required
+    #       }
+    #
+    # @!attribute [rw] administrator_id
+    #   The account ID of the Security Hub administrator account that sent
+    #   the invitation.
+    #   @return [String]
+    #
+    # @!attribute [rw] invitation_id
+    #   The identifier of the invitation sent from the Security Hub
+    #   administrator account.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AcceptAdministratorInvitationRequest AWS API Documentation
+    #
+    class AcceptAdministratorInvitationRequest < Struct.new(
+      :administrator_id,
+      :invitation_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AcceptAdministratorInvitationResponse AWS API Documentation
+    #
+    class AcceptAdministratorInvitationResponse < Aws::EmptyStructure; end
+
     # @note When making an API call, you may pass AcceptInvitationRequest
     #   data as a hash:
     #
@@ -19,12 +50,13 @@ module Aws::SecurityHub
     #       }
     #
     # @!attribute [rw] master_id
-    #   The account ID of the Security Hub master account that sent the
-    #   invitation.
+    #   The account ID of the Security Hub administrator account that sent
+    #   the invitation.
     #   @return [String]
     #
     # @!attribute [rw] invitation_id
-    #   The ID of the invitation sent from the Security Hub master account.
+    #   The identifier of the invitation sent from the Security Hub
+    #   administrator account.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AcceptInvitationRequest AWS API Documentation
@@ -798,7 +830,7 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
-    # contains information about a REST API in version 1 of Amazon API
+    # Contains information about a REST API in version 1 of Amazon API
     # Gateway.
     #
     # @note When making an API call, you may pass AwsApiGatewayRestApiDetails
@@ -3817,6 +3849,189 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # An association between the network ACL and a subnet.
+    #
+    # @note When making an API call, you may pass AwsEc2NetworkAclAssociation
+    #   data as a hash:
+    #
+    #       {
+    #         network_acl_association_id: "NonEmptyString",
+    #         network_acl_id: "NonEmptyString",
+    #         subnet_id: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] network_acl_association_id
+    #   The identifier of the association between the network ACL and the
+    #   subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] network_acl_id
+    #   The identifier of the network ACL.
+    #   @return [String]
+    #
+    # @!attribute [rw] subnet_id
+    #   The identifier of the subnet that is associated with the network
+    #   ACL.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsEc2NetworkAclAssociation AWS API Documentation
+    #
+    class AwsEc2NetworkAclAssociation < Struct.new(
+      :network_acl_association_id,
+      :network_acl_id,
+      :subnet_id)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains details about an EC2 network access control list (ACL).
+    #
+    # @note When making an API call, you may pass AwsEc2NetworkAclDetails
+    #   data as a hash:
+    #
+    #       {
+    #         is_default: false,
+    #         network_acl_id: "NonEmptyString",
+    #         owner_id: "NonEmptyString",
+    #         vpc_id: "NonEmptyString",
+    #         associations: [
+    #           {
+    #             network_acl_association_id: "NonEmptyString",
+    #             network_acl_id: "NonEmptyString",
+    #             subnet_id: "NonEmptyString",
+    #           },
+    #         ],
+    #         entries: [
+    #           {
+    #             cidr_block: "NonEmptyString",
+    #             egress: false,
+    #             icmp_type_code: {
+    #               code: 1,
+    #               type: 1,
+    #             },
+    #             ipv_6_cidr_block: "NonEmptyString",
+    #             port_range: {
+    #               from: 1,
+    #               to: 1,
+    #             },
+    #             protocol: "NonEmptyString",
+    #             rule_action: "NonEmptyString",
+    #             rule_number: 1,
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] is_default
+    #   Whether this is the default network ACL for the VPC.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] network_acl_id
+    #   The identifier of the network ACL.
+    #   @return [String]
+    #
+    # @!attribute [rw] owner_id
+    #   The identifier of the AWS account that owns the network ACL.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpc_id
+    #   The identifier of the VPC for the network ACL.
+    #   @return [String]
+    #
+    # @!attribute [rw] associations
+    #   Associations between the network ACL and subnets.
+    #   @return [Array<Types::AwsEc2NetworkAclAssociation>]
+    #
+    # @!attribute [rw] entries
+    #   The set of rules in the network ACL.
+    #   @return [Array<Types::AwsEc2NetworkAclEntry>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsEc2NetworkAclDetails AWS API Documentation
+    #
+    class AwsEc2NetworkAclDetails < Struct.new(
+      :is_default,
+      :network_acl_id,
+      :owner_id,
+      :vpc_id,
+      :associations,
+      :entries)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A rule for the network ACL. Each rule allows or denies access based on
+    # the IP address, traffic direction, port, and protocol.
+    #
+    # @note When making an API call, you may pass AwsEc2NetworkAclEntry
+    #   data as a hash:
+    #
+    #       {
+    #         cidr_block: "NonEmptyString",
+    #         egress: false,
+    #         icmp_type_code: {
+    #           code: 1,
+    #           type: 1,
+    #         },
+    #         ipv_6_cidr_block: "NonEmptyString",
+    #         port_range: {
+    #           from: 1,
+    #           to: 1,
+    #         },
+    #         protocol: "NonEmptyString",
+    #         rule_action: "NonEmptyString",
+    #         rule_number: 1,
+    #       }
+    #
+    # @!attribute [rw] cidr_block
+    #   The IPV4 network range for which to deny or allow access.
+    #   @return [String]
+    #
+    # @!attribute [rw] egress
+    #   Whether the rule is an egress rule. An egress rule is a rule that
+    #   applies to traffic that leaves the subnet.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] icmp_type_code
+    #   The Internet Control Message Protocol (ICMP) type and code for which
+    #   to deny or allow access.
+    #   @return [Types::IcmpTypeCode]
+    #
+    # @!attribute [rw] ipv_6_cidr_block
+    #   The IPV6 network range for which to deny or allow access.
+    #   @return [String]
+    #
+    # @!attribute [rw] port_range
+    #   For TCP or UDP protocols, the range of ports that the rule applies
+    #   to.
+    #   @return [Types::PortRangeFromTo]
+    #
+    # @!attribute [rw] protocol
+    #   The protocol that the rule applies to. To deny or allow access to
+    #   all protocols, use the value -1.
+    #   @return [String]
+    #
+    # @!attribute [rw] rule_action
+    #   Whether the rule is used to allow access or deny access.
+    #   @return [String]
+    #
+    # @!attribute [rw] rule_number
+    #   The rule number. The rules are processed in order by their number.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsEc2NetworkAclEntry AWS API Documentation
+    #
+    class AwsEc2NetworkAclEntry < Struct.new(
+      :cidr_block,
+      :egress,
+      :icmp_type_code,
+      :ipv_6_cidr_block,
+      :port_range,
+      :protocol,
+      :rule_action,
+      :rule_number)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Information about the network interface attachment.
     #
     # @note When making an API call, you may pass AwsEc2NetworkInterfaceAttachment
@@ -4386,6 +4601,107 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # Contains information about a subnet in EC2.
+    #
+    # @note When making an API call, you may pass AwsEc2SubnetDetails
+    #   data as a hash:
+    #
+    #       {
+    #         assign_ipv_6_address_on_creation: false,
+    #         availability_zone: "NonEmptyString",
+    #         availability_zone_id: "NonEmptyString",
+    #         available_ip_address_count: 1,
+    #         cidr_block: "NonEmptyString",
+    #         default_for_az: false,
+    #         map_public_ip_on_launch: false,
+    #         owner_id: "NonEmptyString",
+    #         state: "NonEmptyString",
+    #         subnet_arn: "NonEmptyString",
+    #         subnet_id: "NonEmptyString",
+    #         vpc_id: "NonEmptyString",
+    #         ipv_6_cidr_block_association_set: [
+    #           {
+    #             association_id: "NonEmptyString",
+    #             ipv_6_cidr_block: "NonEmptyString",
+    #             cidr_block_state: "NonEmptyString",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] assign_ipv_6_address_on_creation
+    #   Whether to assign an IPV6 address to a network interface that is
+    #   created in this subnet.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] availability_zone
+    #   The Availability Zone for the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] availability_zone_id
+    #   The identifier of the Availability Zone for the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] available_ip_address_count
+    #   The number of available IPV4 addresses in the subnet. Does not
+    #   include addresses for stopped instances.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] cidr_block
+    #   The IPV4 CIDR block that is assigned to the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] default_for_az
+    #   Whether this subnet is the default subnet for the Availability Zone.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] map_public_ip_on_launch
+    #   Whether instances in this subnet receive a public IP address.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] owner_id
+    #   The identifier of the AWS account that owns the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] state
+    #   The current state of the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] subnet_arn
+    #   The ARN of the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] subnet_id
+    #   The identifier of the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpc_id
+    #   The identifier of the VPC that contains the subnet.
+    #   @return [String]
+    #
+    # @!attribute [rw] ipv_6_cidr_block_association_set
+    #   The IPV6 CIDR blocks that are associated with the subnet.
+    #   @return [Array<Types::Ipv6CidrBlockAssociation>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsEc2SubnetDetails AWS API Documentation
+    #
+    class AwsEc2SubnetDetails < Struct.new(
+      :assign_ipv_6_address_on_creation,
+      :availability_zone,
+      :availability_zone_id,
+      :available_ip_address_count,
+      :cidr_block,
+      :default_for_az,
+      :map_public_ip_on_launch,
+      :owner_id,
+      :state,
+      :subnet_arn,
+      :subnet_id,
+      :vpc_id,
+      :ipv_6_cidr_block_association_set)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # An attachment to an AWS EC2 volume.
     #
     # @note When making an API call, you may pass AwsEc2VolumeAttachment
@@ -4553,85 +4869,316 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
-    # Information about an Elasticsearch domain.
+    # Contains details about an Elastic Beanstalk environment.
     #
-    # @note When making an API call, you may pass AwsElasticsearchDomainDetails
+    # @note When making an API call, you may pass AwsElasticBeanstalkEnvironmentDetails
     #   data as a hash:
     #
     #       {
-    #         access_policies: "NonEmptyString",
-    #         domain_endpoint_options: {
-    #           enforce_https: false,
-    #           tls_security_policy: "NonEmptyString",
-    #         },
-    #         domain_id: "NonEmptyString",
-    #         domain_name: "NonEmptyString",
-    #         endpoint: "NonEmptyString",
-    #         endpoints: {
-    #           "NonEmptyString" => "NonEmptyString",
-    #         },
-    #         elasticsearch_version: "NonEmptyString",
-    #         encryption_at_rest_options: {
-    #           enabled: false,
-    #           kms_key_id: "NonEmptyString",
-    #         },
-    #         node_to_node_encryption_options: {
-    #           enabled: false,
-    #         },
-    #         vpc_options: {
-    #           availability_zones: ["NonEmptyString"],
-    #           security_group_ids: ["NonEmptyString"],
-    #           subnet_ids: ["NonEmptyString"],
-    #           vpc_id: "NonEmptyString",
+    #         application_name: "NonEmptyString",
+    #         cname: "NonEmptyString",
+    #         date_created: "NonEmptyString",
+    #         date_updated: "NonEmptyString",
+    #         description: "NonEmptyString",
+    #         endpoint_url: "NonEmptyString",
+    #         environment_arn: "NonEmptyString",
+    #         environment_id: "NonEmptyString",
+    #         environment_links: [
+    #           {
+    #             environment_name: "NonEmptyString",
+    #             link_name: "NonEmptyString",
+    #           },
+    #         ],
+    #         environment_name: "NonEmptyString",
+    #         option_settings: [
+    #           {
+    #             namespace: "NonEmptyString",
+    #             option_name: "NonEmptyString",
+    #             resource_name: "NonEmptyString",
+    #             value: "NonEmptyString",
+    #           },
+    #         ],
+    #         platform_arn: "NonEmptyString",
+    #         solution_stack_name: "NonEmptyString",
+    #         status: "NonEmptyString",
+    #         tier: {
+    #           name: "NonEmptyString",
+    #           type: "NonEmptyString",
+    #           version: "NonEmptyString",
     #         },
+    #         version_label: "NonEmptyString",
     #       }
     #
-    # @!attribute [rw] access_policies
-    #   IAM policy document specifying the access policies for the new
-    #   Amazon ES domain.
+    # @!attribute [rw] application_name
+    #   The name of the application that is associated with the environment.
     #   @return [String]
     #
-    # @!attribute [rw] domain_endpoint_options
-    #   Additional options for the domain endpoint.
-    #   @return [Types::AwsElasticsearchDomainDomainEndpointOptions]
+    # @!attribute [rw] cname
+    #   The URL to the CNAME for this environment.
+    #   @return [String]
     #
-    # @!attribute [rw] domain_id
-    #   Unique identifier for an Amazon ES domain.
+    # @!attribute [rw] date_created
+    #   The creation date for this environment.
     #   @return [String]
     #
-    # @!attribute [rw] domain_name
-    #   Name of an Amazon ES domain.
+    # @!attribute [rw] date_updated
+    #   The date when this environment was last modified.
+    #   @return [String]
     #
-    #   Domain names are unique across all domains owned by the same account
-    #   within an AWS Region.
+    # @!attribute [rw] description
+    #   A description of the environment.
+    #   @return [String]
     #
-    #   Domain names must start with a lowercase letter and must be between
-    #   3 and 28 characters.
+    # @!attribute [rw] endpoint_url
+    #   For load-balanced, autoscaling environments, the URL to the load
+    #   balancer. For single-instance environments, the IP address of the
+    #   instance.
+    #   @return [String]
     #
-    #   Valid characters are a-z (lowercase only), 0-9, and – (hyphen).
+    # @!attribute [rw] environment_arn
+    #   The ARN of the environment.
     #   @return [String]
     #
-    # @!attribute [rw] endpoint
-    #   Domain-specific endpoint used to submit index, search, and data
-    #   upload requests to an Amazon ES domain.
+    # @!attribute [rw] environment_id
+    #   The identifier of the environment.
+    #   @return [String]
     #
-    #   The endpoint is a service URL.
+    # @!attribute [rw] environment_links
+    #   Links to other environments in the same group.
+    #   @return [Array<Types::AwsElasticBeanstalkEnvironmentEnvironmentLink>]
+    #
+    # @!attribute [rw] environment_name
+    #   The name of the environment.
     #   @return [String]
     #
-    # @!attribute [rw] endpoints
-    #   The key-value pair that exists if the Amazon ES domain uses VPC
-    #   endpoints.
-    #   @return [Hash<String,String>]
+    # @!attribute [rw] option_settings
+    #   The configuration setting for the environment.
+    #   @return [Array<Types::AwsElasticBeanstalkEnvironmentOptionSetting>]
     #
-    # @!attribute [rw] elasticsearch_version
-    #   Elasticsearch version.
+    # @!attribute [rw] platform_arn
+    #   The ARN of the platform version for the environment.
     #   @return [String]
     #
-    # @!attribute [rw] encryption_at_rest_options
-    #   Details about the configuration for encryption at rest.
-    #   @return [Types::AwsElasticsearchDomainEncryptionAtRestOptions]
+    # @!attribute [rw] solution_stack_name
+    #   The name of the solution stack that is deployed with the
+    #   environment.
+    #   @return [String]
     #
-    # @!attribute [rw] node_to_node_encryption_options
+    # @!attribute [rw] status
+    #   The current operational status of the environment.
+    #   @return [String]
+    #
+    # @!attribute [rw] tier
+    #   The tier of the environment.
+    #   @return [Types::AwsElasticBeanstalkEnvironmentTier]
+    #
+    # @!attribute [rw] version_label
+    #   The application version of the environment.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsElasticBeanstalkEnvironmentDetails AWS API Documentation
+    #
+    class AwsElasticBeanstalkEnvironmentDetails < Struct.new(
+      :application_name,
+      :cname,
+      :date_created,
+      :date_updated,
+      :description,
+      :endpoint_url,
+      :environment_arn,
+      :environment_id,
+      :environment_links,
+      :environment_name,
+      :option_settings,
+      :platform_arn,
+      :solution_stack_name,
+      :status,
+      :tier,
+      :version_label)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about a link to another environment that is in
+    # the same group.
+    #
+    # @note When making an API call, you may pass AwsElasticBeanstalkEnvironmentEnvironmentLink
+    #   data as a hash:
+    #
+    #       {
+    #         environment_name: "NonEmptyString",
+    #         link_name: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] environment_name
+    #   The name of the linked environment.
+    #   @return [String]
+    #
+    # @!attribute [rw] link_name
+    #   The name of the environment link.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsElasticBeanstalkEnvironmentEnvironmentLink AWS API Documentation
+    #
+    class AwsElasticBeanstalkEnvironmentEnvironmentLink < Struct.new(
+      :environment_name,
+      :link_name)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # A configuration option setting for the environment.
+    #
+    # @note When making an API call, you may pass AwsElasticBeanstalkEnvironmentOptionSetting
+    #   data as a hash:
+    #
+    #       {
+    #         namespace: "NonEmptyString",
+    #         option_name: "NonEmptyString",
+    #         resource_name: "NonEmptyString",
+    #         value: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] namespace
+    #   The type of resource that the configuration option is associated
+    #   with.
+    #   @return [String]
+    #
+    # @!attribute [rw] option_name
+    #   The name of the option.
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_name
+    #   The name of the resource.
+    #   @return [String]
+    #
+    # @!attribute [rw] value
+    #   The value of the configuration setting.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsElasticBeanstalkEnvironmentOptionSetting AWS API Documentation
+    #
+    class AwsElasticBeanstalkEnvironmentOptionSetting < Struct.new(
+      :namespace,
+      :option_name,
+      :resource_name,
+      :value)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains information about the tier of the environment.
+    #
+    # @note When making an API call, you may pass AwsElasticBeanstalkEnvironmentTier
+    #   data as a hash:
+    #
+    #       {
+    #         name: "NonEmptyString",
+    #         type: "NonEmptyString",
+    #         version: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] name
+    #   The name of the environment tier.
+    #   @return [String]
+    #
+    # @!attribute [rw] type
+    #   The type of environment tier.
+    #   @return [String]
+    #
+    # @!attribute [rw] version
+    #   The version of the environment tier.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsElasticBeanstalkEnvironmentTier AWS API Documentation
+    #
+    class AwsElasticBeanstalkEnvironmentTier < Struct.new(
+      :name,
+      :type,
+      :version)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Information about an Elasticsearch domain.
+    #
+    # @note When making an API call, you may pass AwsElasticsearchDomainDetails
+    #   data as a hash:
+    #
+    #       {
+    #         access_policies: "NonEmptyString",
+    #         domain_endpoint_options: {
+    #           enforce_https: false,
+    #           tls_security_policy: "NonEmptyString",
+    #         },
+    #         domain_id: "NonEmptyString",
+    #         domain_name: "NonEmptyString",
+    #         endpoint: "NonEmptyString",
+    #         endpoints: {
+    #           "NonEmptyString" => "NonEmptyString",
+    #         },
+    #         elasticsearch_version: "NonEmptyString",
+    #         encryption_at_rest_options: {
+    #           enabled: false,
+    #           kms_key_id: "NonEmptyString",
+    #         },
+    #         node_to_node_encryption_options: {
+    #           enabled: false,
+    #         },
+    #         vpc_options: {
+    #           availability_zones: ["NonEmptyString"],
+    #           security_group_ids: ["NonEmptyString"],
+    #           subnet_ids: ["NonEmptyString"],
+    #           vpc_id: "NonEmptyString",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] access_policies
+    #   IAM policy document specifying the access policies for the new
+    #   Amazon ES domain.
+    #   @return [String]
+    #
+    # @!attribute [rw] domain_endpoint_options
+    #   Additional options for the domain endpoint.
+    #   @return [Types::AwsElasticsearchDomainDomainEndpointOptions]
+    #
+    # @!attribute [rw] domain_id
+    #   Unique identifier for an Amazon ES domain.
+    #   @return [String]
+    #
+    # @!attribute [rw] domain_name
+    #   Name of an Amazon ES domain.
+    #
+    #   Domain names are unique across all domains owned by the same account
+    #   within an AWS Region.
+    #
+    #   Domain names must start with a lowercase letter and must be between
+    #   3 and 28 characters.
+    #
+    #   Valid characters are a-z (lowercase only), 0-9, and – (hyphen).
+    #   @return [String]
+    #
+    # @!attribute [rw] endpoint
+    #   Domain-specific endpoint used to submit index, search, and data
+    #   upload requests to an Amazon ES domain.
+    #
+    #   The endpoint is a service URL.
+    #   @return [String]
+    #
+    # @!attribute [rw] endpoints
+    #   The key-value pair that exists if the Amazon ES domain uses VPC
+    #   endpoints.
+    #   @return [Hash<String,String>]
+    #
+    # @!attribute [rw] elasticsearch_version
+    #   Elasticsearch version.
+    #   @return [String]
+    #
+    # @!attribute [rw] encryption_at_rest_options
+    #   Details about the configuration for encryption at rest.
+    #   @return [Types::AwsElasticsearchDomainEncryptionAtRestOptions]
+    #
+    # @!attribute [rw] node_to_node_encryption_options
     #   Details about the configuration for node-to-node encryption.
     #   @return [Types::AwsElasticsearchDomainNodeToNodeEncryptionOptions]
     #
@@ -9765,6 +10312,51 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # provides information about the Amazon S3 Public Access Block
+    # configuration for accounts.
+    #
+    # @note When making an API call, you may pass AwsS3AccountPublicAccessBlockDetails
+    #   data as a hash:
+    #
+    #       {
+    #         block_public_acls: false,
+    #         block_public_policy: false,
+    #         ignore_public_acls: false,
+    #         restrict_public_buckets: false,
+    #       }
+    #
+    # @!attribute [rw] block_public_acls
+    #   Indicates whether to reject calls to update an S3 bucket if the
+    #   calls include a public access control list (ACL).
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] block_public_policy
+    #   Indicates whether to reject calls to update the access policy for an
+    #   S3 bucket or access point if the policy allows public access.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] ignore_public_acls
+    #   Indicates whether Amazon S3 ignores public ACLs that are associated
+    #   with an S3 bucket.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] restrict_public_buckets
+    #   Indicates whether to restrict access to an access point or S3 bucket
+    #   that has a public policy to only AWS service principals and
+    #   authorized users within the S3 bucket owner's account.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsS3AccountPublicAccessBlockDetails AWS API Documentation
+    #
+    class AwsS3AccountPublicAccessBlockDetails < Struct.new(
+      :block_public_acls,
+      :block_public_policy,
+      :ignore_public_acls,
+      :restrict_public_buckets)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The details of an Amazon S3 bucket.
     #
     # @note When making an API call, you may pass AwsS3BucketDetails
@@ -9784,6 +10376,12 @@ module Aws::SecurityHub
     #             },
     #           ],
     #         },
+    #         public_access_block_configuration: {
+    #           block_public_acls: false,
+    #           block_public_policy: false,
+    #           ignore_public_acls: false,
+    #           restrict_public_buckets: false,
+    #         },
     #       }
     #
     # @!attribute [rw] owner_id
@@ -9810,13 +10408,19 @@ module Aws::SecurityHub
     #   The encryption rules that are applied to the S3 bucket.
     #   @return [Types::AwsS3BucketServerSideEncryptionConfiguration]
     #
+    # @!attribute [rw] public_access_block_configuration
+    #   Provides information about the Amazon S3 Public Access Block
+    #   configuration for the S3 bucket.
+    #   @return [Types::AwsS3AccountPublicAccessBlockDetails]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsS3BucketDetails AWS API Documentation
     #
     class AwsS3BucketDetails < Struct.new(
       :owner_id,
       :owner_name,
       :created_at,
-      :server_side_encryption_configuration)
+      :server_side_encryption_configuration,
+      :public_access_block_configuration)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -10077,12 +10681,12 @@ module Aws::SecurityHub
     #         product_arn: "NonEmptyString", # required
     #         generator_id: "NonEmptyString", # required
     #         aws_account_id: "NonEmptyString", # required
-    #         types: ["NonEmptyString"], # required
+    #         types: ["NonEmptyString"],
     #         first_observed_at: "NonEmptyString",
     #         last_observed_at: "NonEmptyString",
     #         created_at: "NonEmptyString", # required
     #         updated_at: "NonEmptyString", # required
-    #         severity: { # required
+    #         severity: {
     #           product: 1.0,
     #           label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
     #           normalized: 1,
@@ -10206,6 +10810,130 @@ module Aws::SecurityHub
     #             tags: {
     #               "NonEmptyString" => "NonEmptyString",
     #             },
+    #             data_classification: {
+    #               detailed_results_location: "NonEmptyString",
+    #               result: {
+    #                 mime_type: "NonEmptyString",
+    #                 size_classified: 1,
+    #                 additional_occurrences: false,
+    #                 status: {
+    #                   code: "NonEmptyString",
+    #                   reason: "NonEmptyString",
+    #                 },
+    #                 sensitive_data: [
+    #                   {
+    #                     category: "NonEmptyString",
+    #                     detections: [
+    #                       {
+    #                         count: 1,
+    #                         type: "NonEmptyString",
+    #                         occurrences: {
+    #                           line_ranges: [
+    #                             {
+    #                               start: 1,
+    #                               end: 1,
+    #                               start_column: 1,
+    #                             },
+    #                           ],
+    #                           offset_ranges: [
+    #                             {
+    #                               start: 1,
+    #                               end: 1,
+    #                               start_column: 1,
+    #                             },
+    #                           ],
+    #                           pages: [
+    #                             {
+    #                               page_number: 1,
+    #                               line_range: {
+    #                                 start: 1,
+    #                                 end: 1,
+    #                                 start_column: 1,
+    #                               },
+    #                               offset_range: {
+    #                                 start: 1,
+    #                                 end: 1,
+    #                                 start_column: 1,
+    #                               },
+    #                             },
+    #                           ],
+    #                           records: [
+    #                             {
+    #                               json_path: "NonEmptyString",
+    #                               record_index: 1,
+    #                             },
+    #                           ],
+    #                           cells: [
+    #                             {
+    #                               column: 1,
+    #                               row: 1,
+    #                               column_name: "NonEmptyString",
+    #                               cell_reference: "NonEmptyString",
+    #                             },
+    #                           ],
+    #                         },
+    #                       },
+    #                     ],
+    #                     total_count: 1,
+    #                   },
+    #                 ],
+    #                 custom_data_identifiers: {
+    #                   detections: [
+    #                     {
+    #                       count: 1,
+    #                       arn: "NonEmptyString",
+    #                       name: "NonEmptyString",
+    #                       occurrences: {
+    #                         line_ranges: [
+    #                           {
+    #                             start: 1,
+    #                             end: 1,
+    #                             start_column: 1,
+    #                           },
+    #                         ],
+    #                         offset_ranges: [
+    #                           {
+    #                             start: 1,
+    #                             end: 1,
+    #                             start_column: 1,
+    #                           },
+    #                         ],
+    #                         pages: [
+    #                           {
+    #                             page_number: 1,
+    #                             line_range: {
+    #                               start: 1,
+    #                               end: 1,
+    #                               start_column: 1,
+    #                             },
+    #                             offset_range: {
+    #                               start: 1,
+    #                               end: 1,
+    #                               start_column: 1,
+    #                             },
+    #                           },
+    #                         ],
+    #                         records: [
+    #                           {
+    #                             json_path: "NonEmptyString",
+    #                             record_index: 1,
+    #                           },
+    #                         ],
+    #                         cells: [
+    #                           {
+    #                             column: 1,
+    #                             row: 1,
+    #                             column_name: "NonEmptyString",
+    #                             cell_reference: "NonEmptyString",
+    #                           },
+    #                         ],
+    #                       },
+    #                     },
+    #                   ],
+    #                   total_count: 1,
+    #                 },
+    #               },
+    #             },
     #             details: {
     #               aws_auto_scaling_auto_scaling_group: {
     #                 launch_configuration_name: "NonEmptyString",
@@ -10446,6 +11174,58 @@ module Aws::SecurityHub
     #                 network_interface_owner_id: "NonEmptyString",
     #                 private_ip_address: "NonEmptyString",
     #               },
+    #               aws_ec2_subnet: {
+    #                 assign_ipv_6_address_on_creation: false,
+    #                 availability_zone: "NonEmptyString",
+    #                 availability_zone_id: "NonEmptyString",
+    #                 available_ip_address_count: 1,
+    #                 cidr_block: "NonEmptyString",
+    #                 default_for_az: false,
+    #                 map_public_ip_on_launch: false,
+    #                 owner_id: "NonEmptyString",
+    #                 state: "NonEmptyString",
+    #                 subnet_arn: "NonEmptyString",
+    #                 subnet_id: "NonEmptyString",
+    #                 vpc_id: "NonEmptyString",
+    #                 ipv_6_cidr_block_association_set: [
+    #                   {
+    #                     association_id: "NonEmptyString",
+    #                     ipv_6_cidr_block: "NonEmptyString",
+    #                     cidr_block_state: "NonEmptyString",
+    #                   },
+    #                 ],
+    #               },
+    #               aws_ec2_network_acl: {
+    #                 is_default: false,
+    #                 network_acl_id: "NonEmptyString",
+    #                 owner_id: "NonEmptyString",
+    #                 vpc_id: "NonEmptyString",
+    #                 associations: [
+    #                   {
+    #                     network_acl_association_id: "NonEmptyString",
+    #                     network_acl_id: "NonEmptyString",
+    #                     subnet_id: "NonEmptyString",
+    #                   },
+    #                 ],
+    #                 entries: [
+    #                   {
+    #                     cidr_block: "NonEmptyString",
+    #                     egress: false,
+    #                     icmp_type_code: {
+    #                       code: 1,
+    #                       type: 1,
+    #                     },
+    #                     ipv_6_cidr_block: "NonEmptyString",
+    #                     port_range: {
+    #                       from: 1,
+    #                       to: 1,
+    #                     },
+    #                     protocol: "NonEmptyString",
+    #                     rule_action: "NonEmptyString",
+    #                     rule_number: 1,
+    #                   },
+    #                 ],
+    #               },
     #               aws_elbv_2_load_balancer: {
     #                 availability_zones: [
     #                   {
@@ -10466,12 +11246,46 @@ module Aws::SecurityHub
     #                 type: "NonEmptyString",
     #                 vpc_id: "NonEmptyString",
     #               },
-    #               aws_elasticsearch_domain: {
-    #                 access_policies: "NonEmptyString",
-    #                 domain_endpoint_options: {
-    #                   enforce_https: false,
-    #                   tls_security_policy: "NonEmptyString",
-    #                 },
+    #               aws_elastic_beanstalk_environment: {
+    #                 application_name: "NonEmptyString",
+    #                 cname: "NonEmptyString",
+    #                 date_created: "NonEmptyString",
+    #                 date_updated: "NonEmptyString",
+    #                 description: "NonEmptyString",
+    #                 endpoint_url: "NonEmptyString",
+    #                 environment_arn: "NonEmptyString",
+    #                 environment_id: "NonEmptyString",
+    #                 environment_links: [
+    #                   {
+    #                     environment_name: "NonEmptyString",
+    #                     link_name: "NonEmptyString",
+    #                   },
+    #                 ],
+    #                 environment_name: "NonEmptyString",
+    #                 option_settings: [
+    #                   {
+    #                     namespace: "NonEmptyString",
+    #                     option_name: "NonEmptyString",
+    #                     resource_name: "NonEmptyString",
+    #                     value: "NonEmptyString",
+    #                   },
+    #                 ],
+    #                 platform_arn: "NonEmptyString",
+    #                 solution_stack_name: "NonEmptyString",
+    #                 status: "NonEmptyString",
+    #                 tier: {
+    #                   name: "NonEmptyString",
+    #                   type: "NonEmptyString",
+    #                   version: "NonEmptyString",
+    #                 },
+    #                 version_label: "NonEmptyString",
+    #               },
+    #               aws_elasticsearch_domain: {
+    #                 access_policies: "NonEmptyString",
+    #                 domain_endpoint_options: {
+    #                   enforce_https: false,
+    #                   tls_security_policy: "NonEmptyString",
+    #                 },
     #                 domain_id: "NonEmptyString",
     #                 domain_name: "NonEmptyString",
     #                 endpoint: "NonEmptyString",
@@ -10507,6 +11321,18 @@ module Aws::SecurityHub
     #                     },
     #                   ],
     #                 },
+    #                 public_access_block_configuration: {
+    #                   block_public_acls: false,
+    #                   block_public_policy: false,
+    #                   ignore_public_acls: false,
+    #                   restrict_public_buckets: false,
+    #                 },
+    #               },
+    #               aws_s3_account_public_access_block: {
+    #                 block_public_acls: false,
+    #                 block_public_policy: false,
+    #                 ignore_public_acls: false,
+    #                 restrict_public_buckets: false,
     #               },
     #               aws_s3_object: {
     #                 last_modified: "NonEmptyString",
@@ -11737,6 +12563,21 @@ module Aws::SecurityHub
     #             blocked: false,
     #           },
     #         },
+    #         finding_provider_fields: {
+    #           confidence: 1,
+    #           criticality: 1,
+    #           related_findings: [
+    #             {
+    #               product_arn: "NonEmptyString", # required
+    #               id: "NonEmptyString", # required
+    #             },
+    #           ],
+    #           severity: {
+    #             label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
+    #             original: "NonEmptyString",
+    #           },
+    #           types: ["NonEmptyString"],
+    #         },
     #       }
     #
     # @!attribute [rw] schema_version
@@ -11957,6 +12798,12 @@ module Aws::SecurityHub
     #   resource.
     #   @return [Types::Action]
     #
+    # @!attribute [rw] finding_provider_fields
+    #   In a `BatchImportFindings` request, finding providers use
+    #   `FindingProviderFields` to provide and update their own values for
+    #   confidence, criticality, related findings, severity, and types.
+    #   @return [Types::FindingProviderFields]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsSecurityFinding AWS API Documentation
     #
     class AwsSecurityFinding < Struct.new(
@@ -11994,7 +12841,8 @@ module Aws::SecurityHub
       :note,
       :vulnerabilities,
       :patch_summary,
-      :action)
+      :action,
+      :finding_provider_fields)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -12563,6 +13411,50 @@ module Aws::SecurityHub
     #             value: "NonEmptyString",
     #           },
     #         ],
+    #         finding_provider_fields_confidence: [
+    #           {
+    #             gte: 1.0,
+    #             lte: 1.0,
+    #             eq: 1.0,
+    #           },
+    #         ],
+    #         finding_provider_fields_criticality: [
+    #           {
+    #             gte: 1.0,
+    #             lte: 1.0,
+    #             eq: 1.0,
+    #           },
+    #         ],
+    #         finding_provider_fields_related_findings_id: [
+    #           {
+    #             value: "NonEmptyString",
+    #             comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #           },
+    #         ],
+    #         finding_provider_fields_related_findings_product_arn: [
+    #           {
+    #             value: "NonEmptyString",
+    #             comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #           },
+    #         ],
+    #         finding_provider_fields_severity_label: [
+    #           {
+    #             value: "NonEmptyString",
+    #             comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #           },
+    #         ],
+    #         finding_provider_fields_severity_original: [
+    #           {
+    #             value: "NonEmptyString",
+    #             comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #           },
+    #         ],
+    #         finding_provider_fields_types: [
+    #           {
+    #             value: "NonEmptyString",
+    #             comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] product_arn
@@ -12970,6 +13862,52 @@ module Aws::SecurityHub
     #   A keyword for a finding.
     #   @return [Array<Types::KeywordFilter>]
     #
+    # @!attribute [rw] finding_provider_fields_confidence
+    #   The finding provider value for the finding confidence. Confidence is
+    #   defined as the likelihood that a finding accurately identifies the
+    #   behavior or issue that it was intended to identify.
+    #
+    #   Confidence is scored on a 0-100 basis using a ratio scale, where 0
+    #   means zero percent confidence and 100 means 100 percent confidence.
+    #   @return [Array<Types::NumberFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_criticality
+    #   The finding provider value for the level of importance assigned to
+    #   the resources associated with the findings.
+    #
+    #   A score of 0 means that the underlying resources have no
+    #   criticality, and a score of 100 is reserved for the most critical
+    #   resources.
+    #   @return [Array<Types::NumberFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_related_findings_id
+    #   The finding identifier of a related finding that is identified by
+    #   the finding provider.
+    #   @return [Array<Types::StringFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_related_findings_product_arn
+    #   The ARN of the solution that generated a related finding that is
+    #   identified by the finding provider.
+    #   @return [Array<Types::StringFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_severity_label
+    #   The finding provider value for the severity label.
+    #   @return [Array<Types::StringFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_severity_original
+    #   The finding provider's original value for the severity.
+    #   @return [Array<Types::StringFilter>]
+    #
+    # @!attribute [rw] finding_provider_fields_types
+    #   One or more finding types that the finding provider assigned to the
+    #   finding. Uses the format of `namespace/category/classifier` that
+    #   classify a finding.
+    #
+    #   Valid namespace values are: Software and Configuration Checks \|
+    #   TTPs \| Effects \| Unusual Behaviors \| Sensitive Data
+    #   Identifications
+    #   @return [Array<Types::StringFilter>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/AwsSecurityFindingFilters AWS API Documentation
     #
     class AwsSecurityFindingFilters < Struct.new(
@@ -13056,7 +13994,14 @@ module Aws::SecurityHub
       :note_text,
       :note_updated_at,
       :note_updated_by,
-      :keyword)
+      :keyword,
+      :finding_provider_fields_confidence,
+      :finding_provider_fields_criticality,
+      :finding_provider_fields_related_findings_id,
+      :finding_provider_fields_related_findings_product_arn,
+      :finding_provider_fields_severity_label,
+      :finding_provider_fields_severity_original,
+      :finding_provider_fields_types)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -13662,12 +14607,12 @@ module Aws::SecurityHub
     #             product_arn: "NonEmptyString", # required
     #             generator_id: "NonEmptyString", # required
     #             aws_account_id: "NonEmptyString", # required
-    #             types: ["NonEmptyString"], # required
+    #             types: ["NonEmptyString"],
     #             first_observed_at: "NonEmptyString",
     #             last_observed_at: "NonEmptyString",
     #             created_at: "NonEmptyString", # required
     #             updated_at: "NonEmptyString", # required
-    #             severity: { # required
+    #             severity: {
     #               product: 1.0,
     #               label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
     #               normalized: 1,
@@ -13791,6 +14736,130 @@ module Aws::SecurityHub
     #                 tags: {
     #                   "NonEmptyString" => "NonEmptyString",
     #                 },
+    #                 data_classification: {
+    #                   detailed_results_location: "NonEmptyString",
+    #                   result: {
+    #                     mime_type: "NonEmptyString",
+    #                     size_classified: 1,
+    #                     additional_occurrences: false,
+    #                     status: {
+    #                       code: "NonEmptyString",
+    #                       reason: "NonEmptyString",
+    #                     },
+    #                     sensitive_data: [
+    #                       {
+    #                         category: "NonEmptyString",
+    #                         detections: [
+    #                           {
+    #                             count: 1,
+    #                             type: "NonEmptyString",
+    #                             occurrences: {
+    #                               line_ranges: [
+    #                                 {
+    #                                   start: 1,
+    #                                   end: 1,
+    #                                   start_column: 1,
+    #                                 },
+    #                               ],
+    #                               offset_ranges: [
+    #                                 {
+    #                                   start: 1,
+    #                                   end: 1,
+    #                                   start_column: 1,
+    #                                 },
+    #                               ],
+    #                               pages: [
+    #                                 {
+    #                                   page_number: 1,
+    #                                   line_range: {
+    #                                     start: 1,
+    #                                     end: 1,
+    #                                     start_column: 1,
+    #                                   },
+    #                                   offset_range: {
+    #                                     start: 1,
+    #                                     end: 1,
+    #                                     start_column: 1,
+    #                                   },
+    #                                 },
+    #                               ],
+    #                               records: [
+    #                                 {
+    #                                   json_path: "NonEmptyString",
+    #                                   record_index: 1,
+    #                                 },
+    #                               ],
+    #                               cells: [
+    #                                 {
+    #                                   column: 1,
+    #                                   row: 1,
+    #                                   column_name: "NonEmptyString",
+    #                                   cell_reference: "NonEmptyString",
+    #                                 },
+    #                               ],
+    #                             },
+    #                           },
+    #                         ],
+    #                         total_count: 1,
+    #                       },
+    #                     ],
+    #                     custom_data_identifiers: {
+    #                       detections: [
+    #                         {
+    #                           count: 1,
+    #                           arn: "NonEmptyString",
+    #                           name: "NonEmptyString",
+    #                           occurrences: {
+    #                             line_ranges: [
+    #                               {
+    #                                 start: 1,
+    #                                 end: 1,
+    #                                 start_column: 1,
+    #                               },
+    #                             ],
+    #                             offset_ranges: [
+    #                               {
+    #                                 start: 1,
+    #                                 end: 1,
+    #                                 start_column: 1,
+    #                               },
+    #                             ],
+    #                             pages: [
+    #                               {
+    #                                 page_number: 1,
+    #                                 line_range: {
+    #                                   start: 1,
+    #                                   end: 1,
+    #                                   start_column: 1,
+    #                                 },
+    #                                 offset_range: {
+    #                                   start: 1,
+    #                                   end: 1,
+    #                                   start_column: 1,
+    #                                 },
+    #                               },
+    #                             ],
+    #                             records: [
+    #                               {
+    #                                 json_path: "NonEmptyString",
+    #                                 record_index: 1,
+    #                               },
+    #                             ],
+    #                             cells: [
+    #                               {
+    #                                 column: 1,
+    #                                 row: 1,
+    #                                 column_name: "NonEmptyString",
+    #                                 cell_reference: "NonEmptyString",
+    #                               },
+    #                             ],
+    #                           },
+    #                         },
+    #                       ],
+    #                       total_count: 1,
+    #                     },
+    #                   },
+    #                 },
     #                 details: {
     #                   aws_auto_scaling_auto_scaling_group: {
     #                     launch_configuration_name: "NonEmptyString",
@@ -14031,6 +15100,58 @@ module Aws::SecurityHub
     #                     network_interface_owner_id: "NonEmptyString",
     #                     private_ip_address: "NonEmptyString",
     #                   },
+    #                   aws_ec2_subnet: {
+    #                     assign_ipv_6_address_on_creation: false,
+    #                     availability_zone: "NonEmptyString",
+    #                     availability_zone_id: "NonEmptyString",
+    #                     available_ip_address_count: 1,
+    #                     cidr_block: "NonEmptyString",
+    #                     default_for_az: false,
+    #                     map_public_ip_on_launch: false,
+    #                     owner_id: "NonEmptyString",
+    #                     state: "NonEmptyString",
+    #                     subnet_arn: "NonEmptyString",
+    #                     subnet_id: "NonEmptyString",
+    #                     vpc_id: "NonEmptyString",
+    #                     ipv_6_cidr_block_association_set: [
+    #                       {
+    #                         association_id: "NonEmptyString",
+    #                         ipv_6_cidr_block: "NonEmptyString",
+    #                         cidr_block_state: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                   },
+    #                   aws_ec2_network_acl: {
+    #                     is_default: false,
+    #                     network_acl_id: "NonEmptyString",
+    #                     owner_id: "NonEmptyString",
+    #                     vpc_id: "NonEmptyString",
+    #                     associations: [
+    #                       {
+    #                         network_acl_association_id: "NonEmptyString",
+    #                         network_acl_id: "NonEmptyString",
+    #                         subnet_id: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                     entries: [
+    #                       {
+    #                         cidr_block: "NonEmptyString",
+    #                         egress: false,
+    #                         icmp_type_code: {
+    #                           code: 1,
+    #                           type: 1,
+    #                         },
+    #                         ipv_6_cidr_block: "NonEmptyString",
+    #                         port_range: {
+    #                           from: 1,
+    #                           to: 1,
+    #                         },
+    #                         protocol: "NonEmptyString",
+    #                         rule_action: "NonEmptyString",
+    #                         rule_number: 1,
+    #                       },
+    #                     ],
+    #                   },
     #                   aws_elbv_2_load_balancer: {
     #                     availability_zones: [
     #                       {
@@ -14051,6 +15172,40 @@ module Aws::SecurityHub
     #                     type: "NonEmptyString",
     #                     vpc_id: "NonEmptyString",
     #                   },
+    #                   aws_elastic_beanstalk_environment: {
+    #                     application_name: "NonEmptyString",
+    #                     cname: "NonEmptyString",
+    #                     date_created: "NonEmptyString",
+    #                     date_updated: "NonEmptyString",
+    #                     description: "NonEmptyString",
+    #                     endpoint_url: "NonEmptyString",
+    #                     environment_arn: "NonEmptyString",
+    #                     environment_id: "NonEmptyString",
+    #                     environment_links: [
+    #                       {
+    #                         environment_name: "NonEmptyString",
+    #                         link_name: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                     environment_name: "NonEmptyString",
+    #                     option_settings: [
+    #                       {
+    #                         namespace: "NonEmptyString",
+    #                         option_name: "NonEmptyString",
+    #                         resource_name: "NonEmptyString",
+    #                         value: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                     platform_arn: "NonEmptyString",
+    #                     solution_stack_name: "NonEmptyString",
+    #                     status: "NonEmptyString",
+    #                     tier: {
+    #                       name: "NonEmptyString",
+    #                       type: "NonEmptyString",
+    #                       version: "NonEmptyString",
+    #                     },
+    #                     version_label: "NonEmptyString",
+    #                   },
     #                   aws_elasticsearch_domain: {
     #                     access_policies: "NonEmptyString",
     #                     domain_endpoint_options: {
@@ -14092,6 +15247,18 @@ module Aws::SecurityHub
     #                         },
     #                       ],
     #                     },
+    #                     public_access_block_configuration: {
+    #                       block_public_acls: false,
+    #                       block_public_policy: false,
+    #                       ignore_public_acls: false,
+    #                       restrict_public_buckets: false,
+    #                     },
+    #                   },
+    #                   aws_s3_account_public_access_block: {
+    #                     block_public_acls: false,
+    #                     block_public_policy: false,
+    #                     ignore_public_acls: false,
+    #                     restrict_public_buckets: false,
     #                   },
     #                   aws_s3_object: {
     #                     last_modified: "NonEmptyString",
@@ -15322,6 +16489,21 @@ module Aws::SecurityHub
     #                 blocked: false,
     #               },
     #             },
+    #             finding_provider_fields: {
+    #               confidence: 1,
+    #               criticality: 1,
+    #               related_findings: [
+    #                 {
+    #                   product_arn: "NonEmptyString", # required
+    #                   id: "NonEmptyString", # required
+    #                 },
+    #               ],
+    #               severity: {
+    #                 label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
+    #                 original: "NonEmptyString",
+    #               },
+    #               types: ["NonEmptyString"],
+    #             },
     #           },
     #         ],
     #       }
@@ -15545,6 +16727,52 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # An occurrence of sensitive data detected in a Microsoft Excel
+    # workbook, comma-separated value (CSV) file, or tab-separated value
+    # (TSV) file.
+    #
+    # @note When making an API call, you may pass Cell
+    #   data as a hash:
+    #
+    #       {
+    #         column: 1,
+    #         row: 1,
+    #         column_name: "NonEmptyString",
+    #         cell_reference: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] column
+    #   The column number of the column that contains the data. For a
+    #   Microsoft Excel workbook, the column number corresponds to the
+    #   alphabetical column identifiers. For example, a value of 1 for
+    #   Column corresponds to the A column in the workbook.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] row
+    #   The row number of the row that contains the data.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] column_name
+    #   The name of the column that contains the data.
+    #   @return [String]
+    #
+    # @!attribute [rw] cell_reference
+    #   For a Microsoft Excel workbook, provides the location of the cell,
+    #   as an absolute cell reference, that contains the data. For example,
+    #   Sheet2!C5 for cell C5 on Sheet2.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Cell AWS API Documentation
+    #
+    class Cell < Struct.new(
+      :column,
+      :row,
+      :column_name,
+      :cell_reference)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # An IPv4 CIDR block association.
     #
     # @note When making an API call, you may pass CidrBlockAssociation
@@ -15599,38 +16827,235 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
-    # Contains finding details that are specific to control-based findings.
-    # Only returned for findings generated from controls.
+    # Details about the sensitive data that was detected on the resource.
     #
-    # @note When making an API call, you may pass Compliance
+    # @note When making an API call, you may pass ClassificationResult
     #   data as a hash:
     #
     #       {
-    #         status: "PASSED", # accepts PASSED, WARNING, FAILED, NOT_AVAILABLE
-    #         related_requirements: ["NonEmptyString"],
-    #         status_reasons: [
+    #         mime_type: "NonEmptyString",
+    #         size_classified: 1,
+    #         additional_occurrences: false,
+    #         status: {
+    #           code: "NonEmptyString",
+    #           reason: "NonEmptyString",
+    #         },
+    #         sensitive_data: [
     #           {
-    #             reason_code: "NonEmptyString", # required
-    #             description: "NonEmptyString",
+    #             category: "NonEmptyString",
+    #             detections: [
+    #               {
+    #                 count: 1,
+    #                 type: "NonEmptyString",
+    #                 occurrences: {
+    #                   line_ranges: [
+    #                     {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                   ],
+    #                   offset_ranges: [
+    #                     {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                   ],
+    #                   pages: [
+    #                     {
+    #                       page_number: 1,
+    #                       line_range: {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                       offset_range: {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     },
+    #                   ],
+    #                   records: [
+    #                     {
+    #                       json_path: "NonEmptyString",
+    #                       record_index: 1,
+    #                     },
+    #                   ],
+    #                   cells: [
+    #                     {
+    #                       column: 1,
+    #                       row: 1,
+    #                       column_name: "NonEmptyString",
+    #                       cell_reference: "NonEmptyString",
+    #                     },
+    #                   ],
+    #                 },
+    #               },
+    #             ],
+    #             total_count: 1,
     #           },
     #         ],
+    #         custom_data_identifiers: {
+    #           detections: [
+    #             {
+    #               count: 1,
+    #               arn: "NonEmptyString",
+    #               name: "NonEmptyString",
+    #               occurrences: {
+    #                 line_ranges: [
+    #                   {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                 ],
+    #                 offset_ranges: [
+    #                   {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                 ],
+    #                 pages: [
+    #                   {
+    #                     page_number: 1,
+    #                     line_range: {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                     offset_range: {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                   },
+    #                 ],
+    #                 records: [
+    #                   {
+    #                     json_path: "NonEmptyString",
+    #                     record_index: 1,
+    #                   },
+    #                 ],
+    #                 cells: [
+    #                   {
+    #                     column: 1,
+    #                     row: 1,
+    #                     column_name: "NonEmptyString",
+    #                     cell_reference: "NonEmptyString",
+    #                   },
+    #                 ],
+    #               },
+    #             },
+    #           ],
+    #           total_count: 1,
+    #         },
     #       }
     #
-    # @!attribute [rw] status
-    #   The result of a standards check.
+    # @!attribute [rw] mime_type
+    #   The type of content that the finding applies to.
+    #   @return [String]
     #
-    #   The valid values for `Status` are as follows.
+    # @!attribute [rw] size_classified
+    #   The total size in bytes of the affected data.
+    #   @return [Integer]
     #
-    #   * * `PASSED` - Standards check passed for all evaluated resources.
+    # @!attribute [rw] additional_occurrences
+    #   Indicates whether there are additional occurrences of sensitive data
+    #   that are not included in the finding. This occurs when the number of
+    #   occurrences exceeds the maximum that can be included.
+    #   @return [Boolean]
     #
-    #     * `WARNING` - Some information is missing or this check is not
-    #       supported for your configuration.
+    # @!attribute [rw] status
+    #   The current status of the sensitive data detection.
+    #   @return [Types::ClassificationStatus]
     #
-    #     * `FAILED` - Standards check failed for at least one evaluated
-    #       resource.
+    # @!attribute [rw] sensitive_data
+    #   Provides details about sensitive data that was identified based on
+    #   built-in configuration.
+    #   @return [Array<Types::SensitiveDataResult>]
     #
-    #     * `NOT_AVAILABLE` - Check could not be performed due to a service
-    #       outage, API error, or because the result of the AWS Config
+    # @!attribute [rw] custom_data_identifiers
+    #   Provides details about sensitive data that was identified based on
+    #   customer-defined configuration.
+    #   @return [Types::CustomDataIdentifiersResult]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/ClassificationResult AWS API Documentation
+    #
+    class ClassificationResult < Struct.new(
+      :mime_type,
+      :size_classified,
+      :additional_occurrences,
+      :status,
+      :sensitive_data,
+      :custom_data_identifiers)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Provides details about the current status of the sensitive data
+    # detection.
+    #
+    # @note When making an API call, you may pass ClassificationStatus
+    #   data as a hash:
+    #
+    #       {
+    #         code: "NonEmptyString",
+    #         reason: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] code
+    #   The code that represents the status of the sensitive data detection.
+    #   @return [String]
+    #
+    # @!attribute [rw] reason
+    #   A longer description of the current status of the sensitive data
+    #   detection.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/ClassificationStatus AWS API Documentation
+    #
+    class ClassificationStatus < Struct.new(
+      :code,
+      :reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains finding details that are specific to control-based findings.
+    # Only returned for findings generated from controls.
+    #
+    # @note When making an API call, you may pass Compliance
+    #   data as a hash:
+    #
+    #       {
+    #         status: "PASSED", # accepts PASSED, WARNING, FAILED, NOT_AVAILABLE
+    #         related_requirements: ["NonEmptyString"],
+    #         status_reasons: [
+    #           {
+    #             reason_code: "NonEmptyString", # required
+    #             description: "NonEmptyString",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] status
+    #   The result of a standards check.
+    #
+    #   The valid values for `Status` are as follows.
+    #
+    #   * * `PASSED` - Standards check passed for all evaluated resources.
+    #
+    #     * `WARNING` - Some information is missing or this check is not
+    #       supported for your configuration.
+    #
+    #     * `FAILED` - Standards check failed for at least one evaluated
+    #       resource.
+    #
+    #     * `NOT_AVAILABLE` - Check could not be performed due to a service
+    #       outage, API error, or because the result of the AWS Config
     #       evaluation was `NOT_APPLICABLE`. If the AWS Config evaluation
     #       result was `NOT_APPLICABLE`, then after 3 days, Security Hub
     #       automatically archives the finding.
@@ -16339,6 +17764,50 @@ module Aws::SecurityHub
     #               value: "NonEmptyString",
     #             },
     #           ],
+    #           finding_provider_fields_confidence: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_criticality: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_id: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_product_arn: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_label: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_original: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_types: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
     #         },
     #         group_by_attribute: "NonEmptyString", # required
     #       }
@@ -16396,9 +17865,9 @@ module Aws::SecurityHub
     #       }
     #
     # @!attribute [rw] account_details
-    #   The list of accounts to associate with the Security Hub master
-    #   account. For each account, the list includes the account ID and
-    #   optionally the email address.
+    #   The list of accounts to associate with the Security Hub
+    #   administrator account. For each account, the list includes the
+    #   account ID and optionally the email address.
     #   @return [Array<Types::AccountDetails>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/CreateMembersRequest AWS API Documentation
@@ -16422,6 +17891,170 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # The list of detected instances of sensitive data.
+    #
+    # @note When making an API call, you may pass CustomDataIdentifiersDetections
+    #   data as a hash:
+    #
+    #       {
+    #         count: 1,
+    #         arn: "NonEmptyString",
+    #         name: "NonEmptyString",
+    #         occurrences: {
+    #           line_ranges: [
+    #             {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #           ],
+    #           offset_ranges: [
+    #             {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #           ],
+    #           pages: [
+    #             {
+    #               page_number: 1,
+    #               line_range: {
+    #                 start: 1,
+    #                 end: 1,
+    #                 start_column: 1,
+    #               },
+    #               offset_range: {
+    #                 start: 1,
+    #                 end: 1,
+    #                 start_column: 1,
+    #               },
+    #             },
+    #           ],
+    #           records: [
+    #             {
+    #               json_path: "NonEmptyString",
+    #               record_index: 1,
+    #             },
+    #           ],
+    #           cells: [
+    #             {
+    #               column: 1,
+    #               row: 1,
+    #               column_name: "NonEmptyString",
+    #               cell_reference: "NonEmptyString",
+    #             },
+    #           ],
+    #         },
+    #       }
+    #
+    # @!attribute [rw] count
+    #   The total number of occurrences of sensitive data that were
+    #   detected.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] arn
+    #   The ARN of the custom identifier that was used to detect the
+    #   sensitive data.
+    #   @return [String]
+    #
+    # @!attribute [rw] name
+    #   he name of the custom identifier that detected the sensitive data.
+    #   @return [String]
+    #
+    # @!attribute [rw] occurrences
+    #   Details about the sensitive data that was detected.
+    #   @return [Types::Occurrences]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/CustomDataIdentifiersDetections AWS API Documentation
+    #
+    class CustomDataIdentifiersDetections < Struct.new(
+      :count,
+      :arn,
+      :name,
+      :occurrences)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains an instance of sensitive data that was detected by a
+    # customer-defined identifier.
+    #
+    # @note When making an API call, you may pass CustomDataIdentifiersResult
+    #   data as a hash:
+    #
+    #       {
+    #         detections: [
+    #           {
+    #             count: 1,
+    #             arn: "NonEmptyString",
+    #             name: "NonEmptyString",
+    #             occurrences: {
+    #               line_ranges: [
+    #                 {
+    #                   start: 1,
+    #                   end: 1,
+    #                   start_column: 1,
+    #                 },
+    #               ],
+    #               offset_ranges: [
+    #                 {
+    #                   start: 1,
+    #                   end: 1,
+    #                   start_column: 1,
+    #                 },
+    #               ],
+    #               pages: [
+    #                 {
+    #                   page_number: 1,
+    #                   line_range: {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                   offset_range: {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                 },
+    #               ],
+    #               records: [
+    #                 {
+    #                   json_path: "NonEmptyString",
+    #                   record_index: 1,
+    #                 },
+    #               ],
+    #               cells: [
+    #                 {
+    #                   column: 1,
+    #                   row: 1,
+    #                   column_name: "NonEmptyString",
+    #                   cell_reference: "NonEmptyString",
+    #                 },
+    #               ],
+    #             },
+    #           },
+    #         ],
+    #         total_count: 1,
+    #       }
+    #
+    # @!attribute [rw] detections
+    #   The list of detected instances of sensitive data.
+    #   @return [Array<Types::CustomDataIdentifiersDetections>]
+    #
+    # @!attribute [rw] total_count
+    #   The total number of occurrences of sensitive data.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/CustomDataIdentifiersResult AWS API Documentation
+    #
+    class CustomDataIdentifiersResult < Struct.new(
+      :detections,
+      :total_count)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # CVSS scores from the advisory related to the vulnerability.
     #
     # @note When making an API call, you may pass Cvss
@@ -16455,6 +18088,154 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # Provides details about sensitive data that was detected on a resource.
+    #
+    # @note When making an API call, you may pass DataClassificationDetails
+    #   data as a hash:
+    #
+    #       {
+    #         detailed_results_location: "NonEmptyString",
+    #         result: {
+    #           mime_type: "NonEmptyString",
+    #           size_classified: 1,
+    #           additional_occurrences: false,
+    #           status: {
+    #             code: "NonEmptyString",
+    #             reason: "NonEmptyString",
+    #           },
+    #           sensitive_data: [
+    #             {
+    #               category: "NonEmptyString",
+    #               detections: [
+    #                 {
+    #                   count: 1,
+    #                   type: "NonEmptyString",
+    #                   occurrences: {
+    #                     line_ranges: [
+    #                       {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     ],
+    #                     offset_ranges: [
+    #                       {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     ],
+    #                     pages: [
+    #                       {
+    #                         page_number: 1,
+    #                         line_range: {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                         offset_range: {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                       },
+    #                     ],
+    #                     records: [
+    #                       {
+    #                         json_path: "NonEmptyString",
+    #                         record_index: 1,
+    #                       },
+    #                     ],
+    #                     cells: [
+    #                       {
+    #                         column: 1,
+    #                         row: 1,
+    #                         column_name: "NonEmptyString",
+    #                         cell_reference: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                   },
+    #                 },
+    #               ],
+    #               total_count: 1,
+    #             },
+    #           ],
+    #           custom_data_identifiers: {
+    #             detections: [
+    #               {
+    #                 count: 1,
+    #                 arn: "NonEmptyString",
+    #                 name: "NonEmptyString",
+    #                 occurrences: {
+    #                   line_ranges: [
+    #                     {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                   ],
+    #                   offset_ranges: [
+    #                     {
+    #                       start: 1,
+    #                       end: 1,
+    #                       start_column: 1,
+    #                     },
+    #                   ],
+    #                   pages: [
+    #                     {
+    #                       page_number: 1,
+    #                       line_range: {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                       offset_range: {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     },
+    #                   ],
+    #                   records: [
+    #                     {
+    #                       json_path: "NonEmptyString",
+    #                       record_index: 1,
+    #                     },
+    #                   ],
+    #                   cells: [
+    #                     {
+    #                       column: 1,
+    #                       row: 1,
+    #                       column_name: "NonEmptyString",
+    #                       cell_reference: "NonEmptyString",
+    #                     },
+    #                   ],
+    #                 },
+    #               },
+    #             ],
+    #             total_count: 1,
+    #           },
+    #         },
+    #       }
+    #
+    # @!attribute [rw] detailed_results_location
+    #   The path to the folder or file that contains the sensitive data.
+    #   @return [String]
+    #
+    # @!attribute [rw] result
+    #   The details about the sensitive data that was detected on the
+    #   resource.
+    #   @return [Types::ClassificationResult]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/DataClassificationDetails AWS API Documentation
+    #
+    class DataClassificationDetails < Struct.new(
+      :detailed_results_location,
+      :result)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # A date filter for querying findings.
     #
     # @note When making an API call, you may pass DateFilter
@@ -17024,6 +18805,16 @@ module Aws::SecurityHub
     #
     class DisableSecurityHubResponse < Aws::EmptyStructure; end
 
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/DisassociateFromAdministratorAccountRequest AWS API Documentation
+    #
+    class DisassociateFromAdministratorAccountRequest < Aws::EmptyStructure; end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/DisassociateFromAdministratorAccountResponse AWS API Documentation
+    #
+    class DisassociateFromAdministratorAccountResponse < Aws::EmptyStructure; end
+
     # @api private
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/DisassociateFromMasterAccountRequest AWS API Documentation
@@ -17043,7 +18834,7 @@ module Aws::SecurityHub
     #
     # @!attribute [rw] account_ids
     #   The account IDs of the member accounts to disassociate from the
-    #   master account.
+    #   administrator account.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/DisassociateMembersRequest AWS API Documentation
@@ -17170,19 +18961,116 @@ module Aws::SecurityHub
     #   `false`.
     #   @return [Boolean]
     #
-    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/EnableSecurityHubRequest AWS API Documentation
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/EnableSecurityHubRequest AWS API Documentation
+    #
+    class EnableSecurityHubRequest < Struct.new(
+      :tags,
+      :enable_default_standards)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/EnableSecurityHubResponse AWS API Documentation
+    #
+    class EnableSecurityHubResponse < Aws::EmptyStructure; end
+
+    # In a `BatchImportFindings` request, finding providers use
+    # `FindingProviderFields` to provide and update values for confidence,
+    # criticality, related findings, severity, and types.
+    #
+    # @note When making an API call, you may pass FindingProviderFields
+    #   data as a hash:
+    #
+    #       {
+    #         confidence: 1,
+    #         criticality: 1,
+    #         related_findings: [
+    #           {
+    #             product_arn: "NonEmptyString", # required
+    #             id: "NonEmptyString", # required
+    #           },
+    #         ],
+    #         severity: {
+    #           label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
+    #           original: "NonEmptyString",
+    #         },
+    #         types: ["NonEmptyString"],
+    #       }
+    #
+    # @!attribute [rw] confidence
+    #   A finding's confidence. Confidence is defined as the likelihood
+    #   that a finding accurately identifies the behavior or issue that it
+    #   was intended to identify.
+    #
+    #   Confidence is scored on a 0-100 basis using a ratio scale, where 0
+    #   means zero percent confidence and 100 means 100 percent confidence.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] criticality
+    #   The level of importance assigned to the resources associated with
+    #   the finding.
+    #
+    #   A score of 0 means that the underlying resources have no
+    #   criticality, and a score of 100 is reserved for the most critical
+    #   resources.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] related_findings
+    #   A list of findings that are related to the current finding.
+    #   @return [Array<Types::RelatedFinding>]
+    #
+    # @!attribute [rw] severity
+    #   The severity of a finding.
+    #   @return [Types::FindingProviderSeverity]
+    #
+    # @!attribute [rw] types
+    #   One or more finding types in the format of
+    #   `namespace/category/classifier` that classify a finding.
+    #
+    #   Valid namespace values are: Software and Configuration Checks \|
+    #   TTPs \| Effects \| Unusual Behaviors \| Sensitive Data
+    #   Identifications
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/FindingProviderFields AWS API Documentation
+    #
+    class FindingProviderFields < Struct.new(
+      :confidence,
+      :criticality,
+      :related_findings,
+      :severity,
+      :types)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The severity assigned to the finding by the finding provider.
+    #
+    # @note When making an API call, you may pass FindingProviderSeverity
+    #   data as a hash:
+    #
+    #       {
+    #         label: "INFORMATIONAL", # accepts INFORMATIONAL, LOW, MEDIUM, HIGH, CRITICAL
+    #         original: "NonEmptyString",
+    #       }
+    #
+    # @!attribute [rw] label
+    #   The severity label assigned to the finding by the finding provider.
+    #   @return [String]
     #
-    class EnableSecurityHubRequest < Struct.new(
-      :tags,
-      :enable_default_standards)
+    # @!attribute [rw] original
+    #   The finding provider's original value for the severity.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/FindingProviderSeverity AWS API Documentation
+    #
+    class FindingProviderSeverity < Struct.new(
+      :label,
+      :original)
       SENSITIVE = []
       include Aws::Structure
     end
 
-    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/EnableSecurityHubResponse AWS API Documentation
-    #
-    class EnableSecurityHubResponse < Aws::EmptyStructure; end
-
     # Provides the latitude and longitude coordinates of a location.
     #
     # @note When making an API call, you may pass GeoLocation
@@ -17210,6 +19098,24 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # @api private
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetAdministratorAccountRequest AWS API Documentation
+    #
+    class GetAdministratorAccountRequest < Aws::EmptyStructure; end
+
+    # @!attribute [rw] administrator
+    #   Details about an invitation.
+    #   @return [Types::Invitation]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetAdministratorAccountResponse AWS API Documentation
+    #
+    class GetAdministratorAccountResponse < Struct.new(
+      :administrator)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetEnabledStandardsRequest
     #   data as a hash:
     #
@@ -17824,6 +19730,50 @@ module Aws::SecurityHub
     #               value: "NonEmptyString",
     #             },
     #           ],
+    #           finding_provider_fields_confidence: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_criticality: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_id: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_product_arn: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_label: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_original: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_types: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
     #         },
     #         sort_criteria: [
     #           {
@@ -18004,8 +19954,8 @@ module Aws::SecurityHub
     class GetMasterAccountRequest < Aws::EmptyStructure; end
 
     # @!attribute [rw] master
-    #   A list of details about the Security Hub master account for the
-    #   current member account.
+    #   A list of details about the Security Hub administrator account for
+    #   the current member account.
     #   @return [Types::Invitation]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetMasterAccountResponse AWS API Documentation
@@ -18054,6 +20004,35 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # An Internet Control Message Protocol (ICMP) type and code.
+    #
+    # @note When making an API call, you may pass IcmpTypeCode
+    #   data as a hash:
+    #
+    #       {
+    #         code: 1,
+    #         type: 1,
+    #       }
+    #
+    # @!attribute [rw] code
+    #   The ICMP code for which to deny or allow access. To deny or allow
+    #   all codes, use the value -1.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] type
+    #   The ICMP type for which to deny or allow access. To deny or allow
+    #   all types, use the value -1.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/IcmpTypeCode AWS API Documentation
+    #
+    class IcmpTypeCode < Struct.new(
+      :code,
+      :type)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The list of the findings that cannot be imported. For each finding,
     # the list provides the error.
     #
@@ -18222,7 +20201,7 @@ module Aws::SecurityHub
     # Details about an invitation.
     #
     # @!attribute [rw] account_id
-    #   The account ID of the Security Hub master account that the
+    #   The account ID of the Security Hub administrator account that the
     #   invitation was sent from.
     #   @return [String]
     #
@@ -18235,8 +20214,8 @@ module Aws::SecurityHub
     #   @return [Time]
     #
     # @!attribute [rw] member_status
-    #   The current status of the association between the member and master
-    #   accounts.
+    #   The current status of the association between the member and
+    #   administrator accounts.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Invitation AWS API Documentation
@@ -18524,12 +20503,12 @@ module Aws::SecurityHub
     #
     # @!attribute [rw] only_associated
     #   Specifies which member accounts to include in the response based on
-    #   their relationship status with the master account. The default value
-    #   is `TRUE`.
+    #   their relationship status with the administrator account. The
+    #   default value is `TRUE`.
     #
     #   If `OnlyAssociated` is set to `TRUE`, the response includes member
-    #   accounts whose relationship status with the master is set to
-    #   `ENABLED`.
+    #   accounts whose relationship status with the administrator account is
+    #   set to `ENABLED`.
     #
     #   If `OnlyAssociated` is set to `FALSE`, the response includes all
     #   existing member accounts.
@@ -18794,35 +20773,42 @@ module Aws::SecurityHub
     #   @return [String]
     #
     # @!attribute [rw] master_id
-    #   The AWS account ID of the Security Hub master account associated
-    #   with this member account.
+    #   This is replaced by `AdministratorID`.
+    #
+    #   The AWS account ID of the Security Hub administrator account
+    #   associated with this member account.
+    #   @return [String]
+    #
+    # @!attribute [rw] administrator_id
+    #   The AWS account ID of the Security Hub administrator account
+    #   associated with this member account.
     #   @return [String]
     #
     # @!attribute [rw] member_status
     #   The status of the relationship between the member account and its
-    #   master account.
+    #   administrator account.
     #
     #   The status can have one of the following values:
     #
-    #   * `CREATED` - Indicates that the master account added the member
-    #     account, but has not yet invited the member account.
+    #   * `CREATED` - Indicates that the administrator account added the
+    #     member account, but has not yet invited the member account.
     #
-    #   * `INVITED` - Indicates that the master account invited the member
-    #     account. The member account has not yet responded to the
+    #   * `INVITED` - Indicates that the administrator account invited the
+    #     member account. The member account has not yet responded to the
     #     invitation.
     #
     #   * `ENABLED` - Indicates that the member account is currently active.
     #     For manually invited member accounts, indicates that the member
     #     account accepted the invitation.
     #
-    #   * `REMOVED` - Indicates that the master account disassociated the
-    #     member account.
+    #   * `REMOVED` - Indicates that the administrator account disassociated
+    #     the member account.
     #
     #   * `RESIGNED` - Indicates that the member account disassociated
-    #     themselves from the master account.
+    #     themselves from the administrator account.
     #
-    #   * `DELETED` - Indicates that the master account deleted the member
-    #     account.
+    #   * `DELETED` - Indicates that the administrator account deleted the
+    #     member account.
     #   @return [String]
     #
     # @!attribute [rw] invited_at
@@ -18841,6 +20827,7 @@ module Aws::SecurityHub
       :account_id,
       :email,
       :master_id,
+      :administrator_id,
       :member_status,
       :invited_at,
       :updated_at)
@@ -19290,6 +21277,139 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # The detected occurrences of sensitive data.
+    #
+    # @note When making an API call, you may pass Occurrences
+    #   data as a hash:
+    #
+    #       {
+    #         line_ranges: [
+    #           {
+    #             start: 1,
+    #             end: 1,
+    #             start_column: 1,
+    #           },
+    #         ],
+    #         offset_ranges: [
+    #           {
+    #             start: 1,
+    #             end: 1,
+    #             start_column: 1,
+    #           },
+    #         ],
+    #         pages: [
+    #           {
+    #             page_number: 1,
+    #             line_range: {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #             offset_range: {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #           },
+    #         ],
+    #         records: [
+    #           {
+    #             json_path: "NonEmptyString",
+    #             record_index: 1,
+    #           },
+    #         ],
+    #         cells: [
+    #           {
+    #             column: 1,
+    #             row: 1,
+    #             column_name: "NonEmptyString",
+    #             cell_reference: "NonEmptyString",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] line_ranges
+    #   Occurrences of sensitive data detected in a non-binary text file or
+    #   a Microsoft Word file. Non-binary text files include files such as
+    #   HTML, XML, JSON, and TXT files.
+    #   @return [Array<Types::Range>]
+    #
+    # @!attribute [rw] offset_ranges
+    #   Occurrences of sensitive data detected in a binary text file.
+    #   @return [Array<Types::Range>]
+    #
+    # @!attribute [rw] pages
+    #   Occurrences of sensitive data in an Adobe Portable Document Format
+    #   (PDF) file.
+    #   @return [Array<Types::Page>]
+    #
+    # @!attribute [rw] records
+    #   Occurrences of sensitive data in an Apache Avro object container or
+    #   an Apache Parquet file.
+    #   @return [Array<Types::Record>]
+    #
+    # @!attribute [rw] cells
+    #   Occurrences of sensitive data detected in Microsoft Excel workbooks,
+    #   comma-separated value (CSV) files, or tab-separated value (TSV)
+    #   files.
+    #   @return [Array<Types::Cell>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Occurrences AWS API Documentation
+    #
+    class Occurrences < Struct.new(
+      :line_ranges,
+      :offset_ranges,
+      :pages,
+      :records,
+      :cells)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # An occurrence of sensitive data in an Adobe Portable Document Format
+    # (PDF) file.
+    #
+    # @note When making an API call, you may pass Page
+    #   data as a hash:
+    #
+    #       {
+    #         page_number: 1,
+    #         line_range: {
+    #           start: 1,
+    #           end: 1,
+    #           start_column: 1,
+    #         },
+    #         offset_range: {
+    #           start: 1,
+    #           end: 1,
+    #           start_column: 1,
+    #         },
+    #       }
+    #
+    # @!attribute [rw] page_number
+    #   The page number of the page that contains the sensitive data.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] line_range
+    #   An occurrence of sensitive data detected in a non-binary text file
+    #   or a Microsoft Word file. Non-binary text files include files such
+    #   as HTML, XML, JSON, and TXT files.
+    #   @return [Types::Range]
+    #
+    # @!attribute [rw] offset_range
+    #   An occurrence of sensitive data detected in a binary text file.
+    #   @return [Types::Range]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Page AWS API Documentation
+    #
+    class Page < Struct.new(
+      :page_number,
+      :line_range,
+      :offset_range)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Provides an overview of the patch compliance status for an instance
     # against a selected compliance standard.
     #
@@ -19544,6 +21664,33 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # A range of ports.
+    #
+    # @note When making an API call, you may pass PortRangeFromTo
+    #   data as a hash:
+    #
+    #       {
+    #         from: 1,
+    #         to: 1,
+    #       }
+    #
+    # @!attribute [rw] from
+    #   The first port in the port range.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] to
+    #   The last port in the port range.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/PortRangeFromTo AWS API Documentation
+    #
+    class PortRangeFromTo < Struct.new(
+      :from,
+      :to)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The details of process-related information about a finding.
     #
     # @note When making an API call, you may pass ProcessDetails
@@ -19637,20 +21784,29 @@ module Aws::SecurityHub
     #   The types of integration that the product supports. Available values
     #   are the following.
     #
-    #   * `SEND_FINDINGS_TO_SECURITY_HUB` - Indicates that the integration
-    #     sends findings to Security Hub.
+    #   * `SEND_FINDINGS_TO_SECURITY_HUB` - The integration sends findings
+    #     to Security Hub.
     #
-    #   * `RECEIVE_FINDINGS_FROM_SECURITY_HUB` - Indicates that the
-    #     integration receives findings from Security Hub.
+    #   * `RECEIVE_FINDINGS_FROM_SECURITY_HUB` - The integration receives
+    #     findings from Security Hub.
+    #
+    #   * `UPDATE_FINDINGS_IN_SECURITY_HUB` - The integration does not send
+    #     new findings to Security Hub, but does make updates to the
+    #     findings that it receives from Security Hub.
     #   @return [Array<String>]
     #
     # @!attribute [rw] marketplace_url
-    #   The URL for the page that contains more information about the
-    #   product.
+    #   For integrations with AWS services, the AWS Console URL from which
+    #   to activate the service.
+    #
+    #   For integrations with third-party products, the AWS Marketplace URL
+    #   from which to subscribe to or purchase the product.
     #   @return [String]
     #
     # @!attribute [rw] activation_url
-    #   The URL used to activate the product.
+    #   The URL to the service or product documentation about the
+    #   integration with Security Hub, including how to activate the
+    #   integration.
     #   @return [String]
     #
     # @!attribute [rw] product_subscription_resource_policy
@@ -19673,6 +21829,44 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # Identifies where the sensitive data begins and ends.
+    #
+    # @note When making an API call, you may pass Range
+    #   data as a hash:
+    #
+    #       {
+    #         start: 1,
+    #         end: 1,
+    #         start_column: 1,
+    #       }
+    #
+    # @!attribute [rw] start
+    #   The number of lines (for a line range) or characters (for an offset
+    #   range) from the beginning of the file to the end of the sensitive
+    #   data.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] end
+    #   The number of lines (for a line range) or characters (for an offset
+    #   range) from the beginning of the file to the end of the sensitive
+    #   data.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] start_column
+    #   In the line where the sensitive data starts, the column within the
+    #   line where the sensitive data starts.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Range AWS API Documentation
+    #
+    class Range < Struct.new(
+      :start,
+      :end,
+      :start_column)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # A recommendation on how to remediate the issue identified in a
     # finding.
     #
@@ -19703,6 +21897,38 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # An occurrence of sensitive data in an Apache Avro object container or
+    # an Apache Parquet file.
+    #
+    # @note When making an API call, you may pass Record
+    #   data as a hash:
+    #
+    #       {
+    #         json_path: "NonEmptyString",
+    #         record_index: 1,
+    #       }
+    #
+    # @!attribute [rw] json_path
+    #   The path, as a JSONPath expression, to the field in the record that
+    #   contains the data. If the field name is longer than 20 characters,
+    #   it is truncated. If the path is longer than 250 characters, it is
+    #   truncated.
+    #   @return [String]
+    #
+    # @!attribute [rw] record_index
+    #   The record index, starting from 0, for the record that contains the
+    #   data.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/Record AWS API Documentation
+    #
+    class Record < Struct.new(
+      :json_path,
+      :record_index)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Details about a related finding.
     #
     # @note When making an API call, you may pass RelatedFinding
@@ -19769,6 +21995,130 @@ module Aws::SecurityHub
     #         tags: {
     #           "NonEmptyString" => "NonEmptyString",
     #         },
+    #         data_classification: {
+    #           detailed_results_location: "NonEmptyString",
+    #           result: {
+    #             mime_type: "NonEmptyString",
+    #             size_classified: 1,
+    #             additional_occurrences: false,
+    #             status: {
+    #               code: "NonEmptyString",
+    #               reason: "NonEmptyString",
+    #             },
+    #             sensitive_data: [
+    #               {
+    #                 category: "NonEmptyString",
+    #                 detections: [
+    #                   {
+    #                     count: 1,
+    #                     type: "NonEmptyString",
+    #                     occurrences: {
+    #                       line_ranges: [
+    #                         {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                       ],
+    #                       offset_ranges: [
+    #                         {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                       ],
+    #                       pages: [
+    #                         {
+    #                           page_number: 1,
+    #                           line_range: {
+    #                             start: 1,
+    #                             end: 1,
+    #                             start_column: 1,
+    #                           },
+    #                           offset_range: {
+    #                             start: 1,
+    #                             end: 1,
+    #                             start_column: 1,
+    #                           },
+    #                         },
+    #                       ],
+    #                       records: [
+    #                         {
+    #                           json_path: "NonEmptyString",
+    #                           record_index: 1,
+    #                         },
+    #                       ],
+    #                       cells: [
+    #                         {
+    #                           column: 1,
+    #                           row: 1,
+    #                           column_name: "NonEmptyString",
+    #                           cell_reference: "NonEmptyString",
+    #                         },
+    #                       ],
+    #                     },
+    #                   },
+    #                 ],
+    #                 total_count: 1,
+    #               },
+    #             ],
+    #             custom_data_identifiers: {
+    #               detections: [
+    #                 {
+    #                   count: 1,
+    #                   arn: "NonEmptyString",
+    #                   name: "NonEmptyString",
+    #                   occurrences: {
+    #                     line_ranges: [
+    #                       {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     ],
+    #                     offset_ranges: [
+    #                       {
+    #                         start: 1,
+    #                         end: 1,
+    #                         start_column: 1,
+    #                       },
+    #                     ],
+    #                     pages: [
+    #                       {
+    #                         page_number: 1,
+    #                         line_range: {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                         offset_range: {
+    #                           start: 1,
+    #                           end: 1,
+    #                           start_column: 1,
+    #                         },
+    #                       },
+    #                     ],
+    #                     records: [
+    #                       {
+    #                         json_path: "NonEmptyString",
+    #                         record_index: 1,
+    #                       },
+    #                     ],
+    #                     cells: [
+    #                       {
+    #                         column: 1,
+    #                         row: 1,
+    #                         column_name: "NonEmptyString",
+    #                         cell_reference: "NonEmptyString",
+    #                       },
+    #                     ],
+    #                   },
+    #                 },
+    #               ],
+    #               total_count: 1,
+    #             },
+    #           },
+    #         },
     #         details: {
     #           aws_auto_scaling_auto_scaling_group: {
     #             launch_configuration_name: "NonEmptyString",
@@ -20009,6 +22359,58 @@ module Aws::SecurityHub
     #             network_interface_owner_id: "NonEmptyString",
     #             private_ip_address: "NonEmptyString",
     #           },
+    #           aws_ec2_subnet: {
+    #             assign_ipv_6_address_on_creation: false,
+    #             availability_zone: "NonEmptyString",
+    #             availability_zone_id: "NonEmptyString",
+    #             available_ip_address_count: 1,
+    #             cidr_block: "NonEmptyString",
+    #             default_for_az: false,
+    #             map_public_ip_on_launch: false,
+    #             owner_id: "NonEmptyString",
+    #             state: "NonEmptyString",
+    #             subnet_arn: "NonEmptyString",
+    #             subnet_id: "NonEmptyString",
+    #             vpc_id: "NonEmptyString",
+    #             ipv_6_cidr_block_association_set: [
+    #               {
+    #                 association_id: "NonEmptyString",
+    #                 ipv_6_cidr_block: "NonEmptyString",
+    #                 cidr_block_state: "NonEmptyString",
+    #               },
+    #             ],
+    #           },
+    #           aws_ec2_network_acl: {
+    #             is_default: false,
+    #             network_acl_id: "NonEmptyString",
+    #             owner_id: "NonEmptyString",
+    #             vpc_id: "NonEmptyString",
+    #             associations: [
+    #               {
+    #                 network_acl_association_id: "NonEmptyString",
+    #                 network_acl_id: "NonEmptyString",
+    #                 subnet_id: "NonEmptyString",
+    #               },
+    #             ],
+    #             entries: [
+    #               {
+    #                 cidr_block: "NonEmptyString",
+    #                 egress: false,
+    #                 icmp_type_code: {
+    #                   code: 1,
+    #                   type: 1,
+    #                 },
+    #                 ipv_6_cidr_block: "NonEmptyString",
+    #                 port_range: {
+    #                   from: 1,
+    #                   to: 1,
+    #                 },
+    #                 protocol: "NonEmptyString",
+    #                 rule_action: "NonEmptyString",
+    #                 rule_number: 1,
+    #               },
+    #             ],
+    #           },
     #           aws_elbv_2_load_balancer: {
     #             availability_zones: [
     #               {
@@ -20029,6 +22431,40 @@ module Aws::SecurityHub
     #             type: "NonEmptyString",
     #             vpc_id: "NonEmptyString",
     #           },
+    #           aws_elastic_beanstalk_environment: {
+    #             application_name: "NonEmptyString",
+    #             cname: "NonEmptyString",
+    #             date_created: "NonEmptyString",
+    #             date_updated: "NonEmptyString",
+    #             description: "NonEmptyString",
+    #             endpoint_url: "NonEmptyString",
+    #             environment_arn: "NonEmptyString",
+    #             environment_id: "NonEmptyString",
+    #             environment_links: [
+    #               {
+    #                 environment_name: "NonEmptyString",
+    #                 link_name: "NonEmptyString",
+    #               },
+    #             ],
+    #             environment_name: "NonEmptyString",
+    #             option_settings: [
+    #               {
+    #                 namespace: "NonEmptyString",
+    #                 option_name: "NonEmptyString",
+    #                 resource_name: "NonEmptyString",
+    #                 value: "NonEmptyString",
+    #               },
+    #             ],
+    #             platform_arn: "NonEmptyString",
+    #             solution_stack_name: "NonEmptyString",
+    #             status: "NonEmptyString",
+    #             tier: {
+    #               name: "NonEmptyString",
+    #               type: "NonEmptyString",
+    #               version: "NonEmptyString",
+    #             },
+    #             version_label: "NonEmptyString",
+    #           },
     #           aws_elasticsearch_domain: {
     #             access_policies: "NonEmptyString",
     #             domain_endpoint_options: {
@@ -20070,6 +22506,18 @@ module Aws::SecurityHub
     #                 },
     #               ],
     #             },
+    #             public_access_block_configuration: {
+    #               block_public_acls: false,
+    #               block_public_policy: false,
+    #               ignore_public_acls: false,
+    #               restrict_public_buckets: false,
+    #             },
+    #           },
+    #           aws_s3_account_public_access_block: {
+    #             block_public_acls: false,
+    #             block_public_policy: false,
+    #             ignore_public_acls: false,
+    #             restrict_public_buckets: false,
     #           },
     #           aws_s3_object: {
     #             last_modified: "NonEmptyString",
@@ -21155,6 +23603,11 @@ module Aws::SecurityHub
     #   finding was processed.
     #   @return [Hash<String,String>]
     #
+    # @!attribute [rw] data_classification
+    #   Contains information about sensitive data that was detected on the
+    #   resource.
+    #   @return [Types::DataClassificationDetails]
+    #
     # @!attribute [rw] details
     #   Additional details about the resource related to a finding.
     #   @return [Types::ResourceDetails]
@@ -21168,6 +23621,7 @@ module Aws::SecurityHub
       :region,
       :resource_role,
       :tags,
+      :data_classification,
       :details)
       SENSITIVE = []
       include Aws::Structure
@@ -21447,6 +23901,58 @@ module Aws::SecurityHub
     #           network_interface_owner_id: "NonEmptyString",
     #           private_ip_address: "NonEmptyString",
     #         },
+    #         aws_ec2_subnet: {
+    #           assign_ipv_6_address_on_creation: false,
+    #           availability_zone: "NonEmptyString",
+    #           availability_zone_id: "NonEmptyString",
+    #           available_ip_address_count: 1,
+    #           cidr_block: "NonEmptyString",
+    #           default_for_az: false,
+    #           map_public_ip_on_launch: false,
+    #           owner_id: "NonEmptyString",
+    #           state: "NonEmptyString",
+    #           subnet_arn: "NonEmptyString",
+    #           subnet_id: "NonEmptyString",
+    #           vpc_id: "NonEmptyString",
+    #           ipv_6_cidr_block_association_set: [
+    #             {
+    #               association_id: "NonEmptyString",
+    #               ipv_6_cidr_block: "NonEmptyString",
+    #               cidr_block_state: "NonEmptyString",
+    #             },
+    #           ],
+    #         },
+    #         aws_ec2_network_acl: {
+    #           is_default: false,
+    #           network_acl_id: "NonEmptyString",
+    #           owner_id: "NonEmptyString",
+    #           vpc_id: "NonEmptyString",
+    #           associations: [
+    #             {
+    #               network_acl_association_id: "NonEmptyString",
+    #               network_acl_id: "NonEmptyString",
+    #               subnet_id: "NonEmptyString",
+    #             },
+    #           ],
+    #           entries: [
+    #             {
+    #               cidr_block: "NonEmptyString",
+    #               egress: false,
+    #               icmp_type_code: {
+    #                 code: 1,
+    #                 type: 1,
+    #               },
+    #               ipv_6_cidr_block: "NonEmptyString",
+    #               port_range: {
+    #                 from: 1,
+    #                 to: 1,
+    #               },
+    #               protocol: "NonEmptyString",
+    #               rule_action: "NonEmptyString",
+    #               rule_number: 1,
+    #             },
+    #           ],
+    #         },
     #         aws_elbv_2_load_balancer: {
     #           availability_zones: [
     #             {
@@ -21467,6 +23973,40 @@ module Aws::SecurityHub
     #           type: "NonEmptyString",
     #           vpc_id: "NonEmptyString",
     #         },
+    #         aws_elastic_beanstalk_environment: {
+    #           application_name: "NonEmptyString",
+    #           cname: "NonEmptyString",
+    #           date_created: "NonEmptyString",
+    #           date_updated: "NonEmptyString",
+    #           description: "NonEmptyString",
+    #           endpoint_url: "NonEmptyString",
+    #           environment_arn: "NonEmptyString",
+    #           environment_id: "NonEmptyString",
+    #           environment_links: [
+    #             {
+    #               environment_name: "NonEmptyString",
+    #               link_name: "NonEmptyString",
+    #             },
+    #           ],
+    #           environment_name: "NonEmptyString",
+    #           option_settings: [
+    #             {
+    #               namespace: "NonEmptyString",
+    #               option_name: "NonEmptyString",
+    #               resource_name: "NonEmptyString",
+    #               value: "NonEmptyString",
+    #             },
+    #           ],
+    #           platform_arn: "NonEmptyString",
+    #           solution_stack_name: "NonEmptyString",
+    #           status: "NonEmptyString",
+    #           tier: {
+    #             name: "NonEmptyString",
+    #             type: "NonEmptyString",
+    #             version: "NonEmptyString",
+    #           },
+    #           version_label: "NonEmptyString",
+    #         },
     #         aws_elasticsearch_domain: {
     #           access_policies: "NonEmptyString",
     #           domain_endpoint_options: {
@@ -21508,6 +24048,18 @@ module Aws::SecurityHub
     #               },
     #             ],
     #           },
+    #           public_access_block_configuration: {
+    #             block_public_acls: false,
+    #             block_public_policy: false,
+    #             ignore_public_acls: false,
+    #             restrict_public_buckets: false,
+    #           },
+    #         },
+    #         aws_s3_account_public_access_block: {
+    #           block_public_acls: false,
+    #           block_public_policy: false,
+    #           ignore_public_acls: false,
+    #           restrict_public_buckets: false,
     #         },
     #         aws_s3_object: {
     #           last_modified: "NonEmptyString",
@@ -22595,10 +25147,22 @@ module Aws::SecurityHub
     #   Details about an Elastic IP address.
     #   @return [Types::AwsEc2EipDetails]
     #
+    # @!attribute [rw] aws_ec2_subnet
+    #   Details about a subnet in EC2.
+    #   @return [Types::AwsEc2SubnetDetails]
+    #
+    # @!attribute [rw] aws_ec2_network_acl
+    #   Details about an EC2 network access control list (ACL).
+    #   @return [Types::AwsEc2NetworkAclDetails]
+    #
     # @!attribute [rw] aws_elbv_2_load_balancer
     #   Details about a load balancer.
     #   @return [Types::AwsElbv2LoadBalancerDetails]
     #
+    # @!attribute [rw] aws_elastic_beanstalk_environment
+    #   Details about an Elastic Beanstalk environment.
+    #   @return [Types::AwsElasticBeanstalkEnvironmentDetails]
+    #
     # @!attribute [rw] aws_elasticsearch_domain
     #   Details for an Elasticsearch domain.
     #   @return [Types::AwsElasticsearchDomainDetails]
@@ -22607,6 +25171,11 @@ module Aws::SecurityHub
     #   Details about an Amazon S3 bucket related to a finding.
     #   @return [Types::AwsS3BucketDetails]
     #
+    # @!attribute [rw] aws_s3_account_public_access_block
+    #   Details about the Amazon S3 Public Access Block configuration for an
+    #   account.
+    #   @return [Types::AwsS3AccountPublicAccessBlockDetails]
+    #
     # @!attribute [rw] aws_s3_object
     #   Details about an Amazon S3 object related to a finding.
     #   @return [Types::AwsS3ObjectDetails]
@@ -22747,9 +25316,13 @@ module Aws::SecurityHub
       :aws_ec2_volume,
       :aws_ec2_vpc,
       :aws_ec2_eip,
+      :aws_ec2_subnet,
+      :aws_ec2_network_acl,
       :aws_elbv_2_load_balancer,
+      :aws_elastic_beanstalk_environment,
       :aws_elasticsearch_domain,
       :aws_s3_bucket,
+      :aws_s3_account_public_access_block,
       :aws_s3_object,
       :aws_secrets_manager_secret,
       :aws_iam_access_key,
@@ -22820,6 +25393,171 @@ module Aws::SecurityHub
       include Aws::Structure
     end
 
+    # The list of detected instances of sensitive data.
+    #
+    # @note When making an API call, you may pass SensitiveDataDetections
+    #   data as a hash:
+    #
+    #       {
+    #         count: 1,
+    #         type: "NonEmptyString",
+    #         occurrences: {
+    #           line_ranges: [
+    #             {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #           ],
+    #           offset_ranges: [
+    #             {
+    #               start: 1,
+    #               end: 1,
+    #               start_column: 1,
+    #             },
+    #           ],
+    #           pages: [
+    #             {
+    #               page_number: 1,
+    #               line_range: {
+    #                 start: 1,
+    #                 end: 1,
+    #                 start_column: 1,
+    #               },
+    #               offset_range: {
+    #                 start: 1,
+    #                 end: 1,
+    #                 start_column: 1,
+    #               },
+    #             },
+    #           ],
+    #           records: [
+    #             {
+    #               json_path: "NonEmptyString",
+    #               record_index: 1,
+    #             },
+    #           ],
+    #           cells: [
+    #             {
+    #               column: 1,
+    #               row: 1,
+    #               column_name: "NonEmptyString",
+    #               cell_reference: "NonEmptyString",
+    #             },
+    #           ],
+    #         },
+    #       }
+    #
+    # @!attribute [rw] count
+    #   The total number of occurrences of sensitive data that were
+    #   detected.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] type
+    #   The type of sensitive data that was detected. For example, the type
+    #   might indicate that the data is an email address.
+    #   @return [String]
+    #
+    # @!attribute [rw] occurrences
+    #   Details about the sensitive data that was detected.
+    #   @return [Types::Occurrences]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/SensitiveDataDetections AWS API Documentation
+    #
+    class SensitiveDataDetections < Struct.new(
+      :count,
+      :type,
+      :occurrences)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Contains a detected instance of sensitive data that are based on
+    # built-in identifiers.
+    #
+    # @note When making an API call, you may pass SensitiveDataResult
+    #   data as a hash:
+    #
+    #       {
+    #         category: "NonEmptyString",
+    #         detections: [
+    #           {
+    #             count: 1,
+    #             type: "NonEmptyString",
+    #             occurrences: {
+    #               line_ranges: [
+    #                 {
+    #                   start: 1,
+    #                   end: 1,
+    #                   start_column: 1,
+    #                 },
+    #               ],
+    #               offset_ranges: [
+    #                 {
+    #                   start: 1,
+    #                   end: 1,
+    #                   start_column: 1,
+    #                 },
+    #               ],
+    #               pages: [
+    #                 {
+    #                   page_number: 1,
+    #                   line_range: {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                   offset_range: {
+    #                     start: 1,
+    #                     end: 1,
+    #                     start_column: 1,
+    #                   },
+    #                 },
+    #               ],
+    #               records: [
+    #                 {
+    #                   json_path: "NonEmptyString",
+    #                   record_index: 1,
+    #                 },
+    #               ],
+    #               cells: [
+    #                 {
+    #                   column: 1,
+    #                   row: 1,
+    #                   column_name: "NonEmptyString",
+    #                   cell_reference: "NonEmptyString",
+    #                 },
+    #               ],
+    #             },
+    #           },
+    #         ],
+    #         total_count: 1,
+    #       }
+    #
+    # @!attribute [rw] category
+    #   The category of sensitive data that was detected. For example, the
+    #   category can indicate that the sensitive data involved credentials,
+    #   financial information, or personal information.
+    #   @return [String]
+    #
+    # @!attribute [rw] detections
+    #   The list of detected instances of sensitive data.
+    #   @return [Array<Types::SensitiveDataDetections>]
+    #
+    # @!attribute [rw] total_count
+    #   The total number of occurrences of sensitive data.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/SensitiveDataResult AWS API Documentation
+    #
+    class SensitiveDataResult < Struct.new(
+      :category,
+      :detections,
+      :total_count)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # The severity of the finding.
     #
     # The finding provider can provide the initial severity. The finding
@@ -23369,7 +26107,9 @@ module Aws::SecurityHub
     #   @return [String]
     #
     # @!attribute [rw] tags
-    #   The tags to add to the resource.
+    #   The tags to add to the resource. You can add up to 50 tags at a
+    #   time. The tag keys can be no longer than 128 characters. The tag
+    #   values can be no longer than 256 characters.
     #   @return [Hash<String,String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/TagResourceRequest AWS API Documentation
@@ -23460,6 +26200,7 @@ module Aws::SecurityHub
     #
     # @!attribute [rw] tag_keys
     #   The tag keys associated with the tags to remove from the resource.
+    #   You can remove up to 50 tags at a time.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/UntagResourceRequest AWS API Documentation
@@ -24068,6 +26809,50 @@ module Aws::SecurityHub
     #               value: "NonEmptyString",
     #             },
     #           ],
+    #           finding_provider_fields_confidence: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_criticality: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_id: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_product_arn: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_label: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_original: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_types: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
     #         },
     #         note: {
     #           text: "NonEmptyString", # required
@@ -24663,6 +27448,50 @@ module Aws::SecurityHub
     #               value: "NonEmptyString",
     #             },
     #           ],
+    #           finding_provider_fields_confidence: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_criticality: [
+    #             {
+    #               gte: 1.0,
+    #               lte: 1.0,
+    #               eq: 1.0,
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_id: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_related_findings_product_arn: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_label: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_severity_original: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
+    #           finding_provider_fields_types: [
+    #             {
+    #               value: "NonEmptyString",
+    #               comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS
+    #             },
+    #           ],
     #         },
     #         group_by_attribute: "NonEmptyString",
     #       }