mirror of https://github.com/apache/jclouds.git
fixed s3 regression wrt metadata
This commit is contained in:
parent
e90857d7a4
commit
f777592a83
|
@ -6,7 +6,6 @@ import static org.jclouds.aws.reference.AWSConstants.PROPERTY_REGIONS;
|
|||
import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_S3_AUTH_TAG;
|
||||
import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_S3_HEADER_TAG;
|
||||
import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_S3_SERVICE_EXPR;
|
||||
import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
|
@ -19,7 +18,6 @@ public class GoogleStoragePropertiesBuilder extends S3PropertiesBuilder {
|
|||
@Override
|
||||
protected Properties defaultProperties() {
|
||||
Properties properties = super.defaultProperties();
|
||||
properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "x-goog-meta-");
|
||||
properties.setProperty(PROPERTY_S3_AUTH_TAG, "GOOG1");
|
||||
properties.setProperty(PROPERTY_S3_HEADER_TAG, "goog");
|
||||
properties.setProperty(PROPERTY_S3_SERVICE_EXPR, "\\.commondatastorage\\.googleapis\\.com");
|
||||
|
|
|
@ -47,9 +47,8 @@ public class S3PropertiesBuilder extends PropertiesBuilder {
|
|||
protected Properties defaultProperties() {
|
||||
Properties properties = super.defaultProperties();
|
||||
properties.setProperty(PROPERTY_API_VERSION, S3AsyncClient.VERSION);
|
||||
properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "x-amz-meta-");
|
||||
properties.setProperty(PROPERTY_S3_AUTH_TAG, "AWS");
|
||||
properties.setProperty(PROPERTY_S3_HEADER_TAG, "aws");
|
||||
properties.setProperty(PROPERTY_S3_HEADER_TAG, "amz");
|
||||
properties.setProperty(PROPERTY_S3_SERVICE_EXPR, "\\.s3[^.]*\\.amazonaws\\.com");
|
||||
properties.setProperty(PROPERTY_RELAX_HOSTNAME, "true");
|
||||
addEndpoints(properties);
|
||||
|
@ -87,4 +86,17 @@ public class S3PropertiesBuilder extends PropertiesBuilder {
|
|||
properties.setProperty(PROPERTY_USER_METADATA_PREFIX, prefix);
|
||||
return this;
|
||||
}
|
||||
|
||||
protected void setMetaPrefix() {
|
||||
if (properties.getProperty(PROPERTY_USER_METADATA_PREFIX) == null) {
|
||||
properties.setProperty(PROPERTY_USER_METADATA_PREFIX, String.format("x-%s-meta-",
|
||||
properties.getProperty(PROPERTY_S3_HEADER_TAG)));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Properties build() {
|
||||
setMetaPrefix();
|
||||
return super.build();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue