You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2013/09/03 10:06:12 UTC
[2/4] JCLOUDS-245/JCLOUDS-254: Fix live tests
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java
index 776247f..ace63e1 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/CreateNodeAndPopulateAutomaticAttributesImplTest.java
@@ -44,17 +44,11 @@ public class CreateNodeAndPopulateAutomaticAttributesImplTest {
public void testWithNoRunlist() {
ChefApi chef = createMock(ChefApi.class);
- Map<String, JsonBall> automatic = ImmutableMap.<String, JsonBall> of();
+ Supplier<Map<String, JsonBall>> automaticSupplier = Suppliers.<Map<String, JsonBall>> ofInstance(ImmutableMap.<String, JsonBall> of());
- Node node = new Node("name", ImmutableSet.<String> of(), "_default");
+ Node nodeWithAutomatic = Node.builder().name("name").environment("_default")
+ .automaticAttributes(automaticSupplier.get()).build();
- Supplier<Map<String, JsonBall>> automaticSupplier = Suppliers.<Map<String, JsonBall>> ofInstance(automatic);
-
- Node nodeWithAutomatic = new Node("name", ImmutableMap.<String, JsonBall> of(),
- ImmutableMap.<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(), automatic,
- ImmutableSet.<String> of(), "_default");
-
- node.getAutomatic().putAll(automaticSupplier.get());
chef.createNode(nodeWithAutomatic);
replay(chef);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
index 755576c..e8681d2 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplLiveTest.java
@@ -50,12 +50,12 @@ public class UpdateAutomaticAttributesOnNodeImplLiveTest extends BaseChefLiveTes
public void testExecute() {
Set<String> runList = ImmutableSet.of("role[" + prefix + "]");
try {
- api.createNode(new Node(prefix, runList, "_default"));
+ api.createNode(Node.builder().name(prefix).runList(runList).environment("_default").build());
strategy.execute(prefix);
Node node = api.getNode(prefix);
assertEquals(node.getName(), prefix);
assertEquals(node.getRunList(), runList);
- assertEquals(node.getAutomatic().get("current_user").toString(), currentUserProvider.get().toString());
+ assertEquals(node.getAutomaticAttributes().get("current_user").toString(), currentUserProvider.get().toString());
} finally {
api.deleteNode(prefix);
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java
index bf4a0e4..792e391 100644
--- a/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java
+++ b/core/src/test/java/org/jclouds/chef/strategy/internal/UpdateAutomaticAttributesOnNodeImplTest.java
@@ -16,10 +16,10 @@
*/
package org.jclouds.chef.strategy.internal;
+import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import java.util.Map;
@@ -31,7 +31,6 @@ import org.testng.annotations.Test;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
/**
* Tests behavior of {@code UpdateAutomaticAttributesOnNodeImpl}
@@ -46,17 +45,13 @@ public class UpdateAutomaticAttributesOnNodeImplTest {
ChefApi chef = createMock(ChefApi.class);
Map<String, JsonBall> automatic = ImmutableMap.<String, JsonBall> of();
-
- Node node = new Node("name", ImmutableSet.<String> of(), "_default");
-
Supplier<Map<String, JsonBall>> automaticSupplier = Suppliers.<Map<String, JsonBall>> ofInstance(automatic);
- Node nodeWithAutomatic = new Node("name", ImmutableMap.<String, JsonBall> of(),
- ImmutableMap.<String, JsonBall> of(), ImmutableMap.<String, JsonBall> of(), automatic,
- ImmutableSet.<String> of(), "_default");
+ Node node = Node.builder().name("name").environment("_default").build();
+ Node nodeWithAutomatic = Node.builder().name("name").environment("_default").automaticAttributes(automatic)
+ .build();
expect(chef.getNode("name")).andReturn(node);
- node.getAutomatic().putAll(automaticSupplier.get());
expect(chef.updateNode(nodeWithAutomatic)).andReturn(null);
replay(chef);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java b/core/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java
index d11b1cf..13c002e 100644
--- a/core/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java
+++ b/core/src/test/java/org/jclouds/chef/test/TransientChefApiIntegrationTest.java
@@ -50,12 +50,7 @@ public class TransientChefApiIntegrationTest extends BaseChefLiveTest<ChefApi> {
api.createDatabag(PREFIX);
}
- @Test(dependsOnMethods = "testCreateDatabag")
- public void testDatabagExists() {
- assertNotNull(api.databagExists(PREFIX));
- }
-
- @Test(dependsOnMethods = { "testDatabagExists" })
+ @Test(dependsOnMethods = { "testCreateDatabag" })
public void testCreateDatabagItem() {
Properties config = new Properties();
config.setProperty("foo", "bar");
@@ -66,11 +61,6 @@ public class TransientChefApiIntegrationTest extends BaseChefLiveTest<ChefApi> {
}
@Test(dependsOnMethods = "testCreateDatabagItem")
- public void testDatabagItemExists() {
- assertNotNull(api.databagItemExists(PREFIX, PREFIX));
- }
-
- @Test(dependsOnMethods = "testDatabagItemExists")
public void testUpdateDatabagItem() {
for (String databagItemId : api.listDatabagItems(PREFIX)) {
DatabagItem databagItem = api.getDatabagItem(PREFIX, databagItemId);
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/apache-chef-demo-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/apache-chef-demo-cookbook.json b/core/src/test/resources/apache-chef-demo-cookbook.json
index 0a3e384..228a3c0 100644
--- a/core/src/test/resources/apache-chef-demo-cookbook.json
+++ b/core/src/test/resources/apache-chef-demo-cookbook.json
@@ -6,14 +6,23 @@
"json_class": "Chef::CookbookVersion",
"providers": [],
"metadata": {
- "dependencies": {}, "name": "apache-chef-demo",
+ "dependencies": {},
+ "name": "apache-chef-demo",
"maintainer_email": "youremail@example.com",
- "attributes": {}, "license": "Apache v2.0",
+ "attributes": {},
+ "license": "Apache v2.0",
"maintainer": "Your Name",
- "suggestions": {}, "platforms": {}, "long_description": "",
- "recommendations": {}, "version": "0.0.0",
- "groupings": {}, "recipes": {}, "conflicting": {}, "description": "A fabulous new cookbook",
- "replacing": {}, "providing": {}
+ "suggestions": {},
+ "platforms": {},
+ "long_description": "",
+ "recommendations": {},
+ "version": "0.0.0",
+ "groupings": {},
+ "recipes": {},
+ "conflicting": {},
+ "description": "A fabulous new cookbook",
+ "replacing": {},
+ "providing": {}
}, "libraries": [],
"resources": [],
"templates": [],
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/brew-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/brew-cookbook.json b/core/src/test/resources/brew-cookbook.json
index f0b09ed..dcf7aca 100644
--- a/core/src/test/resources/brew-cookbook.json
+++ b/core/src/test/resources/brew-cookbook.json
@@ -1 +1,48 @@
-{"name":"brew-0.0.0","definitions":[],"json_class":"Chef::CookbookVersion","attributes":[],"files":[],"metadata":{"dependencies":{},"name":"brew","maintainer_email":"youremail@example.com","license":"Apache v2.0","attributes":{},"maintainer":"Your Name","suggestions":{},"platforms":{},"long_description":"","version":"0.0.0","recommendations":{},"conflicting":{},"recipes":{"brew":""},"groupings":{},"description":"A fabulous new cookbook","replacing":{},"providing":{"brew":[]}},"providers":[{"name":"brew.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-0c5ecd7788cf4f6c7de2a57193897a6c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=brTA3YkBF7iDnjPGCCHxgm7AHko%3D","checksum":"0c5ecd7788cf4f6c7de2a57193897a6c","path":"providers/brew.rb","specificity":"default"}],"cookbook_name":"brew","resources":[{"name":"brew.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486c
a3ac66264fea926aa0b4ff74341c/checksum-0189e76ccc476701d6b374e5a1a27347?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=ufrI1k6pKJ1%2FBRMAaIGr6icJlpc%3D","checksum":"0189e76ccc476701d6b374e5a1a27347","path":"resources/brew.rb","specificity":"default"}],"templates":[],"libraries":[],"version":"0.0.0","recipes":[{"name":"default.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-1dda05ed139664f1f89b9dec482b77c0?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=dOzPk64at92zOfZlxt1suDpGuPs%3D","checksum":"1dda05ed139664f1f89b9dec482b77c0","path":"recipes/default.rb","specificity":"default"}],"root_files":[],"chef_type":"cookbook_version"}
\ No newline at end of file
+{ "attributes" : [ ],
+ "chef_type" : "cookbook_version",
+ "cookbook_name" : "brew",
+ "definitions" : [ ],
+ "files" : [ ],
+ "json_class" : "Chef::CookbookVersion",
+ "libraries" : [ ],
+ "metadata" : { "attributes" : { },
+ "conflicting" : { },
+ "dependencies" : { },
+ "description" : "A fabulous new cookbook",
+ "groupings" : { },
+ "license" : "Apache v2.0",
+ "long_description" : "",
+ "maintainer" : "Your Name",
+ "maintainer_email" : "youremail@example.com",
+ "name" : "brew",
+ "platforms" : { },
+ "providing" : { "brew" : "0.0.0" },
+ "recipes" : { "brew" : "" },
+ "recommendations" : { },
+ "replacing" : { },
+ "suggestions" : { },
+ "version" : "0.0.0"
+ },
+ "name" : "brew-0.0.0",
+ "providers" : [ { "checksum" : "0c5ecd7788cf4f6c7de2a57193897a6c",
+ "name" : "brew.rb",
+ "path" : "providers/brew.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-0c5ecd7788cf4f6c7de2a57193897a6c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=brTA3YkBF7iDnjPGCCHxgm7AHko%3D"
+ } ],
+ "recipes" : [ { "checksum" : "1dda05ed139664f1f89b9dec482b77c0",
+ "name" : "default.rb",
+ "path" : "recipes/default.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-1dda05ed139664f1f89b9dec482b77c0?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=dOzPk64at92zOfZlxt1suDpGuPs%3D"
+ } ],
+ "resources" : [ { "checksum" : "0189e76ccc476701d6b374e5a1a27347",
+ "name" : "brew.rb",
+ "path" : "resources/brew.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-0189e76ccc476701d6b374e5a1a27347?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774465&Signature=ufrI1k6pKJ1%2FBRMAaIGr6icJlpc%3D"
+ } ],
+ "root_files" : [ ],
+ "templates" : [ ],
+ "version" : "0.0.0"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/client.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/client.json b/core/src/test/resources/client.json
index 15ff8d0..eef7c71 100644
--- a/core/src/test/resources/client.json
+++ b/core/src/test/resources/client.json
@@ -1 +1,8 @@
-{"orgname":"jclouds","certificate":"-----BEGIN CERTIFICATE-----\nMIIClzCCAgCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEwMDczMDIwNDEzMFoXDTIwMDcyNzIwNDEzMFowADCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBAMm9mSSahptCikfvJ30CTbEnfhfbVzTFewnznFuo\n7KrPBGYIlUdPYQ9SGDo+GKjNKiTjZYMoOMUVnsHUhu0Ez49ZSaVQInWvbF8tvpM8\nmoGQNQJtDmXG6m+YaHiA4HF/ng2u/bNLtA6Jo3HzvRCobxywc/szPt0Kj0ZD1fJ2\nE237Ph41c8zlOg9QdF0d/iD2WZdgJ1rNndKoZ0rR3A1L50VUND+PNmMDfVYHHjmb\naT89AwihCeU8eUk7m/JNP87f1QDB0Gny0rkDC3drOGS7jmabTf/7gLE5sYq3qnd+\n8/vGU3QWyfCxKSfogl7kn5uWlIe4sOqMb06GNgC+d/oytlECAwEAATANBgkqhkiG\n9w0BAQUFAAOBgQBftzSZxstWw60GqRTDNN/F2GnrdtnKBoXzHww3r6jtGEylYq20\n5KfKpEx+sPX0gyZuYJiXC2CkEjImAluWKcdN9ZF6VD541sheAjbiaU7q7ZsztTxF\nWUH2tCvHeDXYKPKek3QzL7bYpUhLnCN/XxEv6ibeMDwtI7f5qpk2Aspzcw==\n-----END CER
TIFICATE-----\n","uri":"https://api.opscode.com/organizations/jclouds/clients/adriancole-jcloudstest","private_key":"-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEAyb2ZJJqGm0KKR+8nfQJNsSd+F9tXNMV7CfOcW6jsqs8EZgiV\nR09hD1IYOj4YqM0qJONlgyg4xRWewdSG7QTPj1lJpVAida9sXy2+kzyagZA1Am0O\nZcbqb5hoeIDgcX+eDa79s0u0DomjcfO9EKhvHLBz+zM+3QqPRkPV8nYTbfs+HjVz\nzOU6D1B0XR3+IPZZl2AnWs2d0qhnStHcDUvnRVQ0P482YwN9VgceOZtpPz0DCKEJ\n5Tx5STub8k0/zt/VAMHQafLSuQMLd2s4ZLuOZptN//uAsTmxireqd37z+8ZTdBbJ\n8LEpJ+iCXuSfm5aUh7iw6oxvToY2AL53+jK2UQIDAQABAoIBAQDA88B3i/xWn0vX\nBVxFamCYoecuNjGwXXkSyZew616A+EOCu47bh4aTurdFbYL0YFaAtaWvzlaN2eHg\nDb+HDuTefE29+WkcGk6SshPmiz5T0XOCAICWw6wSVDkHmGwS4jZvbAFm7W8nwGk9\nYhxgxFiRngswJZFopOLoF5WXs2td8guIYNslMpo7tu50iFnBHwKO2ZsPAk8t9nnS\nxlDavKruymEmqHCr3+dtio5eaenJcp3fjoXBQOKUk3ipII29XRB8NqeCVV/7Kxwq\nckqOBEbRwBclckyIbD+RiAgKvOelORjEiE9R42vuqvxRA6k9kd9o7utlX0AUtpEn\n3gZc6LepAoGBAP9ael5Y75+sK2JJUNOOhO8ae45cdsilp2yI0X+UBaSuQs2+dyPp\nkpEHAxd4pmmSvn/8c9TlEZhr+qYbABXVPlDncxpIuw2Ajbk7s/S4XaS
KsRqpXL57\nzj/QOqLkRk8+OVV9q6lMeQNqLtEj1u6JPviX70Ro+FQtRttNOYbfdP/fAoGBAMpA\nXjR5woV5sUb+REg9vEuYo8RSyOarxqKFCIXVUNsLOx+22+AK4+CQpbueWN7jotrl\nYD6uT6svWi3AAC7kiY0UI/fjVPRCUi8tVoQUE0TaU5VLITaYOB+W/bBaDE4M9560\n1NuDWO90baA5dfU44iuzva02rGJXK9+nS3o8nk/PAoGBALOL6djnDe4mwAaG6Jco\ncd4xr8jkyPzCRZuyBCSBbwphIUXLc7hDprPky064ncJD1UDmwIdkXd/fpMkg2QmA\n/CUk6LEFjMisqHojOaCL9gQZJPhLN5QUN2x1PJWGjs1vQh8Tkx0iUUCOa8bQPXNR\n+34OTsW6TUna4CSZAycLfhffAoGBAIggVsefBCvuQkF0NeUhmDCRZfhnd8y55RHR\n1HCvqKIlpv+rhcX/zmyBLuteopYyRJRsOiE2FW00i8+rIPRu4Z3Q5nybx7w3PzV9\noHN5R5baE9OyI4KpZWztpYYitZF67NcnAvVULHHOvVJQGnKYfLHJYmrJF7GA1ojM\nAuMdFbjFAoGAPxUhxwFy8gaqBahKUEZn4F81HFP5ihGhkT4QL6AFPO2e+JhIGjuR\n27+85hcFqQ+HHVtFsm81b/a+R7P4UuCRgc8eCjxQMoJ1Xl4n7VbjPbHMnIN0Ryvd\nO4ZpWDWYnCO021JTOUUOJ4J/y0416Bvkw0z59y7sNX7wDBBHHbK/XCc=\n-----END RSA PRIVATE KEY-----\n","clientname":"adriancole-jcloudstest","name":"adriancole-jcloudstest","validator":false}
\ No newline at end of file
+{ "certificate" : "-----BEGIN CERTIFICATE-----\nMIIClzCCAgCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEwMDczMDIwNDEzMFoXDTIwMDcyNzIwNDEzMFowADCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBAMm9mSSahptCikfvJ30CTbEnfhfbVzTFewnznFuo\n7KrPBGYIlUdPYQ9SGDo+GKjNKiTjZYMoOMUVnsHUhu0Ez49ZSaVQInWvbF8tvpM8\nmoGQNQJtDmXG6m+YaHiA4HF/ng2u/bNLtA6Jo3HzvRCobxywc/szPt0Kj0ZD1fJ2\nE237Ph41c8zlOg9QdF0d/iD2WZdgJ1rNndKoZ0rR3A1L50VUND+PNmMDfVYHHjmb\naT89AwihCeU8eUk7m/JNP87f1QDB0Gny0rkDC3drOGS7jmabTf/7gLE5sYq3qnd+\n8/vGU3QWyfCxKSfogl7kn5uWlIe4sOqMb06GNgC+d/oytlECAwEAATANBgkqhkiG\n9w0BAQUFAAOBgQBftzSZxstWw60GqRTDNN/F2GnrdtnKBoXzHww3r6jtGEylYq20\n5KfKpEx+sPX0gyZuYJiXC2CkEjImAluWKcdN9ZF6VD541sheAjbiaU7q7ZsztTxF\nWUH2tCvHeDXYKPKek3QzL7bYpUhLnCN/XxEv6ibeMDwtI7f5qpk2Aspzcw==\n-----END CERTIFICATE-----\n",
+ "clientname" : "adriancole-jcloudstest",
+ "name" : "adriancole-jcloudstest",
+ "orgname" : "jclouds",
+ "private_key" : "-----BEGIN RSA PRIVATE KEY-----\nMIIEpQIBAAKCAQEAyb2ZJJqGm0KKR+8nfQJNsSd+F9tXNMV7CfOcW6jsqs8EZgiV\nR09hD1IYOj4YqM0qJONlgyg4xRWewdSG7QTPj1lJpVAida9sXy2+kzyagZA1Am0O\nZcbqb5hoeIDgcX+eDa79s0u0DomjcfO9EKhvHLBz+zM+3QqPRkPV8nYTbfs+HjVz\nzOU6D1B0XR3+IPZZl2AnWs2d0qhnStHcDUvnRVQ0P482YwN9VgceOZtpPz0DCKEJ\n5Tx5STub8k0/zt/VAMHQafLSuQMLd2s4ZLuOZptN//uAsTmxireqd37z+8ZTdBbJ\n8LEpJ+iCXuSfm5aUh7iw6oxvToY2AL53+jK2UQIDAQABAoIBAQDA88B3i/xWn0vX\nBVxFamCYoecuNjGwXXkSyZew616A+EOCu47bh4aTurdFbYL0YFaAtaWvzlaN2eHg\nDb+HDuTefE29+WkcGk6SshPmiz5T0XOCAICWw6wSVDkHmGwS4jZvbAFm7W8nwGk9\nYhxgxFiRngswJZFopOLoF5WXs2td8guIYNslMpo7tu50iFnBHwKO2ZsPAk8t9nnS\nxlDavKruymEmqHCr3+dtio5eaenJcp3fjoXBQOKUk3ipII29XRB8NqeCVV/7Kxwq\nckqOBEbRwBclckyIbD+RiAgKvOelORjEiE9R42vuqvxRA6k9kd9o7utlX0AUtpEn\n3gZc6LepAoGBAP9ael5Y75+sK2JJUNOOhO8ae45cdsilp2yI0X+UBaSuQs2+dyPp\nkpEHAxd4pmmSvn/8c9TlEZhr+qYbABXVPlDncxpIuw2Ajbk7s/S4XaSKsRqpXL57\nzj/QOqLkRk8+OVV9q6lMeQNqLtEj1u6JPviX70Ro+FQtRttNOYbfdP/fAoGBAMpA\nXjR5woV5sUb+REg9vEuYo
8RSyOarxqKFCIXVUNsLOx+22+AK4+CQpbueWN7jotrl\nYD6uT6svWi3AAC7kiY0UI/fjVPRCUi8tVoQUE0TaU5VLITaYOB+W/bBaDE4M9560\n1NuDWO90baA5dfU44iuzva02rGJXK9+nS3o8nk/PAoGBALOL6djnDe4mwAaG6Jco\ncd4xr8jkyPzCRZuyBCSBbwphIUXLc7hDprPky064ncJD1UDmwIdkXd/fpMkg2QmA\n/CUk6LEFjMisqHojOaCL9gQZJPhLN5QUN2x1PJWGjs1vQh8Tkx0iUUCOa8bQPXNR\n+34OTsW6TUna4CSZAycLfhffAoGBAIggVsefBCvuQkF0NeUhmDCRZfhnd8y55RHR\n1HCvqKIlpv+rhcX/zmyBLuteopYyRJRsOiE2FW00i8+rIPRu4Z3Q5nybx7w3PzV9\noHN5R5baE9OyI4KpZWztpYYitZF67NcnAvVULHHOvVJQGnKYfLHJYmrJF7GA1ojM\nAuMdFbjFAoGAPxUhxwFy8gaqBahKUEZn4F81HFP5ihGhkT4QL6AFPO2e+JhIGjuR\n27+85hcFqQ+HHVtFsm81b/a+R7P4UuCRgc8eCjxQMoJ1Xl4n7VbjPbHMnIN0Ryvd\nO4ZpWDWYnCO021JTOUUOJ4J/y0416Bvkw0z59y7sNX7wDBBHHbK/XCc=\n-----END RSA PRIVATE KEY-----\n",
+ "uri" : "https://api.opscode.com/organizations/jclouds/clients/adriancole-jcloudstest",
+ "validator" : false
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/client.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/client.txt b/core/src/test/resources/client.txt
deleted file mode 100644
index 5023370..0000000
--- a/core/src/test/resources/client.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "certificate": "-----BEGIN CERTIFICATE-----\ndXQ==\n-----END CERTIFICATE-----\n",
- "orgname": "jclouds",
- "clientname": "adrian-jcloudstest",
- "name": "adrian-jcloudstest",
- "validator": false
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/core/src/test/resources/logback.xml b/core/src/test/resources/logback.xml
index 50b810a..f9c023f 100644
--- a/core/src/test/resources/logback.xml
+++ b/core/src/test/resources/logback.xml
@@ -2,15 +2,12 @@
<configuration scan="false">
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>target/test-data/jclouds.log</file>
-
<encoder>
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
</encoder>
</appender>
-
<appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
<file>target/test-data/jclouds-wire.log</file>
-
<encoder>
<Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
</encoder>
@@ -24,12 +21,10 @@
<level value="DEBUG" />
<appender-ref ref="FILE" />
</logger>
-
<logger name="jclouds.wire">
<level value="DEBUG" />
<appender-ref ref="WIREFILE" />
</logger>
-
<logger name="jclouds.headers">
<level value="DEBUG" />
<appender-ref ref="WIREFILE" />
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/mysql-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/mysql-cookbook.json b/core/src/test/resources/mysql-cookbook.json
index b0f8bc4..b0450ae 100644
--- a/core/src/test/resources/mysql-cookbook.json
+++ b/core/src/test/resources/mysql-cookbook.json
@@ -1 +1,268 @@
-{"definitions":[],"name":"mysql-0.21.2","attributes":[{"name":"server.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-548fa4bc548b8b59ac98fffee8e81f4a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=MsgggSKS0T1q1Lc72nJpHORBQX0%3D","checksum":"548fa4bc548b8b59ac98fffee8e81f4a","path":"attributes/server.rb","specificity":"default"}],"files":[],"json_class":"Chef::CookbookVersion","providers":[{"name":"database.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b994881a2aba60e32c4b6408ffba993d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2XMRbryCmEqirCWLCvrXoenYubw%3D","checksum":"b994881a2aba60e32c4b6408ffba993d","path":"providers/database.rb","specificity":"default"}],"metadata":{"dependencies":{"openssl":[]},"name":"mysql","maintainer_email":"cookbooks@opscode.com","attributes":{"mysql/server_root_pa
ssword":{"required":"optional","calculated":false,"default":"randomly generated","choice":[],"type":"string","recipes":[],"display_name":"MySQL Server Root Password","description":"Randomly generated password for the mysqld root user"},"mysql/tunable/max_heap_table_size":{"required":"optional","calculated":false,"default":"32M","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Max Heap Table Size"},"mysql/bind_address":{"required":"optional","calculated":false,"default":"ipaddress","choice":[],"type":"string","recipes":[],"display_name":"MySQL Bind Address","description":"Address that mysqld should listen on"},"mysql/datadir":{"required":"optional","calculated":false,"default":"/var/lib/mysql","choice":[],"type":"string","recipes":[],"display_name":"MySQL Data Directory","description":"Location of mysql databases"},"mysql/tunable/wait_timeout":{"required":"optional","calculated":false,"default":"180","choice":[],"type":"string","recipes":[],"display_name":"MySQL
Tunable Wait Timeout"},"mysql/tunable/back_log":{"required":"optional","calculated":false,"default":"128","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Back Log"},"mysql/tunable/net_read_timeout":{"required":"optional","calculated":false,"default":"30","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Net Read Timeout"},"mysql/tunable/max_connections":{"required":"optional","calculated":false,"default":"800","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Max Connections"},"mysql/tunable":{"required":"optional","calculated":false,"choice":[],"type":"hash","recipes":[],"display_name":"MySQL Tunables","description":"Hash of MySQL tunable attributes"},"mysql/tunable/table_cache":{"required":"optional","calculated":false,"default":"128","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Table Cache"},"mysql/ec2_path":{"required":"optional","calculated":false,"default":"/mnt/mysql","choice":[],"type
":"string","recipes":[],"display_name":"MySQL EC2 Path","description":"Location of mysql directory on EC2 instance EBS volumes"},"mysql/tunable/key_buffer":{"required":"optional","calculated":false,"default":"250M","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tuntable Key Buffer"},"mysql/tunable/net_write_timeout":{"required":"optional","calculated":false,"default":"30","choice":[],"type":"string","recipes":[],"display_name":"MySQL Tunable Net Write Timeout"}},"license":"Apache 2.0","maintainer":"Opscode, Inc.","suggestions":{},"platforms":{"debian":[],"ubuntu":[]},"long_description":"= DESCRIPTION:\n\nInstalls and configures MySQL client or server.\n\n= REQUIREMENTS:\n\n== Platform:\n\nBest tested on Ubuntu 9.04,9.10. On EC2, requires platform that supports -o bind option for the 'mount' command.\n\n== Cookbooks:\n\nRequires Opscode's openssl cookbook for secure password generation.\n\n= ATTRIBUTES: \n\n* mysql[:server_root_password] - Set the server's root passwo
rd with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_repl_password] - Set the replication user 'repl' password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_debian_password] - Set the debian-sys-maint user password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:bind_address] - Listen address for MySQLd, default is node's ipaddress.\n* mysql[:datadir] - Location for mysql data directory, default is \"/var/lib/mysql\" \n* mysql[:ec2_path] - location of mysql datadir on EC2 nodes, default \"/mnt/mysql\" \n\nPerformance tuning attributes, each corresponds to the same-named parameter in my.cnf; default values listed\n\n* mysql[:tunable][:key_buffer] = \"250M\"\n* mysql[:tunable][:max_connections] = \"800\" \n* mysql[:tunable][:wait_timeout] = \"180\" \n* mysql[:tunable][:net_write_timeout] = \"30\" \n* mysq
l[:tunable][:net_write_timeout] = \"30\" \n* mysql[:tunable][:back_log] = \"128\" \n* mysql[:tunable][:table_cache] = \"128\" \n* mysql[:tunable][:max_heap_table_size] = \"32M\" \n\n= USAGE:\n\nOn client nodes,\n\n include_recipe \"mysql::client\"\n \nAs the common use case is on systems with Ruby, we also install the MySQL RubyGem. Because we may want to be able to use the gem within another Chef recipe, we make sure the mysql development package and gem are installed first. The key is this:\n\n r = package ... do\n action :nothing\n end\n \n r.run_action(:install)\n \nThis creates a resource object for the package and does the installation before other recipes are parsed. You'll need to have the C compiler and such (ie, build-essential on Ubuntu) before running the recipes, but we already do that when installing Chef :-). If you want to be able to access a MySQL database via Ruby within another recipe, you could do so, like so:\n\n Gem.clear_paths #
needed for Chef to find the gem...\n require 'mysql' # requires the mysql gem\n\n execute \"create #{node[:railsapp][:db][:database]} database\" do\n command \"/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:railsapp][:db][:database]}\"\n not_if do\n m = Mysql.new(\"localhost\", \"root\", @node[:mysql][:server_root_password])\n m.list_dbs.include?(@node[:railsapp][:db][:database])\n end\n end\n\nOn server nodes, \n\n include_recipe \"mysql::server\"\n \nOn Debian/Ubuntu this will preseed the MySQL package with the randomly generated root password. You can of course change the password afterward, but this makes sure that there's a good password set. You can view it in the node data in the Chef Server webui. Sets a new password for debian-sys-maint user as well.\n\nAlso sets up 'repl' user grants for replication slaves.\n\nOn EC2 nodes,\n\n include_recipe \"mysql::server_ec2\"\n \nWhen the ec2_path doesn't exist we look fo
r a mounted filesystem (eg, EBS) and move the datadir there.\n\nThe client recipe is already included by server and 'default' recipes.\n\n= LICENSE and AUTHOR:\n \nAuthor:: Joshua Timberman (<jo...@opscode.com>)\nAuthor:: AJ Christensen (<aj...@opscode.com>)\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n","recommendations":{},"version":"0.21.2","groupings":{},"recipes":{"mysql::client":"Installs packages required for mysql clients using run_action magic","mysq
l::server_ec2":"Performs EC2-specific mountpoint manipulation","mysql::server":"Installs packages required for mysql servers w/o manual intervention"},"conflicting":{},"description":"Installs and configures mysql for client or server","replacing":{},"providing":{}},"libraries":[{"name":"database.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b2eb0760c07734be9c637dcffc86175a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=CvVbxzrA%2Fuxc59ZjLR5BsMozfxk%3D","checksum":"b2eb0760c07734be9c637dcffc86175a","path":"libraries/database.rb","specificity":"default"}],"resources":[{"name":"database.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-8aa8e2cafe54c2932c7aa65d62ec2695?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=6URS94f1HpRibHC%2FhBkr7Eg3dVA%3D","checksum":"8aa8e2cafe54c2932c7aa65d62ec2695","path":"
resources/database.rb","specificity":"default"}],"templates":[{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D","checksum":"689c1b6fbb242b6c508384e56646341d","path":"templates/ubuntu-9.10/my.cnf.erb","specificity":"ubuntu-9.10"},{"name":"mysql-server.seed.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-16b036a0bb31957a77e9b825cf616cc5?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=50bRvt6GQqFEcfYtaIsq1d4a4c8%3D","checksum":"16b036a0bb31957a77e9b825cf616cc5","path":"templates/default/mysql-server.seed.erb","specificity":"default"},{"name":"grants.sql.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-
932b51ddddcbd24ee10a76ecae33b8ba?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=RHR0obLFcsN1M9tL28IH4Tcur5g%3D","checksum":"932b51ddddcbd24ee10a76ecae33b8ba","path":"templates/default/grants.sql.erb","specificity":"default"},{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-7746560b37ac8d4a0cf68befbecbd8a3?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=W7Nqkvhw2TBrlDvcM2rlA4Oj5%2Bk%3D","checksum":"7746560b37ac8d4a0cf68befbecbd8a3","path":"templates/default/my.cnf.erb","specificity":"default"},{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D","checksum":"63bd67fae6d297e8f658e9c0ad01a411","path":"templates/centos/my.cnf.erb","specificity":"c
entos"},{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D","checksum":"689c1b6fbb242b6c508384e56646341d","path":"templates/ubuntu-10.04/my.cnf.erb","specificity":"ubuntu-10.04"},{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D","checksum":"63bd67fae6d297e8f658e9c0ad01a411","path":"templates/redhat/my.cnf.erb","specificity":"redhat"},{"name":"port_mysql.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d2244150a145b3f658cd37c13269fafc?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expir
es=1277774082&Signature=23iHcjwpNOvlNf%2BlrKcV2pkU7uo%3D","checksum":"d2244150a145b3f658cd37c13269fafc","path":"templates/default/port_mysql.erb","specificity":"default"},{"name":"debian.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2e08553db526f5f80c28b343f6a616cb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=VdcFYxnLUkj1tS3k8DovrzZEA7E%3D","checksum":"2e08553db526f5f80c28b343f6a616cb","path":"templates/default/debian.cnf.erb","specificity":"default"},{"name":"my.cnf.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-1e5068eec65b51f5a327580fb0af4677?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=D5lPeu1UQvA9pEXZm5nVOwj3WIo%3D","checksum":"1e5068eec65b51f5a327580fb0af4677","path":"templates/ubuntu-8.04/my.cnf.erb","specificity":"ubuntu-8.04"}],"cookbook_name":"mysql","version":"0.21.2","recip
es":[{"name":"server_ec2.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-f51bd8122b7dccc9f4656319fef3252a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=BUR2mosCvmoOKq4Mkh3JUG0MY38%3D","checksum":"f51bd8122b7dccc9f4656319fef3252a","path":"recipes/server_ec2.rb","specificity":"default"},{"name":"server.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-80daa897597560372d017c58c4df0e3c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=bU3j9Nw%2BnuIroXKrlJZe7tjaugA%3D","checksum":"80daa897597560372d017c58c4df0e3c","path":"recipes/server.rb","specificity":"default"},{"name":"default.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-bd3ba2d05dea6a8cf0dc2a45f540cc32?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=7haumT5
EtEM2h8l32efqV%2Fik%2BdY%3D","checksum":"bd3ba2d05dea6a8cf0dc2a45f540cc32","path":"recipes/default.rb","specificity":"default"},{"name":"client.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-a1d679c7480267cd9b69e3194c7e45ab?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=ZhfTiwv1aXC7HZMnW8A7i4vkMCM%3D","checksum":"a1d679c7480267cd9b69e3194c7e45ab","path":"recipes/client.rb","specificity":"default"}],"root_files":[{"name":"README.rdoc","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e9278fc99fd668bdce33d72dc71fade9?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=KPgAGqShEO5SGzz8oRdwIInPUOc%3D","checksum":"e9278fc99fd668bdce33d72dc71fade9","path":"README.rdoc","specificity":"default"},{"name":"metadata.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0
b4ff74341c/checksum-8d2f9635f4817ff905a4124e09ec6c59?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=fPF2iY7tNrq%2FuNrCjRLImP9vRbA%3D","checksum":"8d2f9635f4817ff905a4124e09ec6c59","path":"metadata.rb","specificity":"default"},{"name":"metadata.json","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e6804b8f3e6dfdbbece9d319537ffea1?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=EVsALLreeAA41%2BiPAfPt%2FxFEIYI%3D","checksum":"e6804b8f3e6dfdbbece9d319537ffea1","path":"metadata.json","specificity":"default"}],"chef_type":"cookbook_version"}
\ No newline at end of file
+{ "attributes" : [ { "checksum" : "548fa4bc548b8b59ac98fffee8e81f4a",
+ "name" : "server.rb",
+ "path" : "attributes/server.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-548fa4bc548b8b59ac98fffee8e81f4a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=MsgggSKS0T1q1Lc72nJpHORBQX0%3D"
+ } ],
+ "chef_type" : "cookbook_version",
+ "cookbook_name" : "mysql",
+ "definitions" : [ ],
+ "files" : [ ],
+ "json_class" : "Chef::CookbookVersion",
+ "libraries" : [ { "checksum" : "b2eb0760c07734be9c637dcffc86175a",
+ "name" : "database.rb",
+ "path" : "libraries/database.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b2eb0760c07734be9c637dcffc86175a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=CvVbxzrA%2Fuxc59ZjLR5BsMozfxk%3D"
+ } ],
+ "metadata" : { "attributes" : { "mysql/bind_address" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "ipaddress",
+ "description" : "Address that mysqld should listen on",
+ "display_name" : "MySQL Bind Address",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/datadir" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "/var/lib/mysql",
+ "description" : "Location of mysql databases",
+ "display_name" : "MySQL Data Directory",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/ec2_path" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "/mnt/mysql",
+ "description" : "Location of mysql directory on EC2 instance EBS volumes",
+ "display_name" : "MySQL EC2 Path",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/server_root_password" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "randomly generated",
+ "description" : "Randomly generated password for the mysqld root user",
+ "display_name" : "MySQL Server Root Password",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable" : { "calculated" : false,
+ "choice" : [ ],
+ "description" : "Hash of MySQL tunable attributes",
+ "display_name" : "MySQL Tunables",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "hash"
+ },
+ "mysql/tunable/back_log" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "128",
+ "display_name" : "MySQL Tunable Back Log",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/key_buffer" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "250M",
+ "display_name" : "MySQL Tuntable Key Buffer",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/max_connections" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "800",
+ "display_name" : "MySQL Tunable Max Connections",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/max_heap_table_size" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "32M",
+ "display_name" : "MySQL Tunable Max Heap Table Size",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/net_read_timeout" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "30",
+ "display_name" : "MySQL Tunable Net Read Timeout",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/net_write_timeout" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "30",
+ "display_name" : "MySQL Tunable Net Write Timeout",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/table_cache" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "128",
+ "display_name" : "MySQL Tunable Table Cache",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ },
+ "mysql/tunable/wait_timeout" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "180",
+ "display_name" : "MySQL Tunable Wait Timeout",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ }
+ },
+ "conflicting" : { },
+ "dependencies" : { "openssl" : "" },
+ "description" : "Installs and configures mysql for client or server",
+ "groupings" : { },
+ "license" : "Apache 2.0",
+ "long_description" : "= DESCRIPTION:\n\nInstalls and configures MySQL client or server.\n\n= REQUIREMENTS:\n\n== Platform:\n\nBest tested on Ubuntu 9.04,9.10. On EC2, requires platform that supports -o bind option for the 'mount' command.\n\n== Cookbooks:\n\nRequires Opscode's openssl cookbook for secure password generation.\n\n= ATTRIBUTES: \n\n* mysql[:server_root_password] - Set the server's root password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_repl_password] - Set the replication user 'repl' password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:server_debian_password] - Set the debian-sys-maint user password with this, default is a randomly generated password with OpenSSL::Random.random_bytes.\n* mysql[:bind_address] - Listen address for MySQLd, default is node's ipaddress.\n* mysql[:datadir] - Location for mysql data directory, default is \"/var/lib/mysql\"
\n* mysql[:ec2_path] - location of mysql datadir on EC2 nodes, default \"/mnt/mysql\" \n\nPerformance tuning attributes, each corresponds to the same-named parameter in my.cnf; default values listed\n\n* mysql[:tunable][:key_buffer] = \"250M\"\n* mysql[:tunable][:max_connections] = \"800\" \n* mysql[:tunable][:wait_timeout] = \"180\" \n* mysql[:tunable][:net_write_timeout] = \"30\" \n* mysql[:tunable][:net_write_timeout] = \"30\" \n* mysql[:tunable][:back_log] = \"128\" \n* mysql[:tunable][:table_cache] = \"128\" \n* mysql[:tunable][:max_heap_table_size] = \"32M\" \n\n= USAGE:\n\nOn client nodes,\n\n include_recipe \"mysql::client\"\n \nAs the common use case is on systems with Ruby, we also install the MySQL RubyGem. Because we may want to be able to use the gem within another Chef recipe, we make sure the mysql development package and gem are installed first. The key is this:\n\n r = package ... do\n action :nothing\n end\n \n r.
run_action(:install)\n \nThis creates a resource object for the package and does the installation before other recipes are parsed. You'll need to have the C compiler and such (ie, build-essential on Ubuntu) before running the recipes, but we already do that when installing Chef :-). If you want to be able to access a MySQL database via Ruby within another recipe, you could do so, like so:\n\n Gem.clear_paths # needed for Chef to find the gem...\n require 'mysql' # requires the mysql gem\n\n execute \"create #{node[:railsapp][:db][:database]} database\" do\n command \"/usr/bin/mysqladmin -u root -p#{node[:mysql][:server_root_password]} create #{node[:railsapp][:db][:database]}\"\n not_if do\n m = Mysql.new(\"localhost\", \"root\", @node[:mysql][:server_root_password])\n m.list_dbs.include?(@node[:railsapp][:db][:database])\n end\n end\n\nOn server nodes, \n\n include_recipe \"mysql::server\"\n \nOn Debian/Ubuntu this will preseed the MySQL package with the r
andomly generated root password. You can of course change the password afterward, but this makes sure that there's a good password set. You can view it in the node data in the Chef Server webui. Sets a new password for debian-sys-maint user as well.\n\nAlso sets up 'repl' user grants for replication slaves.\n\nOn EC2 nodes,\n\n include_recipe \"mysql::server_ec2\"\n \nWhen the ec2_path doesn't exist we look for a mounted filesystem (eg, EBS) and move the datadir there.\n\nThe client recipe is already included by server and 'default' recipes.\n\n= LICENSE and AUTHOR:\n \nAuthor:: Joshua Timberman (<jo...@opscode.com>)\nAuthor:: AJ Christensen (<aj...@opscode.com>)\n\nCopyright:: 2009, Opscode, Inc\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing
, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
+ "maintainer" : "Opscode, Inc.",
+ "maintainer_email" : "cookbooks@opscode.com",
+ "name" : "mysql",
+ "platforms" : { "debian" : "",
+ "ubuntu" : ""
+ },
+ "providing" : { },
+ "recipes" : { "mysql::client" : "Installs packages required for mysql clients using run_action magic",
+ "mysql::server" : "Installs packages required for mysql servers w/o manual intervention",
+ "mysql::server_ec2" : "Performs EC2-specific mountpoint manipulation"
+ },
+ "recommendations" : { },
+ "replacing" : { },
+ "suggestions" : { },
+ "version" : "0.21.2"
+ },
+ "name" : "mysql-0.21.2",
+ "providers" : [ { "checksum" : "b994881a2aba60e32c4b6408ffba993d",
+ "name" : "database.rb",
+ "path" : "providers/database.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-b994881a2aba60e32c4b6408ffba993d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2XMRbryCmEqirCWLCvrXoenYubw%3D"
+ } ],
+ "recipes" : [ { "checksum" : "f51bd8122b7dccc9f4656319fef3252a",
+ "name" : "server_ec2.rb",
+ "path" : "recipes/server_ec2.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-f51bd8122b7dccc9f4656319fef3252a?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=BUR2mosCvmoOKq4Mkh3JUG0MY38%3D"
+ },
+ { "checksum" : "80daa897597560372d017c58c4df0e3c",
+ "name" : "server.rb",
+ "path" : "recipes/server.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-80daa897597560372d017c58c4df0e3c?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=bU3j9Nw%2BnuIroXKrlJZe7tjaugA%3D"
+ },
+ { "checksum" : "bd3ba2d05dea6a8cf0dc2a45f540cc32",
+ "name" : "default.rb",
+ "path" : "recipes/default.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-bd3ba2d05dea6a8cf0dc2a45f540cc32?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=7haumT5EtEM2h8l32efqV%2Fik%2BdY%3D"
+ },
+ { "checksum" : "a1d679c7480267cd9b69e3194c7e45ab",
+ "name" : "client.rb",
+ "path" : "recipes/client.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-a1d679c7480267cd9b69e3194c7e45ab?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=ZhfTiwv1aXC7HZMnW8A7i4vkMCM%3D"
+ }
+ ],
+ "resources" : [ { "checksum" : "8aa8e2cafe54c2932c7aa65d62ec2695",
+ "name" : "database.rb",
+ "path" : "resources/database.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-8aa8e2cafe54c2932c7aa65d62ec2695?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=6URS94f1HpRibHC%2FhBkr7Eg3dVA%3D"
+ } ],
+ "root_files" : [ { "checksum" : "e9278fc99fd668bdce33d72dc71fade9",
+ "name" : "README.rdoc",
+ "path" : "README.rdoc",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e9278fc99fd668bdce33d72dc71fade9?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=KPgAGqShEO5SGzz8oRdwIInPUOc%3D"
+ },
+ { "checksum" : "8d2f9635f4817ff905a4124e09ec6c59",
+ "name" : "metadata.rb",
+ "path" : "metadata.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-8d2f9635f4817ff905a4124e09ec6c59?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=fPF2iY7tNrq%2FuNrCjRLImP9vRbA%3D"
+ },
+ { "checksum" : "e6804b8f3e6dfdbbece9d319537ffea1",
+ "name" : "metadata.json",
+ "path" : "metadata.json",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-e6804b8f3e6dfdbbece9d319537ffea1?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=EVsALLreeAA41%2BiPAfPt%2FxFEIYI%3D"
+ }
+ ],
+ "templates" : [ { "checksum" : "689c1b6fbb242b6c508384e56646341d",
+ "name" : "my.cnf.erb",
+ "path" : "templates/ubuntu-9.10/my.cnf.erb",
+ "specificity" : "ubuntu-9.10",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D"
+ },
+ { "checksum" : "16b036a0bb31957a77e9b825cf616cc5",
+ "name" : "mysql-server.seed.erb",
+ "path" : "templates/default/mysql-server.seed.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-16b036a0bb31957a77e9b825cf616cc5?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=50bRvt6GQqFEcfYtaIsq1d4a4c8%3D"
+ },
+ { "checksum" : "932b51ddddcbd24ee10a76ecae33b8ba",
+ "name" : "grants.sql.erb",
+ "path" : "templates/default/grants.sql.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-932b51ddddcbd24ee10a76ecae33b8ba?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=RHR0obLFcsN1M9tL28IH4Tcur5g%3D"
+ },
+ { "checksum" : "7746560b37ac8d4a0cf68befbecbd8a3",
+ "name" : "my.cnf.erb",
+ "path" : "templates/default/my.cnf.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-7746560b37ac8d4a0cf68befbecbd8a3?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=W7Nqkvhw2TBrlDvcM2rlA4Oj5%2Bk%3D"
+ },
+ { "checksum" : "63bd67fae6d297e8f658e9c0ad01a411",
+ "name" : "my.cnf.erb",
+ "path" : "templates/centos/my.cnf.erb",
+ "specificity" : "centos",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D"
+ },
+ { "checksum" : "689c1b6fbb242b6c508384e56646341d",
+ "name" : "my.cnf.erb",
+ "path" : "templates/ubuntu-10.04/my.cnf.erb",
+ "specificity" : "ubuntu-10.04",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-689c1b6fbb242b6c508384e56646341d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=2ugp0XVvvUktYdBxfC9bCZBjOs4%3D"
+ },
+ { "checksum" : "63bd67fae6d297e8f658e9c0ad01a411",
+ "name" : "my.cnf.erb",
+ "path" : "templates/redhat/my.cnf.erb",
+ "specificity" : "redhat",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-63bd67fae6d297e8f658e9c0ad01a411?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=oFcRya56f%2F4oJBGrIvk4XcWQFm4%3D"
+ },
+ { "checksum" : "d2244150a145b3f658cd37c13269fafc",
+ "name" : "port_mysql.erb",
+ "path" : "templates/default/port_mysql.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d2244150a145b3f658cd37c13269fafc?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=23iHcjwpNOvlNf%2BlrKcV2pkU7uo%3D"
+ },
+ { "checksum" : "2e08553db526f5f80c28b343f6a616cb",
+ "name" : "debian.cnf.erb",
+ "path" : "templates/default/debian.cnf.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2e08553db526f5f80c28b343f6a616cb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=VdcFYxnLUkj1tS3k8DovrzZEA7E%3D"
+ },
+ { "checksum" : "1e5068eec65b51f5a327580fb0af4677",
+ "name" : "my.cnf.erb",
+ "path" : "templates/ubuntu-8.04/my.cnf.erb",
+ "specificity" : "ubuntu-8.04",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-1e5068eec65b51f5a327580fb0af4677?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277774082&Signature=D5lPeu1UQvA9pEXZm5nVOwj3WIo%3D"
+ }
+ ],
+ "version" : "0.21.2"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/newclient.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/newclient.txt b/core/src/test/resources/newclient.txt
deleted file mode 100644
index c1e9368..0000000
--- a/core/src/test/resources/newclient.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"clientname":"adriancole-jcloudstest","private_key":"-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAuzaE6azgUxwESX1rCGdJ5xpdrc1XC311bOGZBCE8NA+CpFh2\npopCBQwjpOnlgpdd/+C+TESl30ojauvVej9AbgJb30Jl7e7dEX4Brncnj03G+mo+\nG4osf7I2PA/6+9Ol7xamK9GL/cs8nOb17cRTWmhTRW7+3Rrli/s6wzqQXjGjWzgz\nthXv7FOPHA87UjJzrePBFta7+S8BxKCG2QaTxzNGytSAy8KBX8BUrSt5+X22QjEM\nQF3zA4TPtoWp/lcDRzCMdffMYoVPZzKqIeEFSexwvNlJ/qU6hbcyAxab1lYawjKU\nRgvPCflVYTIw6teHNqkyvTPX+lpIAVXigSVQXwIDAQABAoIBAHz81xvTSSjzaYFO\n9Gh13QcnuSdSEi0fo4f/zdLOBY2UVVo3nW9umskX46w0ZAAd4qn0d9gfdMZwjtjR\nfoLRO8i2VnPltnt1n64P/DtoXcb03EVPLQvh4feXGVJcMOpz0TKgYmyax+W3DE6M\ne+Az1JplUELo6crgLCSapA63SK85PEuWAcMUQg9s6MnzB/qXz95yJlzgjVMIJUyb\n9jFdq2s0gefTpK2cKeSYWQAFPd41Ea5v/3j0LN8qs/dImNnzxDXu+hi8+16/4PTK\npl+1bJXwE9YkWPdd39EfjVkk6q/HyFijK3VpHnOy7n3iaJTUKwBJLRsFrQ5Eor3U\nvNKyGXECgYEA3RZdFC6MRBAo76GKd9axbA0G9Bmct9pQT4B+od2AGGOdiYzYRWfF\nlyTgctY9dcfsX5DBQFUHNnYXMHHI0wHQk1m20UpFLa7IV3RWkW5JwYkbQHmeP4pn\np8GtJEXC+4PrT0Pc32acfWozArokUju7nLLazCPCDdfc8t9MPX1W
230CgYEA2MbB\ndwdwLZx9zEqZ0MciRxjsOA30b6OYPOqMP1ADVeExPN8fHLCAQjwUExQa86+FMV4H\nOtu+DXlisp+TSTRQzpXMfGppupbK1j5cqz2sU37upKuz/uf0XyeyBLOi0y9/DMl5\njG2StLLIMawRqJRUuq/fyA/6oTzADNwoW6LjCgsCgYBGvCj7lAj8nc77HEwZG2+Y\ninJ3Ftq1V/vp88qQLzYUl4qHv7BSRGlLelj1ZOY1EMnnqYCq/IlaO14f+ceu+x2o\nh0OeooyPmSQwFuC7lvWyHhPCBSdEXRvc6HJk8Iz5u7NFoQjB0SqwVZIMhVGpncLg\n17h5J9emZjIi4p6Z7cgkYQKBgHt+/8in3Cif9qrj9S0TxVtrv2dPy+mt8ZUCqlOH\nad8LI9nh4v+dLfSN9YHI+nHJlL/DKatGdMeIV8obTvVtcHvAq3ZVyVYbggL8FB8a\nS4plzd7SUwDtdDKhkrFLBX/6lw7Z2P0/j0ySbaqetJCtsHeKqpp3P/mLen3ZDsTl\nzyJxAoGBAIxl1SGzu3lO3BQ5+EPaprNw3eN3nzG4WLQvnzZwpeAFS+E5pllMkIfs\nu01Vfv68NC4u6LFgdXSY1vQt6hiA5TNqQk0TyVfFAunbXgTekF6XqDPQUf1nq9aZ\nlMvo4vlaLDKBkhG5HJE/pIa0iB+RMZLS0GhxsIWerEDmYdHKM25o\n-----END RSA PRIVATE KEY-----\n","uri":"https://api.opscode.com/organizations/jclouds/clients/adriancole-jcloudstest","certificate":"-----BEGIN CERTIFICATE-----\nMIIClzCCAgCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB
1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEwMDYwNDIzMzM0NloXDTIwMDYwMTIzMzM0NlowADCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBALs2hOms4FMcBEl9awhnSecaXa3NVwt9dWzhmQQh\nPDQPgqRYdqaKQgUMI6Tp5YKXXf/gvkxEpd9KI2rr1Xo/QG4CW99CZe3u3RF+Aa53\nJ49NxvpqPhuKLH+yNjwP+vvTpe8WpivRi/3LPJzm9e3EU1poU0Vu/t0a5Yv7OsM6\nkF4xo1s4M7YV7+xTjxwPO1Iyc63jwRbWu/kvAcSghtkGk8czRsrUgMvCgV/AVK0r\nefl9tkIxDEBd8wOEz7aFqf5XA0cwjHX3zGKFT2cyqiHhBUnscLzZSf6lOoW3MgMW\nm9ZWGsIylEYLzwn5VWEyMOrXhzapMr0z1/paSAFV4oElUF8CAwEAATANBgkqhkiG\n9w0BAQUFAAOBgQCTllbpWNagYjCiaU5UnjIFXn0YyNfZzqCh8SQ0Asj8MtksVbFG\nAErp03+Cb9a7GTdNE7fIyPsLTnGzFhqTwKN+3jIj4wgxhrbYXF73x1+rDRyHjJu7\na7gdTEYZqWiAHdW47vXj69W1dB5e4vNm1F29gOSL/x7BMAyjLFWbdbKw0w==\n-----END CERTIFICATE-----\n","orgname":"jclouds}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/node.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/node.json b/core/src/test/resources/node.json
index ecdb470..c8ddaef 100644
--- a/core/src/test/resources/node.json
+++ b/core/src/test/resources/node.json
@@ -1,2 +1,10 @@
-{"normal":{"tomcat6":{"ssl_port":8433}},"name":"adrian-jcloudstest","override":{},"default":{},"json_class":"Chef::Node","automatic":{},"run_list":["recipe[java]"],"chef_type":"node","chef_environment": "prod"}
-
+{ "automatic" : { },
+ "chef_environment" : "prod",
+ "chef_type" : "node",
+ "default" : { },
+ "json_class" : "Chef::Node",
+ "name" : "adrian-jcloudstest",
+ "normal" : { "tomcat6" : { "ssl_port" : 8433 } },
+ "override" : { },
+ "run_list" : [ "recipe[java]" ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/core/src/test/resources/tomcat-cookbook.json
----------------------------------------------------------------------
diff --git a/core/src/test/resources/tomcat-cookbook.json b/core/src/test/resources/tomcat-cookbook.json
index 6331b51..992f401 100644
--- a/core/src/test/resources/tomcat-cookbook.json
+++ b/core/src/test/resources/tomcat-cookbook.json
@@ -1 +1,121 @@
-{"definitions":[],"name":"tomcat6-0.1.0","files":[{"name":"org.apache.tomcat.tomcat6.plist","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-18e534a72652f3d53b197ca4e5027009?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=M3fBL4t7uuYVXVah2PyZ8eL1QCc%3D","checksum":"18e534a72652f3d53b197ca4e5027009","path":"files/default/org.apache.tomcat.tomcat6.plist","specificity":"default"},{"name":"logging.properties","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-6a35ce92050296862ea63b784529d2e0?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=vRlKoye2%2Fwz8mdQI%2F3Ht916sllE%3D","checksum":"6a35ce92050296862ea63b784529d2e0","path":"files/default/logging.properties","specificity":"default"}],"attributes":[{"name":"tomcat6.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926
aa0b4ff74341c/checksum-6e3fd0d16a87a55c569da108194ecb29?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zvYjsgUXIC7Xj3MT8Wd93esDGJM%3D","checksum":"6e3fd0d16a87a55c569da108194ecb29","path":"attributes/tomcat6.rb","specificity":"default"}],"json_class":"Chef::CookbookVersion","providers":[],"metadata":{"dependencies":{},"name":"tomcat6","maintainer_email":"cookbooks@opscode.com","license":"Apache 2.0","attributes":{"tomcat6/with_native":{"required":"optional","calculated":false,"default":"false","choice":[],"type":"string","recipes":[],"display_name":"Tomcat native support","description":"works for centos, install tomcat-native libraries"}},"maintainer":"Opscode, Inc.","suggestions":{},"platforms":{"debian":[],"centos":[],"ubuntu":[],"redhat":[]},"long_description":"= DESCRIPTION:\n\nInstalls Tomcat6\n\n= REQUIREMENTS:\n\n== Platform and Application Environment:\n\nTested on Centos 5.2 8.10. May work on other platforms, esp Redhat.\nNeeds Java at least Java 5\n\n== C
ookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* java\n\n= ATTRIBUTES: \n\n= USAGE:\n\n\n= LICENSE and AUTHOR:\n \nAuthor:: Edmund Haselwanter (<ed...@haselwanter.com>)\nCopyright:: 2009, Edmund Haselwanter\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n","version":"0.1.0","recommendations":{},"conflicting":{},"recipes":{"tomcat6":"Main Tomcat 6 configuration"},"groupings":{},"description":"Installs and configures all aspects of tomcat6 using custom local
installation","replacing":{},"providing":{}},"libraries":[{"name":"tomcat_manager.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2b6f7847142bb36823c570899669c54b?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zxIoUKcGYWo9ir6qf1tTy3wvKZ4%3D","checksum":"2b6f7847142bb36823c570899669c54b","path":"libraries/tomcat_manager.rb","specificity":"default"},{"name":"tomcat.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-24db7b7dd6f04f8da5fa2b282910ac08?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=c4Gbn5kX0ZaPbWvk5LAcR77sITg%3D","checksum":"24db7b7dd6f04f8da5fa2b282910ac08","path":"libraries/tomcat.rb","specificity":"default"}],"templates":[{"name":"tomcat-users.xml.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-107263b81e4700cf0
adad7af2a133bbd?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=QC7MNIauR2ox5MVlohf2i73uM1s%3D","checksum":"107263b81e4700cf0adad7af2a133bbd","path":"templates/default/tomcat-users.xml.erb","specificity":"default"},{"name":"sv-tomcat6-run.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-fa4432b353fa57b9da26a4bff44285f2?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=q2rDeJFeh4oyhfv9ExMifGB0wxo%3D","checksum":"fa4432b353fa57b9da26a4bff44285f2","path":"templates/default/sv-tomcat6-run.erb","specificity":"default"},{"name":"manager.xml.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-33fd6f63133e7ebe28bc62e58773c408?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=rIijEhwLPf5PWTJOg%2BElbOquPBM%3D","checksum":"33fd6f63133e7ebe28bc62e58773c408","path":"templates/default/manager.xml.erb","s
pecificity":"default"},{"name":"sv-tomcat6-log-run.erb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-09f2bf988663175cd1b7973198dfb5eb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=UnfNDP4pDzPM3PoLcLWyTnTa%2FKI%3D","checksum":"09f2bf988663175cd1b7973198dfb5eb","path":"templates/default/sv-tomcat6-log-run.erb","specificity":"default"}],"resources":[],"cookbook_name":"tomcat6","version":"0.1.0","recipes":[{"name":"default.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d45661e4b50f9677de7b8684af26ff9d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=r3CvyVe7dcOzB%2F0fNAun5ldGwr8%3D","checksum":"d45661e4b50f9677de7b8684af26ff9d","path":"recipes/default.rb","specificity":"default"}],"root_files":[{"name":"README.rdoc","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66
264fea926aa0b4ff74341c/checksum-14f6977f68c3674484e8289e361fb5a4?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=VNZxN%2B7CxO7ZbDHJOS%2FaTtpkPaE%3D","checksum":"14f6977f68c3674484e8289e361fb5a4","path":"README.rdoc","specificity":"default"},{"name":"metadata.rb","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-abc416ffba9ea64ca71635191cb87af6?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=pemynt9Q1F%2BxlS26kLaz%2F4NDGO4%3D","checksum":"abc416ffba9ea64ca71635191cb87af6","path":"metadata.rb","specificity":"default"},{"name":"metadata.json","url":"https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-dd8473a8a7f2b446250ecdefb1882a5e?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=sHpayqP%2Fe4Luv20EMa3q%2FaMN4ms%3D","checksum":"dd8473a8a7f2b446250ecdefb1882a5e","path":"metadata.json","specificity":"default"}
],"chef_type":"cookbook_version"}
\ No newline at end of file
+{ "attributes" : [ { "checksum" : "6e3fd0d16a87a55c569da108194ecb29",
+ "name" : "tomcat6.rb",
+ "path" : "attributes/tomcat6.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-6e3fd0d16a87a55c569da108194ecb29?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zvYjsgUXIC7Xj3MT8Wd93esDGJM%3D"
+ } ],
+ "chef_type" : "cookbook_version",
+ "cookbook_name" : "tomcat6",
+ "definitions" : [ ],
+ "files" : [ { "checksum" : "18e534a72652f3d53b197ca4e5027009",
+ "name" : "org.apache.tomcat.tomcat6.plist",
+ "path" : "files/default/org.apache.tomcat.tomcat6.plist",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-18e534a72652f3d53b197ca4e5027009?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=M3fBL4t7uuYVXVah2PyZ8eL1QCc%3D"
+ },
+ { "checksum" : "6a35ce92050296862ea63b784529d2e0",
+ "name" : "logging.properties",
+ "path" : "files/default/logging.properties",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-6a35ce92050296862ea63b784529d2e0?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=vRlKoye2%2Fwz8mdQI%2F3Ht916sllE%3D"
+ }
+ ],
+ "json_class" : "Chef::CookbookVersion",
+ "libraries" : [ { "checksum" : "2b6f7847142bb36823c570899669c54b",
+ "name" : "tomcat_manager.rb",
+ "path" : "libraries/tomcat_manager.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-2b6f7847142bb36823c570899669c54b?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=zxIoUKcGYWo9ir6qf1tTy3wvKZ4%3D"
+ },
+ { "checksum" : "24db7b7dd6f04f8da5fa2b282910ac08",
+ "name" : "tomcat.rb",
+ "path" : "libraries/tomcat.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-24db7b7dd6f04f8da5fa2b282910ac08?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=c4Gbn5kX0ZaPbWvk5LAcR77sITg%3D"
+ }
+ ],
+ "metadata" : { "attributes" : { "tomcat6/with_native" : { "calculated" : false,
+ "choice" : [ ],
+ "default" : "false",
+ "description" : "works for centos, install tomcat-native libraries",
+ "display_name" : "Tomcat native support",
+ "recipes" : [ ],
+ "required" : "optional",
+ "type" : "string"
+ } },
+ "conflicting" : { },
+ "dependencies" : { },
+ "description" : "Installs and configures all aspects of tomcat6 using custom local installation",
+ "groupings" : { },
+ "license" : "Apache 2.0",
+ "long_description" : "= DESCRIPTION:\n\nInstalls Tomcat6\n\n= REQUIREMENTS:\n\n== Platform and Application Environment:\n\nTested on Centos 5.2 8.10. May work on other platforms, esp Redhat.\nNeeds Java at least Java 5\n\n== Cookbooks:\n\nOpscode cookbooks, http://github.com/opscode/cookbooks/tree/master:\n\n* java\n\n= ATTRIBUTES: \n\n= USAGE:\n\n\n= LICENSE and AUTHOR:\n \nAuthor:: Edmund Haselwanter (<ed...@haselwanter.com>)\nCopyright:: 2009, Edmund Haselwanter\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimit
ations under the License.\n",
+ "maintainer" : "Opscode, Inc.",
+ "maintainer_email" : "cookbooks@opscode.com",
+ "name" : "tomcat6",
+ "platforms" : { "centos" : "",
+ "debian" : "",
+ "redhat" : "",
+ "ubuntu" : ""
+ },
+ "providing" : { },
+ "recipes" : { "tomcat6" : "Main Tomcat 6 configuration" },
+ "recommendations" : { },
+ "replacing" : { },
+ "suggestions" : { },
+ "version" : "0.1.0"
+ },
+ "name" : "tomcat6-0.1.0",
+ "providers" : [ ],
+ "recipes" : [ { "checksum" : "d45661e4b50f9677de7b8684af26ff9d",
+ "name" : "default.rb",
+ "path" : "recipes/default.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-d45661e4b50f9677de7b8684af26ff9d?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=r3CvyVe7dcOzB%2F0fNAun5ldGwr8%3D"
+ } ],
+ "resources" : [ ],
+ "root_files" : [ { "checksum" : "14f6977f68c3674484e8289e361fb5a4",
+ "name" : "README.rdoc",
+ "path" : "README.rdoc",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-14f6977f68c3674484e8289e361fb5a4?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=VNZxN%2B7CxO7ZbDHJOS%2FaTtpkPaE%3D"
+ },
+ { "checksum" : "abc416ffba9ea64ca71635191cb87af6",
+ "name" : "metadata.rb",
+ "path" : "metadata.rb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-abc416ffba9ea64ca71635191cb87af6?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=pemynt9Q1F%2BxlS26kLaz%2F4NDGO4%3D"
+ },
+ { "checksum" : "dd8473a8a7f2b446250ecdefb1882a5e",
+ "name" : "metadata.json",
+ "path" : "metadata.json",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-dd8473a8a7f2b446250ecdefb1882a5e?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=sHpayqP%2Fe4Luv20EMa3q%2FaMN4ms%3D"
+ }
+ ],
+ "templates" : [ { "checksum" : "107263b81e4700cf0adad7af2a133bbd",
+ "name" : "tomcat-users.xml.erb",
+ "path" : "templates/default/tomcat-users.xml.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-107263b81e4700cf0adad7af2a133bbd?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=QC7MNIauR2ox5MVlohf2i73uM1s%3D"
+ },
+ { "checksum" : "fa4432b353fa57b9da26a4bff44285f2",
+ "name" : "sv-tomcat6-run.erb",
+ "path" : "templates/default/sv-tomcat6-run.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-fa4432b353fa57b9da26a4bff44285f2?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=q2rDeJFeh4oyhfv9ExMifGB0wxo%3D"
+ },
+ { "checksum" : "33fd6f63133e7ebe28bc62e58773c408",
+ "name" : "manager.xml.erb",
+ "path" : "templates/default/manager.xml.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-33fd6f63133e7ebe28bc62e58773c408?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=rIijEhwLPf5PWTJOg%2BElbOquPBM%3D"
+ },
+ { "checksum" : "09f2bf988663175cd1b7973198dfb5eb",
+ "name" : "sv-tomcat6-log-run.erb",
+ "path" : "templates/default/sv-tomcat6-log-run.erb",
+ "specificity" : "default",
+ "url" : "https://s3.amazonaws.com/opscode-platform-production-data/organization-486ca3ac66264fea926aa0b4ff74341c/checksum-09f2bf988663175cd1b7973198dfb5eb?AWSAccessKeyId=AKIAJOZTD2N26S7W6APA&Expires=1277771874&Signature=UnfNDP4pDzPM3PoLcLWyTnTa%2FKI%3D"
+ }
+ ],
+ "version" : "0.1.0"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
index 04a7dda..0e0b2a6 100644
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
+++ b/enterprise/src/main/java/org/jclouds/enterprisechef/EnterpriseChefApi.java
@@ -29,7 +29,6 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.core.MediaType;
import org.jclouds.Constants;
-import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.chef.ChefApi;
import org.jclouds.chef.filters.SignedHeaderAuth;
@@ -56,20 +55,6 @@ import org.jclouds.rest.annotations.ResponseParser;
@Headers(keys = "X-Chef-Version", values = "{" + Constants.PROPERTY_API_VERSION + "}")
public interface EnterpriseChefApi extends ChefApi
{
-
- /**
- * Check if there exists a node with the given name.
- *
- * @return <code>true</code> if the specified node name exists.
- */
- @Override
- // Use get instead of HEAD
- @Named("node:exists")
- @GET
- @Path("/nodes/{nodename}")
- @Fallback(FalseOnNotFoundOr404.class)
- boolean nodeExists(@PathParam("nodename") String nodename);
-
/**
* Retrieves an existing user.
*
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
index 056acf4..2c0f058 100644
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
+++ b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/Group.java
@@ -16,11 +16,15 @@
*/
package org.jclouds.enterprisechef.domain;
+import static org.jclouds.chef.util.CollectionUtils.copyOfOrEmpty;
import static com.google.common.base.Preconditions.checkNotNull;
+import java.beans.ConstructorProperties;
import java.util.Set;
-import com.google.common.collect.Sets;
+import org.jclouds.javax.annotation.Nullable;
+
+import com.google.common.collect.ImmutableSet;
/**
* Group object.
@@ -28,22 +32,102 @@ import com.google.common.collect.Sets;
* @author Ignasi Barrera
*/
public class Group {
- private String name;
- private String groupname;
- private String orgname;
- private Set<String> actors = Sets.newHashSet();
- private Set<String> clients = Sets.newHashSet();
- private Set<String> groups = Sets.newHashSet();
- private Set<String> users = Sets.newHashSet();
-
- // When creating groups, only the group name property is considered
- public Group(String groupname) {
- this.groupname = checkNotNull(groupname, "groupname");
+ public static Builder builder(String groupname) {
+ return new Builder(groupname);
}
- // Only for deserialization
- Group() {
+ public static class Builder {
+ private String name;
+ private String groupname;
+ private String orgname;
+ private ImmutableSet.Builder<String> actors = ImmutableSet.builder();
+ private ImmutableSet.Builder<String> clients = ImmutableSet.builder();
+ private ImmutableSet.Builder<String> groups = ImmutableSet.builder();
+ private ImmutableSet.Builder<String> users = ImmutableSet.builder();
+
+ public Builder(String groupname) {
+ this.groupname = groupname;
+ }
+ public Builder name(String name) {
+ this.name = checkNotNull(name, "name");
+ return this;
+ }
+
+ public Builder groupname(String groupname) {
+ this.groupname = checkNotNull(groupname, "groupname");
+ return this;
+ }
+
+ public Builder orgname(String orgname) {
+ this.orgname = checkNotNull(orgname, "orgname");
+ return this;
+ }
+
+ public Builder actor(String actor) {
+ this.actors.add(checkNotNull(actor, "actor"));
+ return this;
+ }
+
+ public Builder actors(Iterable<String> actors) {
+ this.actors.addAll(checkNotNull(actors, "actors"));
+ return this;
+ }
+
+ public Builder client(String client) {
+ this.clients.add(checkNotNull(client, "client"));
+ return this;
+ }
+
+ public Builder clients(Iterable<String> clients) {
+ this.clients.addAll(checkNotNull(clients, "clients"));
+ return this;
+ }
+
+ public Builder group(String group) {
+ this.groups.add(checkNotNull(group, "group"));
+ return this;
+ }
+
+ public Builder groups(Iterable<String> groups) {
+ this.groups.addAll(checkNotNull(groups, "groups"));
+ return this;
+ }
+
+ public Builder user(String user) {
+ this.users.add(checkNotNull(user, "user"));
+ return this;
+ }
+
+ public Builder users(Iterable<String> users) {
+ this.users.addAll(checkNotNull(users, "users"));
+ return this;
+ }
+
+ public Group build() {
+ return new Group(name, checkNotNull(groupname, "groupname"), orgname, actors.build(), clients.build(),
+ groups.build(), users.build());
+ }
+ }
+
+ private final String name;
+ private final String groupname;
+ private final String orgname;
+ private final Set<String> actors;
+ private final Set<String> clients;
+ private final Set<String> groups;
+ private final Set<String> users;
+
+ @ConstructorProperties({ "name", "groupname", "orgname", "actors", "clients", "groups", "users" })
+ public Group(String name, String groupname, String orgname, @Nullable Set<String> actors,
+ @Nullable Set<String> clients, @Nullable Set<String> groups, @Nullable Set<String> users) {
+ this.name = name;
+ this.groupname = groupname;
+ this.orgname = orgname;
+ this.actors = copyOfOrEmpty(actors);
+ this.clients = copyOfOrEmpty(clients);
+ this.groups = copyOfOrEmpty(groups);
+ this.users = copyOfOrEmpty(users);
}
public String getName() {
@@ -74,18 +158,6 @@ public class Group {
return users;
}
- public void setClients(Set<String> clients) {
- this.clients = clients;
- }
-
- public void setGroups(Set<String> groups) {
- this.groups = groups;
- }
-
- public void setUsers(Set<String> users) {
- this.users = users;
- }
-
@Override
public int hashCode() {
final int prime = 31;
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/3f2a196f/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
----------------------------------------------------------------------
diff --git a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
index 247d1a8..c2c71fa 100644
--- a/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
+++ b/enterprise/src/main/java/org/jclouds/enterprisechef/domain/User.java
@@ -16,6 +16,9 @@
*/
package org.jclouds.enterprisechef.domain;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.beans.ConstructorProperties;
import java.security.PublicKey;
import com.google.gson.annotations.SerializedName;
@@ -26,24 +29,110 @@ import com.google.gson.annotations.SerializedName;
* @author Ignasi Barrera
*/
public class User {
- private String username;
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ public static class Builder {
+ private String username;
+ private String firstName;
+ private String middleName;
+ private String lastName;
+ private String displayName;
+ private String email;
+ private PublicKey publicKey;
+
+ public Builder username(String username) {
+ this.username = checkNotNull(username, "username");
+ return this;
+ }
+
+ public Builder firstName(String firstName) {
+ this.firstName = checkNotNull(firstName, "firstName");
+ return this;
+ }
+
+ public Builder middleName(String middleName) {
+ this.middleName = checkNotNull(middleName, "middleName");
+ return this;
+ }
+
+ public Builder lastName(String lastName) {
+ this.lastName = checkNotNull(lastName, "lastName");
+ return this;
+ }
+
+ public Builder displayName(String displayName) {
+ this.displayName = checkNotNull(displayName, "displayName");
+ return this;
+ }
+
+ public Builder email(String email) {
+ this.email = checkNotNull(email, "email");
+ return this;
+ }
+
+ public Builder publicKey(PublicKey publicKey) {
+ this.publicKey = checkNotNull(publicKey, "publicKey");
+ return this;
+ }
+
+ public User build() {
+ return new User(username, firstName, middleName, lastName, displayName, email, publicKey);
+ }
+ }
+
+ private final String username;
@SerializedName("first_name")
- private String firstName;
+ private final String firstName;
@SerializedName("middle_name")
- private String middleName;
+ private final String middleName;
@SerializedName("last_name")
- private String lastName;
+ private final String lastName;
@SerializedName("display_name")
- private String displayName;
- private String email;
+ private final String displayName;
+ private final String email;
@SerializedName("public_key")
- private PublicKey publicKey;
+ private final PublicKey publicKey;
+
+ @ConstructorProperties({ "username", "first_name", "middle_name", "last_name", "display_name", "email", "public_key" })
+ protected User(String username, String firstName, String middleName, String lastName, String displayName,
+ String email, PublicKey publicKey) {
+ this.username = username;
+ this.firstName = firstName;
+ this.middleName = middleName;
+ this.lastName = lastName;
+ this.displayName = displayName;
+ this.email = email;
+ this.publicKey = publicKey;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
- // TODO: Add a constructor to allow creating users. Need an Enterprise Chef instance!
+ public String getMiddleName() {
+ return middleName;
+ }
- // Only for deserialization
- User() {
+ public String getLastName() {
+ return lastName;
+ }
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public PublicKey getPublicKey() {
+ return publicKey;
}
@Override
@@ -124,34 +213,6 @@ public class User {
return true;
}
- public String getUsername() {
- return username;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public String getMiddleName() {
- return middleName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public String getEmail() {
- return email;
- }
-
- public PublicKey getPublicKey() {
- return publicKey;
- }
-
@Override
public String toString() {
return "User [username=" + username + ", firstName=" + firstName + ", middleName=" + middleName + ", lastName="