diff --git a/.apigentools-info b/.apigentools-info index 92964f3fd8f..a1c26fa5bff 100644 --- a/.apigentools-info +++ b/.apigentools-info @@ -4,13 +4,13 @@ "spec_versions": { "v1": { "apigentools_version": "1.6.6", - "regenerated": "2024-12-12 14:27:18.507650", - "spec_repo_commit": "3ebe762b" + "regenerated": "2024-12-12 15:23:55.428002", + "spec_repo_commit": "222e1f81" }, "v2": { "apigentools_version": "1.6.6", - "regenerated": "2024-12-12 14:27:18.526897", - "spec_repo_commit": "3ebe762b" + "regenerated": "2024-12-12 15:23:55.483586", + "spec_repo_commit": "222e1f81" } } } \ No newline at end of file diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 6537e03408d..fd16447031f 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -4654,11 +4654,6 @@ components: description: Widget column field. example: content type: string - is_clustering_pattern_field_path: - description: Identifies the clustering pattern field column, usable only - with logs_pattern_stream. - example: true - type: boolean width: $ref: '#/components/schemas/ListStreamColumnWidth' required: diff --git a/examples/v1/dashboards/CreateDashboard_1039800684.java b/examples/v1/dashboards/CreateDashboard_1039800684.java index c8b75fc4a1d..676a0e613b8 100644 --- a/examples/v1/dashboards/CreateDashboard_1039800684.java +++ b/examples/v1/dashboards/CreateDashboard_1039800684.java @@ -45,8 +45,7 @@ public static void main(String[] args) { .field("timestamp"), new ListStreamColumn() .width(ListStreamColumnWidth.AUTO) - .field("message") - .isClusteringPatternFieldPath(true))) + .field("message"))) .query( new ListStreamQuery() .dataSource( diff --git a/src/main/java/com/datadog/api/client/v1/model/ListStreamColumn.java b/src/main/java/com/datadog/api/client/v1/model/ListStreamColumn.java index 49a867f91e7..278f1c50107 100644 --- a/src/main/java/com/datadog/api/client/v1/model/ListStreamColumn.java +++ b/src/main/java/com/datadog/api/client/v1/model/ListStreamColumn.java @@ -18,11 +18,7 @@ import java.util.Objects; /** Widget column. */ -@JsonPropertyOrder({ - ListStreamColumn.JSON_PROPERTY_FIELD, - ListStreamColumn.JSON_PROPERTY_IS_CLUSTERING_PATTERN_FIELD_PATH, - ListStreamColumn.JSON_PROPERTY_WIDTH -}) +@JsonPropertyOrder({ListStreamColumn.JSON_PROPERTY_FIELD, ListStreamColumn.JSON_PROPERTY_WIDTH}) @jakarta.annotation.Generated( value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator") public class ListStreamColumn { @@ -30,10 +26,6 @@ public class ListStreamColumn { public static final String JSON_PROPERTY_FIELD = "field"; private String field; - public static final String JSON_PROPERTY_IS_CLUSTERING_PATTERN_FIELD_PATH = - "is_clustering_pattern_field_path"; - private Boolean isClusteringPatternFieldPath; - public static final String JSON_PROPERTY_WIDTH = "width"; private ListStreamColumnWidth width; @@ -68,27 +60,6 @@ public void setField(String field) { this.field = field; } - public ListStreamColumn isClusteringPatternFieldPath(Boolean isClusteringPatternFieldPath) { - this.isClusteringPatternFieldPath = isClusteringPatternFieldPath; - return this; - } - - /** - * Identifies the clustering pattern field column, usable only with logs_pattern_stream. - * - * @return isClusteringPatternFieldPath - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_IS_CLUSTERING_PATTERN_FIELD_PATH) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public Boolean getIsClusteringPatternFieldPath() { - return isClusteringPatternFieldPath; - } - - public void setIsClusteringPatternFieldPath(Boolean isClusteringPatternFieldPath) { - this.isClusteringPatternFieldPath = isClusteringPatternFieldPath; - } - public ListStreamColumn width(ListStreamColumnWidth width) { this.width = width; this.unparsed |= !width.isValid(); @@ -170,15 +141,13 @@ public boolean equals(Object o) { } ListStreamColumn listStreamColumn = (ListStreamColumn) o; return Objects.equals(this.field, listStreamColumn.field) - && Objects.equals( - this.isClusteringPatternFieldPath, listStreamColumn.isClusteringPatternFieldPath) && Objects.equals(this.width, listStreamColumn.width) && Objects.equals(this.additionalProperties, listStreamColumn.additionalProperties); } @Override public int hashCode() { - return Objects.hash(field, isClusteringPatternFieldPath, width, additionalProperties); + return Objects.hash(field, width, additionalProperties); } @Override @@ -186,9 +155,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ListStreamColumn {\n"); sb.append(" field: ").append(toIndentedString(field)).append("\n"); - sb.append(" isClusteringPatternFieldPath: ") - .append(toIndentedString(isClusteringPatternFieldPath)) - .append("\n"); sb.append(" width: ").append(toIndentedString(width)).append("\n"); sb.append(" additionalProperties: ") .append(toIndentedString(additionalProperties)) diff --git a/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.freeze b/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.freeze index f275079feea..7adcfc7197a 100644 --- a/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.freeze +++ b/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.freeze @@ -1 +1 @@ -2024-11-20T19:43:46.485Z \ No newline at end of file +2024-12-11T19:18:02.796Z \ No newline at end of file diff --git a/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.json b/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.json index ba7caff75cf..daab49f2525 100644 --- a/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.json +++ b/src/test/resources/cassettes/features/v1/Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget.json @@ -3,7 +3,7 @@ "httpRequest": { "body": { "type": "JSON", - "json": "{\"layout_type\":\"ordered\",\"title\":\"Test-Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget-1732131826 with list_stream widget\",\"widgets\":[{\"definition\":{\"requests\":[{\"columns\":[{\"field\":\"timestamp\",\"width\":\"auto\"},{\"field\":\"message\",\"is_clustering_pattern_field_path\":true,\"width\":\"auto\"}],\"query\":{\"clustering_pattern_field_path\":\"message\",\"data_source\":\"logs_pattern_stream\",\"group_by\":[{\"facet\":\"service\"}],\"query_string\":\"\"},\"response_format\":\"event_list\"}],\"type\":\"list_stream\"}}]}" + "json": "{\"layout_type\":\"ordered\",\"title\":\"Test-Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget-1733944682 with list_stream widget\",\"widgets\":[{\"definition\":{\"requests\":[{\"columns\":[{\"field\":\"timestamp\",\"width\":\"auto\"},{\"field\":\"message\",\"width\":\"auto\"}],\"query\":{\"clustering_pattern_field_path\":\"message\",\"data_source\":\"logs_pattern_stream\",\"group_by\":[{\"facet\":\"service\"}],\"query_string\":\"\"},\"response_format\":\"event_list\"}],\"type\":\"list_stream\"}}]}" }, "headers": {}, "method": "POST", @@ -12,7 +12,7 @@ "secure": true }, "httpResponse": { - "body": "{\"id\":\"r75-hd7-sd9\",\"title\":\"Test-Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget-1732131826 with list_stream widget\",\"description\":null,\"author_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"author_name\":\"CI Account\",\"layout_type\":\"ordered\",\"url\":\"/dashboard/r75-hd7-sd9/test-createanewdashboardwithlogspatternstreamliststreamwidget-1732131826-with-li\",\"is_read_only\":false,\"template_variables\":null,\"widgets\":[{\"definition\":{\"requests\":[{\"columns\":[{\"field\":\"timestamp\",\"width\":\"auto\"},{\"field\":\"message\",\"is_clustering_pattern_field_path\":true,\"width\":\"auto\"}],\"query\":{\"clustering_pattern_field_path\":\"message\",\"data_source\":\"logs_pattern_stream\",\"group_by\":[{\"facet\":\"service\"}],\"query_string\":\"\"},\"response_format\":\"event_list\"}],\"type\":\"list_stream\"},\"id\":6154246442450384}],\"notify_list\":null,\"created_at\":\"2024-11-20T19:43:46.871965+00:00\",\"modified_at\":\"2024-11-20T19:43:46.871965+00:00\",\"restricted_roles\":[]}\n", + "body": "{\"id\":\"fue-7tr-ubw\",\"title\":\"Test-Create_a_new_dashboard_with_logs_pattern_stream_list_stream_widget-1733944682 with list_stream widget\",\"description\":null,\"author_handle\":\"9919ec9b-ebc7-49ee-8dc8-03626e717cca\",\"author_name\":\"CI Account\",\"layout_type\":\"ordered\",\"url\":\"/dashboard/fue-7tr-ubw/test-createanewdashboardwithlogspatternstreamliststreamwidget-1733944682-with-li\",\"is_read_only\":false,\"template_variables\":null,\"widgets\":[{\"definition\":{\"requests\":[{\"columns\":[{\"field\":\"timestamp\",\"width\":\"auto\"},{\"field\":\"message\",\"width\":\"auto\"}],\"query\":{\"clustering_pattern_field_path\":\"message\",\"data_source\":\"logs_pattern_stream\",\"group_by\":[{\"facet\":\"service\"}],\"query_string\":\"\"},\"response_format\":\"event_list\"}],\"type\":\"list_stream\"},\"id\":4674889262305585}],\"notify_list\":null,\"created_at\":\"2024-12-11T19:18:03.039937+00:00\",\"modified_at\":\"2024-12-11T19:18:03.039937+00:00\",\"restricted_roles\":[]}\n", "headers": { "Content-Type": [ "application/json" @@ -27,18 +27,18 @@ "timeToLive": { "unlimited": true }, - "id": "efba31bd-b3f1-473f-e30b-1697b2cc04b1" + "id": "ae4564ca-0ff7-f493-3223-c9bf59642d26" }, { "httpRequest": { "headers": {}, "method": "DELETE", - "path": "/api/v1/dashboard/r75-hd7-sd9", + "path": "/api/v1/dashboard/fue-7tr-ubw", "keepAlive": false, "secure": true }, "httpResponse": { - "body": "{\"deleted_dashboard_id\":\"r75-hd7-sd9\"}\n", + "body": "{\"deleted_dashboard_id\":\"fue-7tr-ubw\"}\n", "headers": { "Content-Type": [ "application/json" @@ -53,6 +53,6 @@ "timeToLive": { "unlimited": true }, - "id": "d71f08f7-6763-c0e7-e498-162bb5fc9fea" + "id": "6f623174-c3b7-b7f8-f17e-f055a28e2d98" } ] \ No newline at end of file diff --git a/src/test/resources/com/datadog/api/client/v1/api/dashboards.feature b/src/test/resources/com/datadog/api/client/v1/api/dashboards.feature index 208a4dd3966..ebcfc7a25bb 100644 --- a/src/test/resources/com/datadog/api/client/v1/api/dashboards.feature +++ b/src/test/resources/com/datadog/api/client/v1/api/dashboards.feature @@ -534,7 +534,7 @@ Feature: Dashboards @team:DataDog/dashboards-backend Scenario: Create a new dashboard with logs_pattern_stream list_stream widget Given new "CreateDashboard" request - And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"},{"width":"auto","field":"message", "is_clustering_pattern_field_path": true}],"query":{"data_source":"logs_pattern_stream","query_string":"","clustering_pattern_field_path":"message","group_by":[{"facet":"service"}]}, "response_format":"event_list"}]}}]} + And body with value {"layout_type": "ordered", "title": "{{ unique }} with list_stream widget","widgets": [{"definition": {"type": "list_stream","requests": [{"columns":[{"width":"auto","field":"timestamp"},{"width":"auto","field":"message"}],"query":{"data_source":"logs_pattern_stream","query_string":"","clustering_pattern_field_path":"message","group_by":[{"facet":"service"}]}, "response_format":"event_list"}]}}]} When the request is sent Then the response status is 200 OK And the response "widgets[0].definition.requests[0].query.data_source" is equal to "logs_pattern_stream"