aws-sdk-securityhub 1.173.0 → 1.174.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96a2972b1649b853df51a68858b14128c69b17514ff5ce52da48f20400829a3
-  data.tar.gz: af5aca0c0f70da36b16ed0ac713e34b164d04627d1dba3e458594268677b7ff1
+  metadata.gz: 0ad419a0e02f48ea102bc6e8d0677769d3705a7328610bece86517148c2f928c
+  data.tar.gz: 93c9c20a0352cf528f9e5c1c2bb392e97eeb5f6eaff87dbbc25e84e464b6b7e7
 SHA512:
-  metadata.gz: 418573fc10b90c9b0c62c88d80b3ae115355600eaf166bbe3e7b471af0b84408a3082567b1b43e4bb8fee8f84429e198ba2714f1bde8dbc343a9cf10d7b09bfc
-  data.tar.gz: 114447205178c6ba9f84b38d5f34e1e9941f745f51b7e2a87e6480006a44818f152bfde1b926f1d5a28d67ca5d249ae7462dd652555e2ae77bff503a88a936b0
+  metadata.gz: 757f469925c106fc166ab3d87e9d9f1694ad3af1c1537f4463fd7bf283a5d5002da6cfd38da996654e34edd2a274f26aa16da4f4e4e22602bf420d1926553425
+  data.tar.gz: 278d4d115e1ce6f56c81590b393d334f2cc05ebb09acdefb31cde4531767ef9c87a426ef6a7ceea757be24738a56e089fd6b1496f35202d3c27b9d7bacb9fced

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.174.0 (2026-11-04)
+------------------
+
+* Feature - Release Software APIs- GetSoftwareV2, GetSoftwareStatisticsV2 and GetSoftwareResourcesV2 to list software packages with aggregated resource count, get aggregated software statistics, and find the resources that contain a specific software package.
+
 1.173.0 (2026-10-29)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.173.0
+1.174.0

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

@@ -10022,6 +10022,373 @@ module Aws::SecurityHub
       req.send_request(options)
     end
 
