From 179a5451bf11421440313a002b455df5e41aa711 Mon Sep 17 00:00:00 2001
From: Matthew Hickey <52446913+matthew-contentful@users.noreply.github.com>
Date: Thu, 19 Sep 2019 11:15:27 +0200
Subject: [PATCH] feat(timeout/retry): increase timeout/retry size, add options
 to configure them (#175)

---
 lib/cmds/space_cmds/export.js                          | 10 ++++++++++
 lib/cmds/space_cmds/import.js                          | 10 ++++++++++
 package.json                                           |  8 ++++----
 .../cmds/space/__snapshots__/import.test.js.snap       |  8 ++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/cmds/space_cmds/export.js b/lib/cmds/space_cmds/export.js
index d4c017861..95aa99148 100644
--- a/lib/cmds/space_cmds/export.js
+++ b/lib/cmds/space_cmds/export.js
@@ -102,6 +102,16 @@ export const builder = function (yargs) {
       type: 'boolean',
       default: false
     })
+    .option('timeout', {
+      describe: 'Timeout in milliseconds for API calls',
+      type: 'number',
+      default: 20000
+    })
+    .option('retry-limit', {
+      describe: 'How many times to retry before an operation fails',
+      type: 'number',
+      default: 10
+    })
     .config('config', 'An optional configuration JSON file containing all the options for a single run')
     .epilog('Copyright 2019 Contentful')
 }
diff --git a/lib/cmds/space_cmds/import.js b/lib/cmds/space_cmds/import.js
index d771f2a2e..fde3fcc15 100644
--- a/lib/cmds/space_cmds/import.js
+++ b/lib/cmds/space_cmds/import.js
@@ -66,6 +66,16 @@ export const builder = (yargs) => {
       describe: 'Proxy configuration in HTTP auth format: [http|https]://host:port or [http|https]://user:password@host:port',
       type: 'string'
     })
+    .option('timeout', {
+      describe: 'Timeout in milliseconds for API calls',
+      type: 'number',
+      default: 20000
+    })
+    .option('retry-limit', {
+      describe: 'How many times to retry before an operation fails',
+      type: 'number',
+      default: 10
+    })
     .config('config', 'An optional configuration JSON file containing all the options for a single run')
     .epilog('Copyright 2019 Contentful')
 }
diff --git a/package.json b/package.json
index d28502a25..c1356a2e7 100644
--- a/package.json
+++ b/package.json
@@ -87,10 +87,10 @@
     "chalk": "^2.4.1",
     "cli-table3": "^0.5.1",
     "command-exists": "^1.2.7",
-    "contentful-export": "^7.6.0",
-    "contentful-import": "^7.5.1",
-    "contentful-management": "^5.9.0",
-    "contentful-migration": "^1.0.0",
+    "contentful-export": "^7.7.0",
+    "contentful-import": "^7.6.0",
+    "contentful-management": "^5.11.0",
+    "contentful-migration": "^0.19.3",
     "emojic": "^1.1.11",
     "execa": "^0.10.0",
     "figlet": "^1.2.0",
diff --git a/test/integration/cmds/space/__snapshots__/import.test.js.snap b/test/integration/cmds/space/__snapshots__/import.test.js.snap
index c946bc067..eddbefe92 100644
--- a/test/integration/cmds/space/__snapshots__/import.test.js.snap
+++ b/test/integration/cmds/space/__snapshots__/import.test.js.snap
@@ -24,6 +24,10 @@ Options:
   --proxy                    Proxy configuration in HTTP auth format:
                              [http|https]://host:port or
                              [http|https]://user:password@host:port     [string]
+  --timeout                  Timeout in milliseconds for API calls
+                                                       [number] [default: 20000]
+  --retry-limit              How many times to retry before an operation fails
+                                                          [number] [default: 10]
   --config                   An optional configuration JSON file containing all
                              the options for a single run
 
@@ -55,6 +59,10 @@ Options:
   --proxy                    Proxy configuration in HTTP auth format:
                              [http|https]://host:port or
                              [http|https]://user:password@host:port     [string]
+  --timeout                  Timeout in milliseconds for API calls
+                                                       [number] [default: 20000]
+  --retry-limit              How many times to retry before an operation fails
+                                                          [number] [default: 10]
   --config                   An optional configuration JSON file containing all
                              the options for a single run