Commit Graph

309 Commits

Author SHA1 Message Date
liolay
4ba22e5409 wrong value eval at ignoreLocalSshSettings (#892)
when "spring.cloud.config.server.git.ignoreLocalSshSettings" is "true",there is a wrong value eval at ignoreLocalSshSettings to decide whether SshUri configured in "spring.cloud.config.server.git.repos" need be validate
2018-02-28 20:14:18 -05:00
Dave Syer
33e85bdf58 Add encrypt.salt optional configuration 2018-02-22 11:08:56 +00:00
moon
ff453c4767 add tracking check to isClean() for git repo (#875) 2018-02-07 15:12:32 -05:00
Spencer Gibb
e558de8665 Merge branch '1.4.x' 2018-02-01 19:22:06 -05:00
Spencer Gibb
049fbf81c1 Env Controller support for {application} (_)
fixes gh-894
2018-02-01 17:19:52 -05:00
Johnny Lim
29ed2eb6c6 Remove a redundant assertion 2018-01-24 16:00:12 +09:00
Dave Syer
d7af06ab12 Ensure config server doesn't try to start a web server
Even if the user (in a mad crazy fugue state) adds
spring.main.web-application-type explicitly to application.properties
we should ignore it when building the "mini" application that
creates the environment to export to remote clients.
2018-01-10 11:20:54 +00:00
Ryan Baxter
5e8b83aacb Merge remote-tracking branch 'origin/1.4.x' 2018-01-02 09:18:37 -05:00
Ryan Baxter
914fa948c8 Merge remote-tracking branch 'origin/1.3.x' into 1.4.x 2018-01-02 09:17:53 -05:00
Ryan Baxter
6b67fcf925 Adding @Validated annotation. Fixes #871. 2018-01-02 09:14:55 -05:00
Spencer Gibb
4f54e73545 Updates for changes in encryption defaults 2018-01-01 16:45:48 -05:00
Spencer Gibb
b43cee2fa5 Merge branch '1.4.x' 2017-11-29 12:21:46 -05:00
Spencer Gibb
cf1bdf647d Fix test that breaks when run as a suite. 2017-11-29 12:21:02 -05:00
Spencer Gibb
98e02dcf1f Update test for ModifiedClassPathRunner 2017-11-28 16:48:08 -05:00
Spencer Gibb
56180bf229 Merge branch '1.4.x' 2017-11-28 16:45:45 -05:00
Spencer Gibb
b1f54c9590 Exclude DataSourceAutoConfiguration from sample application
fixes gh-819
2017-11-28 16:44:04 -05:00
Dave Syer
5ee81a0941 Merge branch 'master' into 2.0.x 2017-11-09 15:15:21 +00:00
Dave Syer
b278e531c9 Make SQL statement for JDBC repo configurable 2017-11-09 15:15:05 +00:00
Tommy Ludwig
b5022e3660 Make CompositeConfiguration conditional on missing bean
Previously, `CompositeConfiguration` (which is imported by `ConfigServerAutoConfiguration`) would unconditionally create a `CompositeEnvironmentRepository` bean marked as `@Primary`. This makes it difficult for users, in their code, to provide their own `CompositeEnvironmentRepository` bean to be used in various places. This adds a `ConditionalOnMissingBean` condition to the `Configuration` to make it easy to provide a primary `CompositeEnvironmentRepository` in user code.
2017-11-07 07:44:01 -05:00
Tommy Ludwig
3157bd4e2c Make CompositeConfiguration conditional on missing bean
Previously, `CompositeConfiguration` (which is imported by `ConfigServerAutoConfiguration`) would unconditionally create a `CompositeEnvironmentRepository` bean marked as `@Primary`. This makes it difficult for users, in their code, to provide their own `CompositeEnvironmentRepository` bean to be used in various places. This adds a `ConditionalOnMissingBean` condition to the `Configuration` to make it easy to provide a primary `CompositeEnvironmentRepository` in user code.
2017-11-06 21:04:24 +09:00
Spencer Gibb
2238ad94c3 Merge branch 'master' into 2.0.x 2017-10-23 21:10:28 -04:00
Daniel Lavoie
1df2c15c88 Add support for default label on native environment repository (#826) 2017-10-23 15:10:36 -04:00
Spencer Gibb
67f7b693f8 Merge branch 'master' into 2.0.x 2017-10-20 17:22:15 -04:00
Spencer Gibb
d087d7e082 Merge branch '1.3.x' 2017-10-20 17:08:56 -04:00
Spencer Gibb
4c505e7b26 Merge branch 'master' into resource-default-label 2017-10-20 16:24:30 -04:00
Sean Dukehart
b333bd4ff9 Feature/organization project level enablement (#814)
* Changes to provide partial functionality for Issue #779

* Corrected formatting

* Additional tests to ensure backwards compatibility

* Corrected test

* Further testing to try to address code coverage concerns

* Additional tests to hopefully aid in code coverage diff

* Expect exceptions for null name (handle branch coverage)
2017-10-20 16:22:26 -04:00
Tommy Ludwig
4f6dcd0de8 Include TransportConfiguration for server bootstrap case (#812)
Previously, taking SSH configuration from properties (as opposed to the default SSH configuration files) was only possible when not bootstrapping the Config Server itself. This includes the `TransportationConfiguration` for the bootstrap case as well.

Related to gh-741
2017-10-20 16:20:15 -04:00
Mihaly Nyeste
ac76f6e970 Fix encryption of string containing curly braces (#774)
* Add test to reproduce curly brace problem

* Fix stripping prefix if string contains curly brace
2017-10-20 16:19:18 -04:00
Daniel Lavoie
01981aad53 ResourceController support for server defined default label.
Fixes #824
2017-10-19 12:42:51 -04:00
Dave Syer
7a82540f59 Merge branch 'master' into 2.0.x 2017-09-22 14:22:07 +01:00
Dave Syer
46253b746b Fix some compiler warnings 2017-09-22 13:39:41 +01:00
Dave Syer
e362f39285 Add simple implementation of JDBC environment repository 2017-09-22 13:39:29 +01:00
Dave Syer
5d80742e9c Merge branch 'master' into 2.0.x 2017-09-21 13:54:55 +01:00
Dave Syer
70aea7c358 Fix ordering issues in environment repository config 2017-09-21 13:54:35 +01:00
Spencer Gibb
0e46f86082 Merge branch 'master' into 2.0.x 2017-09-11 16:02:10 -06:00
Spencer Gibb
90564e0572 Add missing import 2017-09-11 16:01:56 -06:00
Spencer Gibb
6b09a15856 Merge branch '1.3.x' 2017-09-11 15:55:40 -06:00
Spencer Gibb
6d89ed8059 Update jsch for newer keys
fixes gh-780
2017-09-11 15:53:51 -06:00
Spencer Gibb
ec51b0a9a9 Update jgit to 4.8.0.201706111038-r 2017-09-11 15:35:04 -06:00
Spencer Gibb
9b8fa89549 Merge branch 'master' into 2.0.x 2017-09-11 15:24:55 -06:00
Spencer Gibb
3e6fc09bba Merge branch '1.3.x' 2017-09-11 15:17:03 -06:00
Spencer Gibb
f995217841 unignore test 2017-09-11 15:15:12 -06:00
Spencer Gibb
b555ddfe92 Move back to java7 compatible jgit.
Fixes gh-780
2017-09-11 15:14:47 -06:00
Edgars Jasmans
18a5da61d4 Added additional options for GIT SSH configuration property configuration (#775)
Abilty to specify known_hosts file
 Added option to specify SSH 'PreferredAuthentications' property to override SSH server priorities for authentication methods.

fixes gh-101
2017-08-31 19:05:34 -04:00
Johnny Lim
5381497bdb Fix error messages 2017-08-31 10:38:02 +09:00
Ryan Baxter
f5cf304543 Merge remote-tracking branch 'origin/master' into 2.0.x 2017-08-24 16:13:49 -04:00
Tommy Ludwig
c916487795 Remove unused BaseSshUriProperties
I believe this class was added by mistake in merge commit 7e901a1d4f. It is unused and appears to be mostly a duplicate of `SshUri`.
2017-08-20 15:41:41 +09:00
Spencer Gibb
508c1a1b5d Updates for broken tests 2017-08-09 10:17:47 -06:00
Spencer Gibb
99b06cc550 Update for spring boot 2 properties 2017-08-09 10:17:01 -06:00
Dave Syer
302e25544d Merge branch 'master' into 2.0.x 2017-08-09 14:48:40 +01:00