Skip to content

Fix SCA OpenAPI drift #4229

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

Open
api-clients-generation-pipeline wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix SCA OpenAPI drift #4229

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
171 changes: 138 additions & 33 deletions .generator/schemas/v2/openapi.yaml
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 19 additions & 4 deletions examples/v2/static-analysis/CreateSCAResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItemsLocationsItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItemsLocationsItemsFilePosition;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItemsLocationsItemsNullableFilePosition;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesDependenciesItemsReachableSymbolPropertiesItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesFilesItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesRelationsItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesRepository;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesScanStartTimestamp;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesTags;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesTagsTool;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesTagsToolGenerator;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesVulnerabilitiesItems;
import com.datadog.api.client.v2.model.ScaRequestDataAttributesVulnerabilitiesItemsAffectsItems;
import com.datadog.api.client.v2.model.ScaRequestDataType;
Expand All @@ -36,6 +41,8 @@ public static void main(String[] args) {
.dependencies(
Collections.singletonList(
new ScaRequestDataAttributesDependenciesItems()
.group(null)
.isDirect(null)
.locations(
Collections.singletonList(
new ScaRequestDataAttributesDependenciesItemsLocationsItems()
Expand All @@ -46,32 +53,40 @@ public static void main(String[] args) {
.start(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition()))
.name(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsFilePosition()
new ScaRequestDataAttributesDependenciesItemsLocationsItemsNullableFilePosition()
.end(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition())
.start(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition()))
.namespace(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsFilePosition()
new ScaRequestDataAttributesDependenciesItemsLocationsItemsNullableFilePosition()
.end(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition())
.start(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition()))
.version(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsFilePosition()
new ScaRequestDataAttributesDependenciesItemsLocationsItemsNullableFilePosition()
.end(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition())
.start(
new ScaRequestDataAttributesDependenciesItemsLocationsItemsPosition()))))
.reachableSymbolProperties(
Collections.singletonList(
new ScaRequestDataAttributesDependenciesItemsReachableSymbolPropertiesItems()))))
new ScaRequestDataAttributesDependenciesItemsReachableSymbolPropertiesItems()))
.version(null)))
.files(
Collections.singletonList(new ScaRequestDataAttributesFilesItems()))
.relations(
Collections.singletonList(
new ScaRequestDataAttributesRelationsItems()))
.repository(new ScaRequestDataAttributesRepository())
.scanStartTimestamp(new ScaRequestDataAttributesScanStartTimestamp())
.tags(
new ScaRequestDataAttributesTags()
.tool(
new ScaRequestDataAttributesTagsTool()
.generator(
new ScaRequestDataAttributesTagsToolGenerator())))
.vulnerabilities(
Collections.singletonList(
new ScaRequestDataAttributesVulnerabilitiesItems()
Expand Down
67 changes: 54 additions & 13 deletions src/main/java/com/datadog/api/client/v2/model/ScaRequestDataAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.openapitools.jackson.nullable.JsonNullable;

/**
* The attributes of an SCA request, containing dependency graph data, vulnerability information,
Expand All @@ -29,6 +30,7 @@
ScaRequestDataAttributes.JSON_PROPERTY_FILES,
ScaRequestDataAttributes.JSON_PROPERTY_RELATIONS,
ScaRequestDataAttributes.JSON_PROPERTY_REPOSITORY,
ScaRequestDataAttributes.JSON_PROPERTY_SCAN_START_TIMESTAMP,
ScaRequestDataAttributes.JSON_PROPERTY_SERVICE,
ScaRequestDataAttributes.JSON_PROPERTY_TAGS,
ScaRequestDataAttributes.JSON_PROPERTY_VULNERABILITIES
Expand All @@ -55,11 +57,15 @@ public class ScaRequestDataAttributes {
public static final String JSON_PROPERTY_REPOSITORY = "repository";
private ScaRequestDataAttributesRepository repository;

public static final String JSON_PROPERTY_SCAN_START_TIMESTAMP = "scan_start_timestamp";
private JsonNullable<ScaRequestDataAttributesScanStartTimestamp> scanStartTimestamp =
JsonNullable.<ScaRequestDataAttributesScanStartTimestamp>undefined();

public static final String JSON_PROPERTY_SERVICE = "service";
private String service;

public static final String JSON_PROPERTY_TAGS = "tags";
private Map<String, String> tags = null;
private ScaRequestDataAttributesTags tags;

public static final String JSON_PROPERTY_VULNERABILITIES = "vulnerabilities";
private List<ScaRequestDataAttributesVulnerabilitiesItems> vulnerabilities = null;
Expand Down Expand Up @@ -260,6 +266,42 @@ public void setRepository(ScaRequestDataAttributesRepository repository) {
}
}

public ScaRequestDataAttributes scanStartTimestamp(
ScaRequestDataAttributesScanStartTimestamp scanStartTimestamp) {
this.scanStartTimestamp =
JsonNullable.<ScaRequestDataAttributesScanStartTimestamp>of(scanStartTimestamp);
return this;
}

/**
* The time when the SCA scan started.
*
* @return scanStartTimestamp
*/
@jakarta.annotation.Nullable
@JsonIgnore
public ScaRequestDataAttributesScanStartTimestamp getScanStartTimestamp() {
return scanStartTimestamp.orElse(null);
}

@JsonProperty(JSON_PROPERTY_SCAN_START_TIMESTAMP)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public JsonNullable<ScaRequestDataAttributesScanStartTimestamp>
getScanStartTimestamp_JsonNullable() {
return scanStartTimestamp;
}

@JsonProperty(JSON_PROPERTY_SCAN_START_TIMESTAMP)
public void setScanStartTimestamp_JsonNullable(
JsonNullable<ScaRequestDataAttributesScanStartTimestamp> scanStartTimestamp) {
this.scanStartTimestamp = scanStartTimestamp;
}

public void setScanStartTimestamp(ScaRequestDataAttributesScanStartTimestamp scanStartTimestamp) {
this.scanStartTimestamp =
JsonNullable.<ScaRequestDataAttributesScanStartTimestamp>of(scanStartTimestamp);
}

public ScaRequestDataAttributes service(String service) {
this.service = service;
return this;
Expand All @@ -281,33 +323,29 @@ public void setService(String service) {
this.service = service;
}

public ScaRequestDataAttributes tags(Map<String, String> tags) {
public ScaRequestDataAttributes tags(ScaRequestDataAttributesTags tags) {
this.tags = tags;
return this;
}

public ScaRequestDataAttributes putTagsItem(String key, String tagsItem) {
if (this.tags == null) {
this.tags = new HashMap<>();
}
this.tags.put(key, tagsItem);
this.unparsed |= tags.unparsed;
return this;
}

/**
* A map of key-value tags providing additional metadata for the SCA scan.
* A map of tags providing additional metadata for the SCA scan.
*
* @return tags
*/
@jakarta.annotation.Nullable
@JsonProperty(JSON_PROPERTY_TAGS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Map<String, String> getTags() {
public ScaRequestDataAttributesTags getTags() {
return tags;
}

public void setTags(Map<String, String> tags) {
public void setTags(ScaRequestDataAttributesTags tags) {
this.tags = tags;
if (tags != null) {
this.unparsed |= tags.unparsed;
}
}

public ScaRequestDataAttributes vulnerabilities(
Expand Down Expand Up @@ -415,6 +453,7 @@ public boolean equals(Object o) {
&& Objects.equals(this.files, scaRequestDataAttributes.files)
&& Objects.equals(this.relations, scaRequestDataAttributes.relations)
&& Objects.equals(this.repository, scaRequestDataAttributes.repository)
&& Objects.equals(this.scanStartTimestamp, scaRequestDataAttributes.scanStartTimestamp)
&& Objects.equals(this.service, scaRequestDataAttributes.service)
&& Objects.equals(this.tags, scaRequestDataAttributes.tags)
&& Objects.equals(this.vulnerabilities, scaRequestDataAttributes.vulnerabilities)
Expand All @@ -430,6 +469,7 @@ public int hashCode() {
files,
relations,
repository,
scanStartTimestamp,
service,
tags,
vulnerabilities,
Expand All @@ -446,6 +486,7 @@ public String toString() {
sb.append(" files: ").append(toIndentedString(files)).append("\n");
sb.append(" relations: ").append(toIndentedString(relations)).append("\n");
sb.append(" repository: ").append(toIndentedString(repository)).append("\n");
sb.append(" scanStartTimestamp: ").append(toIndentedString(scanStartTimestamp)).append("\n");
sb.append(" service: ").append(toIndentedString(service)).append("\n");
sb.append(" tags: ").append(toIndentedString(tags)).append("\n");
sb.append(" vulnerabilities: ").append(toIndentedString(vulnerabilities)).append("\n");
Expand Down
Loading
Loading