296 Commits

Author SHA1 Message Date
Dave Syer
0d2cb07384 Revert some of the changes to RefreshScope and @Configuration
Some things were changed in Spring and some problems are fixed
(while at least one is not - scope!="refresh" for a @Configuration
with @RefreshScope)
2014-12-03 14:31:39 +00:00
Lukasz Kryger
001e449be2 Update README.adoc
Fixed links to follow the asciidoctor syntax, not MD.
2014-12-01 16:09:05 +00:00
Dave Syer
66de92b4e2 Close repository after each operation
This prevents the tests failing when they try to delete the
.git files, but there is still a file lock (in Snake YAML),
so does not yet fix gh-45.
2014-12-01 12:20:03 +00:00
Dave Syer
815f9be894 Use entrySet() instead of keySet()
Fixes gh-46
2014-12-01 10:36:02 +00:00
Dave Syer
1065149cc9 Fix Maven compiler error 2014-12-01 10:35:38 +00:00
Dave Syer
0ae34b06fe Make it illegal to add @RefreshScope to @Configuration
There are still some problematic areas (see SPR-12486) where users
might be surprised, but at least there now is an error message for the
specific case of @RefreshScope on @Configuration.

Fixes gh-43
2014-12-01 09:47:58 +00:00
Dave Syer
0af301e7c2 More care with form-encoded data if it might be hex 2014-11-29 12:04:47 +00:00
Dave Syer
208173eccd More granular exception handling to provide better error message 2014-11-29 12:04:25 +00:00
Dave Syer
a83daa0ef5 starters->starter-parent 2014-11-26 14:05:57 +00:00
Dave Syer
775eb3b0e0 Fix travis build script 2014-11-26 09:26:26 +00:00
Dave Syer
6205bc7d81 Add more tests for gh-43 2014-11-26 08:11:13 +00:00
Dave Syer
689d12e9c1 Break Mvc endpoint configuration out from non Mvc
Fixes gh-44 because it allows an extra layer to insert
an @AutoConfigureAfter.

Also adds some more integration tests for refresh scope

Per gh-43, note that @Configuration does not play well
with @RefreshScope (see @Ignored test case).
2014-11-25 12:25:14 +00:00
Dave Syer
56434c79eb Fix pull request builds 2014-11-25 09:47:55 +00:00
Dave Syer
4f326b59a0 Add @ConditionalOnClass to health indicator 2014-11-23 07:40:15 +00:00
Spencer Gibb
65112da6fb Merge pull request #35 from spring-cloud/config-server-health-indicator
a HealthIndicator for ConfigServer.  It tests the http connection to the...
2014-11-18 11:11:54 -07:00
Dave Syer
03d827b432 Break @ConfigurationProperties out to type level 2014-11-17 14:35:52 +00:00
Dave Syer
4669102be6 Search in subdirectories of main config repo
... in addition to top level. That way users can
organize their config files, e.g. by subsystem.
Subdirectories have *higher* precedence than the
top level. Users configure which subdirectories to
search through spring.cloud.config.server.git.searchPaths
(array or String, so csv in config file, default empty).

Fixes gh-36
2014-11-17 13:42:04 +00:00
Dave Syer
776ec68280 Add contributing section to README 2014-11-17 10:29:14 +00:00
Dave Syer
93bca31f64 Extract code that is now no visible in Boot 2014-11-17 09:27:26 +00:00
Spencer Gibb
725f0b31c9 Merge pull request #38 from nurkiewicz/patch-1
Minor typo
2014-11-13 11:04:49 -07:00
Dave Syer
bfd3616d15 Ensure context ID can be set in bootstrap.yml
The problem was the ordering of ApplicationContextInitializers:
the bootstrap process sets the parent application context in an
initializer (formerly with no @Order) which needs to happen
before any other initializers that depend on the Environment.
Fix is to add an @Order (e.g. 0) so it comes before the
ContextIdApplicationContextInitializer.