+    # Returns a list of resources that contain a specific software package.
+    # You identify the package with `PackageName` and `PackageType`. To
+    # narrow the results to one version of the package, include
+    # `PackageVersion`.
+    #
+    # You can use the `Scopes` parameter to define the data boundary for the
+    # query. Currently, `Scopes` supports `AwsOrganizations`, which lets you
+    # retrieve resources from your entire organization or from specific
+    # organizational units. Only the delegated administrator account can use
+    # `Scopes`.
+    #
+    # You can use the `Filters` parameter to further refine results based on
+    # resource attributes, such as `ResourceType` or `Region`.
+    #
+    # @option params [required, String] :package_name
+    #   The name of the software package, for example `openssl`. This value
+    #   must match the `PackageName` returned by `GetSoftwareV2`.
+    #
+    # @option params [required, String] :package_type
+    #   The type of the software package, for example `operating-system`,
+    #   `application`, or `library`. This value must match the `PackageType`
+    #   returned by `GetSoftwareV2`.
+    #
+    # @option params [String] :package_version
+    #   The version of the software package, for example `3.0.8`. If you omit
+    #   this value, the response includes resources that contain any version
+    #   of the package.
+    #
+    # @option params [Types::SoftwareFilters] :filters
+    #   Filters the returned resources based on a set of criteria. You can
+    #   nest composite filters up to three levels deep.
+    #
+    # @option params [Types::SoftwareScopes] :scopes
+    #   Limits the results to resources from specific organizational units or
+    #   from the delegated administrator's organization. Only the delegated
+    #   administrator account can use this parameter. Other accounts receive
+    #   an `AccessDeniedException`.
+    #
+    #   This parameter is optional. If you omit it, the delegated
+    #   administrator sees resources from all accounts across the entire
+    #   organization. Other accounts see only their own resources.
+    #
+    #   You can specify up to 10 entries in `Scopes.AwsOrganizations`. If
+    #   multiple entries are specified, the entries are combined using OR
+    #   logic.
+    #
+    # @option params [Array<Types::SortCriterion>] :sort_criteria
+    #   The resource attribute used to sort the list of returned resources,
+    #   for example `Region` or `ResourceType`. You can specify one sort
+    #   criterion.
+    #
+    # @option params [String] :next_token
+    #   The token required for pagination. On your first call, set the value
+    #   of this parameter to `NULL`. For subsequent calls, to continue listing
+    #   data, set the value of this parameter to the value returned in the
+    #   previous response.
+    #
+    #   A token expires one hour after it's issued. If you change the request
+    #   parameters between calls, the token is no longer valid and the request
+    #   fails with a `ValidationException`.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return. Valid values are 1–100. The
+    #   default is 100.
+    #
+    # @return [Types::GetSoftwareResourcesV2Response] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetSoftwareResourcesV2Response#software_resources #software_resources} => Array&lt;Types::SoftwareResourceResult&gt;
+    #   * {Types::GetSoftwareResourcesV2Response#next_token #next_token} => String
+    #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_software_resources_v2({
+    #     package_name: "NonEmptyString", # required
+    #     package_type: "NonEmptyString", # required
+    #     package_version: "NonEmptyString",
+    #     filters: {
+    #       composite_filters: [
+    #         {
+    #           string_filters: [
+    #             {
+    #               field_name: "AccountId", # accepts AccountId, PackageName, PackageVersion, PackageType, Region, ResourceRegion, ResourceType, ResourceId, ResourceProvider, ResourceOwnerAccountId, ResourceOwnerOrgId, ResourceCloudPartition
+    #               filter: {
+    #                 value: "NonEmptyString",
+    #                 comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS, CONTAINS, NOT_CONTAINS, CONTAINS_WORD
+    #               },
+    #             },
+    #           ],
+    #           nested_composite_filters: {
+    #             # recursive SoftwareCompositeFilterList
+    #           },
+    #           operator: "AND", # accepts AND, OR
+    #         },
+    #       ],
+    #       composite_operator: "AND", # accepts AND, OR
+    #     },
+    #     scopes: {
+    #       aws_organizations: [
+    #         {
+    #           organization_id: "NonEmptyString",
+    #           organizational_unit_id: "NonEmptyString",
+    #         },
+    #       ],
+    #     },
+    #     sort_criteria: [
+    #       {
+    #         field: "NonEmptyString",
+    #         sort_order: "asc", # accepts asc, desc
+    #       },
+    #     ],
+    #     next_token: "NextToken",
+    #     max_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.software_resources #=> Array
+    #   resp.software_resources[0].account_id #=> String
+    #   resp.software_resources[0].resource_type #=> String
+    #   resp.software_resources[0].region #=> String
+    #   resp.software_resources[0].resource_id #=> String
+    #   resp.software_resources[0].resource_provider #=> String
+    #   resp.software_resources[0].resource_owner_org_id #=> String
+    #   resp.software_resources[0].resource_owner_account_id #=> String
+    #   resp.software_resources[0].resource_cloud_partition #=> String
+    #   resp.software_resources[0].resource_region #=> String
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetSoftwareResourcesV2 AWS API Documentation
+    #
+    # @overload get_software_resources_v2(params = {})
+    # @param [Hash] params ({})
+    def get_software_resources_v2(params = {}, options = {})
+      req = build_request(:get_software_resources_v2, params)
+      req.send_request(options)
+    end
+
+    # Retrieves aggregated counts of software packages installed on your
+    # resources, grouped by a field that you specify. For example, you can
+    # return the most common package types or the accounts with the most
+    # installed packages.
+    #
+    # Each count is the number of package-to-resource pairs that match the
+    # grouping value. A package installed on three resources contributes
+    # three to the count.
+    #
+    # You can use the `Scopes` parameter to define the data boundary for the
+    # query. Currently, `Scopes` supports `AwsOrganizations`, which lets you
+    # aggregate software from your entire organization or from specific
+    # organizational units. Only the delegated administrator account can use
+    # `Scopes`.
+    #
+    # This operation doesn't paginate. Use `MaxStatisticResults` to control
+    # how many grouping values are returned.
+    #
+    # @option params [required, Array<Types::SoftwareGroupByRule>] :group_by_rules
+    #   How software statistics should be aggregated and organized in the
+    #   response.
+    #
+    # @option params [Types::SoftwareScopes] :scopes
+    #   Limits the results to software on resources from specific
+    #   organizational units or from the delegated administrator's
+    #   organization. Only the delegated administrator account can use this
+    #   parameter. Other accounts receive an `AccessDeniedException`.
+    #
+    #   This parameter is optional. If you omit it, the delegated
+    #   administrator sees statistics from all accounts across the entire
+    #   organization. Other accounts see only statistics for software on their
+    #   own resources.
+    #
+    #   You can specify up to 10 entries in `Scopes.AwsOrganizations`. If
+    #   multiple entries are specified, the entries are combined using OR
+    #   logic.
+    #
+    # @option params [String] :sort_order
+    #   Sorts aggregated statistics by count. The default is descending, which
+    #   returns the values with the highest counts first.
+    #
+    # @option params [Integer] :max_statistic_results
+    #   The maximum number of grouping values to return. Valid values are
+    #   1–400. The default is 400.
+    #
+    # @return [Types::GetSoftwareStatisticsV2Response] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetSoftwareStatisticsV2Response#group_by_results #group_by_results} => Array&lt;Types::GroupByResult&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_software_statistics_v2({
+    #     group_by_rules: [ # required
+    #       {
+    #         group_by_field: "AccountId", # required, accepts AccountId, PackageName, PackageVersion, PackageType, Region, ResourceRegion, ResourceType, ResourceId, ResourceProvider, ResourceOwnerAccountId, ResourceOwnerOrgId, ResourceCloudPartition
+    #         filters: {
+    #           composite_filters: [
+    #             {
+    #               string_filters: [
+    #                 {
+    #                   field_name: "AccountId", # accepts AccountId, PackageName, PackageVersion, PackageType, Region, ResourceRegion, ResourceType, ResourceId, ResourceProvider, ResourceOwnerAccountId, ResourceOwnerOrgId, ResourceCloudPartition
+    #                   filter: {
+    #                     value: "NonEmptyString",
+    #                     comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS, CONTAINS, NOT_CONTAINS, CONTAINS_WORD
+    #                   },
+    #                 },
+    #               ],
+    #               nested_composite_filters: {
+    #                 # recursive SoftwareCompositeFilterList
+    #               },
+    #               operator: "AND", # accepts AND, OR
+    #             },
+    #           ],
+    #           composite_operator: "AND", # accepts AND, OR
+    #         },
+    #       },
+    #     ],
+    #     scopes: {
+    #       aws_organizations: [
+    #         {
+    #           organization_id: "NonEmptyString",
+    #           organizational_unit_id: "NonEmptyString",
+    #         },
+    #       ],
+    #     },
+    #     sort_order: "asc", # accepts asc, desc
+    #     max_statistic_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.group_by_results #=> Array
+    #   resp.group_by_results[0].group_by_field #=> String
+    #   resp.group_by_results[0].group_by_values #=> Array
+    #   resp.group_by_results[0].group_by_values[0].field_value #=> String
+    #   resp.group_by_results[0].group_by_values[0].count #=> Integer
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetSoftwareStatisticsV2 AWS API Documentation
+    #
+    # @overload get_software_statistics_v2(params = {})
+    # @param [Hash] params ({})
+    def get_software_statistics_v2(params = {}, options = {})
+      req = build_request(:get_software_statistics_v2, params)
+      req.send_request(options)
+    end
+
+    # Returns a list of software packages installed on your resources. Each
+    # result identifies a package by name, version, and type, and includes
+    # the number of resources that contain that package.
+    #
+    # You can use the `Scopes` parameter to define the data boundary for the
+    # query. Currently, `Scopes` supports `AwsOrganizations`, which lets you
+    # retrieve software from your entire organization or from specific
+    # organizational units. Only the delegated administrator account can use
+    # `Scopes`.
+    #
+    # You can use the `Filters` parameter to refine results based on package
+    # and resource attributes. You can use `Scopes` and `Filters`
+    # independently or together. When both are provided, `Scopes` narrows
+    # the data set first, and then `Filters` refines results within that
+    # scoped data set.
+    #
+    # To list the resources that contain a specific package, use
+    # `GetSoftwareResourcesV2`. To get counts of software grouped by a
+    # field, use `GetSoftwareStatisticsV2`.
+    #
+    # @option params [Types::SoftwareFilters] :filters
+    #   Filters software packages based on a set of criteria. You can nest
+    #   composite filters up to three levels deep.
+    #
+    # @option params [Types::SoftwareScopes] :scopes
+    #   Limits the results to software on resources from specific
+    #   organizational units or from the delegated administrator's
+    #   organization. Only the delegated administrator account can use this
+    #   parameter. Other accounts receive an `AccessDeniedException`.
+    #
+    #   This parameter is optional. If you omit it, the delegated
+    #   administrator sees software from all accounts across the entire
+    #   organization. Other accounts see only software on their own resources.
+    #
+    #   You can specify up to 10 entries in `Scopes.AwsOrganizations`. If
+    #   multiple entries are specified, the entries are combined using OR
+    #   logic.
+    #
+    # @option params [Array<Types::SortCriterion>] :sort_criteria
+    #   The software attributes used to sort the list of returned software
+    #   packages. You can't sort by `ResourceCount`.
+    #
+    # @option params [String] :next_token
+    #   The token required for pagination. On your first call, set the value
+    #   of this parameter to `NULL`. For subsequent calls, to continue listing
+    #   data, set the value of this parameter to the value returned in the
+    #   previous response.
+    #
+    #   A token expires one hour after it's issued. If you change `Filters`
+    #   or `SortCriteria` between calls, the token is no longer valid and the
+    #   request fails with a `ValidationException`.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return. Valid values are 1–100. The
+    #   default is 100.
+    #
+    # @return [Types::GetSoftwareV2Response] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetSoftwareV2Response#software #software} => Array&lt;Types::SoftwareResult&gt;
+    #   * {Types::GetSoftwareV2Response#next_token #next_token} => String
+    #
+    # The returned {Seahorse::Client::Response response} is a pageable response and is Enumerable. For details on usage see {Aws::PageableResponse PageableResponse}.
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_software_v2({
+    #     filters: {
+    #       composite_filters: [
+    #         {
+    #           string_filters: [
+    #             {
+    #               field_name: "AccountId", # accepts AccountId, PackageName, PackageVersion, PackageType, Region, ResourceRegion, ResourceType, ResourceId, ResourceProvider, ResourceOwnerAccountId, ResourceOwnerOrgId, ResourceCloudPartition
+    #               filter: {
+    #                 value: "NonEmptyString",
+    #                 comparison: "EQUALS", # accepts EQUALS, PREFIX, NOT_EQUALS, PREFIX_NOT_EQUALS, CONTAINS, NOT_CONTAINS, CONTAINS_WORD
+    #               },
+    #             },
+    #           ],
+    #           nested_composite_filters: {
+    #             # recursive SoftwareCompositeFilterList
+    #           },
+    #           operator: "AND", # accepts AND, OR
+    #         },
+    #       ],
+    #       composite_operator: "AND", # accepts AND, OR
+    #     },
+    #     scopes: {
+    #       aws_organizations: [
+    #         {
+    #           organization_id: "NonEmptyString",
+    #           organizational_unit_id: "NonEmptyString",
+    #         },
+    #       ],
+    #     },
+    #     sort_criteria: [
+    #       {
+    #         field: "NonEmptyString",
+    #         sort_order: "asc", # accepts asc, desc
+    #       },
+    #     ],
+    #     next_token: "NextToken",
+    #     max_results: 1,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.software #=> Array
+    #   resp.software[0].package_name #=> String
+    #   resp.software[0].package_version #=> String
+    #   resp.software[0].package_type #=> String
+    #   resp.software[0].resource_count #=> Integer
+    #   resp.next_token #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/securityhub-2018-10-26/GetSoftwareV2 AWS API Documentation
+    #
+    # @overload get_software_v2(params = {})
+    # @param [Hash] params ({})
+    def get_software_v2(params = {}, options = {})
+      req = build_request(:get_software_v2, params)
+      req.send_request(options)
+    end
+
     # <note markdown="1"> We recommend using Organizations instead of Security Hub CSPM
     # invitations to manage your member accounts. For information, see
     # [Managing Security Hub CSPM administrator and member accounts with
@@ -14687,7 +15054,7 @@ module Aws::SecurityHub
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-securityhub'
-      context[:gem_version] = '1.173.0'
+      context[:gem_version] = '1.174.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1052,6 +1052,12 @@ module Aws::SecurityHub
     GetResourcesV2Response = Shapes::StructureShape.new(name: 'GetResourcesV2Response')
     GetSecurityControlDefinitionRequest = Shapes::StructureShape.new(name: 'GetSecurityControlDefinitionRequest')
     GetSecurityControlDefinitionResponse = Shapes::StructureShape.new(name: 'GetSecurityControlDefinitionResponse')
+    GetSoftwareResourcesV2Request = Shapes::StructureShape.new(name: 'GetSoftwareResourcesV2Request')
+    GetSoftwareResourcesV2Response = Shapes::StructureShape.new(name: 'GetSoftwareResourcesV2Response')
+    GetSoftwareStatisticsV2Request = Shapes::StructureShape.new(name: 'GetSoftwareStatisticsV2Request')
+    GetSoftwareStatisticsV2Response = Shapes::StructureShape.new(name: 'GetSoftwareStatisticsV2Response')
+    GetSoftwareV2Request = Shapes::StructureShape.new(name: 'GetSoftwareV2Request')
+    GetSoftwareV2Response = Shapes::StructureShape.new(name: 'GetSoftwareV2Response')
     GranularityField = Shapes::StringShape.new(name: 'GranularityField')
     GroupByField = Shapes::StringShape.new(name: 'GroupByField')
     GroupByResult = Shapes::StructureShape.new(name: 'GroupByResult')
@@ -1402,8 +1408,22 @@ module Aws::SecurityHub
     Signal = Shapes::StructureShape.new(name: 'Signal')
     SignalsList = Shapes::ListShape.new(name: 'SignalsList')
     SizeBytes = Shapes::IntegerShape.new(name: 'SizeBytes')
+    SoftwareCompositeFilter = Shapes::StructureShape.new(name: 'SoftwareCompositeFilter')
+    SoftwareCompositeFilterList = Shapes::ListShape.new(name: 'SoftwareCompositeFilterList')
+    SoftwareFilters = Shapes::StructureShape.new(name: 'SoftwareFilters')
+    SoftwareGroupByField = Shapes::StringShape.new(name: 'SoftwareGroupByField')
+    SoftwareGroupByRule = Shapes::StructureShape.new(name: 'SoftwareGroupByRule')
+    SoftwareGroupByRules = Shapes::ListShape.new(name: 'SoftwareGroupByRules')
+    SoftwareList = Shapes::ListShape.new(name: 'SoftwareList')
     SoftwarePackage = Shapes::StructureShape.new(name: 'SoftwarePackage')
     SoftwarePackageList = Shapes::ListShape.new(name: 'SoftwarePackageList')
+    SoftwareResourceResult = Shapes::StructureShape.new(name: 'SoftwareResourceResult')
+    SoftwareResourceResultList = Shapes::ListShape.new(name: 'SoftwareResourceResultList')
+    SoftwareResult = Shapes::StructureShape.new(name: 'SoftwareResult')
+    SoftwareScopes = Shapes::StructureShape.new(name: 'SoftwareScopes')
+    SoftwareStringField = Shapes::StringShape.new(name: 'SoftwareStringField')
+    SoftwareStringFilter = Shapes::StructureShape.new(name: 'SoftwareStringFilter')
+    SoftwareStringFilterList = Shapes::ListShape.new(name: 'SoftwareStringFilterList')
     SortCriteria = Shapes::ListShape.new(name: 'SortCriteria')
     SortCriterion = Shapes::StructureShape.new(name: 'SortCriterion')
     SortOrder = Shapes::StringShape.new(name: 'SortOrder')
@@ -6727,6 +6747,40 @@ module Aws::SecurityHub
     GetSecurityControlDefinitionResponse.add_member(:security_control_definition, Shapes::ShapeRef.new(shape: SecurityControlDefinition, required: true, location_name: "SecurityControlDefinition"))
     GetSecurityControlDefinitionResponse.struct_class = Types::GetSecurityControlDefinitionResponse
 
+    GetSoftwareResourcesV2Request.add_member(:package_name, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "PackageName"))
+    GetSoftwareResourcesV2Request.add_member(:package_type, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "PackageType"))
+    GetSoftwareResourcesV2Request.add_member(:package_version, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "PackageVersion"))
+    GetSoftwareResourcesV2Request.add_member(:filters, Shapes::ShapeRef.new(shape: SoftwareFilters, location_name: "Filters"))
+    GetSoftwareResourcesV2Request.add_member(:scopes, Shapes::ShapeRef.new(shape: SoftwareScopes, location_name: "Scopes"))
+    GetSoftwareResourcesV2Request.add_member(:sort_criteria, Shapes::ShapeRef.new(shape: SortCriteria, location_name: "SortCriteria"))
+    GetSoftwareResourcesV2Request.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetSoftwareResourcesV2Request.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location_name: "MaxResults"))
+    GetSoftwareResourcesV2Request.struct_class = Types::GetSoftwareResourcesV2Request
+
+    GetSoftwareResourcesV2Response.add_member(:software_resources, Shapes::ShapeRef.new(shape: SoftwareResourceResultList, required: true, location_name: "SoftwareResources"))
+    GetSoftwareResourcesV2Response.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetSoftwareResourcesV2Response.struct_class = Types::GetSoftwareResourcesV2Response
+
+    GetSoftwareStatisticsV2Request.add_member(:group_by_rules, Shapes::ShapeRef.new(shape: SoftwareGroupByRules, required: true, location_name: "GroupByRules"))
+    GetSoftwareStatisticsV2Request.add_member(:scopes, Shapes::ShapeRef.new(shape: SoftwareScopes, location_name: "Scopes"))
+    GetSoftwareStatisticsV2Request.add_member(:sort_order, Shapes::ShapeRef.new(shape: SortOrder, location_name: "SortOrder"))
+    GetSoftwareStatisticsV2Request.add_member(:max_statistic_results, Shapes::ShapeRef.new(shape: MaxStatisticResults, location_name: "MaxStatisticResults"))
+    GetSoftwareStatisticsV2Request.struct_class = Types::GetSoftwareStatisticsV2Request
+
+    GetSoftwareStatisticsV2Response.add_member(:group_by_results, Shapes::ShapeRef.new(shape: GroupByResults, required: true, location_name: "GroupByResults"))
+    GetSoftwareStatisticsV2Response.struct_class = Types::GetSoftwareStatisticsV2Response
+
+    GetSoftwareV2Request.add_member(:filters, Shapes::ShapeRef.new(shape: SoftwareFilters, location_name: "Filters"))
+    GetSoftwareV2Request.add_member(:scopes, Shapes::ShapeRef.new(shape: SoftwareScopes, location_name: "Scopes"))
+    GetSoftwareV2Request.add_member(:sort_criteria, Shapes::ShapeRef.new(shape: SortCriteria, location_name: "SortCriteria"))
+    GetSoftwareV2Request.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetSoftwareV2Request.add_member(:max_results, Shapes::ShapeRef.new(shape: MaxResults, location_name: "MaxResults"))
+    GetSoftwareV2Request.struct_class = Types::GetSoftwareV2Request
+
+    GetSoftwareV2Response.add_member(:software, Shapes::ShapeRef.new(shape: SoftwareList, required: true, location_name: "Software"))
+    GetSoftwareV2Response.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetSoftwareV2Response.struct_class = Types::GetSoftwareV2Response
+
     GroupByResult.add_member(:group_by_field, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "GroupByField"))
     GroupByResult.add_member(:group_by_values, Shapes::ShapeRef.new(shape: GroupByValues, location_name: "GroupByValues"))
     GroupByResult.struct_class = Types::GroupByResult
