Skip to content

feat: adjust parsing of syft options #1487

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
goldmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: adjust parsing of syft options #1487

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
4 changes: 2 additions & 2 deletions service/src/main/java/org/jboss/sbomer/service/nextgen/core/dto/api/GeneratorConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.jboss.sbomer.service.nextgen.core.dto.api;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

/**
* Generator configuration.
Expand All @@ -27,5 +27,5 @@
* @param format Requested manifest format
* @param options Custom options for generator
*/
public record GeneratorConfig(Resources resources, String format, JsonNode options) {
public record GeneratorConfig(Resources resources, String format, ObjectNode options) {
}
17 changes: 2 additions & 15 deletions service/src/main/java/org/jboss/sbomer/service/nextgen/generator/syft/SyftGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.jboss.sbomer.core.errors.ApplicationException;
import org.jboss.sbomer.core.features.sbom.utils.FileUtils;
import org.jboss.sbomer.core.features.sbom.utils.MDCUtils;
import org.jboss.sbomer.core.features.sbom.utils.ObjectMapperProvider;
import org.jboss.sbomer.service.feature.sbom.config.GenerationRequestControllerConfig;
import org.jboss.sbomer.service.feature.sbom.k8s.model.SbomGenerationPhase;
import org.jboss.sbomer.service.feature.sbom.k8s.resources.Labels;
Expand All @@ -49,7 +48,6 @@
import org.jboss.sbomer.service.nextgen.core.utils.JacksonUtils;
import org.jboss.sbomer.service.nextgen.service.EntityMapper;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;

import io.fabric8.kubernetes.api.model.Duration;
Expand Down Expand Up @@ -324,19 +322,8 @@ public TaskRun desired(GenerationRecord generation) {

GenerationRequest request = JacksonUtils.parse(GenerationRequest.class, generation.request());

SyftContainerImageOptions options = null;

try {
options = ObjectMapperProvider.json()
.treeToValue(request.generator().config().options(), SyftContainerImageOptions.class);
} catch (JsonProcessingException e) {
throw new ApplicationException(
"Unexpected options provided, expected Syft generator options, but got: {}",
request.generator().config().options(),
e);
}

// SyftOptions options = (SyftOptions) request.generator().config().options();
SyftContainerImageOptions options = JacksonUtils
.parse(SyftContainerImageOptions.class, request.generator().config().options());

Duration timeout;

Expand Down
Loading