Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jclouds 2.1.1 update #78

Merged
merged 5 commits into from
Aug 31, 2018
Merged

jclouds 2.1.1 update #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f312a81
[JENKINS-50591] [JENKINS-52151] Picking up fix of JCLOUDS-1401.
jglick Aug 29, 2018
608458b
Strengthening some more tests.
jglick Aug 29, 2018
8ab439c
No longer need to patch LocalBlobStore for tests.
jglick Aug 29, 2018
c6d9f57
Merge branch 'master' into metachars-JENKINS-50591-JENKINS-52151
jglick Aug 29, 2018
546841c
Picking up https://github.com/jenkinsci/git-plugin/pull/616.
jglick Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<properties>
<revision>1.2</revision>
<changelist>-SNAPSHOT</changelist>
<jclouds.version>2.1.0</jclouds.version>
<jclouds.version>2.1.1</jclouds.version>
<jenkins.version>2.121.3</jenkins.version>
<java.level>8</java.level>
<workflow-api-plugin.version>2.29</workflow-api-plugin.version>
<git-plugin.version>4.0.0-beta3</git-plugin.version>
<git-plugin.version>4.0.0-rc2883.3399537b3d44</git-plugin.version> <!-- TODO https://github.com/jenkinsci/git-plugin/pull/616 -->
<workflow-multibranch-plugin.version>2.20</workflow-multibranch-plugin.version>
<useBeta>true</useBeta>
<scm-api-plugin.version>2.2.7</scm-api-plugin.version>
Expand Down
308 changes: 1 addition & 307 deletions src/test/java/io/jenkins/plugins/artifact_manager_jclouds/MockApiMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,14 @@

package io.jenkins.plugins.artifact_manager_jclouds;

import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Sets.filter;
import static com.google.common.collect.Sets.newTreeSet;
import com.google.inject.AbstractModule;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.commons.io.IOUtils;
import org.jclouds.apis.ApiMetadata;
import org.jclouds.apis.internal.BaseApiMetadata;
Expand All @@ -64,24 +48,11 @@
import org.jclouds.blobstore.config.TransientBlobStoreContextModule;
import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.BlobAccess;
import org.jclouds.blobstore.domain.BlobBuilder;
import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.blobstore.domain.ContainerAccess;
import org.jclouds.blobstore.domain.MultipartPart;
import org.jclouds.blobstore.domain.MultipartUpload;
import org.jclouds.blobstore.domain.MutableStorageMetadata;
import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.StorageType;
import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl;
import org.jclouds.blobstore.domain.internal.PageSetImpl;
import org.jclouds.blobstore.options.CopyOptions;
import org.jclouds.blobstore.options.CreateContainerOptions;
import org.jclouds.blobstore.options.GetOptions;
import org.jclouds.blobstore.options.ListContainerOptions;
import org.jclouds.blobstore.options.PutOptions;
import org.jclouds.domain.Location;
import org.jclouds.io.Payload;
import org.jclouds.io.Payloads;
import org.kohsuke.MetaInfServices;

