Skip to content
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

chore(core): move run context property validation to the run context #7414

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

chore(core): move run context property validation to the run context #7414

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
13 changes: 13 additions & 0 deletions core/src/main/java/io/kestra/core/runners/DefaultRunContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
import io.kestra.core.utils.VersionProvider;
import io.micronaut.context.ApplicationContext;
import io.micronaut.core.annotation.Introspected;
import jakarta.validation.ConstraintViolation;
import jakarta.validation.ConstraintViolationException;
import jakarta.validation.Validator;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.With;
Expand Down Expand Up @@ -51,6 +54,7 @@
private KVStoreService kvStoreService;
private Optional<String> secretKey;
private WorkingDir workingDir;
private Validator validator;

private Map<String, Object> variables;
private List<AbstractMetricEntry<?>> metrics = new ArrayList<>();
Expand Down Expand Up @@ -147,6 +151,7 @@
this.version = applicationContext.getBean(VersionProvider.class);
this.kvStoreService = applicationContext.getBean(KVStoreService.class);
this.secretKey = applicationContext.getProperty("kestra.encryption.secret-key", String.class);
this.validator = applicationContext.getBean(Validator.class);
}
}

Expand Down Expand Up @@ -309,6 +314,14 @@
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}

@Override
public <T> void validate(T bean) {
Set<ConstraintViolation<T>> violations = validator.validate(bean);

Check failure on line 319 in core/src/main/java/io/kestra/core/runners/DefaultRunContext.java

View workflow job for this annotation

GitHub Actions / Java Tests Report

io.kestra.plugin.core.execution.CountTest ► run() 

Failed test found in:
  core/build/test-results/test/TEST-io.kestra.plugin.core.execution.CountTest.xml
Error:
  java.lang.NullPointerException: Cannot invoke "jakarta.validation.Validator.validate(Object, java.lang.Class[])" because "this.validator" is null
Raw output 
java.lang.NullPointerException: Cannot invoke "jakarta.validation.Validator.validate(Object, java.lang.Class[])" because "this.validator" is null
	at io.kestra.core.runners.DefaultRunContext.validate(DefaultRunContext.java:319)
	at io.kestra.core.runners.RunContextProperty.validate(RunContextProperty.java:40)
	at io.kestra.core.runners.RunContextProperty.asList(RunContextProperty.java:96)
	at io.kestra.plugin.core.execution.Count.run(Count.java:143)
	at io.kestra.plugin.core.execution.CountTest.run(CountTest.java:54)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.micronaut.test.extensions.junit5.MicronautJunit5Extension$2.proceed(MicronautJunit5Extension.java:142)
	at io.micronaut.test.extensions.AbstractMicronautExtension.interceptEach(AbstractMicronautExtension.java:162)
	at io.micronaut.test.extensions.AbstractMicronautExtension.interceptTest(AbstractMicronautExtension.java:119)
	at io.micronaut.test.extensions.junit5.MicronautJunit5Extension.interceptTestMethod(MicronautJunit5Extension.java:129)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
}
}

/**
* {@inheritDoc}
*/
Expand Down
5 changes: 5 additions & 0 deletions core/src/main/java/io/kestra/core/runners/RunContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ public abstract class RunContext {

public abstract Map<String, String> renderMap(Map<String, String> inline, Map<String, Object> variables) throws IllegalVariableEvaluationException;

/**
* Validate a bean using Jakarta Bean Validation.
*/
public abstract <T> void validate(T bean);

public abstract String decrypt(String encrypted) throws GeneralSecurityException;

/**
Expand Down
16 changes: 2 additions & 14 deletions core/src/main/java/io/kestra/core/runners/RunContextProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,11 @@ public class RunContextProperty<T> {
this.trigger = ((DefaultRunContext) runContext).getTrigger();
}

/**
* Validate a bean using Jakarta Bean Validation.
* TODO this seems useful as a general util so maybe move it to the RunContext
*/
public <U> void validate(U bean) {
Validator validator = ((DefaultRunContext) runContext).getApplicationContext().getBean(Validator.class);
Set<ConstraintViolation<U>> violations = validator.validate(bean);
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
}
}

private void validate() {
if (task != null) {
validate(task);
runContext.validate(task);
} else if (trigger != null) {
validate(trigger);
runContext.validate(trigger);
} else if (log.isTraceEnabled()) {
// this should never happen, but it happens a lot on unit test
log.trace("Unable to do validation: no task or trigger found");
Expand Down
Loading