DigitalState · marioprudhomme · Mar 4, 2020 · Mar 1, 2020 · Mar 1, 2020 · Mar 1, 2020
diff --git a/.env b/.env
@@ -13,8 +13,11 @@ API_TRUSTED_HOSTS=localhost,api
 API_DATABASE_URL=postgres://api:!ChangeMe!@database/api
 API_CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
 API_JWT_PASS_PHRASE=!ChangeMe!
-API_DISCOVERY_HOST=cms_mock_discovery:8080
-API_DISCOVERY_CREDENTIAL=!ChangeMe!
+API_DISCOVERY_ADAPTER=consul
+API_DISCOVERY_CONSUL_HOST=cms_mock_discovery:8080
+API_DISCOVERY_CONSUL_CREDENTIALS=!ChangeMe!
+API_DISCOVERY_ENV_SERVICES={}
+API_DISCOVERY_ENV_CONFIGS={}
 API_ENCRYPTION=!ChangeMe!
 API_SYSTEM_USERNAME=!ChangeMe!
 API_SYSTEM_PASSWORD=!ChangeMe!
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.18.0 (2020-03-03)
+
+- Feature [Core] Upgrade digitalstate/core dependency to 0.18.0
+
 ## 0.17.4 (2019-11-17)
 
 - Feature [Core] Upgrade digitalstate/core dependency to 0.17.2

diff --git a/api/.env b/api/.env
@@ -8,8 +8,11 @@ DATABASE_URL=postgres://api:!ChangeMe!@database/api
 MAILER_URL=null://localhost
 CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
 JWT_PASS_PHRASE=!ChangeMe!
-DISCOVERY_HOST=127.0.0.1:8500
-DISCOVERY_CREDENTIAL=!ChangeMe!
+DISCOVERY_ADAPTER=consul
+DISCOVERY_CONSUL_HOST=127.0.0.1:8500
+DISCOVERY_CONSUL_CREDENTIALS=!ChangeMe!
+DISCOVERY_ENV_SERVICES={}
+DISCOVERY_ENV_CONFIGS={}
 ENCRYPTION=!ChangeMe!
 SYSTEM_USERNAME=!ChangeMe!
 SYSTEM_PASSWORD=!ChangeMe!
diff --git a/api/.env.dist b/api/.env.dist
@@ -8,8 +8,11 @@ DATABASE_URL=postgres://api:!ChangeMe!@database/api
 MAILER_URL=null://localhost
 CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
 JWT_PASS_PHRASE=!ChangeMe!
-DISCOVERY_HOST=127.0.0.1:8500
-DISCOVERY_CREDENTIAL=!ChangeMe!
+DISCOVERY_ADAPTER=consul
+DISCOVERY_CONSUL_HOST=127.0.0.1:8500
+DISCOVERY_CONSUL_CREDENTIALS=!ChangeMe!
+DISCOVERY_ENV_SERVICES={}
+DISCOVERY_ENV_CONFIGS={}
 ENCRYPTION=!ChangeMe!
 SYSTEM_USERNAME=!ChangeMe!
 SYSTEM_PASSWORD=!ChangeMe!
diff --git a/api/composer.json b/api/composer.json
@@ -11,7 +11,7 @@
         "ext-iconv": "*",
         "api-platform/api-pack": "^1.1",
         "defuse/php-encryption": "^2.2",
-        "digitalstate/core": "0.17.2",
+        "digitalstate/core": "0.18.0",
         "doctrine/doctrine-fixtures-bundle": "^3.0",
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "guzzlehttp/guzzle": "^6.3",

diff --git a/api/composer.lock b/api/composer.lock
diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml
@@ -5,7 +5,7 @@ api_platform:
   mapping:
     paths: ['%kernel.project_dir%/src/Entity']
   title: Cms
-  version: 0.17.4
+  version: 0.18.0
   collection:
     pagination:
       page_parameter_name: _page

diff --git a/api/config/packages/ds_discovery.yaml b/api/config/packages/ds_discovery.yaml
@@ -1,7 +1,15 @@
 parameters:
-  env(DISCOVERY_HOST): ''
-  env(DISCOVERY_CREDENTIAL): ''
+  env(DISCOVERY_ADAPTER): ''
+  env(DISCOVERY_CONSUL_HOST): ''
+  env(DISCOVERY_CONSUL_CREDENTIALS): ''
+  env(DISCOVERY_ENV_SERVICES): ''
+  env(DISCOVERY_ENV_CONFIGS): ''
 
 ds_discovery:
-  host: '%env(resolve:DISCOVERY_HOST)%'
-  credential: '%env(resolve:DISCOVERY_CREDENTIAL)%'
+  adapter: '%env(resolve:DISCOVERY_ADAPTER)%'
+  consul:
+    host: '%env(resolve:DISCOVERY_CONSUL_HOST)%'
+    credentials: '%env(resolve:DISCOVERY_CONSUL_CREDENTIALS)%'
+  env:
+    services: '%env(resolve:DISCOVERY_ENV_SERVICES)%'
+    configs: '%env(resolve:DISCOVERY_ENV_CONFIGS)%'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
           - cms_database
 
   php:
