SuccessChanges

Summary

  1. Rework concierge config (details)
  2. Rework policies config (details)
  3. Rework connectivity config (details)
  4. Rework gateway config (details)
  5. Rework things config (details)
  6. Rework things-search config (details)
  7. Enable config extension mechanism for things and things-search as well (details)
  8. Reduce complexity of service specific environment configs (details)
  9. fix name of DEVOPS_OAUT2_SUBJECTS (details)
  10. fix vcap enhancement (details)
  11. Enable VCAP and secret support for default service based config as well (details)
  12. Some review findings (details)
  13. make health-check interval overridable via env var (details)
  14. revert uri-parsing-mode back to 'relaxed' as discussed in the PR (details)
Commit 1658febd35b0936d9f91e134b54a414b62fb500f by Yannic Klem
Rework concierge config

* Remove concierge-docker.conf
* introduce ditto-mongo.conf
* Move content of concierge-extension.conf to concierge.conf

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was addedservices/utils/config/src/main/resources/ditto-mongo.conf
The file was modifiedservices/concierge/starter/src/main/resources/concierge-dev.conf (diff)
The file was modifiedservices/concierge/starter/src/main/resources/concierge-extension.conf (diff)
The file was removedservices/concierge/starter/src/main/resources/concierge-docker.conf
The file was modifiedservices/concierge/starter/src/main/resources/concierge.conf (diff)
The file was modifiedservices/utils/config/src/main/resources/ditto-service-base.conf (diff)
Commit 610d935c58a2ec8e60bfa079941e3ac1cea53c2c by Yannic Klem
Rework policies config

* Remove policies-docker.conf
* Remove already defined mongo config from policies.conf
* Align concierge-dev.conf with policies-dev.conf

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/policies/starter/src/main/resources/policies.conf (diff)
The file was removedservices/policies/starter/src/main/resources/policies-docker.conf
The file was modifiedservices/policies/starter/src/main/resources/policies-dev.conf (diff)
The file was modifiedservices/concierge/starter/src/main/resources/concierge-dev.conf (diff)
Commit 9e43e54aeaf722cdf55b65ba47cd12f9aa69cbc6 by Yannic Klem
Rework connectivity config

* Remove connectivity-docker.conf
* Remove already defined mongo config from connectivity.conf

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/connectivity/starter/src/main/resources/connectivity-dev.conf (diff)
The file was removedservices/connectivity/starter/src/main/resources/connectivity-docker.conf
The file was modifiedservices/connectivity/starter/src/main/resources/connectivity.conf (diff)
Commit e867e311bacf1239a17e5ac976e2a08ce22113de by Yannic Klem
Rework gateway config

* Remove gateway-docker.conf
* Remove already defined mongo config from gateway.conf
* Introduce extension mechanism for gateway as well

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/gateway/starter/src/main/resources/gateway-dev.conf (diff)
The file was removedservices/gateway/starter/src/main/resources/gateway-docker.conf
The file was modifiedservices/gateway/starter/src/main/resources/gateway.conf (diff)
The file was modifiedservices/connectivity/starter/src/main/resources/connectivity-dev.conf (diff)
The file was addedservices/gateway/starter/src/main/resources/gateway-extension.conf
Commit 926d7f11369919fdfb5c6da99048198b8c0a1e6d by Yannic Klem
Rework things config

* Remove thing-docker.conf
* Remove already defined mongo config from things.conf

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was removedservices/things/starter/src/main/resources/things-docker.conf
The file was modifiedservices/things/starter/src/main/resources/things.conf (diff)
The file was modifiedservices/things/starter/src/main/resources/things-dev.conf (diff)
Commit 01a8cee6e2e41456ac0ebab92b9c58b7e31451ba by Yannic Klem
Rework things-search config

