added scaleup-storage, and workaround as it doesn't yet support bucket location

aws/core/src/main/java/org/jclouds/aws/handlers/ParseAWSErrorFromXmlContent.java

@@ -94,7 +94,7 @@ public class ParseAWSErrorFromXmlContent implements HttpErrorHandler {
                   && (error.getCode().endsWith(".NotFound") || error.getCode().endsWith(".Unknown")))
                exception = new ResourceNotFoundException(message, exception);
             else if ((error != null && error.getCode() != null && (error.getCode().equals("IncorrectState") || error
-                  .getCode().endsWith(".Duplicate"))) || (message != null && message.indexOf("already exists") != -1))
+                  .getCode().endsWith(".Duplicate"))) || (message != null && (message.indexOf("already exists") != -1)))
                exception = new IllegalStateException(message, exception);
             else if (error != null && error.getCode() != null && error.getCode().equals("AuthFailure"))
                exception = new AuthorizationException(exception.getMessage(), exception);

aws/core/src/main/java/org/jclouds/aws/s3/blobstore/ScaleUpCloudBlobStoreContextContextBuilder.java

@@ -0,0 +1,45 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.aws.s3.blobstore;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.jclouds.aws.s3.S3ContextBuilder;
+import org.jclouds.aws.s3.blobstore.config.ScaleUpCloudBlobStoreContextModule;
+
+import com.google.inject.Module;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class ScaleUpCloudBlobStoreContextContextBuilder extends S3ContextBuilder {
+
+   public ScaleUpCloudBlobStoreContextContextBuilder(Properties props) {
+      super(props);
+   }
+
+   @Override
+   protected void addContextModule(List<Module> modules) {
+      modules.add(new ScaleUpCloudBlobStoreContextModule());
+   }
+
+}

aws/core/src/main/java/org/jclouds/aws/s3/blobstore/config/S3BlobStoreContextModule.java

@@ -29,6 +29,8 @@ import org.jclouds.aws.s3.S3Client;
 import org.jclouds.aws.s3.blobstore.S3AsyncBlobStore;
 import org.jclouds.aws.s3.blobstore.S3BlobRequestSigner;
 import org.jclouds.aws.s3.blobstore.S3BlobStore;
+import org.jclouds.aws.s3.blobstore.functions.LocationFromBucketLocation;
+import org.jclouds.aws.s3.domain.BucketMetadata;
 import org.jclouds.aws.suppliers.DefaultLocationSupplier;
 import org.jclouds.blobstore.AsyncBlobStore;
 import org.jclouds.blobstore.BlobRequestSigner;
@@ -43,6 +45,7 @@ import org.jclouds.domain.LocationScope;
 import org.jclouds.domain.internal.LocationImpl;
 import org.jclouds.rest.annotations.Provider;
 
+import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Sets;
@@ -70,6 +73,12 @@ public class S3BlobStoreContextModule extends AbstractModule {
       bind(BlobStoreContext.class).to(new TypeLiteral<BlobStoreContextImpl<S3Client, S3AsyncClient>>() {
       }).in(Scopes.SINGLETON);
       bind(BlobRequestSigner.class).to(S3BlobRequestSigner.class);
+      bindBucketLocationStrategy();
+   }
+
+   protected void bindBucketLocationStrategy() {
+      bind(new TypeLiteral<Function<BucketMetadata, Location>>() {
+      }).to(LocationFromBucketLocation.class);
    }
 
    @Provides

aws/core/src/main/java/org/jclouds/aws/s3/blobstore/config/ScaleUpCloudBlobStoreContextModule.java

@@ -0,0 +1,41 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.aws.s3.blobstore.config;
+
+import org.jclouds.aws.s3.domain.BucketMetadata;
+import org.jclouds.domain.Location;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.inject.TypeLiteral;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+public class ScaleUpCloudBlobStoreContextModule extends S3BlobStoreContextModule {
+
+   @SuppressWarnings("rawtypes")
+   @Override
+   protected void bindBucketLocationStrategy() {
+      bind(new TypeLiteral<Function<BucketMetadata, Location>>() {
+      }).toInstance((Function)Functions.constant(null));
+   }
+}

aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/BucketToResourceMetadata.java

@@ -19,80 +19,36 @@
 
 package org.jclouds.aws.s3.blobstore.functions;
 
-import java.util.NoSuchElementException;
-import java.util.Set;
 
-import javax.annotation.Resource;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.jclouds.aws.s3.S3Client;
 import org.jclouds.aws.s3.domain.BucketMetadata;
-import org.jclouds.blobstore.ContainerNotFoundException;
 import org.jclouds.blobstore.domain.MutableStorageMetadata;
 import org.jclouds.blobstore.domain.StorageMetadata;
 import org.jclouds.blobstore.domain.StorageType;
 import org.jclouds.blobstore.domain.internal.MutableStorageMetadataImpl;
-import org.jclouds.collect.Memoized;
 import org.jclouds.domain.Location;
-import org.jclouds.logging.Logger;
 
 import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Supplier;
-import com.google.common.collect.Iterables;
 
 /**
  * @author Adrian Cole
  */
 @Singleton
 public class BucketToResourceMetadata implements Function<BucketMetadata, StorageMetadata> {
-   private final S3Client client;
+   private final Function<BucketMetadata, Location> locationOfBucket;
-   private final Location onlyLocation;
-   private final Supplier<Set<? extends Location>> locations;
-
-   @Resource
-   protected Logger logger = Logger.NULL;
 
    @Inject
-   BucketToResourceMetadata(S3Client client, @Memoized Supplier<Set<? extends Location>> locations) {
+   BucketToResourceMetadata(Function<BucketMetadata, Location> locationOfBucket) {
-      this.client = client;
+      this.locationOfBucket = locationOfBucket;
-      this.onlyLocation = locations.get().size() == 1 ? Iterables.get(locations.get(), 0) : null;
-      this.locations = locations;
    }
 
    public StorageMetadata apply(BucketMetadata from) {
       MutableStorageMetadata to = new MutableStorageMetadataImpl();
       to.setName(from.getName());
       to.setType(StorageType.CONTAINER);
-      to.setLocation(onlyLocation != null ? onlyLocation : getLocation(from));
+      to.setLocation(locationOfBucket.apply(from));
       return to;
    }
-
-   private Location getLocation(BucketMetadata from) {
-      try {
-         Set<? extends Location> locations = this.locations.get();
-         final String region = client.getBucketLocation(from.getName());
-         assert region != null : String.format("could not get region for %s", from.getName());
-         if (region != null) {
-            try {
-               return Iterables.find(locations, new Predicate<Location>() {
-
-                  @Override
-                  public boolean apply(Location input) {
-                     return input.getId().equalsIgnoreCase(region.toString());
-                  }
-
-               });
-            } catch (NoSuchElementException e) {
-               logger.error("could not get location for region %s in %s", region, locations);
-            }
-         } else {
-            logger.error("could not get region for %s", from.getName());
-         }
-      } catch (ContainerNotFoundException e) {
-         logger.error(e, "could not get region for %s, as service suggests the bucket doesn't exist", from.getName());
-      }
-      return null;
-   }
 }

aws/core/src/main/java/org/jclouds/aws/s3/blobstore/functions/LocationFromBucketLocation.java

@@ -0,0 +1,88 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.aws.s3.blobstore.functions;
+
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+import javax.annotation.Resource;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.jclouds.aws.s3.S3Client;
+import org.jclouds.aws.s3.domain.BucketMetadata;
+import org.jclouds.blobstore.ContainerNotFoundException;
+import org.jclouds.collect.Memoized;
+import org.jclouds.domain.Location;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Function;
+import com.google.common.base.Predicate;
+import com.google.common.base.Supplier;
+import com.google.common.collect.Iterables;
+
+/**
+ * @author Adrian Cole
+ */
+@Singleton
+public class LocationFromBucketLocation implements Function<BucketMetadata, Location> {
+   private final Location onlyLocation;
+   private final Supplier<Set<? extends Location>> locations;
+   private final S3Client client;
+
+   @Resource
+   protected Logger logger = Logger.NULL;
+
+   @Inject
+   LocationFromBucketLocation(S3Client client, @Memoized Supplier<Set<? extends Location>> locations) {
+      this.client = client;
+      this.onlyLocation = locations.get().size() == 1 ? Iterables.get(locations.get(), 0) : null;
+      this.locations = locations;
+   }
+
+   public Location apply(BucketMetadata from) {
+      if (onlyLocation != null)
+         return onlyLocation;
+      try {
+         Set<? extends Location> locations = this.locations.get();
+         final String region = client.getBucketLocation(from.getName());
+         assert region != null : String.format("could not get region for %s", from.getName());
+         if (region != null) {
+            try {
+               return Iterables.find(locations, new Predicate<Location>() {
+
+                  @Override
+                  public boolean apply(Location input) {
+                     return input.getId().equalsIgnoreCase(region.toString());
+                  }
+
+               });
+            } catch (NoSuchElementException e) {
+               logger.error("could not get location for region %s in %s", region, locations);
+            }
+         } else {
+            logger.error("could not get region for %s", from.getName());
+         }
+      } catch (ContainerNotFoundException e) {
+         logger.error(e, "could not get region for %s, as service suggests the bucket doesn't exist", from.getName());
+      }
+      return null;
+   }
+}

aws/core/src/main/java/org/jclouds/aws/s3/functions/ReturnFalseIfBucketAlreadyOwnedByYou.java

@@ -19,8 +19,14 @@
 
 package org.jclouds.aws.s3.functions;
 
+import static com.google.common.base.Throwables.getCausalChain;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.get;
+import static com.google.common.collect.Iterables.size;
 import static org.jclouds.util.Utils.propagateOrNull;
 
+import java.util.List;
+
 import javax.inject.Singleton;
 
 import org.jclouds.aws.AWSResponseException;
@@ -35,11 +41,12 @@ import com.google.common.base.Function;
 public class ReturnFalseIfBucketAlreadyOwnedByYou implements Function<Exception, Boolean> {
 
    public Boolean apply(Exception from) {
-      if (from instanceof AWSResponseException) {
+      List<Throwable> throwables = getCausalChain(from);
-         AWSResponseException responseException = (AWSResponseException) from;
+
-         if ("BucketAlreadyOwnedByYou".equals(responseException.getError().getCode())) {
+      Iterable<AWSResponseException> matchingAWSResponseException = filter(throwables, AWSResponseException.class);
+      if (size(matchingAWSResponseException) >= 1 && get(matchingAWSResponseException, 0).getError() != null) {
+         if (get(matchingAWSResponseException, 0).getError().getCode().equals("BucketAlreadyOwnedByYou"))
             return false;
-         }
       }
       return Boolean.class.cast(propagateOrNull(from));
    }

core/src/main/resources/rest.properties

@@ -119,6 +119,10 @@ walrus.propertiesbuilder=org.jclouds.aws.s3.WalrusPropertiesBuilder
 googlestorage.contextbuilder=org.jclouds.aws.s3.S3ContextBuilder
 googlestorage.propertiesbuilder=org.jclouds.aws.s3.GoogleStoragePropertiesBuilder
 
+scaleup-storage.contextbuilder=org.jclouds.aws.s3.blobstore.ScaleUpCloudBlobStoreContextContextBuilder
+scaleup-storage.propertiesbuilder=org.jclouds.aws.s3.S3PropertiesBuilder
+scaleup-storage.endpoint=https://scs.scaleupstorage.com
+
 transient.contextbuilder=org.jclouds.blobstore.TransientBlobStoreContextBuilder
 transient.propertiesbuilder=org.jclouds.blobstore.TransientBlobStorePropertiesBuilder