Skip to content

[K9VULN-4477]: Remove Description and Icon URL as Required Fields From Get Framework #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
api-clients-generation-pipeline merged 1 commit into from
May 13, 2025
Merged

[K9VULN-4477]: Remove Description and Icon URL as Required Fields From Get Framework #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2025-05-13 09:46:01.892763",
"spec_repo_commit": "767fe63b"
"regenerated": "2025-05-13 17:47:35.388838",
"spec_repo_commit": "b673a489"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2025-05-13 09:46:01.909982",
"spec_repo_commit": "767fe63b"
"regenerated": "2025-05-13 17:47:35.404525",
"spec_repo_commit": "b673a489"
}
}
}
8 changes: 0 additions & 8 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10937,8 +10937,6 @@ components:
- handle
- version
- name
- description
- icon_url
type: object
DORADeploymentRequest:
description: Request to create a DORA deployment event.
Expand Down Expand Up @@ -15262,10 +15260,6 @@ components:
FullCustomFrameworkDataAttributes:
description: Full Framework Data Attributes.
properties:
description:
description: Framework Description
example: this is a security framework
type: string
handle:
description: Framework Handle
example: sec2
Expand All @@ -15291,8 +15285,6 @@ components:
- handle
- version
- name
- description
- icon_url
- requirements
type: object
GCPMetricNamespaceConfig:
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/com/datadog/api/client/v2/model/CustomFrameworkWithoutRequirements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,10 @@ public CustomFrameworkWithoutRequirements() {}

@JsonCreator
public CustomFrameworkWithoutRequirements(
@JsonProperty(required = true, value = JSON_PROPERTY_DESCRIPTION) String description,
@JsonProperty(required = true, value = JSON_PROPERTY_HANDLE) String handle,
@JsonProperty(required = true, value = JSON_PROPERTY_ICON_URL) String iconUrl,
@JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
@JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
this.description = description;
this.handle = handle;
this.iconUrl = iconUrl;
this.name = name;
this.version = version;
}
Expand All @@ -70,8 +66,9 @@ public CustomFrameworkWithoutRequirements description(String description) {
*
* @return description
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_DESCRIPTION)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getDescription() {
return description;
}
Expand Down Expand Up @@ -110,8 +107,9 @@ public CustomFrameworkWithoutRequirements iconUrl(String iconUrl) {
*
* @return iconUrl
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_ICON_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getIconUrl() {
return iconUrl;
}
Expand Down
38 changes: 4 additions & 34 deletions src/main/java/com/datadog/api/client/v2/model/FullCustomFrameworkDataAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

/** Full Framework Data Attributes. */
@JsonPropertyOrder({
FullCustomFrameworkDataAttributes.JSON_PROPERTY_DESCRIPTION,
FullCustomFrameworkDataAttributes.JSON_PROPERTY_HANDLE,
FullCustomFrameworkDataAttributes.JSON_PROPERTY_ICON_URL,
FullCustomFrameworkDataAttributes.JSON_PROPERTY_NAME,
Expand All @@ -32,9 +31,6 @@
value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
public class FullCustomFrameworkDataAttributes {
@JsonIgnore public boolean unparsed = false;
public static final String JSON_PROPERTY_DESCRIPTION = "description";
private String description;

public static final String JSON_PROPERTY_HANDLE = "handle";
private String handle;

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

@JsonCreator
public FullCustomFrameworkDataAttributes(
@JsonProperty(required = true, value = JSON_PROPERTY_DESCRIPTION) String description,
@JsonProperty(required = true, value = JSON_PROPERTY_HANDLE) String handle,
@JsonProperty(required = true, value = JSON_PROPERTY_ICON_URL) String iconUrl,
@JsonProperty(required = true, value = JSON_PROPERTY_NAME) String name,
@JsonProperty(required = true, value = JSON_PROPERTY_REQUIREMENTS)
List<CustomFrameworkRequirement> requirements,
@JsonProperty(required = true, value = JSON_PROPERTY_VERSION) String version) {
this.description = description;
this.handle = handle;
this.iconUrl = iconUrl;
this.name = name;
this.requirements = requirements;
this.version = version;
}

public FullCustomFrameworkDataAttributes description(String description) {
this.description = description;
return this;
}

/**
* Framework Description
*
* @return description
*/
@JsonProperty(JSON_PROPERTY_DESCRIPTION)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}

public FullCustomFrameworkDataAttributes handle(String handle) {
this.handle = handle;
return this;
Expand Down Expand Up @@ -119,8 +91,9 @@ public FullCustomFrameworkDataAttributes iconUrl(String iconUrl) {
*
* @return iconUrl
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_ICON_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public String getIconUrl() {
return iconUrl;
}
Expand Down Expand Up @@ -257,8 +230,7 @@ public boolean equals(Object o) {
}
FullCustomFrameworkDataAttributes fullCustomFrameworkDataAttributes =
(FullCustomFrameworkDataAttributes) o;
return Objects.equals(this.description, fullCustomFrameworkDataAttributes.description)
&& Objects.equals(this.handle, fullCustomFrameworkDataAttributes.handle)
return Objects.equals(this.handle, fullCustomFrameworkDataAttributes.handle)
&& Objects.equals(this.iconUrl, fullCustomFrameworkDataAttributes.iconUrl)
&& Objects.equals(this.name, fullCustomFrameworkDataAttributes.name)
&& Objects.equals(this.requirements, fullCustomFrameworkDataAttributes.requirements)
Expand All @@ -269,15 +241,13 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(
description, handle, iconUrl, name, requirements, version, additionalProperties);
return Objects.hash(handle, iconUrl, name, requirements, version, additionalProperties);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class FullCustomFrameworkDataAttributes {\n");
sb.append(" description: ").append(toIndentedString(description)).append("\n");
sb.append(" handle: ").append(toIndentedString(handle)).append("\n");
sb.append(" iconUrl: ").append(toIndentedString(iconUrl)).append("\n");
sb.append(" name: ").append(toIndentedString(name)).append("\n");
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/cassettes/features/v1/Create_a_user_returns_User_created_response_test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"timeToLive": {
"unlimited": true
},
"id": "af617072-2860-ba27-e045-b00c8baf0187"
"id": "af617072-2860-ba27-e045-b00c8baf0188"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Create_a_user_returns_null_access_role.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"timeToLive": {
"unlimited": true
},
"id": "af617072-2860-ba27-e045-b00c8baf0188"
"id": "af617072-2860-ba27-e045-b00c8baf0187"
}
]
2 changes: 1 addition & 1 deletion ...esources/cassettes/features/v1/Get_all_hosts_with_metadata_deserializes_successfully.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
}
]
2 changes: 1 addition & 1 deletion ...es/features/v1/Get_all_hosts_with_metadata_for_your_organization_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31e"
"id": "d5bade64-6ebb-4f4d-903d-8069b52bb31d"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Validate_API_key_returns_Forbidden_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v1/Validate_API_key_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f02"
"id": "3f83caea-c405-97df-c554-ee2d9f9e4f01"
}
]
2 changes: 1 addition & 1 deletion ...eatures/v2/AWS_Integration_Create_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d1"
"id": "c206b9cd-771e-14f0-5d18-42a3a48556d0"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...ettes/features/v2/AWS_Integration_Create_account_config_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba4"
"id": "f1ca6244-e46c-b3a2-86bf-65d4e9044ba5"
}
]
2 changes: 1 addition & 1 deletion ...assettes/features/v2/AWS_Integration_Create_account_config_returns_Conflict_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...settes/features/v2/AWS_Integration_Delete_account_config_returns_No_Content_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eea"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9ee9"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...ssettes/features/v2/AWS_Integration_Delete_account_config_returns_Not_Found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion .../v2/AWS_Integration_Generate_new_external_ID_returns_AWS_External_ID_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "a3ebb722-60eb-fa89-589a-ff3630e3a2cd"
"id": "a3ebb722-60eb-fa89-589a-ff3630e3a2ce"
}
]
2 changes: 1 addition & 1 deletion ...s/features/v2/AWS_Integration_Get_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eed"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...assettes/features/v2/AWS_Integration_Get_account_config_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "3d4d0603-9fed-1cc5-8004-086b9b6ef691"
"id": "3d4d0603-9fed-1cc5-8004-086b9b6ef690"
}
]
2 changes: 1 addition & 1 deletion .../cassettes/features/v2/AWS_Integration_Get_account_config_returns_Not_Found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d3"
"id": "9b33b83c-c8bb-714f-cf71-33ab2f3af9d4"
}
]
2 changes: 1 addition & 1 deletion ...WS_Integration_List_available_namespaces_returns_AWS_Namespaces_List_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d11"
}
]
2 changes: 1 addition & 1 deletion ...tures/v2/AWS_Integration_List_namespaces_returns_AWS_Namespaces_List_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"timeToLive": {
"unlimited": true
},
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0f"
"id": "d0ec7736-ef6c-d071-3390-4a5c3a301d0e"
}
]
2 changes: 1 addition & 1 deletion ...features/v2/AWS_Integration_Patch_account_config_returns_AWS_Account_object_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eee"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...settes/features/v2/AWS_Integration_Patch_account_config_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eeb"
"id": "194b15fb-fcae-9b9a-e1a7-0daa19dc9eec"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion ...assettes/features/v2/AWS_Integration_Patch_account_config_returns_Not_Found_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"timeToLive": {
"unlimited": true
},
"id": "6796bfb2-5496-6f6a-d702-4bc629b25992"
"id": "6796bfb2-5496-6f6a-d702-4bc629b25991"
}
]
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Archive_case_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a95"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8f"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Archive_case_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a90"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a92"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Assign_case_returns_Bad_Request_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8d"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a99"
},
{
"httpRequest": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/cassettes/features/v2/Assign_case_returns_OK_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"timeToLive": {
"unlimited": true
},
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a98"
"id": "0a6534d0-42f2-5075-64f8-7ab28f449a8d"
},
{
"httpRequest": {
Expand Down
Loading