Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
415cdeb
feat: enhance stack import/export functionality and error handling
harshithad0703 Jun 6, 2025
4642f83
refactor: rename exportStack method to exportStackSettings and update…
harshithad0703 Jun 6, 2025
b105dc2
update export stack and stack settings
harshithad0703 Jun 9, 2025
56fb8f9
Merge branch 'development' into fix/dx-2953-export-import-stack-settings
harshithad0703 Jun 9, 2025
e7b7d6d
merge development changes
harshithad0703 Jun 9, 2025
8eb4842
merge development changes
harshithad0703 Jun 9, 2025
c5c6388
Merge remote-tracking branch 'origin/staging' into fix/dx-2953-export…
harshithad0703 Jun 9, 2025
8b848fa
Merge remote-tracking branch 'origin/development' into fix/dx-2953-ex…
harshithad0703 Jun 9, 2025
1ffe637
revert import changes
harshithad0703 Jun 9, 2025
ab4e47b
Merge branch 'development' into fix/dx-2953-export-import-stack-settings
harshithad0703 Jun 10, 2025
f03468a
refactor: add exportStackSettings after authentication
harshithad0703 Jun 10, 2025
e4a3cfb
refactor exportStackSettings implementation
harshithad0703 Jun 10, 2025
09b6705
fix: await exportStackSettings in start method for proper execution flow
harshithad0703 Jun 10, 2025
87aeb56
revert changes in audit plugin
harshithad0703 Jun 10, 2025
8da7105
version bump
harshithad0703 Jun 10, 2025
9b82fe6
Merge branch 'development' into fix/dx-2973-export-import-stack-settings
harshithad0703 Jun 11, 2025
313934d
update package
harshithad0703 Jun 11, 2025
680edbf
update package 2
harshithad0703 Jun 11, 2025
0a1acc1
bump version of @contentstack/cli-cm-clone to 1.14.3 in package.json
harshithad0703 Jun 11, 2025
bb65985
Merge branch development into fix/dx-2973-export-import-stack-settings
harshithad0703 Jul 3, 2025
9245d60
Update .talismanrc to include additional file checksums
harshithad0703 Jul 3, 2025
4b50265
revert version of @contentstack/cli-cm-clone to 1.14.2 in package.jso…
harshithad0703 Jul 3, 2025
782f9ab
revert rate-limit changes
harshithad0703 Jul 3, 2025
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
52 changes: 50 additions & 2 deletions .talismanrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,54 @@
fileignoreconfig:
- filename: package-lock.json
checksum: f0395371f201a950d398affb597271fdd5564d1b6e472110243c1bd9bb83bb4f
- filename: pnpm-lock.yaml
checksum: 63d408024e8d1f64b0f23a4db8107c1ee0f450f4b8233ba7831e50f596e39d24
- filename: packages/contentstack-import/test/integration/auth-token-modules/environments.test.js
checksum: bc6f06b75d082aaf99e2f2f4b932b143765e2f14086967fb8973fe1b2ca6c03e
- filename: packages/contentstack-import/test/integration/environments.test.js
checksum: e71f033dad8944ffeafdf22d0514bda1d20c43e8fea0d62c96e774f3414beb31
- filename: package-lock.json
checksum: 8a1af78f7abed40e4894fbc1b82f3b5ffffea76550250c4e9c3d0dda12e59db7
- filename: packages/contentstack-auth/test/unit/tokens-validation.test.ts
checksum: 676052e30d31a771ce68302d89b050d176bbef50f3abc7e9cdd4384f0e274e10
- filename: packages/contentstack-import/test/integration/auth-token.test.js
checksum: 05a5a9917440203efc6db1c5d46ba2c7ce61db4648c379db28b36e08cfe049ef
- filename: packages/contentstack-import/test/integration/workflows.test.js
checksum: 07cfe3cbb586d30b143a0169e7001a1f91ce50a1a5ae4485b2518c2181973cf7
- filename: packages/contentstack-import/test/integration/extensions.test.js
checksum: 2e62534faf6b3c5d9fd9bc001fd45e900430e835f899a2afd70b781098d2add7
- filename: packages/contentstack-utilities/src/helpers.ts
checksum: 216d92b3ccd1dce271a5b93f80af992f1bb3ac72b2b8639d2eb671bf1db91072
- filename: packages/contentstack-import/test/integration/global-fields.test.js
checksum: 16ead9a66c7834e4d24ca27eb11c6a1c70a02304c39a6c0483802e1851438903
- filename: packages/contentstack-import/test/integration/content-types.test.js
checksum: 0f15d1b877cc99ac27cd89ad31082c00f902667e631e1941d5d97d73e74d39e2
- filename: packages/contentstack-import/test/integration/assets.test.js
checksum: ca95054274b7262f3e0325ed312dac3fc09965acf4097a79184a42913c08ecb7
- filename: packages/contentstack-import/test/integration/auth-token-modules/assets.test.js
checksum: 844ac7242268fab10c0fd22cfd4e98284d6461de95d55d22925f61e1b1f29433
- filename: packages/contentstack-import/test/integration/locales.test.js
checksum: f3b6c73302f5883a40dad4e878a37bfc9780c39743c3745402037baa0cd7eab4
- filename: packages/contentstack-import/test/integration/custom-roles.test.js
checksum: 58d77f9139c9c01a4471d9ce821fbc683eaea4650787bfc510959e7817084ed6
- filename: packages/contentstack-import/test/integration/auth-token-modules/content-types.test.js
checksum: b24e5dee9677453088b2ecbd5c70b077cf99756f8fe927c4f38670e6041da94d
- filename: packages/contentstack-import/test/integration/entries.test.js
checksum: 5e33da22b28afd09ce105a6714a90e27c1e2ad559e6b9d8b41f59de02e83894c
- filename: packages/contentstack-import/test/integration/management-token.test.js
checksum: 095187d8b5fee8466f39a13e5cbc9f3c78f3dd0eb07d2c5af3929aca8aff8f2d
- filename: packages/contentstack-import/test/integration/auth-token-modules/custom-roles.test.js
checksum: 429bd7cfe81f22266da6230eae538c36a846b0267de17d0e55f611a9311eef78
- filename: packages/contentstack-import/test/integration/auth-token-modules/locales.test.js
checksum: e3ae0c7c1e7cf15d74918711f8939e46e9257b2525bf936e41d85d6328d4a018
- filename: packages/contentstack-import/test/integration/webhooks.test.js
checksum: eb11a310516a3cdfd5c2dc77bdfe7143eb268b1ab1e0e33babbe9352c5b72c38
- filename: packages/contentstack-import/test/integration/auth-token-modules/webhooks.test.js
checksum: 06290dce8c950c394d061427ad5ecce10e5f36644372d46ee542bffa09a76185
- filename: packages/contentstack-import/test/integration/auth-token-modules/workflows.test.js
checksum: 1c77d21cff245157bc9a9863cc264d29bd81591447de3b27ae3aff67239e2937
- filename: packages/contentstack-import/test/integration/auth-token-modules/entries.test.js
checksum: 75f2c3b007488e9dd0ff43bcc624f9edc9a3daf1dbb1dfd24203a488a986937d
- filename: packages/contentstack-import/test/integration/auth-token-modules/extensions.test.js
checksum: 9c79540ab8522736f17c3ae1c9bfea07784b6ed0aa41f5617c90ba6812b91e72
- filename: packages/contentstack-import/test/integration/auth-token-modules/global-fields.test.js
checksum: db5b7aedcd89d783760eb988a2369243c34edc9c12e93a41b2b08fb0da02afdc
version: ''
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { cliux, configHandler, formatError } from '@contentstack/cli-utilities';
import { cliux, configHandler } from '@contentstack/cli-utilities';
import { limitNamesConfig, defaultRalteLimitConfig } from '../utils/common-utilities';
import { Limit } from '../interfaces';