Expand Down Expand Up @@ -141,7 +112,7 @@ public static final class MockModule extends AbstractModule {
@Override
protected void configure() {
install(new BlobStoreObjectModule());
bind(BlobStore.class).to(PatchedLocalBlobStore.class);
bind(BlobStore.class).to(LocalBlobStore.class);
bind(ConsistencyModel.class).toInstance(ConsistencyModel.STRICT);
bind(LocalStorageStrategy.class).to(MockStrategy.class);
bind(BlobRequestSigner.class).to(LocalBlobRequestSigner.class);
Expand Down Expand Up @@ -283,281 +254,4 @@ public String getSeparator() {

}

/**
* TODO delete when updating to 2.1.1 or 2.2.0
* @see <a href="https://issues.apache.org/jira/browse/JCLOUDS-1422">JCLOUDS-1422</a>
*/
public static final class PatchedLocalBlobStore implements BlobStore {

private final LocalBlobStore delegate;

@Inject
public PatchedLocalBlobStore(LocalBlobStore delegate) {
this.delegate = delegate;
}

@Override
public PageSet<? extends StorageMetadata> list(String containerName, ListContainerOptions options) {
PageSet<? extends StorageMetadata> base = delegate.list(containerName, options);
if (!options.isRecursive()) {
String prefix = options.getPrefix();
if (!Strings.isNullOrEmpty(prefix)) {
SortedSet<StorageMetadata> recursiveResult = new TreeSet<>(delegate.list(containerName, options.clone().recursive()));
SortedSet<StorageMetadata> processedResult = extractCommonPrefixes(recursiveResult, "/", prefix);
if (!processedResult.equals(new TreeSet<>(base))) {
LOGGER.log(Level.INFO, "JCLOUDS-1422: for list({0}, {1}) replacing {2} with {3}", new Object[] {containerName, options, summarize(base), summarize(processedResult)});
return new PageSetImpl<>(processedResult, /* TODO close enough for now */null);
}
}
}
return base;
}

private String summarize(Collection<? extends StorageMetadata> list) {
return list.stream().map(StorageMetadata::getName).collect(Collectors.joining(":"));
}

// from LocalBlobStore
private static SortedSet<StorageMetadata> extractCommonPrefixes(SortedSet<StorageMetadata> contents, String delimiter, String prefix) {
if (Strings.isNullOrEmpty(delimiter)) {
return contents;
}
SortedSet<String> commonPrefixes = newTreeSet(transform(contents, new CommonPrefixes(prefix, delimiter)));
commonPrefixes.remove(CommonPrefixes.NO_PREFIX);
contents = newTreeSet(filter(contents, new DelimiterFilter(prefix, delimiter)));
for (String o : commonPrefixes) {
MutableStorageMetadata md = new MutableStorageMetadataImpl();
md.setType(StorageType.RELATIVE_PATH);
if (prefix != null) {
o = prefix + o;
}
md.setName(o + delimiter);
contents.add(md);
}
return contents;
}
private static class CommonPrefixes implements Function<StorageMetadata, String> {
private final String prefix;
private final String delimiter;
public static final String NO_PREFIX = "NO_PREFIX";
CommonPrefixes(String prefix, String delimiter) {
this.prefix = prefix;
this.delimiter = delimiter;
}
@Override
public String apply(StorageMetadata metadata) {
String working = metadata.getName();
if (prefix != null) {
if (working.startsWith(prefix)) {
working = working.substring(prefix.length());
} else {
return NO_PREFIX;
}
}
if (working.contains(delimiter)) {
return working.substring(0, working.indexOf(delimiter));
} else {
return NO_PREFIX;
}
}
}
private static class DelimiterFilter implements Predicate<StorageMetadata> {
private final String prefix;
private final String delimiter;
DelimiterFilter(String prefix, String delimiter) {
this.prefix = prefix;
this.delimiter = delimiter;
}
@Override
public boolean apply(StorageMetadata metadata) {
String name = metadata.getName();
if (prefix == null || prefix.isEmpty()) {
return !name.contains(delimiter);
}
if (name.startsWith(prefix)) {
String unprefixedName = name.substring(prefix.length());
if (unprefixedName.isEmpty()) {
return true;
}
return !unprefixedName.contains(delimiter);
}
return false;
}
}

@Override
public BlobStoreContext getContext() {
return delegate.getContext();
}
@Override
public BlobBuilder blobBuilder(String name) {
return delegate.blobBuilder(name);
}
@Override
public PageSet<? extends StorageMetadata> list(String containerName) {
return delegate.list(containerName);
}
@Override
public long countBlobs(String containerName) {
return delegate.countBlobs(containerName);
}
@Override
public long countBlobs(String containerName, ListContainerOptions options) {
return delegate.countBlobs(containerName, options);
}
@Override
public void clearContainer(String containerName) {
delegate.clearContainer(containerName);
}
@Override
public void clearContainer(String containerName, ListContainerOptions options) {
delegate.clearContainer(containerName, options);
}
@Override
public void deleteDirectory(String containerName, String directory) {
delegate.deleteDirectory(containerName, directory);
}
@Override
public boolean directoryExists(String containerName, String directory) {
return delegate.directoryExists(containerName, directory);
}
@Override
public void createDirectory(String containerName, String directory) {
delegate.createDirectory(containerName, directory);
}
@Override
public Blob getBlob(String containerName, String key) {
return delegate.getBlob(containerName, key);
}
@Override
public void deleteContainer(String containerName) {
delegate.deleteContainer(containerName);
}
@Override
public Set<? extends Location> listAssignableLocations() {
return delegate.listAssignableLocations();
}
@Override
public void removeBlob(String containerName, String key) {
delegate.removeBlob(containerName, key);
}
@Override
public void removeBlobs(String container, Iterable<String> names) {
delegate.removeBlobs(container, names);
}
@Override
public BlobAccess getBlobAccess(String container, String name) {
return delegate.getBlobAccess(container, name);
}
@Override
public void setBlobAccess(String container, String name, BlobAccess access) {
delegate.setBlobAccess(container, name, access);
}
@Override
public boolean deleteContainerIfEmpty(String containerName) {
return delegate.deleteContainerIfEmpty(containerName);
}
@Override
public boolean containerExists(String containerName) {
return delegate.containerExists(containerName);
}
@Override
public PageSet<? extends StorageMetadata> list() {
return delegate.list();
}
@Override
public boolean createContainerInLocation(Location location, String name) {
return delegate.createContainerInLocation(location, name);
}
@Override
public ContainerAccess getContainerAccess(String container) {
return delegate.getContainerAccess(container);
}
@Override
public void setContainerAccess(String container, ContainerAccess access) {
delegate.setContainerAccess(container, access);
}
@Override
public String putBlob(String containerName, Blob blob) {
return delegate.putBlob(containerName, blob);
}
@Override
public String copyBlob(String fromContainer, String fromName, String toContainer, String toName, CopyOptions options) {
return delegate.copyBlob(fromContainer, fromName, toContainer, toName, options);
}
@Override
public boolean blobExists(String containerName, String key) {
return delegate.blobExists(containerName, key);
}
@Override
public Blob getBlob(String containerName, String key, GetOptions options) {
return delegate.getBlob(containerName, key, options);
}
@Override
public BlobMetadata blobMetadata(String containerName, String key) {
return delegate.blobMetadata(containerName, key);
}
@Override
public String putBlob(String containerName, Blob blob, PutOptions options) {
return delegate.putBlob(containerName, blob, options);
}
@Override
public boolean createContainerInLocation(Location location, String container, CreateContainerOptions options) {
return delegate.createContainerInLocation(location, container, options);
}
@Override
public MultipartUpload initiateMultipartUpload(String container, BlobMetadata blobMetadata, PutOptions options) {
return delegate.initiateMultipartUpload(container, blobMetadata, options);
}
@Override
public void abortMultipartUpload(MultipartUpload mpu) {
delegate.abortMultipartUpload(mpu);
}
@Override
public String completeMultipartUpload(MultipartUpload mpu, List<MultipartPart> parts) {
return delegate.completeMultipartUpload(mpu, parts);
}
@Override
public MultipartPart uploadMultipartPart(MultipartUpload mpu, int partNumber, Payload payload) {
return delegate.uploadMultipartPart(mpu, partNumber, payload);
}
@Override
public List<MultipartPart> listMultipartUpload(MultipartUpload mpu) {
return delegate.listMultipartUpload(mpu);
}
@Override
public List<MultipartUpload> listMultipartUploads(String container) {
return delegate.listMultipartUploads(container);
}
@Override
public long getMinimumMultipartPartSize() {
return delegate.getMinimumMultipartPartSize();
}
@Override
public long getMaximumMultipartPartSize() {
return delegate.getMaximumMultipartPartSize();
}
@Override
public int getMaximumNumberOfParts() {
return delegate.getMaximumNumberOfParts();
}
@Override
public void downloadBlob(String container, String name, File destination) {
delegate.downloadBlob(container, name, destination);
}
@Override
public void downloadBlob(String container, String name, File destination, ExecutorService executor) {
delegate.downloadBlob(container, name, destination, executor);
}
@Override
public InputStream streamBlob(String container, String name) {
return delegate.streamBlob(container, name);
}
@Override
public InputStream streamBlob(String container, String name, ExecutorService executor) {
return delegate.streamBlob(container, name, executor);
}

}

}
Loading