Comparing version 2.1.21 to 2.1.22
@@ -23,2 +23,5 @@ { | ||
"shape": "S3" | ||
}, | ||
"startTimestamp": { | ||
"type": "timestamp" | ||
} | ||
@@ -42,3 +45,3 @@ } | ||
"tags": { | ||
"shape": "S9" | ||
"shape": "Sa" | ||
} | ||
@@ -64,3 +67,3 @@ } | ||
"tags": { | ||
"shape": "S9" | ||
"shape": "Sa" | ||
} | ||
@@ -79,2 +82,20 @@ } | ||
}, | ||
"DeactivatePipeline": { | ||
"input": { | ||
"type": "structure", | ||
"required": [ | ||
"pipelineId" | ||
], | ||
"members": { | ||
"pipelineId": {}, | ||
"cancelActive": { | ||
"type": "boolean" | ||
} | ||
} | ||
}, | ||
"output": { | ||
"type": "structure", | ||
"members": {} | ||
} | ||
}, | ||
"DeletePipeline": { | ||
@@ -101,3 +122,3 @@ "input": { | ||
"objectIds": { | ||
"shape": "Sj" | ||
"shape": "Sn" | ||
}, | ||
@@ -117,3 +138,3 @@ "evaluateExpressions": { | ||
"pipelineObjects": { | ||
"shape": "Sm" | ||
"shape": "Sq" | ||
}, | ||
@@ -135,3 +156,3 @@ "marker": {}, | ||
"pipelineIds": { | ||
"shape": "Sj" | ||
"shape": "Sn" | ||
} | ||
@@ -159,7 +180,7 @@ } | ||
"fields": { | ||
"shape": "So" | ||
"shape": "Ss" | ||
}, | ||
"description": {}, | ||
"tags": { | ||
"shape": "S9" | ||
"shape": "Sa" | ||
} | ||
@@ -211,6 +232,6 @@ } | ||
"pipelineObjects": { | ||
"shape": "Sm" | ||
"shape": "Sq" | ||
}, | ||
"parameterObjects": { | ||
"shape": "Sz" | ||
"shape": "S13" | ||
}, | ||
@@ -284,3 +305,3 @@ "parameterValues": { | ||
"value": { | ||
"shape": "Sn" | ||
"shape": "Sr" | ||
} | ||
@@ -303,6 +324,6 @@ } | ||
"pipelineObjects": { | ||
"shape": "Sm" | ||
"shape": "Sq" | ||
}, | ||
"parameterObjects": { | ||
"shape": "Sz" | ||
"shape": "S13" | ||
}, | ||
@@ -321,6 +342,6 @@ "parameterValues": { | ||
"validationErrors": { | ||
"shape": "S1h" | ||
"shape": "S1l" | ||
}, | ||
"validationWarnings": { | ||
"shape": "S1l" | ||
"shape": "S1p" | ||
}, | ||
@@ -356,3 +377,3 @@ "errored": { | ||
"values": { | ||
"shape": "S1t" | ||
"shape": "S1x" | ||
} | ||
@@ -377,3 +398,3 @@ } | ||
"ids": { | ||
"shape": "Sj" | ||
"shape": "Sn" | ||
}, | ||
@@ -397,3 +418,3 @@ "marker": {}, | ||
"tagKeys": { | ||
"shape": "S1t" | ||
"shape": "S1x" | ||
} | ||
@@ -416,3 +437,3 @@ } | ||
"fields": { | ||
"shape": "So" | ||
"shape": "Ss" | ||
} | ||
@@ -468,3 +489,3 @@ } | ||
"objectIds": { | ||
"shape": "Sj" | ||
"shape": "Sn" | ||
}, | ||
@@ -505,6 +526,6 @@ "status": {} | ||
"pipelineObjects": { | ||
"shape": "Sm" | ||
"shape": "Sq" | ||
}, | ||
"parameterObjects": { | ||
"shape": "Sz" | ||
"shape": "S13" | ||
}, | ||
@@ -523,6 +544,6 @@ "parameterValues": { | ||
"validationErrors": { | ||
"shape": "S1h" | ||
"shape": "S1l" | ||
}, | ||
"validationWarnings": { | ||
"shape": "S1l" | ||
"shape": "S1p" | ||
}, | ||
@@ -551,3 +572,3 @@ "errored": { | ||
}, | ||
"S9": { | ||
"Sa": { | ||
"type": "list", | ||
@@ -566,13 +587,13 @@ "member": { | ||
}, | ||
"Sj": { | ||
"Sn": { | ||
"type": "list", | ||
"member": {} | ||
}, | ||
"Sm": { | ||
"Sq": { | ||
"type": "list", | ||
"member": { | ||
"shape": "Sn" | ||
"shape": "Sr" | ||
} | ||
}, | ||
"Sn": { | ||
"Sr": { | ||
"type": "structure", | ||
@@ -588,7 +609,7 @@ "required": [ | ||
"fields": { | ||
"shape": "So" | ||
"shape": "Ss" | ||
} | ||
} | ||
}, | ||
"So": { | ||
"Ss": { | ||
"type": "list", | ||
@@ -607,3 +628,3 @@ "member": { | ||
}, | ||
"Sz": { | ||
"S13": { | ||
"type": "list", | ||
@@ -635,3 +656,3 @@ "member": { | ||
}, | ||
"S1h": { | ||
"S1l": { | ||
"type": "list", | ||
@@ -643,3 +664,3 @@ "member": { | ||
"errors": { | ||
"shape": "S1j" | ||
"shape": "S1n" | ||
} | ||
@@ -649,7 +670,7 @@ } | ||
}, | ||
"S1j": { | ||
"S1n": { | ||
"type": "list", | ||
"member": {} | ||
}, | ||
"S1l": { | ||
"S1p": { | ||
"type": "list", | ||
@@ -661,3 +682,3 @@ "member": { | ||
"warnings": { | ||
"shape": "S1j" | ||
"shape": "S1n" | ||
} | ||
@@ -667,3 +688,3 @@ } | ||
}, | ||
"S1t": { | ||
"S1x": { | ||
"type": "list", | ||
@@ -670,0 +691,0 @@ "member": {} |
{ | ||
"version": "2.0", | ||
"metadata": { | ||
@@ -12,2 +13,11 @@ "apiVersion": "2010-12-01", | ||
"operations": { | ||
"AbortEnvironmentUpdate": { | ||
"input": { | ||
"type": "structure", | ||
"members": { | ||
"EnvironmentId": {}, | ||
"EnvironmentName": {} | ||
} | ||
} | ||
}, | ||
"CheckDNSAvailability": { | ||
@@ -46,3 +56,3 @@ "input": { | ||
"output": { | ||
"shape": "S9", | ||
"shape": "Sc", | ||
"resultWrapper": "CreateApplicationResult" | ||
@@ -63,3 +73,3 @@ } | ||
"SourceBundle": { | ||
"shape": "Si" | ||
"shape": "Sl" | ||
}, | ||
@@ -72,3 +82,3 @@ "AutoCreateApplication": { | ||
"output": { | ||
"shape": "Sm", | ||
"shape": "Sp", | ||
"resultWrapper": "CreateApplicationVersionResult" | ||
@@ -98,3 +108,3 @@ } | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
} | ||
@@ -104,3 +114,3 @@ } | ||
"output": { | ||
"shape": "Sx", | ||
"shape": "Sz", | ||
"resultWrapper": "CreateConfigurationTemplateResult" | ||
@@ -122,3 +132,3 @@ } | ||
"Tier": { | ||
"shape": "S11" | ||
"shape": "S12" | ||
}, | ||
@@ -139,6 +149,6 @@ "Tags": { | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
}, | ||
"OptionsToRemove": { | ||
"shape": "S17" | ||
"shape": "S18" | ||
} | ||
@@ -148,3 +158,3 @@ } | ||
"output": { | ||
"shape": "S19", | ||
"shape": "S1a", | ||
"resultWrapper": "CreateEnvironmentResult" | ||
@@ -224,3 +234,3 @@ } | ||
"VersionLabels": { | ||
"shape": "Sd" | ||
"shape": "Sg" | ||
} | ||
@@ -236,3 +246,3 @@ } | ||
"member": { | ||
"shape": "Sn" | ||
"shape": "Sq" | ||
} | ||
@@ -260,3 +270,3 @@ } | ||
"member": { | ||
"shape": "Sa" | ||
"shape": "Sd" | ||
} | ||
@@ -276,3 +286,3 @@ } | ||
"Options": { | ||
"shape": "S17" | ||
"shape": "S18" | ||
} | ||
@@ -344,3 +354,3 @@ } | ||
"member": { | ||
"shape": "Sx" | ||
"shape": "Sz" | ||
} | ||
@@ -456,3 +466,3 @@ } | ||
"member": { | ||
"shape": "S19" | ||
"shape": "S1a" | ||
} | ||
@@ -624,3 +634,3 @@ } | ||
"output": { | ||
"shape": "S19", | ||
"shape": "S1a", | ||
"resultWrapper": "TerminateEnvironmentResult" | ||
@@ -641,3 +651,3 @@ } | ||
"output": { | ||
"shape": "S9", | ||
"shape": "Sc", | ||
"resultWrapper": "UpdateApplicationResult" | ||
@@ -660,3 +670,3 @@ } | ||
"output": { | ||
"shape": "Sm", | ||
"shape": "Sp", | ||
"resultWrapper": "UpdateApplicationVersionResult" | ||
@@ -677,6 +687,6 @@ } | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
}, | ||
"OptionsToRemove": { | ||
"shape": "S17" | ||
"shape": "S18" | ||
} | ||
@@ -686,3 +696,3 @@ } | ||
"output": { | ||
"shape": "Sx", | ||
"shape": "Sz", | ||
"resultWrapper": "UpdateConfigurationTemplateResult" | ||
@@ -699,11 +709,12 @@ } | ||
"Tier": { | ||
"shape": "S11" | ||
"shape": "S12" | ||
}, | ||
"VersionLabel": {}, | ||
"TemplateName": {}, | ||
"SolutionStackName": {}, | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
}, | ||
"OptionsToRemove": { | ||
"shape": "S17" | ||
"shape": "S18" | ||
} | ||
@@ -713,3 +724,3 @@ } | ||
"output": { | ||
"shape": "S19", | ||
"shape": "S1a", | ||
"resultWrapper": "UpdateEnvironmentResult" | ||
@@ -730,3 +741,3 @@ } | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
} | ||
@@ -756,11 +767,11 @@ } | ||
"shapes": { | ||
"S9": { | ||
"Sc": { | ||
"type": "structure", | ||
"members": { | ||
"Application": { | ||
"shape": "Sa" | ||
"shape": "Sd" | ||
} | ||
} | ||
}, | ||
"Sa": { | ||
"Sd": { | ||
"type": "structure", | ||
@@ -777,3 +788,3 @@ "members": { | ||
"Versions": { | ||
"shape": "Sd" | ||
"shape": "Sg" | ||
}, | ||
@@ -786,7 +797,7 @@ "ConfigurationTemplates": { | ||
}, | ||
"Sd": { | ||
"Sg": { | ||
"type": "list", | ||
"member": {} | ||
}, | ||
"Si": { | ||
"Sl": { | ||
"type": "structure", | ||
@@ -798,11 +809,11 @@ "members": { | ||
}, | ||
"Sm": { | ||
"Sp": { | ||
"type": "structure", | ||
"members": { | ||
"ApplicationVersion": { | ||
"shape": "Sn" | ||
"shape": "Sq" | ||
} | ||
} | ||
}, | ||
"Sn": { | ||
"Sq": { | ||
"type": "structure", | ||
@@ -814,3 +825,3 @@ "members": { | ||
"SourceBundle": { | ||
"shape": "Si" | ||
"shape": "Sl" | ||
}, | ||
@@ -825,3 +836,3 @@ "DateCreated": { | ||
}, | ||
"Ss": { | ||
"Su": { | ||
"type": "list", | ||
@@ -837,3 +848,3 @@ "member": { | ||
}, | ||
"Sx": { | ||
"Sz": { | ||
"type": "structure", | ||
@@ -854,7 +865,7 @@ "members": { | ||
"OptionSettings": { | ||
"shape": "Ss" | ||
"shape": "Su" | ||
} | ||
} | ||
}, | ||
"S11": { | ||
"S12": { | ||
"type": "structure", | ||
@@ -867,3 +878,3 @@ "members": { | ||
}, | ||
"S17": { | ||
"S18": { | ||
"type": "list", | ||
@@ -878,3 +889,3 @@ "member": { | ||
}, | ||
"S19": { | ||
"S1a": { | ||
"type": "structure", | ||
@@ -898,2 +909,5 @@ "members": { | ||
"Status": {}, | ||
"AbortableOperationInProgress": { | ||
"type": "boolean" | ||
}, | ||
"Health": {}, | ||
@@ -925,3 +939,3 @@ "Resources": { | ||
"Tier": { | ||
"shape": "S11" | ||
"shape": "S12" | ||
} | ||
@@ -928,0 +942,0 @@ } |
@@ -20,3 +20,3 @@ /** | ||
*/ | ||
VERSION: '2.1.21', | ||
VERSION: '2.1.22', | ||
@@ -23,0 +23,0 @@ /** |
@@ -91,2 +91,20 @@ var AWS = require('./core'); | ||
addAsync('COMPUTE_SHA256', 'afterBuild', function COMPUTE_SHA256(req, done) { | ||
if (!req.service.api.signatureVersion) return done(); // none | ||
if (req.service.getSignerClass(req) === AWS.Signers.V4) { | ||
var body = req.httpRequest.body || ''; | ||
AWS.util.computeSha256(body, function(err, sha) { | ||
if (err) { | ||
done(err); | ||
} | ||
else { | ||
req.httpRequest.headers['X-Amz-Content-Sha256'] = sha; | ||
done(); | ||
} | ||
}); | ||
} else { | ||
done(); | ||
} | ||
}); | ||
add('SET_CONTENT_LENGTH', 'afterBuild', function SET_CONTENT_LENGTH(req) { | ||
@@ -93,0 +111,0 @@ if (req.httpRequest.headers['Content-Length'] === undefined) { |
@@ -171,3 +171,2 @@ var AWS = require('../core'); | ||
} | ||
if (runFill) self.fillQueue.call(self); | ||
@@ -208,3 +207,5 @@ }, | ||
self.body = self.service.config.params.Body; | ||
if (!self.body) throw new Error('params.Body is required'); | ||
if (self.body === null || self.body === undefined) { | ||
throw new Error('params.Body is required'); | ||
} | ||
if (typeof self.body === 'string') { | ||
@@ -244,3 +245,3 @@ self.body = new AWS.util.Buffer(self.body); | ||
// try to adjust partSize if we know payload length | ||
if (self.totalBytes) { | ||
if (typeof self.totalBytes === 'number') { | ||
var newPartSize = Math.ceil(self.totalBytes / self.maxTotalParts); | ||
@@ -329,3 +330,4 @@ if (newPartSize > self.partSize) self.partSize = newPartSize; | ||
var bodyLen = byteLength(self.body); | ||
while (self.activeParts < self.queueSize && self.partPos < bodyLen) { | ||
while (!self.isDoneChunking && self.activeParts < self.queueSize | ||
&& self.partPos <= bodyLen) { | ||
var endPos = Math.min(self.partPos + self.partSize, bodyLen); | ||
@@ -356,3 +358,2 @@ var buf = self.sliceFn.call(self.body, self.partPos, endPos); | ||
} | ||
if (self.partBuffer.length >= self.partSize) { | ||
@@ -363,3 +364,3 @@ self.nextChunk(self.partBuffer.slice(0, self.partSize)); | ||
self.totalBytes = self.totalChunkedBytes; | ||
if (self.partBuffer.length > 0) { | ||
if (self.partBuffer.length >= 0) { | ||
self.numParts++; | ||
@@ -371,3 +372,3 @@ self.nextChunk(self.partBuffer); | ||
self.body.read(0); | ||
if (!self.isDoneChunking) self.body.read(0); | ||
}, | ||
@@ -374,0 +375,0 @@ |
@@ -31,3 +31,2 @@ var AWS = require('../core'); | ||
request.addListener('build', this.computeContentMd5); | ||
request.onAsync('build', this.computeSha256); | ||
request.addListener('build', this.computeSseCustomerKeyMd5); | ||
@@ -206,34 +205,2 @@ request.addListener('afterBuild', this.addExpect100Continue); | ||
*/ | ||
computeSha256: function computeSha256(req, done) { | ||
if (req.service.getSignerClass(req) === AWS.Signers.V4) { | ||
var body = req.httpRequest.body || ''; | ||
if (AWS.util.isNode()) { | ||
var Stream = AWS.util.nodeRequire('stream').Stream; | ||
var fs = AWS.util.nodeRequire('fs'); | ||
if (body instanceof Stream) { | ||
if (typeof body.path === 'string') { // assume file object | ||
body = fs.createReadStream(body.path); | ||
} else { // TODO support other stream types | ||
done(new Error('Non-file stream objects are ' + | ||
'not supported with SigV4 in AWS.S3')); | ||
return; | ||
} | ||
} | ||
} | ||
AWS.util.crypto.sha256(body, 'hex', function(err, sha) { | ||
if (!err) { | ||
req.httpRequest.headers['X-Amz-Content-Sha256'] = sha; | ||
} | ||
done(err); | ||
}); | ||
} else { | ||
done(); | ||
} | ||
}, | ||
/** | ||
* @api private | ||
*/ | ||
computeSseCustomerKeyMd5: function computeSseCustomerKeyMd5(req) { | ||
@@ -425,3 +392,3 @@ var headers = [ | ||
request.removeListener('build', request.service.computeContentMd5); | ||
request.removeListener('build', request.service.computeSha256); | ||
request.removeListener('afterBuild', AWS.EventListeners.Core.COMPUTE_SHA256); | ||
} | ||
@@ -428,0 +395,0 @@ }, |
@@ -89,2 +89,4 @@ var AWS = require('../core'); | ||
AWS.EventListeners.Core.SET_CONTENT_LENGTH); | ||
request.removeListener('afterBuild', | ||
AWS.EventListeners.Core.COMPUTE_SHA256); | ||
@@ -91,0 +93,0 @@ request.emit('beforePresign', [request]); |
@@ -739,2 +739,27 @@ /* eslint guard-for-in:0 */ | ||
} | ||
}, | ||
/** | ||
* Compute SHA-256 checksums of streams | ||
* | ||
* @api private | ||
*/ | ||
computeSha256: function computeSha256(body, done) { | ||
if (AWS.util.isNode()) { | ||
var Stream = AWS.util.nodeRequire('stream').Stream; | ||
var fs = AWS.util.nodeRequire('fs'); | ||
if (body instanceof Stream) { | ||
if (typeof body.path === 'string') { // assume file object | ||
body = fs.createReadStream(body.path); | ||
} else { // TODO support other stream types | ||
return done(new Error('Non-file stream objects are ' + | ||
'not supported with SigV4')); | ||
} | ||
} | ||
} | ||
AWS.util.crypto.sha256(body, 'hex', function(err, sha) { | ||
if (err) done(err); | ||
else done(null, sha); | ||
}); | ||
} | ||
@@ -741,0 +766,0 @@ |
{ | ||
"name": "aws-sdk", | ||
"description": "AWS SDK for JavaScript", | ||
"version": "2.1.21", | ||
"version": "2.1.22", | ||
"author": { | ||
@@ -30,3 +30,4 @@ "name":"Amazon Web Services", | ||
"dependencies": { | ||
"xml2js": "0.2.6", | ||
"sax": "0.5.3", | ||
"xml2js": "0.2.8", | ||
"xmlbuilder": "0.4.2" | ||
@@ -33,0 +34,0 @@ }, |
@@ -27,3 +27,3 @@ # AWS SDK for JavaScript | ||
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.21.min.js"></script> | ||
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.22.min.js"></script> | ||
@@ -30,0 +30,0 @@ The AWS SDK is also compatible with [browserify](http://browserify.org). |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1705726
66920
3
+ Addedsax@0.5.3
+ Addedsax@0.5.3(transitive)
+ Addedxml2js@0.2.8(transitive)
- Removedsax@0.4.2(transitive)
- Removedxml2js@0.2.6(transitive)
Updatedxml2js@0.2.8