Merge pull request DataDog#3231 from DataDog/datadog-api-spec/generated/5468

Security Monitoring - expand learningDuration and forgetAfter to support up to 30 days

Author: nogates

.generator/schemas/v2/openapi.yaml

@@ -64576,35 +64576,17 @@ components:
       type: object
     SecurityMonitoringRuleNewValueOptionsForgetAfter:
       description: The duration in days after which a learned value is forgotten.
-      enum:
-        - 1
-        - 2
-        - 7
-        - 14
-        - 21
-        - 28
       format: int32
+      maximum: 30
+      minimum: 1
       type: integer
-      x-enum-varnames:
-        - ONE_DAY
-        - TWO_DAYS
-        - ONE_WEEK
-        - TWO_WEEKS
-        - THREE_WEEKS
-        - FOUR_WEEKS
     SecurityMonitoringRuleNewValueOptionsLearningDuration:
       default: 0
       description: "The duration in days during which values are learned, and after which signals will be generated for values that\nweren't learned. If set to 0, a signal will be generated for all new values after the first value is learned."
-      enum:
-        - 0
-        - 1
-        - 7
       format: int32
+      maximum: 30
+      minimum: 0
       type: integer
-      x-enum-varnames:
-        - ZERO_DAYS
-        - ONE_DAY
-        - SEVEN_DAYS
     SecurityMonitoringRuleNewValueOptionsLearningMethod:
       default: duration
       description: The learning method used to determine when signals should be generated for values that weren't learned.

examples/v2/security-monitoring/ValidateSecurityMonitoringRule_2609327779.rb

@@ -22,9 +22,9 @@
     max_signal_duration: DatadogAPIClient::V2::SecurityMonitoringRuleMaxSignalDuration::TEN_MINUTES,
     detection_method: DatadogAPIClient::V2::SecurityMonitoringRuleDetectionMethod::NEW_VALUE,
     new_value_options: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptions.new({
-      forget_after: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsForgetAfter::ONE_WEEK,
+      forget_after: 7,
       instantaneous_baseline: true,
-      learning_duration: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningDuration::ONE_DAY,
+      learning_duration: 1,
       learning_threshold: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningThreshold::ZERO_OCCURRENCES,
       learning_method: DatadogAPIClient::V2::SecurityMonitoringRuleNewValueOptionsLearningMethod::DURATION,
     }),

lib/datadog_api_client/inflector.rb

@@ -5175,8 +5175,6 @@ def overrides
           "v2.security_monitoring_rule_keep_alive" => "SecurityMonitoringRuleKeepAlive",
           "v2.security_monitoring_rule_max_signal_duration" => "SecurityMonitoringRuleMaxSignalDuration",
           "v2.security_monitoring_rule_new_value_options" => "SecurityMonitoringRuleNewValueOptions",
-          "v2.security_monitoring_rule_new_value_options_forget_after" => "SecurityMonitoringRuleNewValueOptionsForgetAfter",
-          "v2.security_monitoring_rule_new_value_options_learning_duration" => "SecurityMonitoringRuleNewValueOptionsLearningDuration",
           "v2.security_monitoring_rule_new_value_options_learning_method" => "SecurityMonitoringRuleNewValueOptionsLearningMethod",
           "v2.security_monitoring_rule_new_value_options_learning_threshold" => "SecurityMonitoringRuleNewValueOptionsLearningThreshold",
           "v2.security_monitoring_rule_options" => "SecurityMonitoringRuleOptions",

lib/datadog_api_client/v2/models/security_monitoring_rule_new_value_options.rb

@@ -22,14 +22,14 @@ class SecurityMonitoringRuleNewValueOptions
     include BaseGenericModel
 
     # The duration in days after which a learned value is forgotten.
-    attr_accessor :forget_after
+    attr_reader :forget_after
 
     # When set to true, Datadog uses previous values that fall within the defined learning window to construct the baseline, enabling the system to establish an accurate baseline more rapidly rather than relying solely on gradual learning over time.
     attr_accessor :instantaneous_baseline
 
     # The duration in days during which values are learned, and after which signals will be generated for values that
     # weren't learned. If set to 0, a signal will be generated for all new values after the first value is learned.
-    attr_accessor :learning_duration
+    attr_reader :learning_duration
 
     # The learning method used to determine when signals should be generated for values that weren't learned.
     attr_accessor :learning_method
@@ -55,9 +55,9 @@ def self.attribute_map
     # @!visibility private
     def self.openapi_types
       {
-        :'forget_after' => :'SecurityMonitoringRuleNewValueOptionsForgetAfter',
+        :'forget_after' => :'Integer',
         :'instantaneous_baseline' => :'Boolean',
-        :'learning_duration' => :'SecurityMonitoringRuleNewValueOptionsLearningDuration',
+        :'learning_duration' => :'Integer',
         :'learning_method' => :'SecurityMonitoringRuleNewValueOptionsLearningMethod',
         :'learning_threshold' => :'SecurityMonitoringRuleNewValueOptionsLearningThreshold'
       }
@@ -102,6 +102,43 @@ def initialize(attributes = {})
       end
     end
 
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    # @!visibility private
+    def valid?
+      return false if !@forget_after.nil? && @forget_after > 30
+      return false if !@forget_after.nil? && @forget_after < 1
+      return false if !@learning_duration.nil? && @learning_duration > 30
+      return false if !@learning_duration.nil? && @learning_duration < 0
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param forget_after [Object] Object to be assigned
+    # @!visibility private
+    def forget_after=(forget_after)
+      if !forget_after.nil? && forget_after > 30
+        fail ArgumentError, 'invalid value for "forget_after", must be smaller than or equal to 30.'
+      end
+      if !forget_after.nil? && forget_after < 1
+        fail ArgumentError, 'invalid value for "forget_after", must be greater than or equal to 1.'
+      end
+      @forget_after = forget_after
+    end
+
+    # Custom attribute writer method with validation
+    # @param learning_duration [Object] Object to be assigned
+    # @!visibility private
+    def learning_duration=(learning_duration)
+      if !learning_duration.nil? && learning_duration > 30
+        fail ArgumentError, 'invalid value for "learning_duration", must be smaller than or equal to 30.'
+      end
+      if !learning_duration.nil? && learning_duration < 0
+        fail ArgumentError, 'invalid value for "learning_duration", must be greater than or equal to 0.'
+      end
+      @learning_duration = learning_duration
+    end
+
     # Returns the object in the form of hash, with additionalProperties support.
     # @return [Hash] Returns the object in the form of hash
     # @!visibility private