Skip to content

Commit 9ff78b6

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
[K9VULN-4477]: Remove Description and Icon URL as Required Fields From Get Framework (#2855)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent b1be2b4 commit 9ff78b6

File tree

116 files changed

+162
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+162
-202
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-05-13 09:46:01.892763",
8-
"spec_repo_commit": "767fe63b"
7+
"regenerated": "2025-05-13 17:47:35.388838",
8+
"spec_repo_commit": "b673a489"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-05-13 09:46:01.909982",
13-
"spec_repo_commit": "767fe63b"
12+
"regenerated": "2025-05-13 17:47:35.404525",
13+
"spec_repo_commit": "b673a489"
1414
}
1515
}
1616
}

.generator/schemas/v2/openapi.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10937,8 +10937,6 @@ components:
1093710937
- handle
1093810938
- version
1093910939
- name
10940-
- description
10941-
- icon_url
1094210940
type: object
1094310941
DORADeploymentRequest:
1094410942
description: Request to create a DORA deployment event.
@@ -15262,10 +15260,6 @@ components:
1526215260
FullCustomFrameworkDataAttributes:
1526315261
description: Full Framework Data Attributes.
1526415262
properties:
15265-
description:
15266-
description: Framework Description
15267-
example: this is a security framework
15268-
type: string
1526915263
handle:
1527015264
description: Framework Handle
1527115265
example: sec2
@@ -15291,8 +15285,6 @@ components:
1529115285
- handle
1529215286
- version
1529315287
- name
15294-
- description
15295-
- icon_url
1529615288
- requirements
1529715289
type: object
1529815290
GCPMetricNamespaceConfig:

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,10 @@ public CustomFrameworkWithoutRequirements() {}
4848

