Skip to content

With Bucket prefix support #697

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

Open
linktohack wants to merge 1 commit into
base: master
Choose a base branch
from
Open

With Bucket prefix support #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions lib/pkgcloud/amazon/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var Client = exports.Client = function (options) {
this.securityGroupId = options.securityGroupId;
this.version = options.version || '2014-06-15';
this.protocol = options.protocol || 'https://';
this.bucketPrefix = options.bucketPrefix || '';

// support either key/accessKey syntax
this.config.key = this.config.key || options.accessKey;
Expand Down
17 changes: 13 additions & 4 deletions lib/pkgcloud/amazon/storage/client/containers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ exports.getContainers = function (callback) {
return;
}

var containers = data.Buckets;
var containers = data.Buckets.filter(function(container) {
return container.Name.startsWith(self.bucketPrefix);
}).map(function(container) {
return Object.assign({}, container, {
Name: container.Name.substr(self.bucketPrefix.length)
})
});

containers = containers.map(function(container) {
return new (storage.Container)(self, container);
Expand All @@ -45,8 +51,11 @@ exports.getContainer = function (container, callback) {
self = this;

self.s3.listObjects({
Bucket: containerName
Bucket: self.bucketPrefix + containerName
}, function(err, data) {
data = Object.assign({}, data, {
Name: data.Name.substr(self.bucketPrefix.length)
});
return err
? callback(err)
: callback(null, new (storage.Container)(self, data));
Expand All @@ -65,7 +74,7 @@ exports.createContainer = function (options, callback) {
self = this;

self.s3.createBucket({
Bucket: containerName
Bucket: self.bucketPrefix + containerName
}, function(err) {
return err
? callback(err)
Expand Down Expand Up @@ -99,7 +108,7 @@ exports.destroyContainer = function (container, callback) {
}

self.s3.deleteBucket({
Bucket: containerName
Bucket: self.bucketPrefix + containerName
}, function (err) {
return err
? callback(err)
Expand Down
13 changes: 8 additions & 5 deletions lib/pkgcloud/amazon/storage/client/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ exports.removeFile = function (container, file, callback) {
}

self.s3.deleteObject({
Bucket: container,
Bucket: self.bucketPrefix + container,
Key: file
}, function(err, data) {
return err
Expand All @@ -48,7 +48,7 @@ exports.upload = function (options) {
}

var s3Options = {
Bucket: options.container instanceof base.Container ? options.container.name : options.container,
Bucket: self.bucketPrefix + (options.container instanceof base.Container ? options.container.name : options.container),
Key: options.remote instanceof base.File ? options.remote.name : options.remote
};

Expand Down Expand Up @@ -101,6 +101,9 @@ exports.upload = function (options) {
if (err) {
return proxyStream.emit('error', err);
}
data = Object.assign({}, data, {
container: data.Bucket.substr(self.bucketPrefix.length)
});
return proxyStream.emit('success', new storage.File(self, data));
});

Expand All @@ -113,7 +116,7 @@ exports.download = function (options) {
var self = this;

return self.s3.getObject({
Bucket: options.container instanceof base.Container ? options.container.name : options.container,
Bucket: self.bucketPrefix + (options.container instanceof base.Container ? options.container.name : options.container),
Key: options.remote instanceof base.File ? options.remote.name : options.remote
}).createReadStream();

Expand All @@ -124,7 +127,7 @@ exports.getFile = function (container, file, callback) {
self = this;

self.s3.headObject({
Bucket: containerName,
Bucket: self.bucketPrefix + containerName,
Key: file
}, function(err, data) {
return err
Expand All @@ -149,7 +152,7 @@ exports.getFiles = function (container, options, callback) {
}

var s3Options = {
Bucket: containerName
Bucket: self.bucketPrefix + containerName
};

if (options.marker) {
Expand Down