Remove deprecated AgentRule field in Security Rules API for CWS

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-12-22 22:58:32.843350",
-            "spec_repo_commit": "d1e8471"
+            "regenerated": "2021-12-22 23:23:16.153988",
+            "spec_repo_commit": "2f072b0"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-12-22 22:58:34.010355",
-            "spec_repo_commit": "d1e8471"
+            "regenerated": "2021-12-22 23:23:16.943484",
+            "spec_repo_commit": "2f072b0"
         }
     }
 }

.generator/schemas/v2/openapi.yaml

@@ -4695,8 +4695,6 @@ components:
     SecurityMonitoringRuleQuery:
       description: Query for matching rule.
       properties:
-        agentRule:
-          $ref: '#/components/schemas/SecurityMonitoringRuntimeAgentRule'
         aggregation:
           $ref: '#/components/schemas/SecurityMonitoringRuleQueryAggregation'
         distinctFields:
@@ -4741,8 +4739,6 @@ components:
     SecurityMonitoringRuleQueryCreate:
       description: Query for matching rule.
       properties:
-        agentRule:
-          $ref: '#/components/schemas/SecurityMonitoringRuntimeAgentRule'
         aggregation:
           $ref: '#/components/schemas/SecurityMonitoringRuleQueryAggregation'
         distinctFields:
@@ -4925,24 +4921,6 @@ components:
           maximum: 2147483647
           type: integer
       type: object
-    SecurityMonitoringRuntimeAgentRule:
-      description: The Agent rule.
-      properties:
-        agentRuleId:
-          description: The Agent rule ID. Must be unique within the rule.
-          example: etc_shadow
-          type: string
-        expression:
-          description: 'A Runtime Security expression determines what activity should
-            be collected by the Datadog Agent.
-
-            These logical expressions can use predefined operators and attributes.
-            Tags cannot be used in Runtime
-
-            Security expressions. Instead, allow or deny based on tags under the advanced
-            option.'
-          type: string
-      type: object
     SecurityMonitoringSignal:
       description: Object description of a security signal.
       properties:

api_docs/v2/README.md

@@ -406,7 +406,6 @@ All URIs are relative to *https://api.datadoghq.com*
 - [SecurityMonitoringRuleTypeCreate](SecurityMonitoringRuleTypeCreate.md)
 - [SecurityMonitoringRuleTypeRead](SecurityMonitoringRuleTypeRead.md)
 - [SecurityMonitoringRuleUpdatePayload](SecurityMonitoringRuleUpdatePayload.md)
-- [SecurityMonitoringRuntimeAgentRule](SecurityMonitoringRuntimeAgentRule.md)
 - [SecurityMonitoringSignal](SecurityMonitoringSignal.md)
 - [SecurityMonitoringSignalAttributes](SecurityMonitoringSignalAttributes.md)
 - [SecurityMonitoringSignalListRequest](SecurityMonitoringSignalListRequest.md)

api_docs/v2/SecurityMonitoringRuleQuery.md

@@ -4,12 +4,11 @@ Query for matching rule.
 
 ## Properties
 
-| Name               | Type                                                                            | Description                                                                | Notes      |
-| ------------------ | ------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | ---------- |
-| **agentRule**      | [**SecurityMonitoringRuntimeAgentRule**](SecurityMonitoringRuntimeAgentRule.md) |                                                                            | [optional] |
-| **aggregation**    | **SecurityMonitoringRuleQueryAggregation**                                      |                                                                            | [optional] |
-| **distinctFields** | **List<String>**                                                          | Field for which the cardinality is measured. Sent as an array.             | [optional] |
-| **groupByFields**  | **List<String>**                                                          | Fields to group by.                                                        | [optional] |
-| **metric**         | **String**                                                                      | The target field to aggregate over when using the sum or max aggregations. | [optional] |
-| **name**           | **String**                                                                      | Name of the query.                                                         | [optional] |
-| **query**          | **String**                                                                      | Query to run on logs.                                                      | [optional] |
+| Name               | Type                                       | Description                                                                | Notes      |
+| ------------------ | ------------------------------------------ | -------------------------------------------------------------------------- | ---------- |
+| **aggregation**    | **SecurityMonitoringRuleQueryAggregation** |                                                                            | [optional] |
+| **distinctFields** | **List<String>**                     | Field for which the cardinality is measured. Sent as an array.             | [optional] |
+| **groupByFields**  | **List<String>**                     | Fields to group by.                                                        | [optional] |
+| **metric**         | **String**                                 | The target field to aggregate over when using the sum or max aggregations. | [optional] |
+| **name**           | **String**                                 | Name of the query.                                                         | [optional] |
+| **query**          | **String**                                 | Query to run on logs.                                                      | [optional] |

api_docs/v2/SecurityMonitoringRuleQueryCreate.md

@@ -4,12 +4,11 @@ Query for matching rule.
 
 ## Properties
 
