aws-sdk 2.1541.0 → 2.1543.0

package/dist/xml2js.js

@@ -4574,7 +4574,7 @@ module.exports =
 	// Generated by CoffeeScript 1.12.7
 	(function() {
 	  "use strict";
-	  var bom, defaults, events, isEmpty, processItem, processors, sax, setImmediate,
+	  var bom, defaults, defineProperty, events, isEmpty, processItem, processors, sax, setImmediate,
 	    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
 	    extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
 	    hasProp = {}.hasOwnProperty;
@@ -4604,6 +4604,16 @@ module.exports =
 	    return item;
 	  };
 
+	  defineProperty = function(obj, key, value) {
+	    var descriptor;
+	    descriptor = Object.create(null);
+	    descriptor.value = value;
+	    descriptor.writable = true;
+	    descriptor.enumerable = true;
+	    descriptor.configurable = true;
+	    return Object.defineProperty(obj, key, descriptor);
+	  };
+
 	  exports.Parser = (function(superClass) {
 	    extend(Parser, superClass);
 
@@ -4667,13 +4677,13 @@ module.exports =
 	    Parser.prototype.assignOrPush = function(obj, key, newValue) {
 	      if (!(key in obj)) {
 	        if (!this.options.explicitArray) {
-	          return obj[key] = newValue;
+	          return defineProperty(obj, key, newValue);
 	        } else {
-	          return obj[key] = [newValue];
+	          return defineProperty(obj, key, [newValue]);
 	        }
 	      } else {
 	        if (!(obj[key] instanceof Array)) {
-	          obj[key] = [obj[key]];
+	          defineProperty(obj, key, [obj[key]]);
 	        }
 	        return obj[key].push(newValue);
 	      }
@@ -4714,21 +4724,21 @@ module.exports =
 	      this.saxParser.onopentag = (function(_this) {
 	        return function(node) {
 	          var key, newValue, obj, processedKey, ref;
-	          obj = Object.create(null);
+	          obj = {};
 	          obj[charkey] = "";
 	          if (!_this.options.ignoreAttrs) {
 	            ref = node.attributes;
 	            for (key in ref) {
 	              if (!hasProp.call(ref, key)) continue;
 	              if (!(attrkey in obj) && !_this.options.mergeAttrs) {
-	                obj[attrkey] = Object.create(null);
+	                obj[attrkey] = {};
 	              }
 	              newValue = _this.options.attrValueProcessors ? processItem(_this.options.attrValueProcessors, node.attributes[key], key) : node.attributes[key];
 	              processedKey = _this.options.attrNameProcessors ? processItem(_this.options.attrNameProcessors, key) : key;
 	              if (_this.options.mergeAttrs) {
 	                _this.assignOrPush(obj, processedKey, newValue);
 	              } else {
-	                obj[attrkey][processedKey] = newValue;
+	                defineProperty(obj[attrkey], processedKey, newValue);
 	              }
 	            }
 	          }
@@ -4799,7 +4809,7 @@ module.exports =
 	          }
 	          if (_this.options.explicitChildren && !_this.options.mergeAttrs && typeof obj === 'object') {
 	            if (!_this.options.preserveChildrenOrder) {
-	              node = Object.create(null);
+	              node = {};
 	              if (_this.options.attrkey in obj) {
 	                node[_this.options.attrkey] = obj[_this.options.attrkey];
 	                delete obj[_this.options.attrkey];
@@ -4814,10 +4824,10 @@ module.exports =
 	              obj = node;
 	            } else if (s) {
 	              s[_this.options.childkey] = s[_this.options.childkey] || [];
-	              objClone = Object.create(null);
+	              objClone = {};
 	              for (key in obj) {
 	                if (!hasProp.call(obj, key)) continue;
-	                objClone[key] = obj[key];
+	                defineProperty(objClone, key, obj[key]);
 	              }
 	              s[_this.options.childkey].push(objClone);
 	              delete obj["#name"];
@@ -4831,8 +4841,8 @@ module.exports =
 	          } else {
 	            if (_this.options.explicitRoot) {
 	              old = obj;
-	              obj = Object.create(null);
-	              obj[nodeName] = old;
+	              obj = {};
+	              defineProperty(obj, nodeName, old);
 	            }
 	            _this.resultObject = obj;
 	            _this.saxParser.ended = true;

package/lib/core.js

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

package/lib/services/s3.js

@@ -119,6 +119,7 @@ AWS.util.update(AWS.S3.prototype, {
    * @api private
    */
   setupRequestListeners: function setupRequestListeners(request) {
+    request.addListener('validateResponse', this.setExpiresString);
     var prependListener = true;
     request.addListener('validate', this.validateScheme);
     request.addListener('validate', this.validateBucketName, prependListener);
@@ -1284,6 +1285,30 @@ AWS.util.update(AWS.S3.prototype, {
     var uploader = new AWS.S3.ManagedUpload(options);
     if (typeof callback === 'function') uploader.send(callback);
     return uploader;
+  },
+
+  /**
+   * @api private
+   */
+  setExpiresString: function setExpiresString(response) {
+    // Check if response contains Expires value, and populate ExpiresString.
+    if (response && response.httpResponse && response.httpResponse.headers) {
+      if ('expires' in response.httpResponse.headers) {
+        response.httpResponse.headers.expiresstring = response.httpResponse.headers.expires;
+      }
+    }
+
+    // Check if value in Expires is not a Date using parseTimestamp.
+    try {
+      if (response && response.httpResponse && response.httpResponse.headers) {
+        if ('expires' in response.httpResponse.headers) {
+          AWS.util.date.parseTimestamp(response.httpResponse.headers.expires);
+        }
+      }
+    } catch (e) {
+      console.log('AWS SDK', '(warning)', e);
+      delete response.httpResponse.headers.expires;
+    }
   }
 });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk",
   "description": "AWS SDK for JavaScript",
-  "version": "2.1541.0",
+  "version": "2.1543.0",
   "author": {
     "name": "Amazon Web Services",
     "email": "",
@@ -50,7 +50,7 @@
     "url": "0.10.3",
     "util": "^0.12.4",
     "uuid": "8.0.0",
-    "xml2js": "0.5.0"
+    "xml2js": "0.6.2"
   },
   "main": "lib/aws.js",
   "browser": {

package/scripts/lib/set-s3-expires-string.js

@@ -0,0 +1,53 @@
+/**
+ * Sets model overrides for S3 ExpiresString.
+ */
+module.exports = function setS3ExpiresString(model) {
+  if (model.metadata.serviceId === 'S3') {
+    var newShapes = {};
+    for (var shapeId in model.shapes) {
+      newShapes[shapeId] = model.shapes[shapeId];
+      if (shapeId === 'Expires') {
+        // preserve timestamp type for Expires.
+        newShapes[shapeId] = {};
+        newShapes[shapeId].type = 'timestamp';
+
+        // add ExpiresString
+        newShapes['ExpiresString'] = {
+          type: 'string'
+        };
+      }
+    }
+    model.shapes = newShapes;
+
+    for (var operationKey in model.operations) {
+      var op = model.operations[operationKey];
+      if (!op.output || !op.output.shape) {
+        continue;
+      }
+      var output = model.shapes[op.output.shape];
+      if (!output || !output.members) {
+        continue;
+      }
+      if ('Expires' in output.members) {
+        var newMembers = {};
+        for (var memberKey in output.members) {
+          newMembers[memberKey] = output.members[memberKey];
+          if (memberKey === 'Expires') {
+            newMembers['ExpiresString'] = Object.assign({}, newMembers[memberKey], {
+              'shape': 'ExpiresString',
+              'location': 'header',
+              'locationName': 'ExpiresString'
+            });
+
+            newMembers[memberKey].deprecated = true;
+            newMembers[memberKey].documentation = 'Deprecated in favor of ExpiresString.';
+          }
+        }
+        output.members = newMembers;
+      }
+    }
+
+    return true;
+  }
+  return false;
+};

package/scripts/region-checker/allowlist.js

@@ -40,17 +40,17 @@ var allowlist = {
     '/services/s3.js': [
         87,
         88,
-        260,
-        262,
-        275,
-        281,
-        641,
-        643,
-        762,
-        773,
+        261,
+        263,
+        276,
+        282,
+        642,
+        644,
+        763,
         774,
         775,
-        780
+        776,
+        781
     ],
     '/token/sso_token_provider.js': [
         60

package/scripts/translate-api

@@ -3,6 +3,7 @@
 var fs = require('fs');
 var Translator = require('./lib/translator');
 var removeEventStreamOperations = require('./lib/remove-event-stream-ops').removeEventStreamOperations;
+var setS3ExpiresString = require('./lib/set-s3-expires-string');
 var util = require('util');
 var path = require('path');
 
@@ -24,7 +25,7 @@ function ApiTranslator(basePath) {
 ApiTranslator.prototype.minimizeFile = function minimizeFile(filepath) {
   var opath = filepath.replace(/\.normal\.json$/, '.min.json');
   var data = JSON.parse(fs.readFileSync(path.join(this._apisPath, filepath)).toString());
-  var didModify = removeEventStreamOperations(data);
+  var didModify = removeEventStreamOperations(data) || setS3ExpiresString(data);
   if (didModify) {
     // original model modified, replace existing normal.json so docs/ts definitions are accurate
     fs.writeFileSync(path.join(this._apisPath, filepath), JSON.stringify(data, null, '  '));