Fixes gh-37
2014-11-13 17:58:08 +00:00
Tomasz Nurkiewicz
4f9b044453 Minor typo 2014-11-13 13:03:50 +01:00
Spencer Gibb
62e41f63c0 change spring.cloud.config.enabled to @ConditionalOnExpression 2014-11-12 14:33:27 -07:00
Dave Syer
e132e8e9e5 Add support for spring.cloud.config.enabled=false 2014-11-12 15:54:53 +00:00
Spencer Gibb
cae3c1fe42 a HealthIndicator for ConfigServer. It tests the http connection to the config server and lists the names of the property sources if it is up. 2014-11-10 13:54:55 -07:00
Dave Syer
7d84c94bed Fix tess configuration for fail fast encryption 2014-11-10 14:57:49 +00:00
Tomasz Nurkiewicz
13365f0aae Extracting few methods to improve readability
Fixes gh-27
2014-11-10 14:14:45 +00:00
Dave Syer
ea90838dd3 Add secrets to .travis.yml 2014-11-10 14:10:05 +00:00
Dave Syer
91e1ddc9a3 Add fail fast flag for config client if local decryption fails
On the server we choose not to fail if a property cannot be decrypted (clients
might be relying on the other values to be able to deal with the failure).

Fixes gh-31
2014-11-10 09:57:45 +00: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
04b6cd0f13 Add some docs for config server 2014-11-08 19:28:46 +00:00
Dave Syer
4c7cc73671 Add self-bootstrap feature for embedded config server
Also switch to use SpringApplicationEnvironmentRepository
in "native" profile (it's more useful as a "getting started"
tool).

Fixes gh-21, fixes gh-33
2014-11-08 13:12:18 +00:00
Dave Syer
b6f22b83c7 Strip prefix in info rebinding 2014-11-06 14:14:53 +00:00
Dave Syer
54434bd71e Update README with "Building" instructions
Fixes gh-13
2014-10-31 15:41:46 +00:00
Dave Syer
ccf4da59c2 More detail on context hierarchies 2014-10-31 08:54:55 +00:00
Dave Syer
9efae007fa Add Environment to ProeprtySourceLocator.locate()
In this way each contexet in a hierarchy can in principle have a different
set of property sources
2014-10-30 11:43:00 +00:00
Dave Syer
010d29c124 Fix application name always being "bootstrap" 2014-10-30 07:17:02 +00:00
Dave Syer
84962cefca Add spring.cloud.config.server.prefix
Fixes gh-23
2014-10-29 15:13:12 +00:00
Dave Syer
ec0108f867 Clarify role of spring.application.name and context hierarchies
Also allow override of bootstrap properties location using
spring.cloud.config.*.

Fixes gh-22
2014-10-29 14:59:48 +00:00
Dave Syer
d564e8dda0 Add docs for Eureka first config bootstrap 2014-10-26 15:47:33 +00:00
Dave Syer
c966bfe3c4 Add spring.cloud.config.discovery.* configuration properties 2014-10-26 15:36:35 +00:00
Dave Syer
09bdb001d7 Make server tests work offline 2014-10-26 10:42:51 +00:00
Dave Syer
19cd6be001 Add @Order to the default property source locator 2014-10-25 08:15:58 +01:00
Joshua Morris
889e62e248 Added the option to use a username and password
Fixes gh-19
2014-10-24 16:49:07 +01:00
Ernesto Hdez
fb17155b7d Avoid ConcurrentModificationException when decrypting
Fixes gh-20
2014-10-24 16:47:05 +01:00
Dave Syer
596420ff4f Upgrade to Boot 1.1.8 2014-10-23 07:34:17 -07:00
Dave Syer
1ece7ab803 Make executable jar work better as an embeddable
I think it's a good idea to provide an executable jar (good
getting started experience), but it wasn't working very well.
The biggest problem was the missing main() method, but that
was easy to fix. More interestingly I have changed the default
config name to "configserver" so "configserver.yml" is loaded
to set the default config for the standalone jar, and this file
can easily be ignored in a customized server.

Fixes gh-17
2014-10-23 05:26:05 -07:00
Dave Syer
5bb361e806 Add .properties and .yml endpoint 2014-10-22 06:27:17 -07:00
Spencer Gibb
0b6be00fee Merge pull request #11 from boostrack/patch-1
Update spring-cloud-config.adoc
2014-10-17 17:21:36 -07:00
Spencer Gibb
3808213f5c Merge pull request #16 from achudzik/missingAsciiDoctorGem
[#15] Installation of asciidoctor added to travis's before_install
2014-10-17 17:21:12 -07:00