-| Name               | Type                                                                            | Description                                                                | Notes      |
-| ------------------ | ------------------------------------------------------------------------------- | -------------------------------------------------------------------------- | ---------- |
-| **agentRule**      | [**SecurityMonitoringRuntimeAgentRule**](SecurityMonitoringRuntimeAgentRule.md) |                                                                            | [optional] |
-| **aggregation**    | **SecurityMonitoringRuleQueryAggregation**                                      |                                                                            | [optional] |
-| **distinctFields** | **List<String>**                                                          | Field for which the cardinality is measured. Sent as an array.             | [optional] |
-| **groupByFields**  | **List<String>**                                                          | Fields to group by.                                                        | [optional] |
-| **metric**         | **String**                                                                      | The target field to aggregate over when using the sum or max aggregations. | [optional] |
-| **name**           | **String**                                                                      | Name of the query.                                                         | [optional] |
-| **query**          | **String**                                                                      | Query to run on logs.                                                      |
+| Name               | Type                                       | Description                                                                | Notes      |
+| ------------------ | ------------------------------------------ | -------------------------------------------------------------------------- | ---------- |
+| **aggregation**    | **SecurityMonitoringRuleQueryAggregation** |                                                                            | [optional] |
+| **distinctFields** | **List<String>**                     | Field for which the cardinality is measured. Sent as an array.             | [optional] |
+| **groupByFields**  | **List<String>**                     | Fields to group by.                                                        | [optional] |
+| **metric**         | **String**                                 | The target field to aggregate over when using the sum or max aggregations. | [optional] |
+| **name**           | **String**                                 | Name of the query.                                                         | [optional] |
+| **query**          | **String**                                 | Query to run on logs.                                                      |

examples/v2/security-monitoring/CreateSecurityMonitoringRule_498211763.java

@@ -16,7 +16,6 @@
 import com.datadog.api.v2.client.model.SecurityMonitoringRuleResponse;
 import com.datadog.api.v2.client.model.SecurityMonitoringRuleSeverity;
 import com.datadog.api.v2.client.model.SecurityMonitoringRuleTypeCreate;
-import com.datadog.api.v2.client.model.SecurityMonitoringRuntimeAgentRule;
 import java.time.*;
 import java.util.*;
 
@@ -47,12 +46,7 @@ public static void main(String[] args) {
                                     ;
                                   }
                                 })
