Commit Graph

253 Commits

Author SHA1 Message Date
Dave Syer
c685931308 Send 404 if Git label not found
See gh-153
2015-05-19 11:49:41 +01:00
Dave Syer
e94b4039a6 Strip "document" prefix from YAML by default
It's pretty uncommon for Spring apps, but sometimes YAML is not a
map, but more naturally a String or Collection. In these cases Spring
puts a "document" prefix in the Map it creates, so we can strip that
off if the user prefers it.

Fixes gh-143
2015-05-19 10:53:51 +01:00
Mikel Armañanzas
641d5b40e8 Fixing problem in windows loading files
Fixes gh-133, fixes gh-136, fixes gh-135
2015-05-06 06:47:24 -04:00
Spencer Gibb
fb1f28fb84 quote the cipher text
fixes gh-144
2015-05-05 09:41:44 -06:00
Spencer Gibb
242baae663 add a configurable health indicator for the Config Server
fixes gh-142
2015-05-04 13:32:51 -06:00
Dave Syer
98b64aa4cb If URI has no context path add one ("/")
Fixes gh-131
2015-04-29 11:38:00 +02:00
Dave Syer
5d1af78f91 Update to 1.0.2 snapshots 2015-04-23 11:11:21 +01:00
Dave Syer
a1cbf78188 Only enable retry if failFast=true 2015-04-21 08:41:29 +02:00
Dave Syer
5f379c0a62 Add support for retry in config client
If Spring Retry is on the classpath (and AspectJ) the config client
will create a proxy for the ConfigServerPropertySourceLocator that
retries a failed environment fetch. In this way the client can be
made to wait for the config server to come up, even if failFast=true.
(If failFast=false, the default, then it has no effect.)

Fixes gh-90, fixes gh-129
2015-04-21 08:20:07 +02:00
Dave Syer
5440d1d157 Add synchronized keyword to protect repository access
Fixes gh-128
2015-04-17 11:48:16 +01:00
Spencer Gibb
8c12408fba fixed typo
fixes gh-125
2015-04-13 08:06:54 -06:00
Dave Syer
280a7a2c09 Allow environment overrides to be escaped for placeholders
E.g. spring.cloud.config.server.overrides.foo=$\{bar} will evaluate
to foo=${bar} in the client's Environment (allowing local replacement
of the placeholder instead of on the configserver).
2015-04-03 10:32:41 +01:00
Dave Syer
91d12e7c56 Fix grammar 2015-03-31 10:55:41 +01:00
Dave Syer
cef828b544 Fix formatting and clarify use of searchPaths in config server
See gh-117
2015-03-27 12:29:54 +00:00
Dave Syer
0f3233bad1 Add logging to EncryptionController
Fixes gh-115
2015-03-26 10:19:20 +00:00
Spencer Gibb
7218c54a45 Merge pull request #114 from royclarkson/107
Use 'trunk' as default label for Subversion repositories
2015-03-25 11:31:28 -04:00
Roy Clarkson
a15aed0b78 Use 'trunk' as default label for Subversion repositories
This commit adds a getDefaultLabel() method to the EnvironmentRepository
interface. SvnKitEnvironmentRepository returns 'trunk', while all other
implementations return 'master'. ConfigServerMvcConfiguration and
ConfigServerBootstrapConfiguration will utilize labels configured on
the client and server before falling back to the repository's default
label.

Resolves #107
2015-03-24 14:36:52 -05:00
Dave Syer
93543644a2 Nested JSON format instead of flat properties
Since JSON is a subset of YAML it makes more sense to keep the
same format (i.e. nested objects instead of the flattened
property names).

See gh-112
2015-03-24 13:50:36 +00:00
Chris Manning
57bcd734d1 Adding endpoint for .json similar to .yml, .yaml, and .properties
Fixes gh-113, fixes gh-112
2015-03-24 13:25:19 +00:00
Dave Syer
aa2150deda Fix broken test 2015-03-20 15:09:09 +00:00
Dave Syer
b1ba8df066 Fix native profile so it behaves as described in docs
The SCM repositories have a "clean()" method to strip out the server's
own configuration files from the property sources shipped to remote
clients. The "native" one didn't have that method so this change adds
it with a similar implementation to the SCM case, except slightly
more complicated because of the extra search locations added by the
"label" parameter.

Also changes the name SpringApplicationEnvironmentRepository to
NativeEnvironmentRepository to match the profile and the config properties.

