Commit Graph

306 Commits

Author SHA1 Message Date
Ryan Baxter
fbeea130eb Going back to snapshots 2017-10-02 14:39:40 -04:00
Ryan Baxter
47cb05c7aa Update SNAPSHOT to 1.3.3.RELEASE 2017-10-02 14:37:27 -04:00
Spencer Gibb
6d89ed8059 Update jsch for newer keys
fixes gh-780
2017-09-11 15:53:51 -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
Ollie Hughes
c67699562a Use prefix parameter when when matching encrypt.keyStore property
So that relaxed naming will also `encrypt.key-store`. Fixes gh-772.
2017-08-09 14:47:55 +01:00
Dave Syer
89115f195e Add missing file 2017-08-04 12:42:11 +01:00
Dave Syer
fe42a1d669 Check for existing TextEncryptor and create a TextEncryptorLocator
This addresses the corner case where encrypt.key is provided so a
TextEncryptor is available in the bootstrap context. Previously
it was not used and the /encrypt endpoints wouldn't work.

Fixes gh-760
2017-08-04 11:49:22 +01:00
Ryan Baxter
0751f9d69e Merge pull request #753 from ojhughes/ssh-validation-typo
Fix incorrect message when private key is missing
2017-07-31 10:12:47 -04:00
Ollie Hughes
7f047fc0ce Fix incorrect message when private key is missing 2017-07-25 11:32:49 +01:00
Spencer Gibb
ebbe75d6aa Bumping versions to 1.3.3.BUILD-SNAPSHOT after release 2017-07-20 11:03:30 -06:00
Spencer Gibb
00e08f99b3 Going back to snapshots 2017-07-20 11:03:30 -06:00
Spencer Gibb
d52715c061 Update SNAPSHOT to 1.3.2.RELEASE 2017-07-20 10:52:01 -06:00
Ollie Hughes
537f6ce648 Differentiate between SSH settings found at the top level of a Git configuration object and those found as a map under the Repos property. Do this by introducing common base class SshUri that holds common properties and SshUriNestedRepoProperties, that is used to contain properties in the repos property map. This avoids Boot from guarding against a potential infinite deserialization loop. 2017-07-20 12:08:15 +01:00
Ollie Hughes
67cdfab7fa Use JGit URIish to parse SSH URIs
Use JSR-303 cross field validation for `SshUriProperties`
Rebase with 1.3.x Dalston
2017-07-20 12:07:02 +01:00
Ollie Hughes
acee8a1b10 Git SSH configuration using properties
By default, Spring Cloud Config Server uses SSH configuration files such
as ~/.ssh/known_hosts and /etc/ssh/ssh_config when connecting to Git repositories
using an SSH URI. In cloud environments such as Cloud Foundry,
the local filesystem may be ephemeral or not easily accessible.

 For cases such as these, SSH configuration can be set using Java properties.
 In order to activate property based SSH configuration,
