Merge pull request #337 from contentstack/development

DX | 06-05-2025 | Release

Author: cs-raj

.husky/pre-commit

@@ -0,0 +1,69 @@
+#!/usr/bin/env sh
+# Pre-commit hook to run Snyk and Talisman scans, completing both before deciding to commit
+
+# Function to check if a command exists
+command_exists() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# Check if Snyk is installed
+if ! command_exists snyk; then
+  echo "Error: Snyk is not installed. Please install it and try again."
+  exit 1
+fi
+
+# Check if Talisman is installed
+if ! command_exists talisman; then
+  echo "Error: Talisman is not installed. Please install it and try again."
+  exit 1
+fi
+
+# Allow bypassing the hook with an environment variable
+if [ "$SKIP_HOOK" = "1" ]; then
+  echo "Skipping Snyk and Talisman scans (SKIP_HOOK=1)."
+  exit 0
+fi
+
+# Initialize variables to track scan results
+snyk_failed=false
+talisman_failed=false
+
+# Run Snyk vulnerability scan
+echo "Running Snyk vulnerability scan..."
+snyk test --all-projects > snyk_output.log 2>&1
+snyk_exit_code=$?
+
+if [ $snyk_exit_code -eq 0 ]; then
+  echo "Snyk scan passed: No vulnerabilities found."
+elif [ $snyk_exit_code -eq 1 ]; then
+  echo "Snyk found vulnerabilities. See snyk_output.log for details."
+  snyk_failed=true
+else
+  echo "Snyk scan failed with error (exit code $snyk_exit_code). See snyk_output.log for details."
+  snyk_failed=true
+fi
+
+# Run Talisman secret scan (continues even if Snyk failed)
+echo "Running Talisman secret scan..."
+talisman --githook pre-commit > talisman_output.log 2>&1
+talisman_exit_code=$?
+
+if [ $talisman_exit_code -eq 0 ]; then
+  echo "Talisman scan passed: No secrets found."
+else
+  echo "Talisman scan failed (exit code $talisman_exit_code). See talisman_output.log for details."
+  talisman_failed=true
+fi
+
+# Evaluate results after both scans
+if [ "$snyk_failed" = true ] || [ "$talisman_failed" = true ]; then
+  echo "Commit aborted due to issues found in one or both scans."
+  [ "$snyk_failed" = true ] && echo "- Snyk issues: Check snyk_output.log"
+  [ "$talisman_failed" = true ] && echo "- Talisman issues: Check talisman_output.log"
+  exit 1
+fi
+
+# If both scans pass, allow the commit
+echo "All scans passed. Proceeding with commit.cd ."
+rm -f snyk_output.log talisman_output.log
+exit 0

.talismanrc

@@ -1,5 +1,6 @@
-threshold: medium
 fileignoreconfig:
-- filename: package-lock.json
-  checksum: 9d0340f9359927d477fe8ab4650642c068c592be63fb817651d866849e0dbbc2
+  - filename: package-lock.json
+    checksum: 1c800fd99bd50e77185fe36aa6494210e33096452dc72280a9931fc4a3dc67e3
+  - filename: .husky/pre-commit
+    checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
 version: ""

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [v1.21.0](https://github.com/contentstack/contentstack-management-javascript/tree/v1.21.0) (2025-05-05)
+ - Enhancement
+    - Region support added
+    
 ## [v1.20.3](https://github.com/contentstack/contentstack-management-javascript/tree/v1.20.3) (2025-04-21)
  - Fix
     - Handle the sanity tests when ENVs are not provided

lib/contentstack.js

@@ -7,6 +7,14 @@ import clonedeep from 'lodash/cloneDeep'
 import getUserAgent from './core/Util.js'
 import contentstackClient from './contentstackClient.js'
 import httpClient from './core/contentstackHTTPClient.js'
+const regionHostMap = {
+  NA: 'api.contentstack.io',
+  EU: 'eu-api.contentstack.com',
+  AZURE_NA: 'azure-na-api.contentstack.com',
+  AZURE_EU: 'azure-eu-api.contentstack.com',
+  GCP_NA: 'gcp-na-api.contentstack.com',
+  GCP_EU: 'gcp-eu-api.contentstack.com'
+}
 
 /**
  * Create client instance
@@ -161,8 +169,22 @@ import httpClient from './core/contentstackHTTPClient.js'
  * @returns Contentstack.Client
  */
 export function client (params = {}) {
+  let defaultHostName
+
+  if (params.region) {
+    const region = params.region.toUpperCase()
+    if (!regionHostMap[region]) {
+      throw new Error(`Invalid region '${params.region}' provided. Allowed regions are: ${Object.keys(regionHostMap).join(', ')}`)
+    }
+    defaultHostName = regionHostMap[region]
+  } else if (params.host) {
+    defaultHostName = params.host
+  } else {
+    defaultHostName = regionHostMap['NA']
+  }
+
   const defaultParameter = {
-    defaultHostName: 'api.contentstack.io'
+    defaultHostName: defaultHostName
   }
 
   const sdkAgent = `contentstack-management-javascript/${packages.version}`

lib/core/contentstackHTTPClient.js

@@ -53,6 +53,9 @@ export default function contentstackHttpClient (options) {
   let port = config.port || 443
   const version = config.version || 'v3'
 
+  if (config.region) {
+    config.host = config.defaultHostName // set region on priority
+  }
   if (isHost(config.host)) {
     const parsed = config.host.split(':')
     if (parsed.length === 2) {