Skip to content

Possibility to set more s3 client options #685

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
reneseses wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Possibility to set more s3 client options #685

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aa15cb
Add 'maxTries' and 'httpOptions' to amazon client
reneseses Mar 23, 2020
d25bbe4
Change 'maxTries' to 'maxRetries'
reneseses Mar 23, 2020
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
19 changes: 12 additions & 7 deletions lib/pkgcloud/amazon/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
*/

var util = require('util'),
AWS = require('aws-sdk'),
base = require('../core/base');
AWS = require('aws-sdk'),
base = require('../core/base');

var userAgent = AWS.util.userAgent();
var Client = exports.Client = function (options) {
Expand All @@ -18,7 +18,7 @@ var Client = exports.Client = function (options) {
options = options || {};

// Allow overriding serversUrl in child classes
this.provider = 'amazon';
this.provider = 'amazon';
this.endpoint = options.endpoint;
this.securityGroup = options.securityGroup;
this.securityGroupId = options.securityGroupId;
Expand All @@ -35,15 +35,20 @@ var Client = exports.Client = function (options) {
region: options.region,
s3ForcePathStyle: options.forcePathBucket,
sessionToken: options.sessionToken,
credentials: options.credentials
credentials: options.credentials,
maxRetries: options.maxRetries,
httpOptions: options.httpOptions
};

// TODO think about a proxy option for pkgcloud
// enable forwarding to mock test server
if (options.serversUrl) {
this._awsConfig.httpOptions = {
proxy: this.protocol + options.serversUrl
};
if (!this._awsConfig.httpOptions || typeof this._awsConfig.httpOptions !== 'object') {
this._awsConfig.httpOptions = {};
}

// prioritize "serverUrl" over "httpOptions.proxy"
this._awsConfig.httpOptions.proxy = this.protocol + options.serversUrl;
}

if (options.endpoint) {
Expand Down