4949
@JsonCreator
5050
public CustomFrameworkWithoutRequirements(
51-
@JsonProperty(required = true, value = JSON_PROPERTY_DESCRIPTION) String description,
5251
@JsonProperty(required = true, value = JSON_PROPERTY_HANDLE) String handle,
53-
@JsonProperty(required = true, value = JSON_PROPERTY_ICON_URL) String iconUrl,
5452
@JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
5553
@JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
56-
this.description = description;
5754
this.handle = handle;
58-
this.iconUrl = iconUrl;
5955
this.name = name;
6056
this.version = version;
6157
}
@@ -70,8 +66,9 @@ public CustomFrameworkWithoutRequirements description(String description) {
7066
*
7167
* @return description
7268
*/
69+
@jakarta.annotation.Nullable
7370
@JsonProperty(JSON_PROPERTY_DESCRIPTION)
74-
@JsonInclude(value = JsonInclude.Include.ALWAYS)
71+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
7572
public String getDescription() {
7673
return description;
7774
}
@@ -110,8 +107,9 @@ public CustomFrameworkWithoutRequirements iconUrl(String iconUrl) {
110107
*
111108
* @return iconUrl
112109
*/
110+
@jakarta.annotation.Nullable
113111
@JsonProperty(JSON_PROPERTY_ICON_URL)
114-
@JsonInclude(value = JsonInclude.Include.ALWAYS)
112+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
115113
public String getIconUrl() {
116114
return iconUrl;
117115
}

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

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
/** Full Framework Data Attributes. */
2323
@JsonPropertyOrder({
24-
FullCustomFrameworkDataAttributes.JSON_PROPERTY_DESCRIPTION,
2524
FullCustomFrameworkDataAttributes.JSON_PROPERTY_HANDLE,
2625
FullCustomFrameworkDataAttributes.JSON_PROPERTY_ICON_URL,
2726
FullCustomFrameworkDataAttributes.JSON_PROPERTY_NAME,
@@ -32,9 +31,6 @@
3231
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
3332
public class FullCustomFrameworkDataAttributes {
3433
@JsonIgnore public boolean unparsed = false;
35-
public static final String JSON_PROPERTY_DESCRIPTION = "description";
36-
private String description;
37-
3834
public static final String JSON_PROPERTY_HANDLE = "handle";
3935
private String handle;
4036

@@ -54,41 +50,17 @@ public FullCustomFrameworkDataAttributes() {}
5450

5551
@JsonCreator
5652
public FullCustomFrameworkDataAttributes(
57-
@JsonProperty(required = true, value = JSON_PROPERTY_DESCRIPTION) String description,
5853
@JsonProperty(required = true, value = JSON_PROPERTY_HANDLE) String handle,
59-
@JsonProperty(required = true, value = JSON_PROPERTY_ICON_URL) String iconUrl,
6054
@JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
6155
@JsonProperty(required = true, value = JSON_PROPERTY_REQUIREMENTS)
6256
List<CustomFrameworkRequirement> requirements,
6357
@JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
64-
this.description = description;
6558
this.handle = handle;
66-
this.iconUrl = iconUrl;
6759
this.name = name;
6860
this.requirements = requirements;
6961
this.version = version;
7062
}
7163

72-
public FullCustomFrameworkDataAttributes description(String description) {
73-
this.description = description;
74-
return this;
75-
}
76-
77-
/**
78-
* Framework Description
79-
*
80-
* @return description
81-
*/
82-
@JsonProperty(JSON_PROPERTY_DESCRIPTION)
83-
@JsonInclude(value = JsonInclude.Include.ALWAYS)
84-
public String getDescription() {
85-
return description;
86-
}
87-
88-
public void setDescription(String description) {
89-
this.description = description;
90-
}
91-
9264
public FullCustomFrameworkDataAttributes handle(String handle) {
9365
this.handle = handle;
9466
return this;
@@ -119,8 +91,9 @@ public FullCustomFrameworkDataAttributes iconUrl(String iconUrl) {
11991
*
12092
* @return iconUrl
12193
*/
94+
@jakarta.annotation.Nullable
12295
@JsonProperty(JSON_PROPERTY_ICON_URL)
123-
@JsonInclude(value = JsonInclude.Include.ALWAYS)
96+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
12497
public String getIconUrl() {
12598
return iconUrl;
12699
}
@@ -257,8 +230,7 @@ public boolean equals(Object o) {
257230
}
258231
FullCustomFrameworkDataAttributes fullCustomFrameworkDataAttributes =
259232
(FullCustomFrameworkDataAttributes) o;
260-
return Objects.equals(this.description, fullCustomFrameworkDataAttributes.description)
261-
&& Objects.equals(this.handle, fullCustomFrameworkDataAttributes.handle)
233+
return Objects.equals(this.handle, fullCustomFrameworkDataAttributes.handle)
262234
&& Objects.equals(this.iconUrl, fullCustomFrameworkDataAttributes.iconUrl)
263235
&& Objects.equals(this.name, fullCustomFrameworkDataAttributes.name)
264236
&& Objects.equals(this.requirements, fullCustomFrameworkDataAttributes.requirements)
@@ -269,15 +241,13 @@ public boolean equals(Object o) {
269241

270242
@Override
271243
public int hashCode() {
272-
return Objects.hash(
273-
description, handle, iconUrl, name, requirements, version, additionalProperties);
244+
return Objects.hash(handle, iconUrl, name, requirements, version, additionalProperties);
274245
}
275246

276247
@Override
277248
public String toString() {
278249
StringBuilder sb = new StringBuilder();
279250
sb.append("class FullCustomFrameworkDataAttributes {\n");
280-
sb.append(" description: ").append(toIndentedString(description)).append("\n");
281251
sb.append(" handle: ").append(toIndentedString(handle)).append("\n");
282252
sb.append(" iconUrl: ").append(toIndentedString(iconUrl)).append("\n");
283253
sb.append(" name: ").append(toIndentedString(name)).append("\n");

src/test/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
"timeToLive": {
5454
"unlimited": true
5555
},
56-
"id": "af617072-2860-ba27-e045-b00c8baf0187"
56+
"id": "af617072-2860-ba27-e045-b00c8baf0188"
5757
}
5858
]

src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
"timeToLive": {
5454
"unlimited": true
5555
},
56-
"id": "af617072-2860-ba27-e045-b00c8baf0188"
56+
"id": "af617072-2860-ba27-e045-b00c8baf0187"
5757
}
5858
]

src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
"timeToLive": {
2929
"unlimited": true
3030
},
31-
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
31+
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
3232
}
3333
]

src/test/resources/cassettes/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
"timeToLive": {
2929
"unlimited": true
3030
},
31-
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
31+
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
3232
}
3333
]

src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"timeToLive": {
2424
"unlimited": true
2525
},
26-
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
26+
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
2727
}
2828
]

src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"timeToLive": {
2424
"unlimited": true
2525
},
26-
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
26+
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
2727
}
2828
]

0 commit comments

Comments
 (0)