Merge pull request #147 from delyriand/feature/add_es_url

Add a new env variable to define the ES_URL
monsieurbiz · Nov 16, 2022 · 21f616a · 21f616a
2 parents 4988cd6 + 21ead59
commit 21f616a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -74,6 +74,7 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
 	$(MAKE) apply_dist
 	(cd ${APP_DIR} && ${COMPOSER} require --no-progress --no-interaction monsieurbiz/${PLUGIN_NAME}="*@dev")
+	git restore dist/docker-compose.override.yaml # Restore dist file to prevent modification by flex recipes (symfony/mailer)
 	rm -rf ${APP_DIR}/var/cache
 
 ${APP_DIR}/docker-compose.yaml:

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ Finally configure plugin in your .env file by adding these lines at the end :
 MONSIEURBIZ_SEARCHPLUGIN_MESSENGER_TRANSPORT_DSN=doctrine://default
 MONSIEURBIZ_SEARCHPLUGIN_ES_HOST=${ELASTICSEARCH_HOST:-localhost}
 MONSIEURBIZ_SEARCHPLUGIN_ES_PORT=${ELASTICSEARCH_PORT:-9200}
+MONSIEURBIZ_SEARCHPLUGIN_ES_URL=http://${MONSIEURBIZ_SEARCHPLUGIN_ES_HOST}:${MONSIEURBIZ_SEARCHPLUGIN_ES_PORT}/
 ###< MonsieurBizSearchPlugin ###
 ```
 

diff --git a/dist/.env.local b/dist/.env.local
@@ -1,3 +1,4 @@
 MONSIEURBIZ_SEARCHPLUGIN_MESSENGER_TRANSPORT_DSN=doctrine://default
 MONSIEURBIZ_SEARCHPLUGIN_ES_HOST=${ELASTICSEARCH_HOST:-localhost}
 MONSIEURBIZ_SEARCHPLUGIN_ES_PORT=${ELASTICSEARCH_PORT:-9200}
+MONSIEURBIZ_SEARCHPLUGIN_ES_URL=http://${MONSIEURBIZ_SEARCHPLUGIN_ES_HOST}:${MONSIEURBIZ_SEARCHPLUGIN_ES_PORT}/
diff --git a/recipes/2.0/manifest.json b/recipes/2.0/manifest.json
@@ -13,6 +13,7 @@
     "env": {
         "MONSIEURBIZ_SEARCHPLUGIN_ES_HOST": "${ELASTICSEARCH_HOST:-localhost}",
         "MONSIEURBIZ_SEARCHPLUGIN_ES_PORT": "${ELASTICSEARCH_PORT:-9200}",
+        "MONSIEURBIZ_SEARCHPLUGIN_ES_URL": "http://${MONSIEURBIZ_SEARCHPLUGIN_ES_HOST}:${MONSIEURBIZ_SEARCHPLUGIN_ES_PORT}/",
         "MONSIEURBIZ_SEARCHPLUGIN_MESSENGER_TRANSPORT_DSN": "doctrine://default"
     }
 }
diff --git a/src/Resources/config/services.yaml b/src/Resources/config/services.yaml
@@ -1,4 +1,8 @@
 parameters:
+  monsieurbiz.search.elasticsearch.host: '%env(default::MONSIEURBIZ_SEARCHPLUGIN_ES_HOST)%'
+  monsieurbiz.search.elasticsearch.port: '%env(default::MONSIEURBIZ_SEARCHPLUGIN_ES_PORT)%'
+  monsieurbiz.search.elasticsearch.fallback_url: 'http://%monsieurbiz.search.elasticsearch.host%:%monsieurbiz.search.elasticsearch.port%/'
+  monsieurbiz.search.elasticsearch.url: '%env(default:monsieurbiz.search.elasticsearch.fallback_url:MONSIEURBIZ_SEARCHPLUGIN_ES_URL)%'
   monsieurbiz.search.model.documentable.interface: MonsieurBiz\SyliusSearchPlugin\Model\Documentable\DocumentableInterface
   monsieurbiz.search.request.interface: MonsieurBiz\SyliusSearchPlugin\Search\Request\RequestInterface
   monsieurbiz.search.product_attribute_analyzer: 'search_standard'
@@ -45,8 +49,7 @@ services:
   MonsieurBiz\SyliusSearchPlugin\Search\ClientFactory:
     arguments:
       $config:
-        host: '%env(MONSIEURBIZ_SEARCHPLUGIN_ES_HOST)%'
-        port: '%env(MONSIEURBIZ_SEARCHPLUGIN_ES_PORT)%'
+        url: '%monsieurbiz.search.elasticsearch.url%'
 
   MonsieurBiz\SyliusSearchPlugin\Repository\ProductAttributeRepository:
     arguments: