ISSUE-1942 Jobs Service Embedded Addon do not allow to override the k…

…ogito.service.url parameter (apache#1943) * ISSUE-1942 Jobs Service Embedded Addon do not allow to override the kogito.service.url parameter
rgdoliveira · Jan 18, 2024 · 84ec2f1 · 84ec2f1
1 parent 0274f3d
commit 84ec2f1
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 24 deletions.
diff --git a/...ion-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties b/...ion-tests-jobs-service-quarkus-knative-eventing/src/main/resources/application.properties
@@ -17,8 +17,6 @@
 # under the License.
 #
 
-kogito.service.url=http://localhost:8080
-
 # Disable the KSinkInjectionHealthCheck since the K_SINK env variable is not passed in this context.
 quarkus.smallrye-health.check."org.kie.kogito.addons.quarkus.knative.eventing.KSinkInjectionHealthCheck".enabled=false
 

diff --git a/...tegration-tests-jobs-service-quarkus-management/src/main/resources/application.properties b/...tegration-tests-jobs-service-quarkus-management/src/main/resources/application.properties
@@ -17,8 +17,6 @@
 # under the License.
 #
 
-kogito.service.url=http://localhost:8080
-
 quarkus.log.category."org.kie.kogito.jobs.management.quarkus".level=DEBUG
 
 quarkus.kafka.devservices.enabled=false

diff --git a/...ntegration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties b/...ntegration-tests-jobs-service-quarkus-messaging/src/main/resources/application.properties
@@ -17,8 +17,6 @@
 # under the License.
 #
 
-kogito.service.url=http://localhost:8080
-
 quarkus.log.category."org.kie.kogito.jobs.messaging.quarkus".level=DEBUG
 
 quarkus.kafka.devservices.enabled=false

diff --git a/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties b/jobs-service/jobs-service-common/src/main/resources/META-INF/microprofile-config.properties
@@ -42,7 +42,6 @@ mp.openapi.filter=org.kie.kogito.jobs.service.openapi.JobServiceModelFilter
 # Job Service
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=60

diff --git a/jobs-service/jobs-service-common/src/test/resources/application.properties b/jobs-service/jobs-service-common/src/test/resources/application.properties
@@ -19,7 +19,6 @@
 
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0

diff --git a/jobs-service/jobs-service-infinispan/src/test/resources/application.properties b/jobs-service/jobs-service-infinispan/src/test/resources/application.properties
@@ -19,7 +19,6 @@
 
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0

diff --git a/jobs-service/jobs-service-mongodb/src/test/resources/application.properties b/jobs-service/jobs-service-mongodb/src/test/resources/application.properties
@@ -19,7 +19,6 @@
 
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0

diff --git a/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql-common/src/test/resources/application.properties
@@ -19,7 +19,6 @@
 
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0

diff --git a/jobs-service/jobs-service-postgresql/src/test/resources/application.properties b/jobs-service/jobs-service-postgresql/src/test/resources/application.properties
@@ -19,7 +19,6 @@
 
 kogito.jobs-service.maxIntervalLimitToRetryMillis=60000
 kogito.jobs-service.backoffRetryMillis=1000
-kogito.service.url=http://localhost:8080
 kogito.jobs-service.schedulerChunkInMinutes=10
 kogito.jobs-service.loadJobIntervalInMinutes=10
 kogito.jobs-service.loadJobFromCurrentTimeIntervalInMinutes=0

diff --git a/...kus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java b/...kus/jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessor.java
@@ -40,8 +40,6 @@
 
 class KogitoAddonsQuarkusJobsServiceEmbeddedProcessor extends OneOfCapabilityKogitoAddOnProcessor {
     private static final String FEATURE = "kogito-addons-quarkus-jobs-service-embedded";
-    private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
-    private static final String SERVICE_URL = "kogito.service.url";
     private static final String DATA_SOURCE_NAME = "jobs_service";
     private static final String DATA_SOURCE_NAME_KEY = "datasource.name";
 
@@ -56,8 +54,6 @@ FeatureBuildItem feature() {
 
     @BuildStep
     void buildConfiguration(BuildProducer<SystemPropertyBuildItem> systemProperties) {
-        systemProperties.produce(new SystemPropertyBuildItem(SERVICE_URL, "http://${quarkus.http.host}:${quarkus.http.port}"));
-        systemProperties.produce(new SystemPropertyBuildItem(JOBS_SERVICE_URL, "${" + SERVICE_URL + "}"));
         systemProperties.produce(new SystemPropertyBuildItem(DATA_SOURCE_NAME_KEY, DATA_SOURCE_NAME));
     }
 

diff --git a/...jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java b/...jobs/service/embedded/deployment/KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest.java
@@ -45,11 +45,7 @@
 @ExtendWith(MockitoExtension.class)
 class KogitoAddonsQuarkusJobsServiceEmbeddedProcessorTest {
 
-    private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
-    private static final String SERVICE_URL = "kogito.service.url";
-
     private KogitoAddonsQuarkusJobsServiceEmbeddedProcessor processor;
-
     @Mock
     private BuildProducer<SystemPropertyBuildItem> systemPropertyBuildItemBuildProducer;
     @Captor
@@ -77,11 +73,10 @@ void feature() {
     @Test
     void buildConfiguration() {
         processor.buildConfiguration(systemPropertyBuildItemBuildProducer);
-        verify(systemPropertyBuildItemBuildProducer, times(3)).produce(systemPropertyBuildItemCaptor.capture());
+        verify(systemPropertyBuildItemBuildProducer, times(1)).produce(systemPropertyBuildItemCaptor.capture());
         List<SystemPropertyBuildItem> items = systemPropertyBuildItemCaptor.getAllValues();
         assertThat(items)
-                .anyMatch(item -> JOBS_SERVICE_URL.equals(item.getKey()) && ("${" + SERVICE_URL + "}").equals(item.getValue()))
-                .anyMatch(item -> SERVICE_URL.equals(item.getKey()) && "http://${quarkus.http.host}:${quarkus.http.port}".equals(item.getValue()));
+                .anyMatch(item -> "datasource.name".equals(item.getKey()) && ("jobs_service").equals(item.getValue()));
     }
 
     @Test

diff --git a/...ons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java b/...ons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource.java
@@ -28,12 +28,15 @@ public class KogitoAddonsQuarkusJobsServiceEmbeddedConfigSource implements Confi
 
     private static final String KAFKA_DEV_SERVICES = "quarkus.kafka.devservices.enabled";
     private static final String DATASOURCE_DEV_SERVICES = "quarkus.datasource.devservices.enabled";
-
+    private static final String JOBS_SERVICE_URL = "kogito.jobs-service.url";
+    private static final String SERVICE_URL = "kogito.service.url";
     private static final Map<String, String> DEFAULT_CONFIG = new HashMap<>();
 
     static {
         DEFAULT_CONFIG.put(KAFKA_DEV_SERVICES, "false");
         DEFAULT_CONFIG.put(DATASOURCE_DEV_SERVICES, "false");
+        DEFAULT_CONFIG.put(SERVICE_URL, "http://localhost:${quarkus.http.port}");
+        DEFAULT_CONFIG.put(JOBS_SERVICE_URL, "${" + SERVICE_URL + "}");
     }
 
     @Override