-    image: digitalstate/cms:php-0.17.4
+    image: digitalstate/cms:php-0.18.0
     depends_on:
       - database
     env_file:
@@ -30,8 +30,11 @@ services:
       DATABASE_URL: ${API_DATABASE_URL}
       CORS_ALLOW_ORIGIN: ${API_CORS_ALLOW_ORIGIN}
       JWT_PASS_PHRASE: ${API_JWT_PASS_PHRASE}
-      DISCOVERY_HOST: ${API_DISCOVERY_HOST}
-      DISCOVERY_CREDENTIAL: ${API_DISCOVERY_CREDENTIAL}
+      DISCOVERY_ADAPTER: ${API_DISCOVERY_ADAPTER}
+      DISCOVERY_CONSUL_HOST: ${API_DISCOVERY_CONSUL_HOST}
+      DISCOVERY_CONSUL_CREDENTIALS: ${API_DISCOVERY_CONSUL_CREDENTIALS}
+      DISCOVERY_ENV_SERVICES: ${API_DISCOVERY_ENV_SERVICES}
+      DISCOVERY_ENV_CONFIGS: ${API_DISCOVERY_ENV_CONFIGS}
       ENCRYPTION: ${API_ENCRYPTION}
       SYSTEM_USERNAME: ${API_SYSTEM_USERNAME}
       SYSTEM_PASSWORD: ${API_SYSTEM_PASSWORD}
@@ -41,7 +44,7 @@ services:
           - cms_php
 
   api:
-    image: digitalstate/cms:api-0.17.4
+    image: digitalstate/cms:api-0.18.0
     depends_on:
       - php
     networks:

diff --git a/reference/docker.md b/reference/docker.md
@@ -31,8 +31,11 @@ _Note: The majority of variables found in the list below are used to override im
 | `API_TRUSTED_HOSTS` | See [TRUSTED_HOSTS](#api_image). | `localhost,api` |
 | `API_DATABASE_URL` | See [DATABASE_URL](#api_image). | `postgres://api:!ChangeMe!@database/api` |
 | `API_CORS_ALLOW_ORIGIN` | See [CORS_ALLOW_ORIGIN](#api_image). | `^https?://localhost(:[0-9]+)?$` |
-| `API_DISCOVERY_HOST` | See [DISCOVERY_HOST](#api_image). | `127.0.0.1:8500` |
-| `API_DISCOVERY_CREDENTIAL` | See [DISCOVERY_CREDENTIAL](#api_image). | `!ChangeMe!` |
+| `API_DISCOVERY_ADAPTER` | See [DISCOVERY_ADAPTER](#api_image). | `consul` |
+| `API_DISCOVERY_CONSUL_HOST` | See [DISCOVERY_CONSUL_HOST](#api_image). | `127.0.0.1:8500` |
+| `API_DISCOVERY_CONSUL_CREDENTIALS` | See [DISCOVERY_CONSUL_CREDENTIALS](#api_image). | `!ChangeMe!` |
+| `API_DISCOVERY_ENV_SERVICES` | See [DISCOVERY_ENV_SERVICES](#api_image). | `{}` |
+| `API_DISCOVERY_ENV_CONFIGS` | See [DISCOVERY_ENV_CONFIGS](#api_image). | `{}` |
 | `API_ENCRYPTION` | See [ENCRYPTION](#api_image). | `!ChangeMe!` |
 | `API_SYSTEM_USERNAME` | See [SYSTEM_USERNAME](#api_image). | `!ChangeMe!` |
 | `API_SYSTEM_PASSWORD` | See [SYSTEM_PASSWORD](#api_image). | `!ChangeMe!` |
@@ -69,8 +72,11 @@ _Note: The majority of variables found in the list below are used to override im
 | `TRUSTED_HOSTS` | The trusted hosts by the web entrypoint. | `localhost,api` |
 | `DATABASE_URL` | The database connection string. | `postgres://api:!ChangeMe!@database/api` |
 | `CORS_ALLOW_ORIGIN` | The cors rules. | `^https?://localhost(:[0-9]+)?$` |
-| `DISCOVERY_HOST` | The discovery host. This value is used by the discovery core component. | `127.0.0.1:8500` |
-| `DISCOVERY_CREDENTIAL` | The discovery credential. This value is used by the discovery core component. | `!ChangeMe!` |
+| `DISCOVERY_ADAPTER` | The discovery adapter. This value is used by the discovery core component. | `consul` |
+| `DISCOVERY_CONSUL_HOST` | The discovery consul host. This value is used by the discovery core component. | `127.0.0.1:8500` |
+| `DISCOVERY_CONSUL_CREDENTIALS` | The discovery consul credentials. This value is used by the discovery core component. | `!ChangeMe!` |
+| `DISCOVERY_ENV_SERVICES` | The discovery env services. This value is used by the discovery core component. | `{}` |
+| `DISCOVERY_ENV_CONFIGS` | The discovery env configs. This value is used by the discovery core component. | `{}` |
 | `ENCRYPTION` | The secret encryption key. | `!ChangeMe!` |
 | `SYSTEM_USERNAME` | The system username. | `!ChangeMe!` |
 | `SYSTEM_PASSWORD` | The system password. | `!ChangeMe!` |