Skip to content

Commit 054c82c

Browse files
committed
Update package dependencies and remove regions.json file
- Added @contentstack/utils dependency to package.json and package-lock.json. - Replaced region endpoint retrieval logic in contentstack.js to use getContentstackEndpoint from @contentstack/utils. - Removed the regions.json file as it is no longer needed for region endpoint resolution.
1 parent 9bf6bd3 commit 054c82c

File tree

6 files changed

+38
-244
lines changed

6 files changed

+38
-244
lines changed

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fileignoreconfig:
99
ignore_detectors:
1010
- filecontent
1111
- filename: package-lock.json
12-
checksum: 1475ee2c6a615f4e6f8393f4a209398aa6b827e7d036302c6fc065d5914e8292
12+
checksum: e4173c2b09c7aaee2e7c9f43a208ccb524abd123ff260d6f4636c29cf285a12f
1313
- filename: .husky/pre-commit
1414
checksum: 52a664f536cf5d1be0bea19cb6031ca6e8107b45b6314fe7d47b7fad7d800632
1515
- filename: test/sanity-check/api/user-test.js

lib/assets/regions.json

Lines changed: 0 additions & 211 deletions
This file was deleted.

lib/contentstack.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*/
55
import packages from '../package.json'
66
import clonedeep from 'lodash/cloneDeep'
7-
import getUserAgent, { getRegionEndpoint } from './core/Util.js'
7+
import getUserAgent from './core/Util.js'
88
import contentstackClient from './contentstackClient.js'
99
import httpClient from './core/contentstackHTTPClient.js'
10+
import { getContentstackEndpoint } from '@contentstack/utils'
1011

1112
/**
1213
* Create client instance
@@ -161,11 +162,11 @@ import httpClient from './core/contentstackHTTPClient.js'
161162
* @returns Contentstack.Client
162163
*/
163164
export function client (params = {}) {
164-
let defaultHostName = getRegionEndpoint('na')
165+
let defaultHostName = getContentstackEndpoint('aws-na', 'contentManagement', true)
165166

166167
if (params.region) {
167168
params.region = params.region.toLowerCase()
168-
defaultHostName = getRegionEndpoint(params.region)
169+
defaultHostName = getContentstackEndpoint(params.region, 'contentManagement', true)
169170
}
170171

171172
const defaultParameter = {

lib/core/Util.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { platform, release } from 'os'
2-
import regionHostMap from '../assets/regions.json'
32

43
const HOST_REGEX = /^(?!(?:(?:https?|ftp):\/\/|internal|localhost|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))(?:[\w-]+\.contentstack\.(?:io|com)(?::[^\/\s:]+)?|[\w-]+(?:\.[\w-]+)*(?::[^\/\s:]+)?)(?![\/?#])$/ // eslint-disable-line
54

@@ -237,14 +236,3 @@ export const validateAndSanitizeConfig = (config) => {
237236
url: config.url.trim() // Sanitize URL by removing whitespace
238237
}
239238
}
240-
241-
export const getRegionEndpoint = (region, service = 'contentManagement') => {
242-
const regionData = regionHostMap.regions.find(r =>
243-
r.id === region ||
244-
r.alias.some(alias => alias === region)
245-
)
246-
if (!regionData) {
247-
throw new Error(`Invalid region '${region}' provided. Allowed regions are: ${regionHostMap.regions.map(r => r.id).join(', ')}`)
248-
}
249-
return regionData.endpoints[service]?.replace(/^https?:\/\//, '')
250-
}

0 commit comments

Comments
 (0)