aws-sdk 2.972.0 → 2.976.0

package/lib/core.js

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

package/lib/metadata_service/endpoint.js

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

package/lib/metadata_service/endpoint_config_options.js

@@ -0,0 +1,14 @@
+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

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

package/lib/metadata_service/endpoint_mode_config_options.js

@@ -0,0 +1,16 @@
+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
+};

package/lib/metadata_service/get_metadata_service_endpoint.js

@@ -0,0 +1,24 @@
+var AWS = require('../core');
+
+var Endpoint = require('./endpoint');
+var EndpointMode = require('./endpoint_mode');
+
+var ENDPOINT_CONFIG_OPTIONS = require('./endpoint_config_options').ENDPOINT_CONFIG_OPTIONS;
+var ENDPOINT_MODE_CONFIG_OPTIONS = require('./endpoint_mode_config_options').ENDPOINT_MODE_CONFIG_OPTIONS;
+
+var getMetadataServiceEndpoint = function() {
+  var endpoint = AWS.util.loadConfig(ENDPOINT_CONFIG_OPTIONS);
+  if (endpoint !== undefined) return endpoint;
+
+  var endpointMode = AWS.util.loadConfig(ENDPOINT_MODE_CONFIG_OPTIONS);
+  switch (endpointMode) {
+    case EndpointMode.IPv4:
+      return Endpoint.IPv4;
+    case EndpointMode.IPv6:
+      return Endpoint.IPv6;
+    default:
+      throw new Error('Unsupported endpoint mode: ' + endpointMode);
+  }
+};
+
+module.exports = getMetadataServiceEndpoint;

package/lib/metadata_service.js

@@ -1,6 +1,8 @@
 var AWS = require('./core');
 require('./http');
 var inherit = AWS.util.inherit;
+var getMetadataServiceEndpoint = require('./metadata_service/get_metadata_service_endpoint');
+var URL = require('url').URL;
 
 /**
  * Represents a metadata service available on EC2 instances. Using the
@@ -20,9 +22,9 @@ var inherit = AWS.util.inherit;
  */
 AWS.MetadataService = inherit({
   /**
-   * @return [String] the hostname of the instance metadata service
+   * @return [String] the endpoint of the instance metadata service
    */
-  host: '169.254.169.254',
+  endpoint: getMetadataServiceEndpoint(),
 
   /**
    * @!ignore
@@ -58,6 +60,10 @@ AWS.MetadataService = inherit({
    *   retry delay on retryable errors. See AWS.Config for details.
    */
   constructor: function MetadataService(options) {
+    if (options && options.host) {
+      options.endpoint = 'http://' + options.host;
+      delete options.host;
+    }
     AWS.util.update(this, options);
   },
 
@@ -90,7 +96,11 @@ AWS.MetadataService = inherit({
     }
 
     path = path || '/';
-    var httpRequest = new AWS.HttpRequest('http://' + this.host + path);
+
+    // Verify that host is a valid URL
+    if (URL) { new URL(this.endpoint); }
+
+    var httpRequest = new AWS.HttpRequest(this.endpoint + path);
     httpRequest.method = options.method || 'GET';
     if (options.headers) {
       httpRequest.headers = options.headers;

package/lib/node_loader.js

@@ -21,6 +21,33 @@ util.clientSideMonitoring = {
 util.iniLoader = require('./shared-ini').iniLoader;
 util.getSystemErrorName = require('util').getSystemErrorName;
 
+util.loadConfig = function(options) {
+  var envValue = options.environmentVariableSelector(process.env);
+  if (envValue !== undefined) {
+    return envValue;
+  }
+
+  var configFile = {};
+  try {
+    configFile = util.iniLoader ? util.iniLoader.loadFrom({
+      isConfig: true,
+      filename: process.env[util.sharedConfigFileEnv]
+    }) : {};
+  } catch (e) {}
+  var sharedFileConfig = configFile[
+    process.env.AWS_PROFILE || util.defaultProfile
+  ] || {};
+  var configValue = options.configFileSelector(sharedFileConfig);
+  if (configValue !== undefined) {
+    return configValue;
+  }
+
+  if (typeof options.default === 'function') {
+    return options.default();
+  }
+  return options.default;
+};
+
 var AWS;
 
 /**

package/package.json

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