@@ -8103,6 +8157,25 @@ module Aws::SecurityHub
 
     SignalsList.member = Shapes::ShapeRef.new(shape: Signal)
 
+    SoftwareCompositeFilter.add_member(:string_filters, Shapes::ShapeRef.new(shape: SoftwareStringFilterList, location_name: "StringFilters"))
+    SoftwareCompositeFilter.add_member(:nested_composite_filters, Shapes::ShapeRef.new(shape: SoftwareCompositeFilterList, location_name: "NestedCompositeFilters"))
+    SoftwareCompositeFilter.add_member(:operator, Shapes::ShapeRef.new(shape: AllowedOperators, location_name: "Operator"))
+    SoftwareCompositeFilter.struct_class = Types::SoftwareCompositeFilter
+
+    SoftwareCompositeFilterList.member = Shapes::ShapeRef.new(shape: SoftwareCompositeFilter)
+
+    SoftwareFilters.add_member(:composite_filters, Shapes::ShapeRef.new(shape: SoftwareCompositeFilterList, location_name: "CompositeFilters"))
+    SoftwareFilters.add_member(:composite_operator, Shapes::ShapeRef.new(shape: AllowedOperators, location_name: "CompositeOperator"))
+    SoftwareFilters.struct_class = Types::SoftwareFilters
+
+    SoftwareGroupByRule.add_member(:group_by_field, Shapes::ShapeRef.new(shape: SoftwareGroupByField, required: true, location_name: "GroupByField"))
+    SoftwareGroupByRule.add_member(:filters, Shapes::ShapeRef.new(shape: SoftwareFilters, location_name: "Filters"))
+    SoftwareGroupByRule.struct_class = Types::SoftwareGroupByRule
+
+    SoftwareGroupByRules.member = Shapes::ShapeRef.new(shape: SoftwareGroupByRule)
+
+    SoftwareList.member = Shapes::ShapeRef.new(shape: SoftwareResult)
+
     SoftwarePackage.add_member(:name, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Name"))
     SoftwarePackage.add_member(:version, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Version"))
     SoftwarePackage.add_member(:epoch, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Epoch"))
@@ -8118,6 +8191,34 @@ module Aws::SecurityHub
 
     SoftwarePackageList.member = Shapes::ShapeRef.new(shape: SoftwarePackage)
 
+    SoftwareResourceResult.add_member(:account_id, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "AccountId"))
+    SoftwareResourceResult.add_member(:resource_type, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "ResourceType"))
+    SoftwareResourceResult.add_member(:region, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "Region"))
+    SoftwareResourceResult.add_member(:resource_id, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "ResourceId"))
+    SoftwareResourceResult.add_member(:resource_provider, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "ResourceProvider"))
+    SoftwareResourceResult.add_member(:resource_owner_org_id, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "ResourceOwnerOrgId"))
+    SoftwareResourceResult.add_member(:resource_owner_account_id, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "ResourceOwnerAccountId"))
+    SoftwareResourceResult.add_member(:resource_cloud_partition, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "ResourceCloudPartition"))
+    SoftwareResourceResult.add_member(:resource_region, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "ResourceRegion"))
+    SoftwareResourceResult.struct_class = Types::SoftwareResourceResult
+
+    SoftwareResourceResultList.member = Shapes::ShapeRef.new(shape: SoftwareResourceResult)
+
+    SoftwareResult.add_member(:package_name, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "PackageName"))
+    SoftwareResult.add_member(:package_version, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "PackageVersion"))
+    SoftwareResult.add_member(:package_type, Shapes::ShapeRef.new(shape: NonEmptyString, required: true, location_name: "PackageType"))
+    SoftwareResult.add_member(:resource_count, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "ResourceCount"))
+    SoftwareResult.struct_class = Types::SoftwareResult
+
+    SoftwareScopes.add_member(:aws_organizations, Shapes::ShapeRef.new(shape: AwsOrganizationScopeList, location_name: "AwsOrganizations"))
+    SoftwareScopes.struct_class = Types::SoftwareScopes
+
+    SoftwareStringFilter.add_member(:field_name, Shapes::ShapeRef.new(shape: SoftwareStringField, location_name: "FieldName"))
+    SoftwareStringFilter.add_member(:filter, Shapes::ShapeRef.new(shape: StringFilter, location_name: "Filter"))
+    SoftwareStringFilter.struct_class = Types::SoftwareStringFilter
+
+    SoftwareStringFilterList.member = Shapes::ShapeRef.new(shape: SoftwareStringFilter)
+
     SortCriteria.member = Shapes::ShapeRef.new(shape: SortCriterion)
 
     SortCriterion.add_member(:field, Shapes::ShapeRef.new(shape: NonEmptyString, location_name: "Field"))
