From 0aa15cb460502d1e636541d769e445777ba1fc98 Mon Sep 17 00:00:00 2001
From: Rene Mena <rene.mena.m@gmail.com>
Date: Mon, 23 Mar 2020 09:19:33 -0300
Subject: [PATCH 1/2] Add 'maxTries' and 'httpOptions' to amazon client

---
 lib/pkgcloud/amazon/client.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/pkgcloud/amazon/client.js b/lib/pkgcloud/amazon/client.js
index e6786ea8f..b683a63d4 100644
--- a/lib/pkgcloud/amazon/client.js
+++ b/lib/pkgcloud/amazon/client.js
@@ -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) {
@@ -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;
@@ -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,
+    maxTries: options.maxTries,
+    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) {

From d25bbe41784b1eba2fbb4034e946b37ec451fbd9 Mon Sep 17 00:00:00 2001
From: Rene Mena <rene.mena.m@gmail.com>
Date: Mon, 23 Mar 2020 09:33:10 -0300
Subject: [PATCH 2/2] Change 'maxTries' to 'maxRetries'

---
 lib/pkgcloud/amazon/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pkgcloud/amazon/client.js b/lib/pkgcloud/amazon/client.js
index b683a63d4..36d9f3e81 100644
--- a/lib/pkgcloud/amazon/client.js
+++ b/lib/pkgcloud/amazon/client.js
@@ -36,7 +36,7 @@ var Client = exports.Client = function (options) {
     s3ForcePathStyle: options.forcePathBucket,
     sessionToken: options.sessionToken,
     credentials: options.credentials,
-    maxTries: options.maxTries,
+    maxRetries: options.maxRetries,
     httpOptions: options.httpOptions
   };