* Remove things-search-docker.conf
* Remove already defined mongo config from things-search.conf

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/thingsearch/starter/src/main/resources/things-search.conf (diff)
The file was modifiedservices/thingsearch/starter/src/main/resources/things-search-dev.conf (diff)
The file was removedservices/thingsearch/starter/src/main/resources/things-search-docker.conf
Commit 05efabc5db3645877e2cf2b473f0784dd99d56be by Yannic Klem
Enable config extension mechanism for things and things-search as well

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was addedservices/thingsearch/starter/src/main/resources/things-search-extension.conf
The file was addedservices/things/starter/src/main/resources/things-extension.conf
The file was modifiedservices/things/starter/src/main/resources/things.conf (diff)
The file was modifiedservices/thingsearch/starter/src/main/resources/things-search.conf (diff)
Commit 4242c18ce0ddeb531f9687b4880099ba1f816d01 by Yannic Klem
Reduce complexity of service specific environment configs

* There are now only two different cases: dev and filebased
* For all other the servicename.conf file is used which is capable
  now to resolve secrets and vcap entries as well
* To run with the default servicename.conf the HOSTING_ENVIRONMENT need
  to be set to 'docker'

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/VcapServicesStringSupplier.java (diff)
The file was removedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/FileBasedConfigSupplier.java
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/HostingEnvironment.java (diff)
The file was modifiedservices/utils/config/src/test/java/org/eclipse/ditto/services/utils/config/raw/ServiceSpecificEnvironmentConfigSupplierTest.java (diff)
The file was removedservices/utils/config/src/test/java/org/eclipse/ditto/services/utils/config/raw/FileBasedConfigSupplierTest.java
The file was modifiedservices/utils/config/src/test/java/org/eclipse/ditto/services/utils/config/raw/VcapServicesStringParserTest.java (diff)
The file was removedservices/utils/config/src/test/resources/test-service-cloud.conf
The file was addedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/DittoConfigFactory.java
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/ServiceSpecificEnvironmentConfigSupplier.java (diff)
The file was removedservices/utils/config/src/test/resources/test-service-docker.conf
The file was modifiedservices/utils/config/src/test/java/org/eclipse/ditto/services/utils/config/raw/VcapServicesStringSupplierTest.java (diff)
Commit ab1fe0f3dde09f8e3ad2e4bedbb1eb085f2eb240 by Yannic Klem
fix name of DEVOPS_OAUT2_SUBJECTS

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/gateway/starter/src/main/resources/gateway.conf (diff)
Commit 3dd10a816c976df49d7359636b07965d3f5de8ee by Yannic Klem
fix vcap enhancement

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/DittoConfigFactory.java (diff)
Commit f97200b25e6cd7a0598556d908451ebfebf092d7 by Yannic Klem
Enable VCAP and secret support for default service based config as well

Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/RawConfigSupplier.java (diff)
Commit 26266524592425cbda0d16b95b9dbec9a98ed913 by joel.bartelheimer
Some review findings

Move 'hostinEnvironment' logic into the corresponding Enum, some minor simplifications and updated the JavaDocs accordingly

Signed-off-by: Joel Bartelheimer <joel.bartelheimer@bosch.io>
The file was modifiedservices/utils/config/src/test/java/org/eclipse/ditto/services/utils/config/raw/ServiceSpecificEnvironmentConfigSupplierTest.java (diff)
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/HostingEnvironment.java (diff)
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/ServiceSpecificEnvironmentConfigSupplier.java (diff)
The file was modifiedservices/utils/config/src/main/java/org/eclipse/ditto/services/utils/config/raw/RawConfigSupplier.java (diff)
Commit 28f183c7e5186b071853ee4213b71044d7718686 by joel.bartelheimer
make health-check interval overridable via env var

Signed-off-by: Joel Bartelheimer <joel.bartelheimer@bosch.io>
The file was modifiedservices/gateway/starter/src/main/resources/gateway.conf (diff)
Commit 9742643c6400d899aa3d8219926602ddb9ac30bf by joel.bartelheimer
revert uri-parsing-mode back to 'relaxed' as discussed in the PR

Signed-off-by: Joel Bartelheimer <joel.bartelheimer@bosch.io>
The file was modifiedservices/gateway/starter/src/main/resources/gateway.conf (diff)