Remove duplicate MonitorFormulaAndFunctionAggregateFilterQuery schema

.generator/schemas/v1/openapi.yaml

@@ -7845,12 +7845,6 @@ components:
       x-enum-varnames:
       - DRAFT
       - PUBLISHED
-    MonitorFormulaAndFunctionAggregateAugmentQuery:
-      description: Augment query for aggregate augmented queries. Can be an events
-        query or a reference table query.
-      oneOf:
-      - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition'
-      - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition'
     MonitorFormulaAndFunctionAggregateAugmentedDataSource:
       description: Data source for aggregate augmented queries.
       enum:
@@ -7865,7 +7859,9 @@ components:
         base query results with data from a reference table.
       properties:
         augment_query:
-          $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateAugmentQuery'
+          $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateSubQuery'
+          description: Augment query for aggregate augmented queries. Can be an events
+            query or a reference table query.
         base_query:
           $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateBaseQuery'
         compute:
@@ -7901,12 +7897,6 @@ components:
       oneOf:
       - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition'
       - $ref: '#/components/schemas/MonitorFormulaAndFunctionMetricsQueryDefinition'
-    MonitorFormulaAndFunctionAggregateFilterQuery:
-      description: Filter query for aggregate filtered queries. Can be an events query
-        or a reference table query.
-      oneOf:
-      - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition'
-      - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition'
     MonitorFormulaAndFunctionAggregateFilteredDataSource:
       description: Data source for aggregate filtered queries.
       enum:
@@ -7930,7 +7920,9 @@ components:
         data_source:
           $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateFilteredDataSource'
         filter_query:
-          $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateFilterQuery'
+          $ref: '#/components/schemas/MonitorFormulaAndFunctionAggregateSubQuery'
+          description: Filter query for aggregate filtered queries. Can be an events
+            query or a reference table query.
         filters:
           description: Filter conditions for the query.
           items:
@@ -8000,6 +7992,12 @@ components:
       x-enum-varnames:
       - INNER
       - LEFT
+    MonitorFormulaAndFunctionAggregateSubQuery:
+      description: Sub-query for aggregate composite queries (augmented or filtered).
+        Can be an events query or a reference table query.
+      oneOf:
+      - $ref: '#/components/schemas/MonitorFormulaAndFunctionEventQueryDefinition'
+      - $ref: '#/components/schemas/MonitorFormulaAndFunctionReferenceTableQueryDefinition'
     MonitorFormulaAndFunctionCostAggregator:
       description: Aggregation methods for metric queries.
       enum:

.generator/schemas/v2/openapi.yaml

@@ -102212,6 +102212,13 @@ paths:
     get:
       description: Get the list of all critical assets.
       operationId: ListSecurityMonitoringCriticalAssets
+      parameters:
+      - description: Query string.
+        in: query
+        name: query
+        required: false
+        schema:
+          type: string
       responses:
         '200':
           content:

features/scenarios_model_mapping.rb

@@ -1607,6 +1607,9 @@
             "filter_operating_system_name" => "String",
             "filter_operating_system_version" => "String",
     },
+    "v2.ListSecurityMonitoringCriticalAssets" => {
+            "query" => "String",
+    },
     "v2.CreateSecurityMonitoringCriticalAsset" => {
             "body" => "SecurityMonitoringCriticalAssetCreateRequest",
     },

lib/datadog_api_client/inflector.rb

@@ -343,14 +343,13 @@ def overrides
           "v1.monitor_draft_status" => "MonitorDraftStatus",
           "v1.monitor_formula_and_function_aggregate_augmented_data_source" => "MonitorFormulaAndFunctionAggregateAugmentedDataSource",
           "v1.monitor_formula_and_function_aggregate_augmented_query_definition" => "MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition",
-          "v1.monitor_formula_and_function_aggregate_augment_query" => "MonitorFormulaAndFunctionAggregateAugmentQuery",
           "v1.monitor_formula_and_function_aggregate_base_query" => "MonitorFormulaAndFunctionAggregateBaseQuery",
           "v1.monitor_formula_and_function_aggregate_filtered_data_source" => "MonitorFormulaAndFunctionAggregateFilteredDataSource",
           "v1.monitor_formula_and_function_aggregate_filtered_query_definition" => "MonitorFormulaAndFunctionAggregateFilteredQueryDefinition",
