Skip to content

Commit d1e1298

Browse files
authored
Merge branch 'development' into fix/DX-2943-validate-empty-api-keys
2 parents b9a2358 + 3e03980 commit d1e1298

File tree

57 files changed

+1502
-1409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1502
-1409
lines changed

.talismanrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: 8cb8f731c811c721e741725fd0aab39cbef0e047392ccee0d0e61c679e7d0998
3+
checksum: ad5cedb62e915203b1a3561b231889f945452d48da12dbdca13c346f93258a7a
44
- filename: pnpm-lock.yaml
5-
checksum: cbc8b8c0dc444eaf2895bdf8c46812cf4dbadfa7c63be4e9dc619018022899b5
5+
checksum: afa28e14d5080f836632e31930ed3a950bfefb4c874acd163eb6849139b2034e
66
- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
77
checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
88
- filename: packages/contentstack-import-setup/test/config.json
@@ -269,4 +269,8 @@ fileignoreconfig:
269269
checksum: 9b83875b8d82086f13e0b7ab44ff7fe95486fced95b0c22d5c73fa69fbe35d4a
270270
- filename: packages/contentstack-bulk-publish/src/producer/add-fields.js
271271
checksum: 3e70b11978fc5f29a6a6c90b725c28c9df8d15bcc6fd74e2253fca23a3630160
272+
- filename: packages/contentstack-export/src/export/modules-js/environments.js
273+
checksum: e8714ef41940f3a9be782dfaa43a15df57bd1eb4c3f0e4d5f305e68681c1bd93
274+
- filename: packages/contentstack-import/src/import/modules-js/environments.js
275+
checksum: d484342c25462a7052c8aae6cad0baed9a01e1eaa67d6a09f175981c53092301
272276
version: '1.0'

CHANGELOG.md

Lines changed: 5 additions & 0 deletions

package-lock.json

Lines changed: 291 additions & 260 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-audit/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-auth/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-bootstrap/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-branches/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-bulk-publish/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-clone/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Contentstack
3+
Copyright (c) 2026 Contentstack
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/contentstack-clone/src/commands/cm/stacks/clone.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,18 @@ class StackCloneCommand extends Command {
141141
config.importWebhookStatus = importWebhookStatus;
142142
}
143143

144+
//Set host and auth BEFORE SDK initialization to ensure correct regional endpoints
145+
config.host = this.cmaHost;
146+
config.cdn = this.cdaHost;
147+
config.auth_token = configHandler.get('authtoken');
148+
144149
const managementAPIClient = await managementSDKClient(config);
145150
log.debug('Management API client initialized successfully', cloneContext);
146151

147152
log.debug(`Content directory path: ${pathdir}`, cloneContext);
148153
await this.removeContentDirIfNotEmptyBeforeClone(pathdir, cloneContext); // NOTE remove if folder not empty before clone
149154
this.registerCleanupOnInterrupt(pathdir, cloneContext);
150155

151-
config.auth_token = configHandler.get('authtoken');
152-
config.host = this.cmaHost;
153-
config.cdn = this.cdaHost;
154156
config.pathDir = pathdir;
155157
config.cloneContext = cloneContext;
156158
log.debug('Clone configuration finalized', cloneContext);

0 commit comments

Comments
 (0)