Skip to content

Commit a382de7

Browse files
author
naman-contentstack
committed
fix: update the logic to resolve host
1 parent 9e043aa commit a382de7

3 files changed

Lines changed: 7 additions & 22 deletions

File tree

.talismanrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ fileignoreconfig:
1313
checksum: f4f44b6031d2936ec2da98b39bb5f5c1bd0f3be34dbe498c75e64a35b7d25a33
1414
- filename: packages/contentstack/README.md
1515
checksum: 3a0fab964797476a71d2149ce261d265f410bd756eb9cde9400be9e5250fdc35
16+
- filename: packages/contentstack-config/src/utils/region-handler.ts
17+
checksum: 7fb77272b01e48e0cde7a0b25d18a6a237bd59a8e2156aed8a8de5acd27f2465
1618
version: '1.0'

packages/contentstack-config/src/commands/config/set/region.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
114114
composableStudioUrl = this.transformUrl(cma, 'composable-studio-api');
115115
}
116116
if (!assetManagementUrl) {
117-
assetManagementUrl = this.transformUrl(uiHost, '/am/api');
117+
assetManagementUrl = this.transformUrl(cma, 'dam-api');
118118
}
119119
let customRegion: Region = {
120120
cda,
@@ -162,12 +162,6 @@ export default class RegionSetCommand extends BaseCommand<typeof RegionSetComman
162162
}
163163
}
164164
transformUrl(url: string, replacement: string): string {
165-
// If replacement contains '/', treat it as a path to append to the base URL
166-
if (replacement.includes('/')) {
167-
const baseUrl = url.replace(/\/$/, ''); // Remove trailing slash if present
168-
return `${baseUrl}${replacement}`;
169-
}
170-
171165
let transformedUrl = url.replace('api', replacement);
172166
if (transformedUrl.startsWith('http')) {
173167
transformedUrl = transformedUrl.split('//')[1];

packages/contentstack-config/src/utils/region-handler.ts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function getRegionObject(regionKey: string): Region {
2626
try {
2727
// getContentstackEndpoint handles all aliases defined in regions.json
2828
const endpoints = getContentstackEndpoint(regionKey) as any;
29-
29+
3030
if (typeof endpoints === 'string') {
3131
throw new Error('Invalid endpoint response');
3232
}
@@ -40,7 +40,7 @@ function getRegionObject(regionKey: string): Region {
4040
launchHubUrl: endpoints.launch,
4141
personalizeUrl: endpoints.personalizeManagement,
4242
composableStudioUrl: endpoints.composableStudio,
43-
assetManagementUrl: endpoints.assetManagement || (endpoints.application ? `${endpoints.application.replace(/\/$/, '')}/am/api` : undefined),
43+
assetManagementUrl: endpoints.assetManagement,
4444
};
4545
} catch (error) {
4646
return null;
@@ -52,21 +52,10 @@ function getRegionObject(regionKey: string): Region {
5252
* This creates a regions object similar to the old hardcoded one but using @contentstack/utils
5353
*/
5454
function getAvailableRegions() {
55-
const regionKeys = [
56-
'NA',
57-
'AWS-NA',
58-
'EU',
59-
'AWS-EU',
60-
'AU',
61-
'AWS-AU',
62-
'AZURE-NA',
63-
'AZURE-EU',
64-
'GCP-NA',
65-
'GCP-EU',
66-
];
55+
const regionKeys = ['NA', 'AWS-NA', 'EU', 'AWS-EU', 'AU', 'AWS-AU', 'AZURE-NA', 'AZURE-EU', 'GCP-NA', 'GCP-EU'];
6756

6857
const regions: RegionsMap = {};
69-
58+
7059
for (const key of regionKeys) {
7160
const regionObj = getRegionObject(key);
7261
if (regionObj) {

0 commit comments

Comments
 (0)