contentful-migration 4.7.2 → 4.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -1
- package/README.md +1 -0
- package/built/bin/lib/config.js +10 -9
- package/built/bin/lib/config.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
# [4.8.0](https://github.com/contentful/contentful-migration/compare/v4.7.2...v4.8.0) (2022-02-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* **options:** Expose retryLimit parameter ([88fc079](https://github.com/contentful/contentful-migration/commit/88fc0799b130c2699c22f2faae41e3e73fa4f933))
|
|
2
7
|
|
|
3
8
|
# Change Log
|
|
4
9
|
|
package/README.md
CHANGED
|
@@ -208,6 +208,7 @@ runMigration(options)
|
|
|
208
208
|
| environmentId | `'master'` | string | ID of the environment within the space to run the | false |
|
|
209
209
|
| accessToken | | string | The access token to use | true |
|
|
210
210
|
| yes | false | boolean | Skips any confirmation before applying the migration,script | false |
|
|
211
|
+
| retryLimit | 5 | number | Number of retries before failure (every subsequent retry will increase the timeout to the previous retry by about 1.5 seconds) | false |
|
|
211
212
|
| requestBatchSize | 100 | number | Limit for every single request | false |
|
|
212
213
|
| headers | | object | Additional headers to attach to the requests | false |
|
|
213
214
|
|
package/built/bin/lib/config.js
CHANGED
|
@@ -29,9 +29,7 @@ const configPath = path.resolve(homedir, '.contentfulrc.json');
|
|
|
29
29
|
function getFileConfig() {
|
|
30
30
|
try {
|
|
31
31
|
const config = require(configPath);
|
|
32
|
-
return config.cmaToken ?
|
|
33
|
-
{ accessToken: config.cmaToken } :
|
|
34
|
-
{};
|
|
32
|
+
return config.cmaToken ? { accessToken: config.cmaToken } : {};
|
|
35
33
|
}
|
|
36
34
|
catch (e) {
|
|
37
35
|
return {};
|
|
@@ -39,11 +37,9 @@ function getFileConfig() {
|
|
|
39
37
|
}
|
|
40
38
|
function getEnvConfig() {
|
|
41
39
|
const envKey = 'CONTENTFUL_MANAGEMENT_ACCESS_TOKEN';
|
|
42
|
-
return process.env[envKey] ?
|
|
43
|
-
{ accessToken: process.env[envKey] } :
|
|
44
|
-
{};
|
|
40
|
+
return process.env[envKey] ? { accessToken: process.env[envKey] } : {};
|
|
45
41
|
}
|
|
46
|
-
function getArgvConfig({ spaceId, environmentId = 'master', accessToken, proxy, rawProxy, requestBatchSize, headers }) {
|
|
42
|
+
function getArgvConfig({ spaceId, environmentId = 'master', accessToken, proxy, rawProxy, requestBatchSize, headers, retryLimit }) {
|
|
47
43
|
const config = {
|
|
48
44
|
spaceId,
|
|
49
45
|
environmentId,
|
|
@@ -51,8 +47,12 @@ function getArgvConfig({ spaceId, environmentId = 'master', accessToken, proxy,
|
|
|
51
47
|
proxy,
|
|
52
48
|
rawProxy,
|
|
53
49
|
requestBatchSize,
|
|
54
|
-
headers: addSequenceHeader(headers)
|
|
50
|
+
headers: addSequenceHeader(headers),
|
|
51
|
+
retryLimit
|
|
55
52
|
};
|
|
53
|
+
if (config.retryLimit && (config.retryLimit < 0 || config.retryLimit > 60)) {
|
|
54
|
+
throw new Error('retryLimit must be between 0 and 60');
|
|
55
|
+
}
|
|
56
56
|
if (!config.accessToken) {
|
|
57
57
|
delete config.accessToken;
|
|
58
58
|
}
|
|
@@ -99,8 +99,9 @@ exports.getConfig = getConfig;
|
|
|
99
99
|
* @param {object} headers
|
|
100
100
|
*/
|
|
101
101
|
function addSequenceHeader(headers) {
|
|
102
|
-
if (typeof headers !== 'object')
|
|
102
|
+
if (typeof headers !== 'object') {
|
|
103
103
|
throw new Error('addSequence function expects an object as input');
|
|
104
|
+
}
|
|
104
105
|
return Object.assign(Object.assign({}, headers), {
|
|
105
106
|
// Unique sequence header
|
|
106
107
|
'CF-Sequence': (0, uuid_1.v4)() });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/bin/lib/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAC5B,uCAAwB;AACxB,+BAAmC;AAEnC,kCAAkC;AAClC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAA;AACvE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/bin/lib/config.ts"],"names":[],"mappings":"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"}
|