the property spring.cloud.config.server.git.ignoreLocalSshSettings must be set to true
2017-07-20 12:06:39 +01:00
Dave Syer
8df2051fef Fix encryptor configuration to prevent infinite loop 2017-06-27 13:14:22 +01:00
Dave Syer
4db8f48233 Send 404 if repository does not exist 2017-06-27 10:54:18 +01:00
Dave Syer
0da1397153 Add optional decryption to bootstrap config server
Fixes gh-434
2017-06-26 16:58:25 +01:00
Dave Syer
e6a42aab95 Check for index.lock before attempting to use JGit
A stale lock from a crashed JVM can prang the JGit client by
preventing it from ever getting access to the working directory.
This change attempts to clean the slate by removing the lock -
because of the synchronization already present in the repository
the only way this can go wrong is if multiple server instances
are trying to share the working directory (which would be an
eror for other reasons).
2017-06-26 14:48:13 +01:00
Dave Syer
c5c432e2b3 Use undeprecated class 2017-06-26 08:12:55 +01:00
Ryan Baxter
bb41683804 Set version when there is only a single environment repository in a composite. Fixes #718. 2017-06-14 14:46:43 -04:00
tapvirvirk
b7ce318596 Update AwsCodeCommitCredentialsProviderTests.java
Fixed the spaces
2017-05-30 19:05:37 -04:00
tapvirvirk
b83572ab47 Update AwsCodeCommitCredentialProvider.java
Fixed the spaces
2017-05-30 19:04:58 -04:00
tapvirvirk
2611b0a229 Update AwsCodeCommitCredentialsProviderTests.java 2017-05-26 16:53:58 -04:00
tapvirvirk
389da6b20f Update AwsCodeCommitCredentialsProviderTests.java 2017-05-26 16:51:14 -04:00
tapvirvirk
cf38dedd14 Update AwsCodeCommitCredentialProvider.java 2017-05-26 16:43:27 -04:00
tapvirvirk
215eb24d0b Update AwsCodeCommitCredentialProvider.java 2017-05-25 15:03:42 -04:00
Spencer Gibb
8ca749ff4b Bumping versions to 1.3.2.BUILD-SNAPSHOT after release 2017-05-24 10:23:14 -06:00
Spencer Gibb
446a65f4e1 Going back to snapshots 2017-05-24 10:23:14 -06:00
Spencer Gibb
63e6a0ebd3 Update SNAPSHOT to 1.3.1.RELEASE 2017-05-24 10:23:14 -06:00
Venil Noronha
d9113a417d Adds addLabelLocations option to ConfigServerProperties (#681)
Adds addLabelLocations option to server properties.
Also eliminates any duplicate locations.

Fixes gh-676
2017-05-19 18:13:02 -04:00
Spencer Gibb
2c62116cef Merge branch 'jgit-transport-config-callback' of https://github.com/rterentiev/spring-cloud-config into rterentiev-jgit-transport-config-callback 2017-05-19 16:05:33 -06:00
Spencer Gibb
0d4a48444b Try and create the basedir if it doesn't exists.
fixes gh-700
2017-05-18 15:02:44 -06:00
Roman Terentiev
7ee15a4f2a Add null checks 2017-05-16 12:27:57 +03:00
Roman Terentiev
e693542693 Add ability to set JGit TransportConfigCallback 2017-05-10 11:05:49 +03:00
Dave Syer
4d4cd17ed2 Merge branch '1.2.x' 2017-05-08 20:29:11 +01:00
Dave Syer
f67bdba5ed Derive base dir of new pattern matching repositories from the parent
Before this change when a repository is created to support a pattern match
in the URL, the basedir for cloning the scm repository is a new temp dir.
So if user configures the basedir to be something other than temp then he
loses the benefit once patterns are used in the URL matchers.

The basedir still has to be unique, so we now use the same parent directory
as the parent repo, and add the temp file name as a directory name. I.e.
if basedir=/foo/bar the pattern matched basedir will be something like
/foo/config-repo-23874691. You need the directory to have a parent that
is writable by the config server JVM.

Fixes gh-451
2017-05-08 20:21:20 +01:00
Ryan Baxter
dfa609aa0d Bumping version for next release 2017-04-07 05:29:57 -04:00
Ryan Baxter
7bada56f30 Going back to snapshots 2017-04-07 05:01:59 -04:00
Ryan Baxter
e051d56965 Update SNAPSHOT to 1.3.0.RELEASE 2017-04-07 04:55:32 -04:00
Abhijit Sarkar
8c36922d21 Making refresh modifier public so that clients can do AOP failover (#634) 2017-04-05 21:13:59 -04:00
George Harley
1b701ebdb6 Stop VaultEnvironmentRepository returning duplicate property sources (#679)
When findOne() is called with an application parameter that matches the defaultKey property value then
the returned Environment contains two identical PropertySource values when it should only contain one.
2017-04-03 13:03:00 -04:00
Spencer Gibb
62ef648b59 polish 2017-03-31 14:18:30 -06:00
ivasylyev
1152821221 Add stacktrace logging 2017-03-31 14:17:15 -06:00
Sean Dukehart
7d7b2c3ce0 Adds resolvePlaceholders to ResourceController
Adds resolvePlaceholders query parameter to ResourceController to allow users the option to resolve placeholders or not.

fixes gh-669
2017-03-24 17:36:17 -04:00
Ryan Baxter
94bd2a98b8 Revert "Version changes for Dalston.RC1"
This reverts commit 78c24a18b2.
2017-03-16 11:42:14 -04:00
Ryan Baxter
78c24a18b2 Version changes for Dalston.RC1 2017-03-16 11:19:21 -04:00
Don Laidlaw
91372cad2d Add missing test for credential provider. (#664) 2017-03-10 12:32:02 -05:00
Ryan Baxter
e5e575370e Bumping versions for next release 2017-03-08 10:56:04 -05:00