aws-sdk 2.1012.0 → 2.1016.0

package/lib/core.js

@@ -20,7 +20,7 @@ AWS.util.update(AWS, {
   /**
    * @constant
    */
-  VERSION: '2.1012.0',
+  VERSION: '2.1016.0',
 
   /**
    * @api private

package/lib/protocol/rest_json.js

@@ -12,30 +12,24 @@ function populateBody(req) {
     var params = {};
     var payloadShape = input.members[input.payload];
     params = req.params[input.payload];
-    if (params === undefined) return;
 
     if (payloadShape.type === 'structure') {
-      req.httpRequest.body = builder.build(params, payloadShape);
+      req.httpRequest.body = builder.build(params || {}, payloadShape);
       applyContentTypeHeader(req);
-    } else { // non-JSON payload
+    } else if (params !== undefined) {
+      // non-JSON payload
       req.httpRequest.body = params;
       if (payloadShape.type === 'binary' || payloadShape.isStreaming) {
         applyContentTypeHeader(req, true);
       }
     }
   } else {
-    var body = builder.build(req.params, input);
-    if (body !== '{}' || req.httpRequest.method !== 'GET') { //don't send empty body for GET method
-      req.httpRequest.body = body;
-    }
+    req.httpRequest.body = builder.build(req.params, input);
     applyContentTypeHeader(req);
   }
 }
 
 function applyContentTypeHeader(req, isBinary) {
-  var operation = req.service.api.operations[req.operation];
-  var input = operation.input;
-
   if (!req.httpRequest.headers['Content-Type']) {
     var type = isBinary ? 'binary/octet-stream' : 'application/json';
     req.httpRequest.headers['Content-Type'] = type;
@@ -45,8 +39,8 @@ function applyContentTypeHeader(req, isBinary) {
 function buildRequest(req) {
   Rest.buildRequest(req);
 
-  // never send body payload on HEAD/DELETE
-  if (['HEAD', 'DELETE'].indexOf(req.httpRequest.method) < 0) {
+  // never send body payload on GET/HEAD/DELETE
+  if (['GET', 'HEAD', 'DELETE'].indexOf(req.httpRequest.method) < 0) {
     populateBody(req);
   }
 }

package/lib/region_config.js

@@ -3,6 +3,12 @@ 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;
@@ -56,6 +62,12 @@ function configureEndpoint(service) {
         );
       }
 
+      // 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) {
@@ -90,10 +102,41 @@ 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
+  getEndpointSuffix: getEndpointSuffix,
+  getRealRegion: getRealRegion,
 };

package/lib/region_config_data.json

@@ -3,6 +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"
     },
@@ -61,6 +66,58 @@
     "*/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"
+    },
+    "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"
+    },
+    "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": {
+      "endpoint": "elasticfilesystem-fips.{region}.c2s.ic.gov"
     }
   },
 
@@ -78,6 +135,30 @@
     "s3signature": {
       "endpoint": "{service}.{region}.amazonaws.com",
       "signatureVersion": "s3"
+    },
+    "fipsStandard": {
+      "endpoint": "{service}-fips.{region}.amazonaws.com"
+    },
+    "fipsDotPrefix": {
+      "endpoint": "fips.{service}.{region}.amazonaws.com"
+    },
+    "fipsWithoutRegion": {
+      "endpoint": "{service}-fips.amazonaws.com"
+    },
+    "fips.api.ecr": {
+      "endpoint": "ecr-fips.{region}.amazonaws.com"
+    },
+    "fips.api.sagemaker": {
+      "endpoint": "api-fips.sagemaker.{region}.amazonaws.com"
+    },
+    "fips.models.lex": {
+      "endpoint": "models-fips.lex.{region}.amazonaws.com"
+    },
+    "fips.runtime.lex": {
+      "endpoint": "runtime-fips.lex.{region}.amazonaws.com"
+    },
+    "fipsWithServiceOnly": {
+      "endpoint": "{service}.{region}.amazonaws.com"
     }
   }
 }

package/lib/request.js

