Add field attribute to the Workload Protection hash action (#3271)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.generator/schemas/v2/openapi.yaml

@@ -10258,6 +10258,10 @@ components:
           description: Whether the policy is pinned
           example: false
           type: boolean
+        policyType:
+          description: The type of the policy
+          example: policy
+          type: string
         policyVersion:
           description: The version of the policy
           example: '1'
@@ -10436,11 +10440,11 @@ components:
     CloudWorkloadSecurityAgentPolicyVersion:
       description: The versions of the policy
       properties:
-        Date:
+        date:
           description: The date and time the version was created
           nullable: true
           type: string
-        Name:
+        name:
           description: The version of the policy
           example: 1.47.0-rc2
           type: string
@@ -10467,8 +10471,11 @@ components:
           $ref: '#/components/schemas/CloudWorkloadSecurityAgentRuleActionSet'
       type: object
     CloudWorkloadSecurityAgentRuleActionHash:
-      additionalProperties: {}
-      description: An empty object indicating the hash action
+      description: Hash file specified by the field attribute
+      properties:
+        field:
+          description: The field of the hash action
+          type: string
       type: object
     CloudWorkloadSecurityAgentRuleActionMetadata:
       description: The metadata action applied on the scope matching the rule
@@ -10516,9 +10523,14 @@ components:
           format: int64
           type: integer
         value:
-          description: The value of the set action
-          type: string
+          $ref: '#/components/schemas/CloudWorkloadSecurityAgentRuleActionSetValue'
       type: object
+    CloudWorkloadSecurityAgentRuleActionSetValue:
+      description: The value of the set action
+      oneOf:
+      - type: string
+      - type: integer
+      - type: boolean
     CloudWorkloadSecurityAgentRuleActions:
       description: The array of actions the rule can perform if triggered
       items:

examples/v2/csm-threats/CreateCSMThreatsAgentRule_1295653933.java

@@ -4,14 +4,15 @@
 import com.datadog.api.client.ApiException;
 import com.datadog.api.client.v2.api.CsmThreatsApi;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleAction;
+import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleActionHash;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleActionSet;
+import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleActionSetValue;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleCreateAttributes;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleCreateData;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleCreateRequest;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleResponse;
 import com.datadog.api.client.v2.model.CloudWorkloadSecurityAgentRuleType;
 import java.util.Arrays;
-import java.util.Map;
 
 public class Example {
   public static void main(String[] args) {
@@ -40,11 +41,15 @@ public static void main(String[] args) {
                                         .set(
                                             new CloudWorkloadSecurityAgentRuleActionSet()
                                                 .name("test_set")
-                                                .value("test_value")
+                                                .value(
+                                                    new CloudWorkloadSecurityAgentRuleActionSetValue(
+                                                        "test_value"))
                                                 .scope("process")
                                                 .inherited(true)),
                                     new CloudWorkloadSecurityAgentRuleAction()
-                                        .hash(Map.ofEntries()))))
+                                        .hash(
+                                            new CloudWorkloadSecurityAgentRuleActionHash()
+                                                .field("exec.file")))))
                     .type(CloudWorkloadSecurityAgentRuleType.AGENT_RULE));
 
     try {

examples/v2/csm-threats/CreateCSMThreatsAgentRule_1363354233.java

@@ -39,7 +39,7 @@ public static void main(String[] args) {
                                         .set(
                                             new CloudWorkloadSecurityAgentRuleActionSet()
                                                 .name("test_set")
-                                                .expression("open.file.path")
+                                                .expression("exec.file.path")
                                                 .defaultValue("/dev/null")
                                                 .scope("process")))))
                     .type(CloudWorkloadSecurityAgentRuleType.AGENT_RULE));

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

@@ -30,6 +30,7 @@
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_MONITORING_RULES_COUNT,
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_NAME,
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_PINNED,
+  CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_POLICY_TYPE,
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_POLICY_VERSION,
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_PRIORITY,
   CloudWorkloadSecurityAgentPolicyAttributes.JSON_PROPERTY_RULE_COUNT,
