Regenerate client from commit ad5455ac of spec repo

DataDog · Aug 14, 2023 · bb83e65 · bb83e65
1 parent a71520f
commit bb83e65
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 13 deletions.
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-08-11 18:45:42.989487",
-            "spec_repo_commit": "54e2961f"
+            "regenerated": "2023-08-14 18:43:46.574452",
+            "spec_repo_commit": "ad5455ac"
         },
         "v2": {
             "apigentools_version": "1.6.5",
-            "regenerated": "2023-08-11 18:45:43.006040",
-            "spec_repo_commit": "54e2961f"
+            "regenerated": "2023-08-14 18:43:46.589534",
+            "spec_repo_commit": "ad5455ac"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -647,6 +647,14 @@ components:
     AzureAccount:
       description: Datadog-Azure integrations configured for your organization.
       properties:
+        app_service_plan_filters:
+          description: 'Limit the Azure app service plans that are pulled into Datadog
+            using tags.
+
+            Only app service plans that match one of the defined tags are imported
+            into Datadog.'
+          example: key:value,filter:example
+          type: string
         automute:
           description: Silence monitors for expected Azure VM shutdowns.
           example: true
@@ -659,6 +667,15 @@ components:
           description: Your Azure web application secret key.
           example: testingx./Sw*g/Y33t..R1cH+hScMDt
           type: string
+        cspm_enabled:
+          description: Enable Cloud Security Management Misconfigurations for your
+            organization.
+          example: true
+          type: boolean
+        custom_metrics_enabled:
+          description: Enable custom metrics for your organization.
+          example: true
+          type: boolean
         errors:
           description: Errors in your configuration.
           example:

diff --git a/examples/v1/azure-integration/CreateAzureIntegration.java b/examples/v1/azure-integration/CreateAzureIntegration.java
@@ -13,9 +13,12 @@ public static void main(String[] args) {
 
     AzureAccount body =
         new AzureAccount()
+            .appServicePlanFilters("key:value,filter:example")
             .automute(true)
             .clientId("testc7f6-1234-5678-9101-3fcbf464test")
             .clientSecret("testingx./Sw*g/Y33t..R1cH+hScMDt")
+            .cspmEnabled(true)
+            .customMetricsEnabled(true)
             .errors(Collections.singletonList("*"))
             .hostFilters("key:value,filter:example")
             .newClientId("new1c7f6-1234-5678-9101-3fcbf464test")

diff --git a/examples/v1/azure-integration/DeleteAzureIntegration.java b/examples/v1/azure-integration/DeleteAzureIntegration.java
@@ -13,9 +13,12 @@ public static void main(String[] args) {
 
     AzureAccount body =
         new AzureAccount()
+            .appServicePlanFilters("key:value,filter:example")
             .automute(true)
             .clientId("testc7f6-1234-5678-9101-3fcbf464test")
             .clientSecret("testingx./Sw*g/Y33t..R1cH+hScMDt")
+            .cspmEnabled(true)
+            .customMetricsEnabled(true)
             .errors(Collections.singletonList("*"))
             .hostFilters("key:value,filter:example")
             .newClientId("new1c7f6-1234-5678-9101-3fcbf464test")

diff --git a/examples/v1/azure-integration/UpdateAzureHostFilters.java b/examples/v1/azure-integration/UpdateAzureHostFilters.java
@@ -13,9 +13,12 @@ public static void main(String[] args) {
 
     AzureAccount body =
         new AzureAccount()
+            .appServicePlanFilters("key:value,filter:example")
             .automute(true)
             .clientId("testc7f6-1234-5678-9101-3fcbf464test")
             .clientSecret("testingx./Sw*g/Y33t..R1cH+hScMDt")
+            .cspmEnabled(true)
+            .customMetricsEnabled(true)
             .errors(Collections.singletonList("*"))
             .hostFilters("key:value,filter:example")
             .newClientId("new1c7f6-1234-5678-9101-3fcbf464test")

diff --git a/examples/v1/azure-integration/UpdateAzureIntegration.java b/examples/v1/azure-integration/UpdateAzureIntegration.java
@@ -13,9 +13,12 @@ public static void main(String[] args) {
 
     AzureAccount body =
         new AzureAccount()
+            .appServicePlanFilters("key:value,filter:example")
             .automute(true)
             .clientId("testc7f6-1234-5678-9101-3fcbf464test")
             .clientSecret("testingx./Sw*g/Y33t..R1cH+hScMDt")
+            .cspmEnabled(true)
+            .customMetricsEnabled(true)
             .errors(Collections.singletonList("*"))
             .hostFilters("key:value,filter:example")
             .newClientId("new1c7f6-1234-5678-9101-3fcbf464test")

diff --git a/src/main/java/com/datadog/api/client/v1/model/AzureAccount.java b/src/main/java/com/datadog/api/client/v1/model/AzureAccount.java
@@ -20,9 +20,12 @@
 
 /** Datadog-Azure integrations configured for your organization. */
 @JsonPropertyOrder({
+  AzureAccount.JSON_PROPERTY_APP_SERVICE_PLAN_FILTERS,
   AzureAccount.JSON_PROPERTY_AUTOMUTE,
   AzureAccount.JSON_PROPERTY_CLIENT_ID,
   AzureAccount.JSON_PROPERTY_CLIENT_SECRET,
+  AzureAccount.JSON_PROPERTY_CSPM_ENABLED,
+  AzureAccount.JSON_PROPERTY_CUSTOM_METRICS_ENABLED,
   AzureAccount.JSON_PROPERTY_ERRORS,
   AzureAccount.JSON_PROPERTY_HOST_FILTERS,
   AzureAccount.JSON_PROPERTY_NEW_CLIENT_ID,
@@ -33,6 +36,9 @@
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
 public class AzureAccount {
   @JsonIgnore public boolean unparsed = false;
+  public static final String JSON_PROPERTY_APP_SERVICE_PLAN_FILTERS = "app_service_plan_filters";
+  private String appServicePlanFilters;
+
   public static final String JSON_PROPERTY_AUTOMUTE = "automute";
   private Boolean automute;
 
@@ -42,6 +48,12 @@ public class AzureAccount {
   public static final String JSON_PROPERTY_CLIENT_SECRET = "client_secret";
   private String clientSecret;
 
+  public static final String JSON_PROPERTY_CSPM_ENABLED = "cspm_enabled";
+  private Boolean cspmEnabled;
+
+  public static final String JSON_PROPERTY_CUSTOM_METRICS_ENABLED = "custom_metrics_enabled";
+  private Boolean customMetricsEnabled;
+
   public static final String JSON_PROPERTY_ERRORS = "errors";
   private List<String> errors = null;
 
@@ -57,6 +69,28 @@ public class AzureAccount {
   public static final String JSON_PROPERTY_TENANT_NAME = "tenant_name";
   private String tenantName;
 
+  public AzureAccount appServicePlanFilters(String appServicePlanFilters) {
+    this.appServicePlanFilters = appServicePlanFilters;
+    return this;
+  }
+
+  /**
+   * Limit the Azure app service plans that are pulled into Datadog using tags. Only app service
+   * plans that match one of the defined tags are imported into Datadog.
+   *
+   * @return appServicePlanFilters
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_APP_SERVICE_PLAN_FILTERS)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public String getAppServicePlanFilters() {
+    return appServicePlanFilters;
+  }
+
+  public void setAppServicePlanFilters(String appServicePlanFilters) {
+    this.appServicePlanFilters = appServicePlanFilters;
+  }
+
   public AzureAccount automute(Boolean automute) {
     this.automute = automute;
     return this;
@@ -120,6 +154,48 @@ public void setClientSecret(String clientSecret) {
     this.clientSecret = clientSecret;
   }
 
+  public AzureAccount cspmEnabled(Boolean cspmEnabled) {
+    this.cspmEnabled = cspmEnabled;
+    return this;
+  }
+
+  /**
+   * Enable Cloud Security Management Misconfigurations for your organization.
+   *
+   * @return cspmEnabled
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CSPM_ENABLED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getCspmEnabled() {
+    return cspmEnabled;
+  }
+
+  public void setCspmEnabled(Boolean cspmEnabled) {
+    this.cspmEnabled = cspmEnabled;
+  }
+
+  public AzureAccount customMetricsEnabled(Boolean customMetricsEnabled) {
+    this.customMetricsEnabled = customMetricsEnabled;
+    return this;
+  }
+
+  /**
+   * Enable custom metrics for your organization.
+   *
+   * @return customMetricsEnabled
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_CUSTOM_METRICS_ENABLED)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Boolean getCustomMetricsEnabled() {
+    return customMetricsEnabled;
+  }
+
+  public void setCustomMetricsEnabled(Boolean customMetricsEnabled) {
+    this.customMetricsEnabled = customMetricsEnabled;
+  }
+
   public AzureAccount errors(List<String> errors) {
     this.errors = errors;
     return this;
@@ -290,9 +366,12 @@ public boolean equals(Object o) {
       return false;
     }
     AzureAccount azureAccount = (AzureAccount) o;
-    return Objects.equals(this.automute, azureAccount.automute)
+    return Objects.equals(this.appServicePlanFilters, azureAccount.appServicePlanFilters)
+        && Objects.equals(this.automute, azureAccount.automute)
         && Objects.equals(this.clientId, azureAccount.clientId)
         && Objects.equals(this.clientSecret, azureAccount.clientSecret)
+        && Objects.equals(this.cspmEnabled, azureAccount.cspmEnabled)
+        && Objects.equals(this.customMetricsEnabled, azureAccount.customMetricsEnabled)
         && Objects.equals(this.errors, azureAccount.errors)
         && Objects.equals(this.hostFilters, azureAccount.hostFilters)
         && Objects.equals(this.newClientId, azureAccount.newClientId)
@@ -304,9 +383,12 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(
+        appServicePlanFilters,
         automute,
         clientId,
         clientSecret,
+        cspmEnabled,
+        customMetricsEnabled,
         errors,
         hostFilters,
         newClientId,
@@ -319,9 +401,16 @@ public int hashCode() {
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AzureAccount {\n");
+    sb.append("    appServicePlanFilters: ")
+        .append(toIndentedString(appServicePlanFilters))
+        .append("\n");
     sb.append("    automute: ").append(toIndentedString(automute)).append("\n");
     sb.append("    clientId: ").append(toIndentedString(clientId)).append("\n");
     sb.append("    clientSecret: ").append(toIndentedString(clientSecret)).append("\n");
+    sb.append("    cspmEnabled: ").append(toIndentedString(cspmEnabled)).append("\n");
+    sb.append("    customMetricsEnabled: ")
+        .append(toIndentedString(customMetricsEnabled))
+        .append("\n");
     sb.append("    errors: ").append(toIndentedString(errors)).append("\n");
     sb.append("    hostFilters: ").append(toIndentedString(hostFilters)).append("\n");
     sb.append("    newClientId: ").append(toIndentedString(newClientId)).append("\n");

diff --git a/src/test/resources/com/datadog/api/client/v1/api/azure_integration.feature b/src/test/resources/com/datadog/api/client/v1/api/azure_integration.feature
@@ -12,28 +12,28 @@ Feature: Azure Integration
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Create an Azure integration returns "Bad Request" response
     Given new "CreateAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Create an Azure integration returns "OK" response
     Given new "CreateAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Delete an Azure integration returns "Bad Request" response
     Given new "DeleteAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Delete an Azure integration returns "OK" response
     Given new "DeleteAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 200 OK
 
@@ -52,27 +52,27 @@ Feature: Azure Integration
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update Azure integration host filters returns "Bad Request" response
     Given new "UpdateAzureHostFilters" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update Azure integration host filters returns "OK" response
     Given new "UpdateAzureHostFilters" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 200 OK
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update an Azure integration returns "Bad Request" response
     Given new "UpdateAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 400 Bad Request
 
   @generated @skip @team:DataDog/cloud-integrations
   Scenario: Update an Azure integration returns "OK" response
     Given new "UpdateAzureIntegration" request
-    And body with value {"automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
+    And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "testingx./Sw*g/Y33t..R1cH+hScMDt", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
     When the request is sent
     Then the response status is 200 OK