@@ -9832,6 +9933,66 @@ module Aws::SecurityHub
         o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
       end)
 
+      api.add_operation(:get_software_resources_v2, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetSoftwareResourcesV2"
+        o.http_method = "POST"
+        o.http_request_uri = "/softwarev2/resources"
+        o.input = Shapes::ShapeRef.new(shape: GetSoftwareResourcesV2Request)
+        o.output = Shapes::ShapeRef.new(shape: GetSoftwareResourcesV2Response)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationalUnitNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationNotFoundException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:get_software_statistics_v2, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetSoftwareStatisticsV2"
+        o.http_method = "POST"
+        o.http_request_uri = "/softwarev2/statistics"
+        o.input = Shapes::ShapeRef.new(shape: GetSoftwareStatisticsV2Request)
+        o.output = Shapes::ShapeRef.new(shape: GetSoftwareStatisticsV2Response)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationalUnitNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationNotFoundException)
+      end)
+
+      api.add_operation(:get_software_v2, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetSoftwareV2"
+        o.http_method = "POST"
+        o.http_request_uri = "/softwarev2"
+        o.input = Shapes::ShapeRef.new(shape: GetSoftwareV2Request)
+        o.output = Shapes::ShapeRef.new(shape: GetSoftwareV2Response)
+        o.errors << Shapes::ShapeRef.new(shape: InternalServerException)
+        o.errors << Shapes::ShapeRef.new(shape: AccessDeniedException)
+        o.errors << Shapes::ShapeRef.new(shape: ThrottlingException)
+        o.errors << Shapes::ShapeRef.new(shape: ConflictException)
+        o.errors << Shapes::ShapeRef.new(shape: ValidationException)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationalUnitNotFoundException)
+        o.errors << Shapes::ShapeRef.new(shape: OrganizationNotFoundException)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:invite_members, Seahorse::Model::Operation.new.tap do |o|
         o.name = "InviteMembers"
         o.http_method = "POST"