diff --git a/.apigentools-info b/.apigentools-info index 097b85f62f46..0ee7130486dd 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-17 13:26:11.488046", - "spec_repo_commit": "12ab5180" + "regenerated": "2025-04-18 16:37:12.793461", + "spec_repo_commit": "8ff9b6bd" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2025-04-17 13:26:11.504561", - "spec_repo_commit": "12ab5180" + "regenerated": "2025-04-18 16:37:12.809005", + "spec_repo_commit": "8ff9b6bd" } } } \ No newline at end of file diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index a191ada020a0..4f10460727bb 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -52698,7 +52698,6 @@ paths: operator: OR permissions: - security_monitoring_rules_read - x-unstable: '**Note**: This endpoint is in beta and may be subject to changes.' /api/v2/security_monitoring/signals: get: description: 'The list endpoint returns security signals that match a search diff --git a/examples/v2/security-monitoring/GetRuleVersionHistory.rb b/examples/v2/security-monitoring/GetRuleVersionHistory.rb index 0e04f6a7de65..173c2ffa9f8b 100644 --- a/examples/v2/security-monitoring/GetRuleVersionHistory.rb +++ b/examples/v2/security-monitoring/GetRuleVersionHistory.rb @@ -1,8 +1,5 @@ # Get a rule's version history returns "OK" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.get_rule_version_history".to_sym] = true -end api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new p api_instance.get_rule_version_history("rule_id") diff --git a/examples/v2/security-monitoring/GetRuleVersionHistory_2467565841.rb b/examples/v2/security-monitoring/GetRuleVersionHistory_2467565841.rb index 729b08f86aee..19df5c3b1251 100644 --- a/examples/v2/security-monitoring/GetRuleVersionHistory_2467565841.rb +++ b/examples/v2/security-monitoring/GetRuleVersionHistory_2467565841.rb @@ -1,9 +1,6 @@ # Get rule version history returns "OK" response require "datadog_api_client" -DatadogAPIClient.configure do |config| - config.unstable_operations["v2.get_rule_version_history".to_sym] = true -end api_instance = DatadogAPIClient::V2::SecurityMonitoringAPI.new # there is a valid "security_rule" in the system diff --git a/features/v2/security_monitoring.feature b/features/v2/security_monitoring.feature index 1d7b0efc0cc7..b07aa48837be 100644 --- a/features/v2/security_monitoring.feature +++ b/features/v2/security_monitoring.feature @@ -604,24 +604,21 @@ Feature: Security Monitoring @generated @skip @team:DataDog/k9-cloud-security-platform Scenario: Get a rule's version history returns "Bad Request" response - Given operation "GetRuleVersionHistory" enabled - And new "GetRuleVersionHistory" request + Given new "GetRuleVersionHistory" request And request contains "rule_id" parameter from "REPLACE.ME" When the request is sent Then the response status is 400 Bad Request @generated @skip @team:DataDog/k9-cloud-security-platform Scenario: Get a rule's version history returns "Not Found" response - Given operation "GetRuleVersionHistory" enabled - And new "GetRuleVersionHistory" request + Given new "GetRuleVersionHistory" request And request contains "rule_id" parameter from "REPLACE.ME" When the request is sent Then the response status is 404 Not Found @generated @skip @team:DataDog/k9-cloud-security-platform Scenario: Get a rule's version history returns "OK" response - Given operation "GetRuleVersionHistory" enabled - And new "GetRuleVersionHistory" request + Given new "GetRuleVersionHistory" request And request contains "rule_id" parameter from "REPLACE.ME" When the request is sent Then the response status is 200 OK @@ -737,8 +734,7 @@ Feature: Security Monitoring @skip-go @skip-java @skip-ruby @team:DataDog/k9-cloud-security-platform Scenario: Get rule version history returns "OK" response - Given operation "GetRuleVersionHistory" enabled - And new "GetRuleVersionHistory" request + Given new "GetRuleVersionHistory" request And there is a valid "security_rule" in the system And request contains "rule_id" parameter from "security_rule.id" When the request is sent diff --git a/lib/datadog_api_client/configuration.rb b/lib/datadog_api_client/configuration.rb index b94c3c4d3b6d..e921e7c3e97b 100644 --- a/lib/datadog_api_client/configuration.rb +++ b/lib/datadog_api_client/configuration.rb @@ -241,7 +241,6 @@ def initialize "v2.delete_historical_job": false, "v2.get_finding": false, "v2.get_historical_job": false, - "v2.get_rule_version_history": false, "v2.get_sbom": false, "v2.list_findings": false, "v2.list_historical_jobs": false, 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 53511b78b8ee..f7a7305e4926 100644 --- a/lib/datadog_api_client/v2/api/security_monitoring_api.rb +++ b/lib/datadog_api_client/v2/api/security_monitoring_api.rb @@ -1416,12 +1416,6 @@ def get_rule_version_history(rule_id, opts = {}) # @option opts [Integer] :page_number Specific page number to return. # @return [Array<(GetRuleVersionHistoryResponse, Integer, Hash)>] GetRuleVersionHistoryResponse data, response status code and response headers def get_rule_version_history_with_http_info(rule_id, opts = {}) - unstable_enabled = @api_client.config.unstable_operations["v2.get_rule_version_history".to_sym] - if unstable_enabled - @api_client.config.logger.warn format("Using unstable operation '%s'", "v2.get_rule_version_history") - else - raise DatadogAPIClient::APIError.new(message: format("Unstable operation '%s' is disabled", "v2.get_rule_version_history")) - end if @api_client.config.debugging @api_client.config.logger.debug 'Calling API: SecurityMonitoringAPI.get_rule_version_history ...' diff --git a/lib/datadog_api_client/v2/model_base.rb b/lib/datadog_api_client/v2/model_base.rb index cfc8c7051560..7bdfde0c6bcd 100644 --- a/lib/datadog_api_client/v2/model_base.rb +++ b/lib/datadog_api_client/v2/model_base.rb @@ -124,7 +124,7 @@ def _deserialize(type, value) # generic array, return directly value when :UUID - value + value.to_s when /\AArray<(?.+)>\z/ inner_type = Regexp.last_match[:inner_type] value.map { |v| _deserialize(inner_type, v) } @@ -255,9 +255,7 @@ def find_and_cast_into_type(klass, data) when 'Object' # "type: object" return data if data.instance_of?(Hash) when 'UUID' - raise TypeError, "Expected String, got #{uuid_string.class.name} instead." unless uuid_string.kind_of?(String) - raise ArgumentError, "Invalid UUID format." unless /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/.match?(data) - return data + return UUIDTools::UUID.parse(data) when /\AArray<(?.+)>\z/ # "type: array" if data.instance_of?(Array) sub_type = Regexp.last_match[:sub_type]