aws-sdk 2.1024.0 → 2.1028.0

package/lib/region_config.js

@@ -3,13 +3,6 @@ var regionConfig = require('./region_config_data.json');
 
 function generateRegionPrefix(region) {
   if (!region) return null;
-  if (isFipsRegion(region)) {
-    if (isFipsCnRegion(region)) return 'fips-cn-*';
-    if (isFipsUsGovRegion(region)) return 'fips-us-gov-*';
-    if (region.startsWith('fips-accesspoint-')) return 'fips-accesspoint-*';
-    return 'fips-*';
-  }
-
   var parts = region.split('-');
   if (parts.length < 3) return null;
   return parts.slice(0, parts.length - 2).join('-') + '-*';
@@ -43,31 +36,26 @@ function applyConfig(service, config) {
 
 function configureEndpoint(service) {
   var keys = derivedKeys(service);
+  var useFipsEndpoint = service.config.useFipsEndpoint;
+  var useDualstackEndpoint = service.config.useDualstackEndpoint;
   for (var i = 0; i < keys.length; i++) {
     var key = keys[i];
     if (!key) continue;
 
-    if (Object.prototype.hasOwnProperty.call(regionConfig.rules, key)) {
-      var config = regionConfig.rules[key];
+    var rules = useFipsEndpoint
+      ? useDualstackEndpoint
+        ? regionConfig.dualstackFipsRules
+        : regionConfig.fipsRules
+      : useDualstackEndpoint
+      ? regionConfig.dualstackRules
+      : regionConfig.rules;
+
+    if (Object.prototype.hasOwnProperty.call(rules, key)) {
+      var config = rules[key];
       if (typeof config === 'string') {
         config = regionConfig.patterns[config];
       }
 
-      // set dualstack endpoint
-      if (service.config.useDualstack && util.isDualstackAvailable(service)) {
-        config = util.copy(config);
-        config.endpoint = config.endpoint.replace(
-          /{service}\.({region}\.)?/,
-          '{service}.dualstack.{region}.'
-        );
-      }
-
-      // set FIPS signingRegion and endpoint.
-      if (isFipsRegion(service.config.region)) {
-        config = util.copy(config);
-        service.signingRegion = getRealRegion(service.config.region);
-      }
-
       // set global endpoint
       service.isGlobalEndpoint = !!config.globalEndpoint;
       if (config.signingRegion) {
@@ -102,41 +90,10 @@ function getEndpointSuffix(region) {
   return defaultSuffix;
 }
 
-function isFipsRegion(region) {
-  return region && (region.startsWith('fips-') || region.endsWith('-fips'));
-}
-
-function isFipsUsGovRegion(region) {
-  return (
-    region &&
-    region.startsWith('fips-us-gov-') ||
-    (region.startsWith('us-gov-') && region.endsWith('-fips'))
-  );
-}
-
-function isFipsCnRegion(region) {
-  return (
-    region &&
-    region.startsWith('fips-cn-') ||
-    (region.startsWith('cn-') && region.endsWith('-fips'))
-  );
-}
-
-function getRealRegion(region) {
-  return isFipsRegion(region)
-    ? ['fips-aws-global', 'aws-fips'].includes(region)
-      ? 'us-east-1'
-      : region === 'fips-aws-us-gov-global'
-      ? 'us-gov-west-1'
-      : region.replace(/fips-(dkr-|prod-|accesspoint-)?|-fips/, '')
-    : region;
-}
-
 /**
  * @api private
  */
 module.exports = {
   configureEndpoint: configureEndpoint,
   getEndpointSuffix: getEndpointSuffix,
-  getRealRegion: getRealRegion,
 };

package/lib/region_config_data.json

@@ -3,20 +3,11 @@
     "*/*": {
       "endpoint": "{service}.{region}.amazonaws.com"
     },
-    "fips-*/*": "fipsStandard",
-    "fips-us-gov-*/*": "fipsStandard",
-    "fips-cn-*/*": {
-      "endpoint": "{service}-fips.{region}.amazonaws.com.cn"
-    },
     "cn-*/*": {
       "endpoint": "{service}.{region}.amazonaws.com.cn"
     },
-    "us-iso-*/*": {
-      "endpoint": "{service}.{region}.c2s.ic.gov"
-    },
-    "us-isob-*/*": {
-      "endpoint": "{service}.{region}.sc2s.sgov.gov"
-    },
+    "us-iso-*/*": "usIso",
+    "us-isob-*/*": "usIsob",
     "*/budgets": "globalSSL",
     "*/cloudfront": "globalSSL",
     "*/sts": "globalSSL",
@@ -66,61 +57,95 @@
     "*/sdb": {
       "endpoint": "{service}.{region}.amazonaws.com",
       "signatureVersion": "v2"
-    },
+    }
+  },
 
-    "fips-*/api.ecr": "fips.api.ecr",
-    "fips-us-gov-*/api.ecr": "fips.api.ecr",
-    "fips-*/api.sagemaker": "fips.api.sagemaker",
-    "fips-us-gov-*/api.sagemaker": "fips.api.sagemaker",
-    "fips-*/batch": "fipsDotPrefix",
-    "fips-*/eks": "fipsDotPrefix",
-    "fips-*/models.lex": "fips.models.lex",
-    "fips-us-gov-*/models.lex": "fips.models.lex",
-    "fips-*/runtime.lex": "fips.runtime.lex",
-    "fips-us-gov-*/runtime.lex": "fips.runtime.lex",
-    "fips-*/runtime.sagemaker": {
-      "endpoint": "runtime-fips.sagemaker.{region}.amazonaws.com"
+  "fipsRules": {
+    "*/*": "fipsStandard",
+    "us-gov-*/*": "fipsStandard",
+    "us-iso-*/*": {
+      "endpoint": "{service}-fips.{region}.c2s.ic.gov"
     },
-    "fips-*/streams.dynamodb": {
-      "endpoint": "dynamodb-fips.{region}.amazonaws.com"
-    },
-    "fips-*/route53": "fipsWithoutRegion",
-    "fips-*/transcribe": "fipsDotPrefix",
-    "fips-us-gov-*/transcribe": "fipsDotPrefix",
-    "fips-*/waf": "fipsWithoutRegion",
-    "fips-accesspoint-*/*": {
-      "endpoint": "{service}-accesspoint-fips.{region}.amazonaws.com"
-    },
-    "fips-us-gov-*/acm-pca": "fipsWithServiceOnly",
-    "fips-us-gov-*/batch": "fipsWithServiceOnly",
-    "fips-us-gov-*/config": "fipsWithServiceOnly",
-    "fips-us-gov-*/eks": "fipsWithServiceOnly",
-    "fips-us-gov-*/elasticmapreduce": "fipsWithServiceOnly",
-    "fips-us-gov-*/identitystore": "fipsWithServiceOnly",
-    "fips-us-gov-*/dynamodb": "fipsWithServiceOnly",
-    "fips-us-gov-*/elasticloadbalancing": "fipsWithServiceOnly",
-    "fips-us-gov-*/guardduty": "fipsWithServiceOnly",
-    "fips-us-gov-*/monitoring": "fipsWithServiceOnly",
-    "fips-aws-us-gov-global/organizations": "fipsWithServiceOnly",
-    "fips-us-gov-*/resource-groups": "fipsWithServiceOnly",
-    "fips-aws-us-gov-global/route53": {
-      "endpoint": "route53.us-gov.amazonaws.com"
+    "us-iso-*/dms": "usIso",
+    "us-isob-*/*": {
+      "endpoint": "{service}-fips.{region}.sc2s.sgov.gov"
     },
-    "fips-us-gov-*/runtime.sagemaker": "fipsWithServiceOnly",
-    "fips-us-gov-*/servicecatalog-appregistry": "fipsWithServiceOnly",
-    "fips-us-gov-*/servicequotas": "fipsWithServiceOnly",
-    "fips-us-gov-*/ssm": "fipsWithServiceOnly",
-    "fips-us-gov-*/sts": "fipsWithServiceOnly",
-    "fips-us-gov-west-1/states": "fipsWithServiceOnly",
-    "fips-us-gov-*/support": "fipsWithServiceOnly",
-    "fips-us-gov-*/streams.dynamodb": {
-      "endpoint": "dynamodb.{region}.amazonaws.com"
-    },
-    "fips-us-iso-east-1/elasticfilesystem": {
+    "us-isob-*/dms": "usIsob",
+    "cn-*/*": {
+      "endpoint": "{service}-fips.{region}.amazonaws.com.cn"
+    },
+    "*/api.ecr": "fips.api.ecr",
+    "*/api.sagemaker": "fips.api.sagemaker",
+    "*/batch": "fipsDotPrefix",
+    "*/eks": "fipsDotPrefix",
+    "*/models.lex": "fips.models.lex",
+    "*/runtime.lex": "fips.runtime.lex",
+    "*/runtime.sagemaker": {
+      "endpoint": "runtime-fips.sagemaker.{region}.amazonaws.com"
+    },
+    "*/iam": "fipsWithoutRegion",
+    "*/route53": "fipsWithoutRegion",
+    "*/transcribe": "fipsDotPrefix",
+    "*/waf": "fipsWithoutRegion",
+
+    "us-gov-*/transcribe": "fipsDotPrefix",
+    "us-gov-*/api.ecr": "fips.api.ecr",
+    "us-gov-*/api.sagemaker": "fips.api.sagemaker",
+    "us-gov-*/models.lex": "fips.models.lex",
+    "us-gov-*/runtime.lex": "fips.runtime.lex",
+    "us-gov-*/acm-pca": "fipsWithServiceOnly",
+    "us-gov-*/batch": "fipsWithServiceOnly",
+    "us-gov-*/config": "fipsWithServiceOnly",
+    "us-gov-*/eks": "fipsWithServiceOnly",
+    "us-gov-*/elasticmapreduce": "fipsWithServiceOnly",
+    "us-gov-*/identitystore": "fipsWithServiceOnly",
+    "us-gov-*/dynamodb": "fipsWithServiceOnly",
+    "us-gov-*/elasticloadbalancing": "fipsWithServiceOnly",
+    "us-gov-*/guardduty": "fipsWithServiceOnly",
+    "us-gov-*/monitoring": "fipsWithServiceOnly",
+    "us-gov-*/resource-groups": "fipsWithServiceOnly",
+    "us-gov-*/runtime.sagemaker": "fipsWithServiceOnly",
+    "us-gov-*/servicecatalog-appregistry": "fipsWithServiceOnly",
+    "us-gov-*/servicequotas": "fipsWithServiceOnly",
+    "us-gov-*/ssm": "fipsWithServiceOnly",
+    "us-gov-*/sts": "fipsWithServiceOnly",
+    "us-gov-*/support": "fipsWithServiceOnly",
+    "us-gov-west-1/states": "fipsWithServiceOnly",
+    "us-iso-east-1/elasticfilesystem": {
       "endpoint": "elasticfilesystem-fips.{region}.c2s.ic.gov"
+    },
+    "us-gov-west-1/organizations": "fipsWithServiceOnly",
+    "us-gov-west-1/route53": {
+      "endpoint": "route53.us-gov.amazonaws.com"
     }
   },
 
+  "dualstackRules": {
+    "*/*": {
+      "endpoint": "{service}.{region}.api.aws"
+    },
+    "cn-*/*": {
+      "endpoint": "{service}.{region}.api.amazonwebservices.com.cn"
+    },
+    "*/s3": "dualstackLegacy",
+    "cn-*/s3": "dualstackLegacyCn",
+    "*/s3-control": "dualstackLegacy",
+    "cn-*/s3-control": "dualstackLegacyCn"
+  },
+
+  "dualstackFipsRules": {
+    "*/*": {
+      "endpoint": "{service}-fips.{region}.api.aws"
+    },
+    "cn-*/*": {
+      "endpoint": "{service}-fips.{region}.api.amazonwebservices.com.cn"
+    },
+    "*/s3": "dualstackFipsLegacy",
+    "cn-*/s3": "dualstackFipsLegacyCn",
+    "*/s3-control": "dualstackFipsLegacy",
+    "cn-*/s3-control": "dualstackFipsLegacyCn"
+  },
+
   "patterns": {
     "globalSSL": {
       "endpoint": "https://{service}.amazonaws.com",
@@ -136,6 +161,12 @@
       "endpoint": "{service}.{region}.amazonaws.com",
       "signatureVersion": "s3"
     },
+    "usIso": {
+      "endpoint": "{service}.{region}.c2s.ic.gov"
+    },
+    "usIsob": {
+      "endpoint": "{service}.{region}.sc2s.sgov.gov"
+    },
     "fipsStandard": {
       "endpoint": "{service}-fips.{region}.amazonaws.com"
     },
@@ -159,6 +190,18 @@
     },
     "fipsWithServiceOnly": {
       "endpoint": "{service}.{region}.amazonaws.com"
+    },
+    "dualstackLegacy": {
+      "endpoint": "{service}.dualstack.{region}.amazonaws.com"
+    },
+    "dualstackLegacyCn": {
+      "endpoint": "{service}.dualstack.{region}.amazonaws.com.cn"
+    },
+    "dualstackFipsLegacy": {
+      "endpoint": "{service}-fips.dualstack.{region}.amazonaws.com"
+    },
+    "dualstackFipsLegacyCn": {
+      "endpoint": "{service}-fips.dualstack.{region}.amazonaws.com.cn"
     }
   }
 }

package/lib/service.js

@@ -4,6 +4,7 @@ var regionConfig = require('./region_config');
 
 var inherit = AWS.util.inherit;
 var clientCount = 0;
+var region_utils = require('./region/utils');
 
 /**
  * The service class representing an AWS service.
@@ -25,6 +26,24 @@ AWS.Service = inherit({
       throw AWS.util.error(new Error(),
         'Service must be constructed with `new\' operator');
     }
+
+    if (config) {
+      if (config.region) {
+        var region = config.region;
+        if (region_utils.isFipsRegion(region)) {
+          config.region = region_utils.getRealRegion(region);
+          config.useFipsEndpoint = true;
+        }
+        if (region_utils.isGlobalRegion(region)) {
+          config.region = region_utils.getRealRegion(region);
+        }
+      }
+      if (typeof config.useDualstack === 'boolean'
+        && typeof config.useDualstackEndpoint !== 'boolean') {
+        config.useDualstackEndpoint = config.useDualstack;
+      }
+    }
+
     var ServiceClass = this.loadServiceClass(config || {});
     if (ServiceClass) {
       var originalConfig = AWS.util.copy(config);
@@ -636,7 +655,7 @@ AWS.Service = inherit({
 
     var e = endpoint;
     e = e.replace(/\{service\}/g, this.api.endpointPrefix);
-    e = e.replace(/\{region\}/g, regionConfig.getRealRegion(this.config.region));
+    e = e.replace(/\{region\}/g, this.config.region);
     e = e.replace(/\{scheme\}/g, this.config.sslEnabled ? 'https' : 'http');
     return e;
   },

package/lib/services/s3util.js

@@ -136,6 +136,7 @@ var s3util = {
     var useArnRegion = s3util.loadUseArnRegionConfig(req);
     var regionFromArn = req._parsedArn.region;
     var clientRegion = req.service.config.region;
+    var useFipsEndpoint = req.service.config.useFipsEndpoint;
 
     if (!regionFromArn) {
       throw AWS.util.error(new Error(), {
@@ -145,7 +146,7 @@ var s3util = {
     }
 
     if (
-      clientRegion.indexOf('fips') >= 0 ||
+      useFipsEndpoint ||
       regionFromArn.indexOf('fips') >= 0
     ) {
       throw AWS.util.error(new Error(), {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk",
   "description": "AWS SDK for JavaScript",
-  "version": "2.1024.0",
+  "version": "2.1028.0",
   "author": {
     "name": "Amazon Web Services",
     "email": "",

package/scripts/region-checker/allowlist.js

@@ -4,9 +4,9 @@ var allowlist = {
         25,
         85,
         86,
-        201,
-        255,
-        256
+        207,
+        261,
+        262
     ],
     '/credentials/cognito_identity_credentials.js': [
         78,
@@ -27,8 +27,8 @@ var allowlist = {
         110,
         112
     ],
-    '/region_config.js': [
-        127
+    '/region/utils.js': [
+        10
     ],
     '/request.js': [
         318,

package/lib/metadata_service/endpoint.js

@@ -1,6 +0,0 @@
-var Endpoint = {
-  IPv4: 'http://169.254.169.254',
-  IPv6: 'http://[fd00:ec2::254]',
-};
-
-module.exports = Endpoint;

package/lib/metadata_service/endpoint_config_options.js

@@ -1,14 +0,0 @@
-var ENV_ENDPOINT_NAME = 'AWS_EC2_METADATA_SERVICE_ENDPOINT';
-var CONFIG_ENDPOINT_NAME = 'ec2_metadata_service_endpoint';
-
-var ENDPOINT_CONFIG_OPTIONS = {
-  environmentVariableSelector: function(env) { return env[ENV_ENDPOINT_NAME]; },
-  configFileSelector: function(profile) { return profile[CONFIG_ENDPOINT_NAME]; },
-  default: undefined,
-};
-
-module.exports = {
-  ENV_ENDPOINT_NAME: ENV_ENDPOINT_NAME,
-  CONFIG_ENDPOINT_NAME: CONFIG_ENDPOINT_NAME,
-  ENDPOINT_CONFIG_OPTIONS: ENDPOINT_CONFIG_OPTIONS
-};

package/lib/metadata_service/endpoint_mode.js

@@ -1,6 +0,0 @@
-var EndpointMode = {
-  IPv4: 'IPv4',
-  IPv6: 'IPv6',
-};
-
-module.exports = EndpointMode;

package/lib/metadata_service/endpoint_mode_config_options.js

@@ -1,16 +0,0 @@
-var EndpointMode = require('./endpoint_mode');
-
-var ENV_ENDPOINT_MODE_NAME = 'AWS_EC2_METADATA_SERVICE_ENDPOINT_MODE';
-var CONFIG_ENDPOINT_MODE_NAME = 'ec2_metadata_service_endpoint_mode';
-
-var ENDPOINT_MODE_CONFIG_OPTIONS = {
-  environmentVariableSelector: function(env) { return env[ENV_ENDPOINT_MODE_NAME]; },
-  configFileSelector: function(profile) { return profile[CONFIG_ENDPOINT_MODE_NAME]; },
-  default: EndpointMode.IPv4,
-};
-
-module.exports = {
-  ENV_ENDPOINT_MODE_NAME: ENV_ENDPOINT_MODE_NAME,
-  CONFIG_ENDPOINT_MODE_NAME: CONFIG_ENDPOINT_MODE_NAME,
-  ENDPOINT_MODE_CONFIG_OPTIONS: ENDPOINT_MODE_CONFIG_OPTIONS
-};