Skip to content

Commit 7b0ad2c

Browse files
Merge pull request #1960 from contentstack/fix/dx-2973-export-import-stack-settings
Fix/dx 2973 export stack settings
2 parents 985209d + 782f9ab commit 7b0ad2c

File tree

3 files changed

+72
-5
lines changed

3 files changed

+72
-5
lines changed

.talismanrc

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,54 @@
11
fileignoreconfig:
2-
- filename: package-lock.json
3-
checksum: f0395371f201a950d398affb597271fdd5564d1b6e472110243c1bd9bb83bb4f
42
- filename: pnpm-lock.yaml
53
checksum: 63d408024e8d1f64b0f23a4db8107c1ee0f450f4b8233ba7831e50f596e39d24
4+
- filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
5+
checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
6+
- filename: packages/contentstack-import/test/integration/environments.test.js
7+
checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
8+
- filename: package-lock.json
9+
checksum: 8a1af78f7abed40e4894fbc1b82f3b5ffffea76550250c4e9c3d0dda12e59db7
10+
- filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
11+
checksum: 676052e30d31a771ce68302d89b050d176bbef50f3abc7e9cdd4384f0e274e10
12+
- filename: packages/contentstack-import/test/integration/auth-token.test.js
13+
checksum: 05a5a9917440203efc6db1c5d46ba2c7ce61db4648c379db28b36e08cfe049ef
14+
- filename: packages/contentstack-import/test/integration/workflows.test.js
15+
checksum: 07cfe3cbb586d30b143a0169e7001a1f91ce50a1a5ae4485b2518c2181973cf7
16+
- filename: packages/contentstack-import/test/integration/extensions.test.js
17+
checksum: 2e62534faf6b3c5d9fd9bc001fd45e900430e835f899a2afd70b781098d2add7
18+
- filename: packages/contentstack-utilities/src/helpers.ts
19+
checksum: 216d92b3ccd1dce271a5b93f80af992f1bb3ac72b2b8639d2eb671bf1db91072
20+
- filename: packages/contentstack-import/test/integration/global-fields.test.js
21+
checksum: 16ead9a66c7834e4d24ca27eb11c6a1c70a02304c39a6c0483802e1851438903
22+
- filename: packages/contentstack-import/test/integration/content-types.test.js
23+
checksum: 0f15d1b877cc99ac27cd89ad31082c00f902667e631e1941d5d97d73e74d39e2
24+
- filename: packages/contentstack-import/test/integration/assets.test.js
25+
checksum: ca95054274b7262f3e0325ed312dac3fc09965acf4097a79184a42913c08ecb7
26+
- filename: packages/contentstack-import/test/integration/auth-token-modules/assets.test.js
27+
checksum: 844ac7242268fab10c0fd22cfd4e98284d6461de95d55d22925f61e1b1f29433
28+
- filename: packages/contentstack-import/test/integration/locales.test.js
29+
checksum: f3b6c73302f5883a40dad4e878a37bfc9780c39743c3745402037baa0cd7eab4
30+
- filename: packages/contentstack-import/test/integration/custom-roles.test.js
31+
checksum: 58d77f9139c9c01a4471d9ce821fbc683eaea4650787bfc510959e7817084ed6
32+
- filename: packages/contentstack-import/test/integration/auth-token-modules/content-types.test.js
33+
checksum: b24e5dee9677453088b2ecbd5c70b077cf99756f8fe927c4f38670e6041da94d
34+
- filename: packages/contentstack-import/test/integration/entries.test.js
35+
checksum: 5e33da22b28afd09ce105a6714a90e27c1e2ad559e6b9d8b41f59de02e83894c
36+
- filename: packages/contentstack-import/test/integration/management-token.test.js
37+
checksum: 095187d8b5fee8466f39a13e5cbc9f3c78f3dd0eb07d2c5af3929aca8aff8f2d
38+
- filename: packages/contentstack-import/test/integration/auth-token-modules/custom-roles.test.js
39+
checksum: 429bd7cfe81f22266da6230eae538c36a846b0267de17d0e55f611a9311eef78
40+
- filename: packages/contentstack-import/test/integration/auth-token-modules/locales.test.js
41+
checksum: e3ae0c7c1e7cf15d74918711f8939e46e9257b2525bf936e41d85d6328d4a018
42+
- filename: packages/contentstack-import/test/integration/webhooks.test.js
43+
checksum: eb11a310516a3cdfd5c2dc77bdfe7143eb268b1ab1e0e33babbe9352c5b72c38
44+
- filename: packages/contentstack-import/test/integration/auth-token-modules/webhooks.test.js
45+
checksum: 06290dce8c950c394d061427ad5ecce10e5f36644372d46ee542bffa09a76185
46+
- filename: packages/contentstack-import/test/integration/auth-token-modules/workflows.test.js
47+
checksum: 1c77d21cff245157bc9a9863cc264d29bd81591447de3b27ae3aff67239e2937
48+
- filename: packages/contentstack-import/test/integration/auth-token-modules/entries.test.js
49+
checksum: 75f2c3b007488e9dd0ff43bcc624f9edc9a3daf1dbb1dfd24203a488a986937d
50+
- filename: packages/contentstack-import/test/integration/auth-token-modules/extensions.test.js
51+
checksum: 9c79540ab8522736f17c3ae1c9bfea07784b6ed0aa41f5617c90ba6812b91e72
52+
- filename: packages/contentstack-import/test/integration/auth-token-modules/global-fields.test.js
53+
checksum: db5b7aedcd89d783760eb988a2369243c34edc9c12e93a41b2b08fb0da02afdc
654
version: ''