@@ -313,12 +313,10 @@ AWS.Request = inherit({
     var region = service.config.region;
     var customUserAgent = service.config.customUserAgent;
 
-    if (service.isGlobalEndpoint) {
-      if (service.signingRegion) {
-        region = service.signingRegion;
-      } else {
-        region = 'us-east-1';
-      }
+    if (service.signingRegion) {
+      region = service.signingRegion;
+    } else if (service.isGlobalEndpoint) {
+      region = 'us-east-1';
     }
 
     this.domain = domain && domain.active;

package/lib/service.js

@@ -636,7 +636,7 @@ AWS.Service = inherit({
 
     var e = endpoint;
     e = e.replace(/\{service\}/g, this.api.endpointPrefix);
-    e = e.replace(/\{region\}/g, this.config.region);
+    e = e.replace(/\{region\}/g, regionConfig.getRealRegion(this.config.region));
     e = e.replace(/\{scheme\}/g, this.config.sslEnabled ? 'https' : 'http');
     return e;
   },

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "aws-sdk",
   "description": "AWS SDK for JavaScript",
-  "version": "2.1012.0",
+  "version": "2.1016.0",
   "author": {
     "name": "Amazon Web Services",
     "email": "",
     "url": "https://aws.amazon.com/"
   },
   "config": {
-    "test_args": "test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly test/rds test/publisher test/event-stream"
+    "test_args": "test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly test/rds test/publisher test/event-stream test/endpoint"
   },
   "homepage": "https://github.com/aws/aws-sdk-js",
   "contributors": [

package/scripts/region-checker/allowlist.js

@@ -27,7 +27,11 @@ var allowlist = {
         110,
         112
     ],
+    '/region_config.js': [
+        127
+    ],
     '/request.js': [
+        318,
         319
     ],
     '/services/s3.js': [

package/lib/services/finspace.js

@@ -1,23 +0,0 @@
-var AWS = require('../core');
-
-AWS.util.update(AWS.Finspace.prototype, {
-  /**
-   * @api private
-   */
-  setupRequestListeners: function setupRequestListeners(request) {
-    request.addListener('build', this.modifyContentType);
-  },
-
-  /**
-   * Normally rest-json services require `Content-Type` header to be 'application/json',
-   * However Finspace service requires the header to be 'application/x-amz-json-1.1'.
-   *
-   * @api private
-   */
-  modifyContentType: function modifyContentType(request) {
-    if (request.httpRequest.headers['Content-Type'] === 'application/json') {
-      request.httpRequest.headers['Content-Type'] = 'application/x-amz-json-1.1';
-    }
-  }
-});
-

package/lib/services/finspacedata.js

@@ -1,23 +0,0 @@
-var AWS = require('../core');
-
-AWS.util.update(AWS.Finspacedata.prototype, {
-  /**
-   * @api private
-   */
-  setupRequestListeners: function setupRequestListeners(request) {
-    request.addListener('build', this.modifyContentType);
-  },
-
-  /**
-   * Normally rest-json services require `Content-Type` header to be 'application/json',
-   * However Finspacedata service requires the header to be 'application/x-amz-json-1.1'.
-   *
-   * @api private
-   */
-  modifyContentType: function modifyContentType(request) {
-    if (request.httpRequest.headers['Content-Type'] === 'application/json') {
-      request.httpRequest.headers['Content-Type'] = 'application/x-amz-json-1.1';
-    }
-  }
-});
-

package/lib/services/lexmodelsv2.js

@@ -1,23 +0,0 @@
-var AWS = require('../core');
-
-AWS.util.update(AWS.LexModelsV2.prototype, {
-  /**
-   * @api private
-   */
-  setupRequestListeners: function setupRequestListeners(request) {
-    request.addListener('build', this.modifyContentType);
-  },
-
-  /**
-   * Normally rest-json services require `Content-Type` header to be 'application/json',
-   * However Lex Model V2 services requires the header to be 'application/x-amz-json-1.1'.
-   *
-   * @api private
-   */
-  modifyContentType: function modifyContentType(request) {
-    if (request.httpRequest.headers['Content-Type'] === 'application/json') {
-      request.httpRequest.headers['Content-Type'] = 'application/x-amz-json-1.1';
-    }
-  }
-});
-

package/lib/services/lookoutmetrics.js

@@ -1,22 +0,0 @@
-var AWS = require('../core');
-
-AWS.util.update(AWS.LookoutMetrics.prototype, {
-  /**
-   * @api private
-   */
-  setupRequestListeners: function setupRequestListeners(request) {
-    request.addListener('build', this.modifyContentType);
-  },
-
-  /**
-   * Normally rest-json services require `Content-Type` header to be 'application/json',
-   * However lookout metrics services requires the header to be 'application/x-amz-json-1.1'.
-   *
-   * @api private
-   */
-  modifyContentType: function modifyContentType(request) {
-    if (request.httpRequest.headers['Content-Type'] === 'application/json') {
-      request.httpRequest.headers['Content-Type'] = 'application/x-amz-json-1.1';
-    }
-  }
-});