@@ -72,6 +73,9 @@ public class CloudWorkloadSecurityAgentPolicyAttributes {
   public static final String JSON_PROPERTY_PINNED = "pinned";
   private Boolean pinned;
 
+  public static final String JSON_PROPERTY_POLICY_TYPE = "policyType";
+  private String policyType;
+
   public static final String JSON_PROPERTY_POLICY_VERSION = "policyVersion";
   private String policyVersion;
 
@@ -323,6 +327,27 @@ public void setPinned(Boolean pinned) {
     this.pinned = pinned;
   }
 
+  public CloudWorkloadSecurityAgentPolicyAttributes policyType(String policyType) {
+    this.policyType = policyType;
+    return this;
+  }
+
+  /**
+   * The type of the policy
+   *
+   * @return policyType
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_POLICY_TYPE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getPolicyType() {
+    return policyType;
+  }
+
+  public void setPolicyType(String policyType) {
+    this.policyType = policyType;
+  }
+
   public CloudWorkloadSecurityAgentPolicyAttributes policyVersion(String policyVersion) {
     this.policyVersion = policyVersion;
     return this;
@@ -560,6 +585,7 @@ public boolean equals(Object o) {
             cloudWorkloadSecurityAgentPolicyAttributes.monitoringRulesCount)
         && Objects.equals(this.name, cloudWorkloadSecurityAgentPolicyAttributes.name)
         && Objects.equals(this.pinned, cloudWorkloadSecurityAgentPolicyAttributes.pinned)
+        && Objects.equals(this.policyType, cloudWorkloadSecurityAgentPolicyAttributes.policyType)
         && Objects.equals(
             this.policyVersion, cloudWorkloadSecurityAgentPolicyAttributes.policyVersion)
         && Objects.equals(this.priority, cloudWorkloadSecurityAgentPolicyAttributes.priority)
@@ -586,6 +612,7 @@ public int hashCode() {
         monitoringRulesCount,
         name,
         pinned,
+        policyType,
         policyVersion,
         priority,
         ruleCount,
@@ -612,6 +639,7 @@ public String toString() {
         .append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    pinned: ").append(toIndentedString(pinned)).append("\n");
+    sb.append("    policyType: ").append(toIndentedString(policyType)).append("\n");
     sb.append("    policyVersion: ").append(toIndentedString(policyVersion)).append("\n");
     sb.append("    priority: ").append(toIndentedString(priority)).append("\n");
     sb.append("    ruleCount: ").append(toIndentedString(ruleCount)).append("\n");

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

@@ -26,10 +26,10 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class CloudWorkloadSecurityAgentPolicyVersion {
   @JsonIgnore public boolean unparsed = false;
-  public static final String JSON_PROPERTY_DATE = "Date";
+  public static final String JSON_PROPERTY_DATE = "date";
   private JsonNullable<String> date = JsonNullable.<String>undefined();
 
-  public static final String JSON_PROPERTY_NAME = "Name";
+  public static final String JSON_PROPERTY_NAME = "name";
   private String name;
 
   public CloudWorkloadSecurityAgentPolicyVersion date(String date) {

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

@@ -32,7 +32,7 @@ public class CloudWorkloadSecurityAgentRuleAction {
   private String filter;
 
   public static final String JSON_PROPERTY_HASH = "hash";
-  private Map<String, Object> hash = null;
+  private CloudWorkloadSecurityAgentRuleActionHash hash;
 
   public static final String JSON_PROPERTY_KILL = "kill";
   private CloudWorkloadSecurityAgentRuleKill kill;
@@ -64,32 +64,25 @@ public void setFilter(String filter) {
     this.filter = filter;
   }
 
-  public CloudWorkloadSecurityAgentRuleAction hash(Map<String, Object> hash) {
+  public CloudWorkloadSecurityAgentRuleAction hash(CloudWorkloadSecurityAgentRuleActionHash hash) {
     this.hash = hash;
-    return this;
-  }
-
-  public CloudWorkloadSecurityAgentRuleAction putHashItem(String key, Object hashItem) {
-    if (this.hash == null) {
-      this.hash = new HashMap<>();
-    }
-    this.hash.put(key, hashItem);
+    this.unparsed |= hash.unparsed;
     return this;
   }
 
   /**
-   * An empty object indicating the hash action
+   * Hash file specified by the field attribute
    *
    * @return hash
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HASH)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public Map<String, Object> getHash() {
+  public CloudWorkloadSecurityAgentRuleActionHash getHash() {
     return hash;
   }
 
-  public void setHash(Map<String, Object> hash) {
+  public void setHash(CloudWorkloadSecurityAgentRuleActionHash hash) {
     this.hash = hash;
   }
 

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

@@ -0,0 +1,138 @@
+/*
+ * 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 2019-Present Datadog, Inc.
+ */
+
+package com.datadog.api.client.v2.model;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/** Hash file specified by the field attribute */
+@JsonPropertyOrder({CloudWorkloadSecurityAgentRuleActionHash.JSON_PROPERTY_FIELD})
+@jakarta.annotation.Generated(
+    value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
+public class CloudWorkloadSecurityAgentRuleActionHash {
+  @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_FIELD = "field";
+  private String field;
+
+  public CloudWorkloadSecurityAgentRuleActionHash field(String field) {
+    this.field = field;
+    return this;
+  }
+
+  /**
+   * The field of the hash action
+   *
+   * @return field
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_FIELD)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getField() {
+    return field;
+  }
+
+  public void setField(String field) {
+    this.field = field;
+  }
+
+  /**
+   * A container for additional, undeclared properties. This is a holder for any undeclared
+   * properties as specified with the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value. If the property
+   * does not already exist, create it otherwise replace it.
+   *
+   * @param key The arbitrary key to set
+   * @param value The associated value
+   * @return CloudWorkloadSecurityAgentRuleActionHash
+   */
+  @JsonAnySetter
+  public CloudWorkloadSecurityAgentRuleActionHash putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+      this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   *
+   * @return The additional properties
+   */
+  @JsonAnyGetter
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   *
+   * @param key The arbitrary key to get
+   * @return The specific additional property for the given key
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+      return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+  /** Return true if this CloudWorkloadSecurityAgentRuleActionHash object is equal to o. */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CloudWorkloadSecurityAgentRuleActionHash cloudWorkloadSecurityAgentRuleActionHash =
+        (CloudWorkloadSecurityAgentRuleActionHash) o;
+    return Objects.equals(this.field, cloudWorkloadSecurityAgentRuleActionHash.field)
+        && Objects.equals(
+            this.additionalProperties,
+            cloudWorkloadSecurityAgentRuleActionHash.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(field, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CloudWorkloadSecurityAgentRuleActionHash {\n");
+    sb.append("    field: ").append(toIndentedString(field)).append("\n");
+    sb.append("    additionalProperties: ")
+        .append(toIndentedString(additionalProperties))
+        .append("\n");
+    sb.append('}');
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}