packages/contentstack-config/src/utils/rate-limit-handler.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { cliux, configHandler, formatError } from '@contentstack/cli-utilities';
1+
import { cliux, configHandler } from '@contentstack/cli-utilities';
22
import { limitNamesConfig, defaultRalteLimitConfig } from '../utils/common-utilities';
33
import { Limit } from '../interfaces';
44

@@ -66,7 +66,6 @@ export class RateLimitHandler {
6666
}
6767
});
6868
} catch (error) {
69-
console.log('Something went wrong while setting rate limit for org:', formatError(error));
7069
throw new Error(error);
7170
}
7271
}

packages/contentstack-export/src/export/modules/stack.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ export default class ExportStack extends BaseClass {
1818
super({ exportConfig, stackAPIClient });
1919
this.stackConfig = exportConfig.modules.stack;
2020
this.qs = { include_count: true };
21-
this.stackFolderPath = pResolve(this.exportConfig.data, this.stackConfig.dirName);
21+
this.stackFolderPath = pResolve(
22+
this.exportConfig.data,
23+
this.exportConfig.branchName || '',
24+
this.stackConfig.dirName,
25+
);
2226
}
2327

2428
async start(): Promise<void> {
2529
if (isAuthenticated()) {
30+
await this.exportStackSettings();
2631
const stackData = await this.getStack();
2732
if (stackData?.org_uid) {
2833
this.exportConfig.org_uid = stackData.org_uid;
@@ -92,4 +97,19 @@ export default class ExportStack extends BaseClass {
9297
log(this.exportConfig, `Failed to export stack. ${formatError(error)}`, 'error');
9398
});
9499
}
100+
101+
async exportStackSettings(): Promise<any> {
102+
log(this.exportConfig, 'Exporting stack settings', 'success');
103+
await fsUtil.makeDirectory(this.stackFolderPath);
104+
return this.stack
105+
.settings()
106+
.then((resp: any) => {
107+
fsUtil.writeFile(pResolve(this.stackFolderPath, 'settings.json'), resp);
108+
log(this.exportConfig, 'Exported stack settings successfully!', 'success');
109+
return resp;
110+
})
111+
.catch((error: any) => {
112+
log(this.exportConfig, `Failed to export stack settings. ${formatError(error)}`, 'error');
113+
});
114+
}
95115
}

0 commit comments

Comments
 (0)