Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-776: Map chef cookbook attribute files with Resource instead of Attribute

This commit is contained in:
akorompai 2014-11-15 12:58:01 +01:00 committed by Ignasi Barrera
parent 494f35ddae
commit 68f3bdc264
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/chef/src/main/java/org/jclouds/chef/domain/CookbookVersion.java
View File

@ -38,7 +38,7 @@ public class CookbookVersion {
public static class Builder { public static class Builder {
private String cookbookName; private String cookbookName;
private ImmutableSet.Builder<Resource> definitions = ImmutableSet.builder(); private ImmutableSet.Builder<Resource> definitions = ImmutableSet.builder();
private ImmutableSet.Builder<Attribute> attributes = ImmutableSet.builder(); private ImmutableSet.Builder<Resource> attributes = ImmutableSet.builder();
private ImmutableSet.Builder<Resource> files = ImmutableSet.builder(); private ImmutableSet.Builder<Resource> files = ImmutableSet.builder();
private Metadata metadata = Metadata.builder().build(); private Metadata metadata = Metadata.builder().build();
private ImmutableSet.Builder<Resource> providers = ImmutableSet.builder(); private ImmutableSet.Builder<Resource> providers = ImmutableSet.builder();
@ -69,12 +69,12 @@ public class CookbookVersion {
return this; return this;
} }
public Builder attribute(Attribute attribute) { public Builder attribute(Resource attribute) {
this.attributes.add(checkNotNull(attribute, "attribute")); this.attributes.add(checkNotNull(attribute, "attribute"));
return this; return this;
} }
public Builder attributes(Iterable<Attribute> attributes) { public Builder attributes(Iterable<Resource> attributes) {
this.attributes.addAll(checkNotNull(attributes, "attributes")); this.attributes.addAll(checkNotNull(attributes, "attributes"));
return this; return this;
} }
@ -168,7 +168,7 @@ public class CookbookVersion {
private final String name; private final String name;
private final Set<Resource> definitions; private final Set<Resource> definitions;
private final Set<Attribute> attributes; private final Set<Resource> attributes;
private final Set<Resource> files; private final Set<Resource> files;
private final Metadata metadata; private final Metadata metadata;
private final Set<Resource> providers; private final Set<Resource> providers;
@ -190,7 +190,7 @@ public class CookbookVersion {
@ConstructorProperties({ "name", "definitions", "attributes", "files", "metadata", "providers", "cookbook_name", @ConstructorProperties({ "name", "definitions", "attributes", "files", "metadata", "providers", "cookbook_name",
"resources", "templates", "libraries", "version", "recipes", "root_files" }) "resources", "templates", "libraries", "version", "recipes", "root_files" })
protected CookbookVersion(String name, @Nullable Set<Resource> definitions, @Nullable Set<Attribute> attributes, protected CookbookVersion(String name, @Nullable Set<Resource> definitions, @Nullable Set<Resource> attributes,
@Nullable Set<Resource> files, Metadata metadata, @Nullable Set<Resource> providers, String cookbookName, @Nullable Set<Resource> files, Metadata metadata, @Nullable Set<Resource> providers, String cookbookName,
@Nullable Set<Resource> resources, @Nullable Set<Resource> templates, @Nullable Set<Resource> libraries, @Nullable Set<Resource> resources, @Nullable Set<Resource> templates, @Nullable Set<Resource> libraries,
String version, @Nullable Set<Resource> recipes, @Nullable Set<Resource> rootFiles) { String version, @Nullable Set<Resource> recipes, @Nullable Set<Resource> rootFiles) {
@ -217,7 +217,7 @@ public class CookbookVersion {
return definitions; return definitions;
} }
public Set<Attribute> getAttributes() { public Set<Resource> getAttributes() {
return attributes; return attributes;
} }

51
apis/chef/src/test/java/org/jclouds/chef/internal/BaseChefApiLiveTest.java
View File

@ -30,6 +30,7 @@ import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail; import static org.testng.Assert.fail;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -85,6 +86,30 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
public void testCreateNewCookbook() throws Exception { public void testCreateNewCookbook() throws Exception {
// Define the file you want in the cookbook // Define the file you want in the cookbook
File file = new File(System.getProperty("user.dir"), "pom.xml"); File file = new File(System.getProperty("user.dir"), "pom.xml");
FilePayload content = uploadAndGetFilePayload(file);
// Create the metadata of the cookbook
Metadata metadata = Metadata.builder() //
.name(PREFIX) //
.version("0.0.0") //
.description("Jclouds test uploaded cookbook") //
.maintainer("jclouds") //
.maintainerEmail("someone@jclouds.org") //
.license("Apache 2.0") //
.build();
// Create a new cookbook
CookbookVersion cookbook = CookbookVersion.builder(PREFIX, "0.0.0") //
.metadata(metadata) //
.rootFile(Resource.builder().fromPayload(content).build()) //
.attribute(Resource.builder().fromPayload(content).name("default.rb").build())
.build();
// upload the cookbook to the remote server
api.updateCookbook(PREFIX, "0.0.0", cookbook);
}
private FilePayload uploadAndGetFilePayload(File file) throws IOException {
FilePayload content = Payloads.newFilePayload(file); FilePayload content = Payloads.newFilePayload(file);
content.getContentMetadata().setContentType("application/x-binary"); content.getContentMetadata().setContentType("application/x-binary");
@ -111,25 +136,7 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
api.commitSandbox(site.getSandboxId(), false); api.commitSandbox(site.getSandboxId(), false);
fail("Could not upload content"); fail("Could not upload content");
} }
return content;
// Create the metadata of the cookbook
Metadata metadata = Metadata.builder() //
.name(PREFIX) //
.version("0.0.0") //
.description("Jclouds test uploaded cookbook") //
.maintainer("jclouds") //
.maintainerEmail("someone@jclouds.org") //
.license("Apache 2.0") //
.build();
// Create a new cookbook
CookbookVersion cookbook = CookbookVersion.builder(PREFIX, "0.0.0") //
.metadata(metadata) //
.rootFile(Resource.builder().fromPayload(content).build()) //
.build();
// upload the cookbook to the remote server
api.updateCookbook(PREFIX, "0.0.0", cookbook);
} }
public void testListCookbooks() throws Exception { public void testListCookbooks() throws Exception {
@ -158,9 +165,9 @@ public abstract class BaseChefApiLiveTest<A extends ChefApi> extends BaseChefLiv
Iterable<? extends CookbookVersion> cookbooks = chefService.listCookbookVersions(); Iterable<? extends CookbookVersion> cookbooks = chefService.listCookbookVersions();
for (CookbookVersion cookbook : cookbooks) { for (CookbookVersion cookbook : cookbooks) {
for (Resource resource : ImmutableList.<Resource> builder().addAll(cookbook.getDefinitions()) for (Resource resource : ImmutableList.<Resource> builder().addAll(cookbook.getDefinitions())
.addAll(cookbook.getFiles()).addAll(cookbook.getLibraries()).addAll(cookbook.getSuppliers()) .addAll(cookbook.getFiles()).addAll(cookbook.getLibraries()).addAll(cookbook.getSuppliers())
.addAll(cookbook.getRecipes()).addAll(cookbook.getResources()).addAll(cookbook.getRootFiles()) .addAll(cookbook.getRecipes()).addAll(cookbook.getResources()).addAll(cookbook.getRootFiles())
.addAll(cookbook.getTemplates()).build()) { .addAll(cookbook.getTemplates()).addAll(cookbook.getAttributes()).build()) {
InputStream stream = api.getResourceContents(resource); InputStream stream = api.getResourceContents(resource);
assertNotNull(stream, "Resource contents are null for resource: " + resource.getName()); assertNotNull(stream, "Resource contents are null for resource: " + resource.getName());