From 8d345a55a7529ccaa493157bec2f8692b9a243b3 Mon Sep 17 00:00:00 2001 From: "ci.datadog-api-spec" Date: Wed, 18 Mar 2026 17:25:29 +0000 Subject: [PATCH] Regenerate client from commit c23dc44 of spec repo --- .generator/schemas/v1/openapi.yaml | 26 ++++---- .generator/schemas/v2/openapi.yaml | 7 +++ features/scenarios_model_mapping.rb | 3 + lib/datadog_api_client/inflector.rb | 3 +- ...on_aggregate_augmented_query_definition.rb | 4 +- ...ula_and_function_aggregate_filter_query.rb | 63 ------------------- ...ion_aggregate_filtered_query_definition.rb | 4 +- ...rmula_and_function_aggregate_sub_query.rb} | 4 +- .../v2/api/security_monitoring_api.rb | 2 + 9 files changed, 31 insertions(+), 85 deletions(-) delete mode 100644 lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filter_query.rb rename lib/datadog_api_client/v1/models/{monitor_formula_and_function_aggregate_augment_query.rb => monitor_formula_and_function_aggregate_sub_query.rb} (92%) diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 715f38f30c74..d971b72fbfbc 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.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: diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 7c5de28af805..7ae721a4124b 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.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: diff --git a/features/scenarios_model_mapping.rb b/features/scenarios_model_mapping.rb index a3162c56f7a1..95f3727d7bec 100644 --- a/features/scenarios_model_mapping.rb +++ b/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", }, diff --git a/lib/datadog_api_client/inflector.rb b/lib/datadog_api_client/inflector.rb index 53171cd9b40d..edc8684093e9 100644 --- a/lib/datadog_api_client/inflector.rb +++ b/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", diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augmented_query_definition.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augmented_query_definition.rb index c02811727d1e..bf49ebc81514 100644 --- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augmented_query_definition.rb +++ b/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', :'data_source' => :'MonitorFormulaAndFunctionAggregateAugmentedDataSource', diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filter_query.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filter_query.rb deleted file mode 100644 index 38ee4da77b35..000000000000 --- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filter_query.rb +++ /dev/null @@ -1,63 +0,0 @@ -=begin -#Datadog API V1 Collection - -#Collection of all Datadog Public endpoints. - -The version of the OpenAPI document: 1.0 -Contact: support@datadoghq.com -Generated by: https://github.com/DataDog/datadog-api-client-ruby/tree/master/.generator - - Unless explicitly stated otherwise all files in this repository are licensed under the Apache-2.0 License. - This product includes software developed at Datadog (https://www.datadoghq.com/). - Copyright 2020-Present Datadog, Inc. - -=end - -require 'date' -require 'time' - -module DatadogAPIClient::V1 - # Filter query for aggregate filtered queries. Can be an events query or a reference table query. - module MonitorFormulaAndFunctionAggregateFilterQuery - class << self - include BaseOneOfModel - include BaseOneOfModelNoDiscriminator - - # List of class defined in oneOf (OpenAPI v3) - def openapi_one_of - [ - :'MonitorFormulaAndFunctionEventQueryDefinition', - :'MonitorFormulaAndFunctionReferenceTableQueryDefinition' - ] - end - # Builds the object - # @param data [Mixed] Data to be matched against the list of oneOf items - # @return [Object] Returns the model or the data itself - def build(data) - # Go through the list of oneOf items and attempt to identify the appropriate one. - # Note: - # - We do not attempt to check whether exactly one item matches. - # - No advanced validation of types in some cases (e.g. "x: { type: string }" will happily match { x: 123 }) - # due to the way the deserialization is made in the base_object template (it just casts without verifying). - # - TODO: scalar values are de facto behaving as if they were nullable. - # - TODO: logging when debugging is set. - openapi_one_of.each do |klass| - begin - next if klass == :AnyType # "nullable: true" - typed_data = find_and_cast_into_type(klass, data) - next if typed_data.respond_to?(:_unparsed) && typed_data._unparsed - return typed_data if typed_data - rescue # rescue all errors so we keep iterating even if the current item lookup raises - end - end - - if openapi_one_of.include?(:AnyType) - data - else - self._unparsed = true - DatadogAPIClient::UnparsedObject.new(data) - end - end - end - end -end diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filtered_query_definition.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filtered_query_definition.rb index e89146c263fb..cf15aafd6886 100644 --- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_filtered_query_definition.rb +++ b/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', :'data_source' => :'MonitorFormulaAndFunctionAggregateFilteredDataSource', - :'filter_query' => :'MonitorFormulaAndFunctionAggregateFilterQuery', + :'filter_query' => :'MonitorFormulaAndFunctionAggregateSubQuery', :'filters' => :'Array', :'group_by' => :'Array', :'name' => :'String' diff --git a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augment_query.rb b/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_sub_query.rb similarity index 92% rename from lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augment_query.rb rename to lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_sub_query.rb index 3b437f3644b7..ecdee94936c0 100644 --- a/lib/datadog_api_client/v1/models/monitor_formula_and_function_aggregate_augment_query.rb +++ b/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 diff --git a/lib/datadog_api_client/v2/api/security_monitoring_api.rb b/lib/datadog_api_client/v2/api/security_monitoring_api.rb index 3192e46a021f..c185ce633926 100644 --- a/lib/datadog_api_client/v2/api/security_monitoring_api.rb +++ b/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] || {}