Repository: jclouds Updated Branches: refs/heads/master 415a8a660 -> 962de83e8
JCLOUDS-1050: Fix BootstrapConfig deserialization in Chef Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/962de83e Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/962de83e Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/962de83e Branch: refs/heads/master Commit: 962de83e86842d576d9a82d6105c4f98fdd0dc97 Parents: 415a8a6 Author: Ignasi Barrera <[email protected]> Authored: Wed Dec 16 14:58:05 2015 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Wed Dec 16 16:05:09 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/jclouds/chef/domain/BootstrapConfig.java | 4 ++++ .../org/jclouds/chef/functions/BootstrapConfigForGroupTest.java | 3 +++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/962de83e/apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java b/apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java index 7b10edc..6a004fc 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java +++ b/apis/chef/src/main/java/org/jclouds/chef/domain/BootstrapConfig.java @@ -41,6 +41,10 @@ public class BootstrapConfig { public String toString() { return ":verify_" + name().toLowerCase(); } + + public static SSLVerifyMode fromValue(String value) { + return valueOf(value.replaceAll(":verify_", "").toUpperCase()); + } } public static Builder builder() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/962de83e/apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java b/apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java index c704ee6..87b1463 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/functions/BootstrapConfigForGroupTest.java @@ -28,6 +28,7 @@ import org.jclouds.chef.ChefApi; import org.jclouds.chef.domain.BootstrapConfig; import org.jclouds.chef.domain.Client; import org.jclouds.chef.domain.DatabagItem; +import org.jclouds.chef.domain.BootstrapConfig.SSLVerifyMode; import org.jclouds.json.Json; import org.jclouds.json.config.GsonModule; import org.testng.annotations.BeforeClass; @@ -70,6 +71,7 @@ public class BootstrapConfigForGroupTest { BootstrapConfigForGroup fn = new BootstrapConfigForGroup("jclouds", chefApi, json); DatabagItem databag = new DatabagItem("foo", "{\"environment\":\"development\",\"ssl_ca_file\":\"/etc/certs/chef-server.crt\"," + + "\"ssl_verify_mode\": \":verify_peer\"," + "\"run_list\":[\"recipe[apache2]\",\"role[webserver]\"]," + "\"attributes\":{\"tomcat6\":{\"ssl_port\":8433}}}"); @@ -79,6 +81,7 @@ public class BootstrapConfigForGroupTest { BootstrapConfig config = fn.apply("foo"); assertEquals(config.getEnvironment(), "development"); assertEquals(config.getSslCAFile(), "/etc/certs/chef-server.crt"); + assertEquals(config.getSslVerifyMode(), SSLVerifyMode.PEER); assertEquals(config.getRunList().get(0), "recipe[apache2]"); assertEquals(config.getRunList().get(1), "role[webserver]"); assertEquals(config.getAttributes().toString(), "{\"tomcat6\":{\"ssl_port\":8433}}");
