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

Jump to bottom

fix mesh worker service not set the default value for ForwardSourceMessageProperty #300

Merged
merged 3 commits into from
Oct 20, 2021
Merged

fix mesh worker service not set the default value for ForwardSourceMessageProperty #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eb8519
fix mesh worker service not set the default value for ForwardSourceMe…
freeznet Oct 19, 2021
dcefde0
fix the default value
freeznet Oct 19, 2021
19a10c5
fix CI
freeznet Oct 20, 2021
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
2 changes: 1 addition & 1 deletion controllers/spec/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func generateSourceOutputSpec(source *v1alpha1.Source) *proto.SinkSpec {
BatchBuilder: source.Spec.Output.ProducerConf.BatchBuilder,
}
}
var forward = false
var forward = true
if source.Spec.ForwardSourceMessageProperty != nil {
forward = *source.Spec.ForwardSourceMessageProperty
}
Expand Down
4 changes: 3 additions & 1 deletion mesh-worker-service/src/main/java/io/functionmesh/compute/util/FunctionsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ public static V1alpha1Function createV1alpha1FunctionFromFunctionConfig(String k
v1alpha1FunctionSpec.setLogTopic(functionDetails.getLogTopic());
}
v1alpha1FunctionSpec.setForwardSourceMessageProperty(functionDetails.getSink().getForwardSourceMessageProperty());

if (v1alpha1FunctionSpec.getForwardSourceMessageProperty() == null) {
v1alpha1FunctionSpec.setForwardSourceMessageProperty(true);
}
if (functionDetails.hasRetryDetails()) {
v1alpha1FunctionSpec.setMaxMessageRetry(functionDetails.getRetryDetails().getMaxMessageRetries());
if (!StringUtils.isEmpty(functionDetails.getRetryDetails().getDeadLetterTopic())) {
Expand Down
3 changes: 3 additions & 0 deletions mesh-worker-service/src/main/java/io/functionmesh/compute/util/SourcesUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ public static V1alpha1Source createV1alpha1SourceFromSourceConfig(String kind, S
v1alpha1SourceSpecOutput.setSinkSchemaType(functionDetails.getSink().getSchemaType());
}
v1alpha1SourceSpec.setForwardSourceMessageProperty(functionDetails.getSink().getForwardSourceMessageProperty());
if (v1alpha1SourceSpec.getForwardSourceMessageProperty() == null) {
v1alpha1SourceSpec.setForwardSourceMessageProperty(true);
}
// process ProducerConf
V1alpha1SourceSpecOutputProducerConf v1alpha1SourceSpecOutputProducerConf
= new V1alpha1SourceSpecOutputProducerConf();
Expand Down
1 change: 1 addition & 0 deletions mesh-worker-service/src/test/java/io/functionmesh/compute/testdata/Generate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public static FunctionConfig CreateJavaFunctionWithPackageURLConfig(String tenan
functionConfig.setCustomRuntimeOptions(customRuntimeOptionsJSON);
functionConfig.setJar(String.format("function://public/default/%s@1.0", functionName));
functionConfig.setAutoAck(true);
functionConfig.setForwardSourceMessageProperty(true);
return functionConfig;
}

Expand Down
2 changes: 1 addition & 1 deletion mesh-worker-service/src/test/java/io/functionmesh/compute/util/FunctionsUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void testCreateV1alpha1FunctionFromFunctionConfig() {
Assert.assertEquals(v1alpha1FunctionSpec.getInput().getTypeClassName(), typeClassName);
Assert.assertEquals(v1alpha1FunctionSpec.getOutput().getTypeClassName(), typeClassName);
Assert.assertEquals(v1alpha1FunctionSpec.getJava().getJar(), jar);

Assert.assertEquals(v1alpha1FunctionSpec.getForwardSourceMessageProperty(), true);
}

@Test
Expand Down
1 change: 1 addition & 0 deletions mesh-worker-service/src/test/java/io/functionmesh/compute/util/SourcesUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,5 +197,6 @@ public void testCreateV1alpha1SourceFromSinkConfigWithBuiltin() throws IOExcepti
Assert.assertEquals(v1alpha1SourceSpec.getOutput().getTypeClassName(), typeClassName);
Assert.assertEquals(v1alpha1SourceSpec.getJava().getJar(), archive);
Assert.assertEquals(v1alpha1SourceSpec.getSourceConfig(), configs);
Assert.assertEquals(v1alpha1SourceSpec.getForwardSourceMessageProperty(), true);
}
}