-                            .metric("")
-                            .agentRule(
-                                new SecurityMonitoringRuntimeAgentRule()
-                                    .agentRuleId("kernel_module_unlink_2")
-                                    .expression(
-                                        "(open.flags & ((O_CREAT|O_RDWR|O_WRONLY|O_TRUNC)) > 0)")));
+                            .metric(""));
                   }
                 })
             .filters(

src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQuery.java

@@ -23,7 +23,6 @@
 /** Query for matching rule. */
 @ApiModel(description = "Query for matching rule.")
 @JsonPropertyOrder({
-  SecurityMonitoringRuleQuery.JSON_PROPERTY_AGENT_RULE,
   SecurityMonitoringRuleQuery.JSON_PROPERTY_AGGREGATION,
   SecurityMonitoringRuleQuery.JSON_PROPERTY_DISTINCT_FIELDS,
   SecurityMonitoringRuleQuery.JSON_PROPERTY_GROUP_BY_FIELDS,
@@ -34,9 +33,6 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SecurityMonitoringRuleQuery {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_AGENT_RULE = "agentRule";
-  private SecurityMonitoringRuntimeAgentRule agentRule;
-
   public static final String JSON_PROPERTY_AGGREGATION = "aggregation";
   private SecurityMonitoringRuleQueryAggregation aggregation;
 
@@ -55,29 +51,6 @@ public class SecurityMonitoringRuleQuery {
   public static final String JSON_PROPERTY_QUERY = "query";
   private String query;
 
-  public SecurityMonitoringRuleQuery agentRule(SecurityMonitoringRuntimeAgentRule agentRule) {
-    this.agentRule = agentRule;
-    this.unparsed |= agentRule.unparsed;
-    return this;
-  }
-
-  /**
-   * Get agentRule
-   *
-   * @return agentRule
-   */
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_AGENT_RULE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public SecurityMonitoringRuntimeAgentRule getAgentRule() {
-    return agentRule;
-  }
-
-  public void setAgentRule(SecurityMonitoringRuntimeAgentRule agentRule) {
-    this.agentRule = agentRule;
-  }
-
   public SecurityMonitoringRuleQuery aggregation(
       SecurityMonitoringRuleQueryAggregation aggregation) {
     this.aggregation = aggregation;
@@ -242,8 +215,7 @@ public boolean equals(Object o) {
       return false;
     }
     SecurityMonitoringRuleQuery securityMonitoringRuleQuery = (SecurityMonitoringRuleQuery) o;
-    return Objects.equals(this.agentRule, securityMonitoringRuleQuery.agentRule)
-        && Objects.equals(this.aggregation, securityMonitoringRuleQuery.aggregation)
+    return Objects.equals(this.aggregation, securityMonitoringRuleQuery.aggregation)
         && Objects.equals(this.distinctFields, securityMonitoringRuleQuery.distinctFields)
         && Objects.equals(this.groupByFields, securityMonitoringRuleQuery.groupByFields)
         && Objects.equals(this.metric, securityMonitoringRuleQuery.metric)
@@ -253,14 +225,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(agentRule, aggregation, distinctFields, groupByFields, metric, name, query);
+    return Objects.hash(aggregation, distinctFields, groupByFields, metric, name, query);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SecurityMonitoringRuleQuery {\n");
-    sb.append("    agentRule: ").append(toIndentedString(agentRule)).append("\n");
     sb.append("    aggregation: ").append(toIndentedString(aggregation)).append("\n");
     sb.append("    distinctFields: ").append(toIndentedString(distinctFields)).append("\n");
     sb.append("    groupByFields: ").append(toIndentedString(groupByFields)).append("\n");

src/main/java/com/datadog/api/v2/client/model/SecurityMonitoringRuleQueryCreate.java

@@ -24,7 +24,6 @@
 /** Query for matching rule. */
 @ApiModel(description = "Query for matching rule.")
 @JsonPropertyOrder({
-  SecurityMonitoringRuleQueryCreate.JSON_PROPERTY_AGENT_RULE,
   SecurityMonitoringRuleQueryCreate.JSON_PROPERTY_AGGREGATION,
   SecurityMonitoringRuleQueryCreate.JSON_PROPERTY_DISTINCT_FIELDS,
   SecurityMonitoringRuleQueryCreate.JSON_PROPERTY_GROUP_BY_FIELDS,
@@ -35,9 +34,6 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class SecurityMonitoringRuleQueryCreate {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_AGENT_RULE = "agentRule";
-  private SecurityMonitoringRuntimeAgentRule agentRule;
-
   public static final String JSON_PROPERTY_AGGREGATION = "aggregation";
   private SecurityMonitoringRuleQueryAggregation aggregation;
 
@@ -64,29 +60,6 @@ public SecurityMonitoringRuleQueryCreate(
     this.query = query;
   }
 
-  public SecurityMonitoringRuleQueryCreate agentRule(SecurityMonitoringRuntimeAgentRule agentRule) {
-    this.agentRule = agentRule;
-    this.unparsed |= agentRule.unparsed;
-    return this;
-  }
-
-  /**
-   * Get agentRule
-   *
-   * @return agentRule
-   */
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_AGENT_RULE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public SecurityMonitoringRuntimeAgentRule getAgentRule() {
-    return agentRule;
-  }
-
-  public void setAgentRule(SecurityMonitoringRuntimeAgentRule agentRule) {
-    this.agentRule = agentRule;
-  }
-
   public SecurityMonitoringRuleQueryCreate aggregation(
       SecurityMonitoringRuleQueryAggregation aggregation) {
     this.aggregation = aggregation;
@@ -251,8 +224,7 @@ public boolean equals(Object o) {
     }
     SecurityMonitoringRuleQueryCreate securityMonitoringRuleQueryCreate =
         (SecurityMonitoringRuleQueryCreate) o;
-    return Objects.equals(this.agentRule, securityMonitoringRuleQueryCreate.agentRule)
-        && Objects.equals(this.aggregation, securityMonitoringRuleQueryCreate.aggregation)
+    return Objects.equals(this.aggregation, securityMonitoringRuleQueryCreate.aggregation)
         && Objects.equals(this.distinctFields, securityMonitoringRuleQueryCreate.distinctFields)
         && Objects.equals(this.groupByFields, securityMonitoringRuleQueryCreate.groupByFields)
         && Objects.equals(this.metric, securityMonitoringRuleQueryCreate.metric)
@@ -262,14 +234,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(agentRule, aggregation, distinctFields, groupByFields, metric, name, query);
+    return Objects.hash(aggregation, distinctFields, groupByFields, metric, name, query);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class SecurityMonitoringRuleQueryCreate {\n");
-    sb.append("    agentRule: ").append(toIndentedString(agentRule)).append("\n");
     sb.append("    aggregation: ").append(toIndentedString(aggregation)).append("\n");
     sb.append("    distinctFields: ").append(toIndentedString(distinctFields)).append("\n");
     sb.append("    groupByFields: ").append(toIndentedString(groupByFields)).append("\n");

src/test/resources/cassettes/features/v2/Create_a_detection_rule_with_type_workload_security_returns_OK_response.freeze

@@ -1 +1 @@
-2021-08-16T07:49:00.464Z
+2021-12-22T16:20:11.758Z