Fixes gh-109
2015-03-20 14:42:42 +00:00
Dave Syer
5a80ce9e3a Explicitly list profiles and label in Environment
Fixes gh-111
2015-03-20 13:13:52 +00:00
Dave Syer
2845b26eed Add link to github in rendered docs 2015-03-20 11:46:14 +00:00
Dave Syer
ea138e8dbd Default label on client is null (so server can set priority)
Fixes gh-108
2015-03-20 07:59:49 +00:00
Dave Syer
d72d4c06a6 Update docs for native repo
Fixes gh-109
2015-03-19 17:54:07 +00:00
Dave Syer
ae343454a4 Add getters and setter for native profile repository 2015-03-19 17:22:16 +00:00
Dave Syer
24904a4d6d Add annotation processor 2015-03-19 14:26:41 +00:00
Dave Syer
7b6fdb5f72 Re-organize non-config concerns in spring-cloud-context
Fixes gh-110 See gh-104
2015-03-19 11:49:33 +00:00
Dave Syer
02b13a41b2 Moved non-config client related code into commons
Refresh, Bootstrap and encryption features all moved into commons

See gh-104
2015-03-18 15:41:20 +00:00
Dave Syer
cab00b3edd Prevent aggressive bean instantiation with config props rebinder
A BeanPostProcessor has to be a good citizen and not force other beans
to be instantiated. ConfigurationPropertiesRebinder was a nightmare in
this regard. Fixed now by knowing the bean ids of its dependencies.
2015-03-18 13:05:23 +00:00
Spencer Gibb
9d6dcac60b remove unused annotations 2015-03-17 10:36:18 -06:00
Dave Syer
707b83292a Fix broken test in sample 2015-03-17 16:08:02 +00:00
Dave Syer
83ef3e4b74 Disable config server client by default in config server
This change adds a listener that inserts a PropertySource really early
so that spring.cloud.config.enabled=false is the default in a config
server. It can be overridden if the user primes the Environment with
spring.cloud.config.enabled=true.

See gh-104
2015-03-17 15:14:32 +00:00
Dave Syer
b49ceed3c5 Config server health indicator default status changed to UNKNOWN
In the unlikely event that the property source locator throws an
exception we go with DOWN, but if there are no property sources
we just mark it as UNKNOWN. It's then a business decision whether or
not to rely on the server to be there at runtime (e.g. in a /refresh).

See gh-104
2015-03-17 13:13:28 +00:00
Dave Syer
ee4717bbab Allow patterns in repository search paths
User can now specify spring.cloud.config.server.git.searchPaths as
a list of patterns (instead of a list of subdirectory names).

See gh-97
2015-03-16 11:01:21 +00:00
Dave Syer
4ae639c351 Extra docs for embeddable config server
Fixes gh-100
2015-03-11 10:32:02 +00:00
Dave Syer
f0c77a594e Make svnkit optional
See gh-99
2015-03-11 10:31:29 +00:00
Dave Syer
bcef73bc98 Add encrypt.keyStore.secret property
So that the keystore and the key can have independent secrets
(the "secret" is the key, and the "password" is the store).

Fixes gh-98
2015-03-09 22:15:41 +00:00
Dave Syer
742cb478ba Add bintray properties 2015-03-05 16:28:10 +00:00
Dave Syer
d4553f6a57 Update to next snapshot 2015-03-03 14:56:26 +00:00
Dave Syer
8a44cf5fa5 Simplfy RefreshScope
By adding a proxyMode to the @RefreshScope annotation we
no longer need to do all teh autoProxy stuff in GenericScope
(apparently Spring does it for you now).

See gh-96
2015-03-02 15:25:46 +00:00
Dave Syer
5fc2b1af66 Fix @RequestMapping so that git label can contain periods
Spring MVC lops off the "extension" from request paths by default
(causing no end of other problems), but in this case making it
impossible, or unintuitive at best, to use version-like labels
in git repositories (e.g. 1.0.0). This change makes the mapping
a regex match which includes the whole path, not just the stem.

Fixes gh-94
2015-03-02 09:03:59 +00:00
Dave Syer
80cc7f9800 source->environment 2015-02-27 15:52:45 +00:00
Dave Syer
8f7f4bf3b4 Add release profile for distribution management 2015-02-27 15:49:52 +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
0c794adf5c Fix concurrent map modification error 2015-02-27 10:27:50 +00:00
Dave Syer
1dc13c2964 Tweak test sensitive to ordering 2015-02-27 08:35:00 +00:00
Dave Syer
76871fdf7c Fix YAML output if arrays are nested or contain objects
Fixes gh-92
2015-02-26 18:11:33 +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
Dave Syer
fc82c93175 Add explicit ref to serviceId for disovery 2015-02-23 15:40:10 +00:00