Commit Graph

27 Commits

Author SHA1 Message Date
Spencer Gibb
fee1e87c5a Update tests for spring boot 2.0 compatibility 2017-09-26 16:31:00 -04:00
Dave Syer
d4bc8503a5 Fix all tests with Spring Boot latest snapshots 2017-05-12 17:45:42 +01:00
Spencer Gibb
06393add99 Merge branch 'master' into 2.0.x
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-config-client/pom.xml
#	spring-cloud-config-dependencies/pom.xml
#	spring-cloud-config-monitor/pom.xml
#	spring-cloud-config-sample/pom.xml
#	spring-cloud-config-server/pom.xml
#	spring-cloud-starter-config/pom.xml
2017-04-28 15:58:33 -06:00
Spencer Gibb
62ef648b59 polish 2017-03-31 14:18:30 -06:00
Spencer Gibb
2bc2abcfae fix compile error for boot 2.0 2017-03-17 20:14:04 -06:00
Spencer Gibb
171d2b261b Update to s-c-build 1.3.0 and bump version to 1.3.0 2016-12-12 09:26:34 -07:00
Spencer Gibb
465bc94953 Make config server configuration deterministic.
Move @Import from EnableConfigServer to ConfigServerAutoConfiguration that is only activated if Marker bean created by EnableConfigServer exists.

fixes gh-530
2016-10-25 14:44:34 -06:00
Spencer Gibb
753db0ed22 Implement VaultEnvironmentRepository.
This is an alternative to VCS or file based repository implementations.

All properties are stored ecrypted in vault, regardless of whether or
not that actaully need to be encrypted.

Supports properties style (this.is.a.property) or vault nested
properties.

Adds a watch to client and server, if enabled, the client will long poll
the server and wait for changes rather than relying on a message broker
to send change events.

Adds a server side watch for consul keys, this is useful when vault is
backed by consul (and currently the only use case, since there is not a
consul repository implementation).

Closes gh-397
2016-07-01 11:29:29 -06:00
Dave Syer
be4cc1b051 Update readme script to handle local includes 2016-06-11 09:54:41 +01:00
Dave Syer
4c0376d72c Fix broken test (changes in commons) 2016-01-25 10:04:20 +00:00
Dave Syer
8dba793499 Fix test (changed format of /env endpoint) 2015-10-23 17:54:21 +01:00
Dave Syer
d4ce149f2d Refactor server into packages
Also removes getDefaultLabel() from EnvironmentRepository.
2015-10-01 11:21:17 +01:00
Dave Syer
aa2150deda Fix broken test 2015-03-20 15:09:09 +00:00
Dave Syer
707b83292a Fix broken test in sample 2015-03-17 16:08:02 +00:00
Dave Syer
9a8e8e7627 Back to configure->config
The connectors project doesn't use any of the subpackages we do
here so if we movethe Environment and PropertySource into a sub-
package it should be safe.

See gh-91
2015-02-27 15:33:43 +00:00
Dave Syer
105612d30e Config package name change to avoid conflict with connectors
Fixes gh-91
2015-02-25 17:13:00 +00:00
Roy Kachouh
2be1962893 Account for different base directories depending on test environment
Fixes gh-62, fixes gh-68
2015-01-29 14:25:25 +00:00
Dave Syer
8c6740ab71 Use only ConfigFileApplicationListener in server mini-application
In the server we use a SpringApplicationEnvironmentRepository to load
the YAML and properties files from git (or locally). It creates a mini
SpringApplication so as to faithfully replicate the way the Environment
is created. Unfortunately that can have side effects on the server
application itself (e.g. setting log levels). In particular if the
mini SpringApplication fails to start then the log levels could be
left in a "preInitialized" state with all log levels OFF by default.

This change ensures that the server logs all errors when loading YAML
and properties files, and also that the client logs the error response
if it is JSON (as it should be).

Fixes gh-66, fixes gh-67
2015-01-21 14:40:39 +00:00
Dave Syer
574c4d5097 Really enable cacheing 2014-12-12 11:56:01 +00:00
Dave Syer
0ef78db45c Fix integration test 2014-12-12 11:23:42 +00:00
Spencer Gibb
eb48314cea added failFast option
fixes gh-1
2014-12-04 19:38:02 -07:00
Dave Syer
9d55ef84d0 Extract config server properties to Java bean
ConfigServerProperties is now used to store global properties
for the config server (like the path prefix and bootstrap flag)
under spring.cloud.config.server.* so git specific ones have
been pushed down to spring.cloud.config.server.git.* (similarly
for git->native).

At the same time introduce spring.cloud.config.server.defaultLabel
for the deafult git label (defaults to "master").

Fixes gh-28
2014-11-10 08:46:02 +00:00
Dave Syer
09bdb001d7 Make server tests work offline 2014-10-26 10:42:51 +00:00
Dave Syer
da7522c25a Update for new security module 2014-10-03 16:02:30 +01:00
Dave Syer
fdb6d0e354 More defensive about content type 2014-09-02 19:38:00 +01:00
Dave Syer
2e5a1c8ff5 Update package names 2014-08-29 13:34:36 +01:00
Dave Syer
8471d14a18 Rename platform->cloud 2014-08-29 12:52:52 +01:00