Updated Branches: refs/heads/1.5.x 0301a3089 -> 5860bb9ea
Ensuring pem files are properly split regardless of source OS Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/commit/5860bb9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/tree/5860bb9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/diff/5860bb9e Branch: refs/heads/1.5.x Commit: 5860bb9ea80861a285c38822b82d612d04e82178 Parents: 0301a30 Author: zack-shoylev <[email protected]> Authored: Mon Jul 1 00:47:41 2013 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Mon Jul 1 00:48:33 2013 +0200 ---------------------------------------------------------------------- .../java/org/jclouds/chef/functions/GroupToBootScript.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/5860bb9e/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java b/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java index 3ad9024..0acd51d 100644 --- a/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java +++ b/core/src/main/java/org/jclouds/chef/functions/GroupToBootScript.java @@ -28,6 +28,7 @@ import java.security.PrivateKey; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; import javax.inject.Inject; import javax.inject.Named; @@ -56,6 +57,8 @@ import com.google.inject.TypeLiteral; */ @Singleton public class GroupToBootScript implements Function<String, Statement> { + private static final Pattern newLinePattern = Pattern.compile("(\\r\\n)|(\\n)"); + @VisibleForTesting static final Type RUN_LIST_TYPE = new TypeLiteral<Map<String, List<String>>>() { }.getType(); @@ -95,8 +98,8 @@ public class GroupToBootScript implements Function<String, Statement> { .format("validation_client_name \"%s\"", validatorClientName), String.format( "chef_server_url \"%s\"", endpoint.get()))); - Statement createValidationPem = appendFile(chefConfigDir + "{fs}validation.pem", Splitter.on('\n').split( - Pems.pem(validatorKey))); + Statement createValidationPem = appendFile(chefConfigDir + "{fs}validation.pem", Splitter.on(newLinePattern) + .split(Pems.pem(validatorKey))); String chefBootFile = chefConfigDir + "{fs}first-boot.json";