-          "v1.monitor_formula_and_function_aggregate_filter_query" => "MonitorFormulaAndFunctionAggregateFilterQuery",
           "v1.monitor_formula_and_function_aggregate_query_filter" => "MonitorFormulaAndFunctionAggregateQueryFilter",
           "v1.monitor_formula_and_function_aggregate_query_join_condition" => "MonitorFormulaAndFunctionAggregateQueryJoinCondition",
           "v1.monitor_formula_and_function_aggregate_query_join_type" => "MonitorFormulaAndFunctionAggregateQueryJoinType",
+          "v1.monitor_formula_and_function_aggregate_sub_query" => "MonitorFormulaAndFunctionAggregateSubQuery",
           "v1.monitor_formula_and_function_cost_aggregator" => "MonitorFormulaAndFunctionCostAggregator",
           "v1.monitor_formula_and_function_cost_query_definition" => "MonitorFormulaAndFunctionCostQueryDefinition",
           "v1.monitor_formula_and_function_data_quality_data_source" => "MonitorFormulaAndFunctionDataQualityDataSource",

lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augmented_query_definition.rb

@@ -21,7 +21,7 @@ module DatadogAPIClient::V1
   class MonitorFormulaAndFunctionAggregateAugmentedQueryDefinition
     include BaseGenericModel
 
-    # Augment query for aggregate augmented queries. Can be an events query or a reference table query.
+    # Sub-query for aggregate composite queries (augmented or filtered). Can be an events query or a reference table query.
     attr_reader :augment_query
 
     # Base query for aggregate queries. Can be an events query or a metrics query.
@@ -60,7 +60,7 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
-        :'augment_query' => :'MonitorFormulaAndFunctionAggregateAugmentQuery',
+        :'augment_query' => :'MonitorFormulaAndFunctionAggregateSubQuery',
         :'base_query' => :'MonitorFormulaAndFunctionAggregateBaseQuery',
         :'compute' => :'Array<MonitorFormulaAndFunctionEventQueryDefinitionCompute>',
         :'data_source' => :'MonitorFormulaAndFunctionAggregateAugmentedDataSource',

lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filtered_query_definition.rb

@@ -30,7 +30,7 @@ class MonitorFormulaAndFunctionAggregateFilteredQueryDefinition
     # Data source for aggregate filtered queries.
     attr_reader :data_source
 
-    # Filter query for aggregate filtered queries. Can be an events query or a reference table query.
+    # Sub-query for aggregate composite queries (augmented or filtered). Can be an events query or a reference table query.
     attr_reader :filter_query
 
     # Filter conditions for the query.
@@ -63,7 +63,7 @@ def self.openapi_types
         :'base_query' => :'MonitorFormulaAndFunctionAggregateBaseQuery',
         :'compute' => :'Array<MonitorFormulaAndFunctionEventQueryDefinitionCompute>',
         :'data_source' => :'MonitorFormulaAndFunctionAggregateFilteredDataSource',
-        :'filter_query' => :'MonitorFormulaAndFunctionAggregateFilterQuery',
+        :'filter_query' => :'MonitorFormulaAndFunctionAggregateSubQuery',
         :'filters' => :'Array<MonitorFormulaAndFunctionAggregateQueryFilter>',
         :'group_by' => :'Array<MonitorFormulaAndFunctionEventQueryGroupBy>',
         :'name' => :'String'

lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augment_query.rb → lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_sub_query.rb

@@ -17,8 +17,8 @@
 require 'time'
 
 module DatadogAPIClient::V1
-  # Augment query for aggregate augmented queries. Can be an events query or a reference table query.
-  module MonitorFormulaAndFunctionAggregateAugmentQuery
+  # Sub-query for aggregate composite queries (augmented or filtered). Can be an events query or a reference table query.
+  module MonitorFormulaAndFunctionAggregateSubQuery
     class << self
       include BaseOneOfModel
       include BaseOneOfModelNoDiscriminator

lib/datadog_api_client/v2/api/security_monitoring_api.rb

@@ -4326,6 +4326,7 @@ def list_security_monitoring_critical_assets(opts = {})
     # Get the list of all critical assets.
     #
     # @param opts [Hash] the optional parameters
+    # @option opts [String] :query Query string.
     # @return [Array<(SecurityMonitoringCriticalAssetsResponse, Integer, Hash)>] SecurityMonitoringCriticalAssetsResponse data, response status code and response headers
     def list_security_monitoring_critical_assets_with_http_info(opts = {})
 
@@ -4337,6 +4338,7 @@ def list_security_monitoring_critical_assets_with_http_info(opts = {})
 
       # query parameters
       query_params = opts[:query_params] || {}
+      query_params[:'query'] = opts[:'query'] if !opts[:'query'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}