let client: any;

Check warning on line 5 in packages/contentstack-config/src/utils/rate-limit-handler.ts

View workflow job for this annotation

GitHub Actions / run-tests

Unexpected any. Specify a different type

export class RateLimitHandler {
setClient(managementSDKClient) {
Expand Down Expand Up @@ -66,7 +66,6 @@
}
});
} catch (error) {
console.log('Something went wrong while setting rate limit for org:', formatError(error));
throw new Error(error);
}
}
Expand Down
22 changes: 21 additions & 1 deletion packages/contentstack-export/src/export/modules/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@ export default class ExportStack extends BaseClass {
super({ exportConfig, stackAPIClient });
this.stackConfig = exportConfig.modules.stack;
this.qs = { include_count: true };
this.stackFolderPath = pResolve(this.exportConfig.data, this.stackConfig.dirName);
this.stackFolderPath = pResolve(
this.exportConfig.data,
this.exportConfig.branchName || '',
this.stackConfig.dirName,
);
}

async start(): Promise<void> {
if (isAuthenticated()) {
await this.exportStackSettings();
const stackData = await this.getStack();
if (stackData?.org_uid) {
this.exportConfig.org_uid = stackData.org_uid;
Expand Down Expand Up @@ -92,4 +97,19 @@ export default class ExportStack extends BaseClass {
log(this.exportConfig, `Failed to export stack. ${formatError(error)}`, 'error');
});
}

async exportStackSettings(): Promise<any> {
log(this.exportConfig, 'Exporting stack settings', 'success');
await fsUtil.makeDirectory(this.stackFolderPath);
return this.stack
.settings()
.then((resp: any) => {
fsUtil.writeFile(pResolve(this.stackFolderPath, 'settings.json'), resp);
log(this.exportConfig, 'Exported stack settings successfully!', 'success');
return resp;
})
.catch((error: any) => {
log(this.exportConfig, `Failed to export stack settings. ${formatError(error)}`, 'error');
});
}
}
Loading