Elasticsearch: clean Jest config in deployment subgenerators

jhipster · May 1, 2020 · 8b101a0 · 8b101a0
1 parent f7fbeaf
commit 8b101a0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/generators/heroku/templates/application-heroku.yml.ejs b/generators/heroku/templates/application-heroku.yml.ejs
@@ -51,14 +51,13 @@ spring:
         hikari:
             maximumPoolSize: 8
 <%_ } _%>
-<%_ if (prodDatabaseType === 'mongodb' || searchEngine === 'elasticsearch') { _%>
+<%_ if (prodDatabaseType === 'mongodb') { _%>
     data:
-  <%_ if (prodDatabaseType === 'mongodb') { _%>
         mongodb:
             uri: ${MONGODB_URI}?authMode=scram-sha1
-  <%_ } _%>
-  <%_ if (searchEngine === 'elasticsearch') { _%>
-        jest:
-            uri: ${BONSAI_URL}
-  <%_ } _%>
+<%_ } _%>
+<%_ if (searchEngine === 'elasticsearch') { _%>
+    elasticsearch:
+        rest:
+            uris: ${BONSAI_URL}
 <%_ } _%>
diff --git a/generators/kubernetes-knative/templates/service.yml.ejs b/generators/kubernetes-knative/templates/service.yml.ejs
@@ -118,8 +118,6 @@ spec:
               value: <%= app.baseName.toLowerCase() %>
             <%_ } _%>
             <%_ if (app.searchEngine === 'elasticsearch') { _%>
-            - name: SPRING_DATA_JEST_URI
-              value: http://<%= app.baseName.toLowerCase() %>-elasticsearch.<%= kubernetesNamespace %>.svc.cluster.local:9200
             - name: SPRING_ELASTICSEARCH_REST_URIS
               value: http://<%= app.baseName.toLowerCase() %>-elasticsearch.<%= kubernetesNamespace %>.svc.cluster.local:9200
             <%_ } _%>

diff --git a/generators/kubernetes/templates/deployment.yml.ejs b/generators/kubernetes/templates/deployment.yml.ejs
@@ -155,8 +155,6 @@ spec:
           value: <%= app.baseName.toLowerCase() %>
         <%_ } _%>
         <%_ if (app.searchEngine === 'elasticsearch') { _%>
-        - name: SPRING_DATA_JEST_URI
-          value: http://<%= app.baseName.toLowerCase() %>-elasticsearch.<%= kubernetesNamespace %>.svc.cluster.local:9200
         - name: SPRING_ELASTICSEARCH_REST_URIS
           value: http://<%= app.baseName.toLowerCase() %>-elasticsearch.<%= kubernetesNamespace %>.svc.cluster.local:9200
         <%_ } _%>

diff --git a/generators/openshift/templates/deployment.yml.ejs b/generators/openshift/templates/deployment.yml.ejs
@@ -205,8 +205,6 @@ objects:
               value: ${APPLICATION_NAME}
             <%_ } _%>
             <%_ if (app.searchEngine === 'elasticsearch') { _%>
-            - name: SPRING_DATA_JEST_URI
-              value: http://${APPLICATION_NAME}-elasticsearch:9200
             - name: SPRING_ELASTICSEARCH_REST_URIS
               value: http://${APPLICATION_NAME}-elasticsearch:9200
             <%_ } _%>

diff --git a/generators/server/templates/src/main/docker/app.yml.ejs b/generators/server/templates/src/main/docker/app.yml.ejs
@@ -78,7 +78,6 @@ services:
             - JHIPSTER_SLEEP=30 # gives time for other services to boot before the application
             <%_ } _%>
             <%_ if (searchEngine === 'elasticsearch') { _%>
-            - SPRING_DATA_JEST_URI=http://<%= baseName.toLowerCase() %>-elasticsearch:9200
             - SPRING_ELASTICSEARCH_REST_URIS=http://<%= baseName.toLowerCase() %>-elasticsearch:9200
             <%_ } _%>
             <%_ if (messageBroker === 'kafka') { _%>

diff --git a/test/templates/compose/03-psql/src/main/docker/app.yml b/test/templates/compose/03-psql/src/main/docker/app.yml
@@ -6,7 +6,6 @@ services:
             - SPRING_PROFILES_ACTIVE=prod
             - SPRING_CLOUD_CONFIG_URI=http://admin:admin@jhipster-registry:8761/config
             - SPRING_DATASOURCE_URL=jdbc:postgresql://mspsql-postgresql:5432/mspsql
-            - SPRING_DATA_JEST_URI=http://mspsql-elasticsearch:9200
             - SPRING_ELASTICSEARCH_REST_URIS=http://mspsql-elasticsearch:9200
     mspsql-postgresql:
         extends: