Skip to content

Commit a10dde7

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Revert "Add tags and description to logs pipelines (#3424)" (#2648)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 9edbc1a commit a10dde7

File tree

4 files changed

+10
-90
lines changed

4 files changed

+10
-90
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2025-01-10 22:21:35.663663",
8-
"spec_repo_commit": "2f8c42a8"
7+
"regenerated": "2025-01-13 17:10:06.419911",
8+
"spec_repo_commit": "be17a7b8"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-01-10 22:21:35.678588",
13-
"spec_repo_commit": "2f8c42a8"
12+
"regenerated": "2025-01-13 17:10:06.435212",
13+
"spec_repo_commit": "be17a7b8"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5926,9 +5926,6 @@ components:
59265926

59275927
Make sure to use an application key created by an admin.'
59285928
properties:
5929-
description:
5930-
description: A description of the pipeline.
5931-
type: string
59325929
filter:
59335930
$ref: '#/components/schemas/LogsFilter'
59345931
id:
@@ -5951,12 +5948,6 @@ components:
59515948
items:
59525949
$ref: '#/components/schemas/LogsProcessor'
59535950
type: array
5954-
tags:
5955-
description: A list of tags associated with the pipeline.
5956-
items:
5957-
description: A single tag using the format `key:value`.
5958-
type: string
5959-
type: array
59605951
type:
59615952
description: Type of pipeline.
59625953
example: pipeline

src/main/java/com/datadog/api/client/v1/model/LogsPipeline.java

Lines changed: 2 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,18 @@
2727
* application key created by an admin.
2828
*/
2929
@JsonPropertyOrder({
30-
LogsPipeline.JSON_PROPERTY_DESCRIPTION,
3130
LogsPipeline.JSON_PROPERTY_FILTER,
3231
LogsPipeline.JSON_PROPERTY_ID,
3332
LogsPipeline.JSON_PROPERTY_IS_ENABLED,
3433
LogsPipeline.JSON_PROPERTY_IS_READ_ONLY,
3534
LogsPipeline.JSON_PROPERTY_NAME,
3635
LogsPipeline.JSON_PROPERTY_PROCESSORS,
37-
LogsPipeline.JSON_PROPERTY_TAGS,
3836
LogsPipeline.JSON_PROPERTY_TYPE
3937
})
4038
@jakarta.annotation.Generated(
4139
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
4240
public class LogsPipeline {
4341
@JsonIgnore public boolean unparsed = false;
44-
public static final String JSON_PROPERTY_DESCRIPTION = "description";
45-
private String description;
46-
4742
public static final String JSON_PROPERTY_FILTER = "filter";
4843
private LogsFilter filter;
4944

@@ -62,9 +57,6 @@ public class LogsPipeline {
6257
public static final String JSON_PROPERTY_PROCESSORS = "processors";
6358
private List<LogsProcessor> processors = null;
6459

65-
public static final String JSON_PROPERTY_TAGS = "tags";
66-
private List<String> tags = null;
67-
6860
public static final String JSON_PROPERTY_TYPE = "type";
6961
private String type;
7062

@@ -75,27 +67,6 @@ public LogsPipeline(@JsonProperty(required = true, value = JSON_PROPERTY_NAME) S
7567
this.name = name;
7668
}
7769

78-
public LogsPipeline description(String description) {
79-
this.description = description;
80-
return this;
81-
}
82-
83-
/**
84-
* A description of the pipeline.
85-
*
86-
* @return description
87-
*/
88-
@jakarta.annotation.Nullable
89-
@JsonProperty(JSON_PROPERTY_DESCRIPTION)
90-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
91-
public String getDescription() {
92-
return description;
93-
}
94-
95-
public void setDescription(String description) {
96-
this.description = description;
97-
}
98-
9970
public LogsPipeline filter(LogsFilter filter) {
10071
this.filter = filter;
10172
this.unparsed |= filter.unparsed;
@@ -216,35 +187,6 @@ public void setProcessors(List<LogsProcessor> processors) {
216187
this.processors = processors;
217188
}
218189

219-
public LogsPipeline tags(List<String> tags) {
220-
this.tags = tags;
221-
return this;
222-
}
223-
224-
public LogsPipeline addTagsItem(String tagsItem) {
225-
if (this.tags == null) {
226-
this.tags = new ArrayList<>();
227-
}
228-
this.tags.add(tagsItem);
229-
return this;
230-
}
231-
232-
/**
233-
* A list of tags associated with the pipeline.
234-
*
235-
* @return tags
236-
*/
237-
@jakarta.annotation.Nullable
238-
@JsonProperty(JSON_PROPERTY_TAGS)
239-
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
240-
public List<String> getTags() {
241-
return tags;
242-
}
243-
244-
public void setTags(List<String> tags) {
245-
this.tags = tags;
246-
}
247-
248190
/**
249191
* Type of pipeline.
250192
*
@@ -313,45 +255,32 @@ public boolean equals(Object o) {
313255
return false;
314256
}
315257
LogsPipeline logsPipeline = (LogsPipeline) o;
316-
return Objects.equals(this.description, logsPipeline.description)
317-
&& Objects.equals(this.filter, logsPipeline.filter)
258+
return Objects.equals(this.filter, logsPipeline.filter)
318259
&& Objects.equals(this.id, logsPipeline.id)
319260
&& Objects.equals(this.isEnabled, logsPipeline.isEnabled)
320261
&& Objects.equals(this.isReadOnly, logsPipeline.isReadOnly)
321262
&& Objects.equals(this.name, logsPipeline.name)
322263
&& Objects.equals(this.processors, logsPipeline.processors)
323-
&& Objects.equals(this.tags, logsPipeline.tags)
324264
&& Objects.equals(this.type, logsPipeline.type)
325265
&& Objects.equals(this.additionalProperties, logsPipeline.additionalProperties);
326266
}
327267

328268
@Override
329269
public int hashCode() {
330270
return Objects.hash(
331-
description,
332-
filter,
333-
id,
334-
isEnabled,
335-
isReadOnly,
336-
name,
337-
processors,
338-
tags,
339-
type,
340-
additionalProperties);
271+
filter, id, isEnabled, isReadOnly, name, processors, type, additionalProperties);
341272
}
342273

343274
@Override
344275
public String toString() {
345276
StringBuilder sb = new StringBuilder();
346277
sb.append("class LogsPipeline {\n");
347-
sb.append(" description: ").append(toIndentedString(description)).append("\n");
348278
sb.append(" filter: ").append(toIndentedString(filter)).append("\n");
349279
sb.append(" id: ").append(toIndentedString(id)).append("\n");
350280
sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n");
351281
sb.append(" isReadOnly: ").append(toIndentedString(isReadOnly)).append("\n");
352282
sb.append(" name: ").append(toIndentedString(name)).append("\n");
353283
sb.append(" processors: ").append(toIndentedString(processors)).append("\n");
354-
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
355284
sb.append(" type: ").append(toIndentedString(type)).append("\n");
356285
sb.append(" additionalProperties: ")
357286
.append(toIndentedString(additionalProperties))

src/test/resources/com/datadog/api/client/v1/api/logs_pipelines.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Feature: Logs Pipelines
2626
@generated @skip @team:DataDog/event-platform-experience
2727
Scenario: Create a pipeline returns "Bad Request" response
2828
Given new "CreateLogsPipeline" request
29-
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
29+
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}]}
3030
When the request is sent
3131
Then the response status is 400 Bad Request
3232

3333
@generated @skip @team:DataDog/event-platform-experience
3434
Scenario: Create a pipeline returns "OK" response
3535
Given new "CreateLogsPipeline" request
36-
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
36+
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}]}
3737
When the request is sent
3838
Then the response status is 200 OK
3939

@@ -81,15 +81,15 @@ Feature: Logs Pipelines
8181
Scenario: Update a pipeline returns "Bad Request" response
8282
Given new "UpdateLogsPipeline" request
8383
And request contains "pipeline_id" parameter from "REPLACE.ME"
84-
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
84+
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}]}
8585
When the request is sent
8686
Then the response status is 400 Bad Request
8787

8888
@generated @skip @team:DataDog/event-platform-experience
8989
Scenario: Update a pipeline returns "OK" response
9090
Given new "UpdateLogsPipeline" request
9191
And request contains "pipeline_id" parameter from "REPLACE.ME"
92-
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}], "tags": []}
92+
And body with value {"filter": {"query": "source:python"}, "name": "", "processors": [{"grok": {"match_rules": "rule_name_1 foo\nrule_name_2 bar\n", "support_rules": "rule_name_1 foo\nrule_name_2 bar\n"}, "is_enabled": false, "samples": [], "source": "message", "type": "grok-parser"}]}
9393
When the request is sent
9494
Then the response status is 200 OK
9595

0 commit comments

Comments
 (0)