From af99bef53be81c4c2045563a3d9be717b11630ed Mon Sep 17 00:00:00 2001 From: Tobias Speicher Date: Sat, 26 Mar 2022 00:55:23 +0100 Subject: [PATCH] chore: replace deprecated String.prototype.substr() .substr() is deprecated so we replace it with .slice() which works similarily but isn't deprecated Signed-off-by: Tobias Speicher --- lib/event-stream/parse-message.js | 10 +++++----- lib/publisher/index.js | 4 ++-- lib/query/query_param_serializer.js | 2 +- lib/service.js | 2 +- lib/services/s3.js | 6 +++--- lib/signers/presign.js | 2 +- lib/signers/v4.js | 4 ++-- lib/signers/v4_credentials.js | 2 +- lib/util.js | 6 +++--- scripts/lib/translator.js | 2 +- .../event-stream/scripts/build-test-vectors-fixture.js | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/event-stream/parse-message.js b/lib/event-stream/parse-message.js index 013493a2c0..94b31fbed6 100644 --- a/lib/event-stream/parse-message.js +++ b/lib/event-stream/parse-message.js @@ -101,11 +101,11 @@ function parseHeaders(headers) { position += 16; out[name] = { type: UUID_TAG, - value: uuidChars.substr(0, 8) + '-' + - uuidChars.substr(8, 4) + '-' + - uuidChars.substr(12, 4) + '-' + - uuidChars.substr(16, 4) + '-' + - uuidChars.substr(20) + value: uuidChars.slice(0, 8) + '-' + + uuidChars.slice(8, 12) + '-' + + uuidChars.slice(12, 16) + '-' + + uuidChars.slice(16, 20) + '-' + + uuidChars.slice(20) }; break; default: diff --git a/lib/publisher/index.js b/lib/publisher/index.js index f40ccf03b8..b84387a241 100644 --- a/lib/publisher/index.js +++ b/lib/publisher/index.js @@ -21,7 +21,7 @@ function Publisher(options) { this.address = options.host || '127.0.0.1'; if (this.clientId.length > 255) { // ClientId has a max length of 255 - this.clientId = this.clientId.substr(0, 255); + this.clientId = this.clientId.slice(0, 255); } this.messagesInFlight = 0; } @@ -53,7 +53,7 @@ Publisher.prototype.trimFields = function(event) { var maxLength = this.fieldsToTrim[field]; var value = event[field]; if (value && value.length > maxLength) { - event[field] = value.substr(0, maxLength); + event[field] = value.slice(0, maxLength); } } } diff --git a/lib/query/query_param_serializer.js b/lib/query/query_param_serializer.js index cac4a5bf37..ab6fa5a169 100644 --- a/lib/query/query_param_serializer.js +++ b/lib/query/query_param_serializer.js @@ -11,7 +11,7 @@ function ucfirst(shape) { if (shape.isQueryName || shape.api.protocol !== 'ec2') { return shape.name; } else { - return shape.name[0].toUpperCase() + shape.name.substr(1); + return shape.name[0].toUpperCase() + shape.name.slice(1); } } diff --git a/lib/service.js b/lib/service.js index ada1989838..6087111d23 100644 --- a/lib/service.js +++ b/lib/service.js @@ -152,7 +152,7 @@ AWS.Service = inherit({ if (keys[i][keys[i].length - 1] !== '*') { selectedVersion = keys[i]; } - if (keys[i].substr(0, 10) <= version) { + if (keys[i].slice(0, 10) <= version) { return selectedVersion; } } diff --git a/lib/services/s3.js b/lib/services/s3.js index 5566719882..45647398c7 100644 --- a/lib/services/s3.js +++ b/lib/services/s3.js @@ -234,9 +234,9 @@ AWS.util.update(AWS.S3.prototype, { if (typeof key === 'string' && slashIndex > 0) { req.params = AWS.util.copy(req.params); // Need to include trailing slash to match sigv2 behavior - var prefix = bucket.substr(slashIndex + 1) || ''; + var prefix = bucket.slice(slashIndex + 1) || ''; req.params.Key = prefix + '/' + key; - req.params.Bucket = bucket.substr(0, slashIndex); + req.params.Bucket = bucket.slice(0, slashIndex); } else if (signatureVersion === 'v4') { var msg = 'Bucket names cannot contain forward slashes. Bucket: ' + bucket; throw AWS.util.error(new Error(), @@ -1124,7 +1124,7 @@ AWS.util.update(AWS.S3.prototype, { expiresInSeconds = expiresInSeconds || 3600; var signingDate = AWS.util.date.iso8601(now).replace(/[:\-]|\.\d{3}/g, ''); - var shortDate = signingDate.substr(0, 8); + var shortDate = signingDate.slice(0, 8); var scope = v4Credentials.createScope(shortDate, region, 's3'); var credential = credentials.accessKeyId + '/' + scope; diff --git a/lib/signers/presign.js b/lib/signers/presign.js index cef15a5531..bb0e8ddb85 100644 --- a/lib/signers/presign.js +++ b/lib/signers/presign.js @@ -46,7 +46,7 @@ function signedUrlSigner(request) { var queryParams = {}; if (parsedUrl.search) { - queryParams = AWS.util.queryStringParse(parsedUrl.search.substr(1)); + queryParams = AWS.util.queryStringParse(parsedUrl.search.slice(1)); } var auth = request.httpRequest.headers['Authorization'].split(' '); diff --git a/lib/signers/v4.js b/lib/signers/v4.js index aa524f43dd..8f441fc093 100644 --- a/lib/signers/v4.js +++ b/lib/signers/v4.js @@ -97,7 +97,7 @@ AWS.Signers.V4 = inherit(AWS.Signers.RequestSigner, { signature: function signature(credentials, datetime) { var signingKey = v4Credentials.getSigningKey( credentials, - datetime.substr(0, 8), + datetime.slice(0, 8), this.request.region, this.serviceName, this.signatureCache @@ -167,7 +167,7 @@ AWS.Signers.V4 = inherit(AWS.Signers.RequestSigner, { credentialString: function credentialString(datetime) { return v4Credentials.createScope( - datetime.substr(0, 8), + datetime.slice(0, 8), this.request.region, this.serviceName ); diff --git a/lib/signers/v4_credentials.js b/lib/signers/v4_credentials.js index 4a5d1ca721..ce012c70be 100644 --- a/lib/signers/v4_credentials.js +++ b/lib/signers/v4_credentials.js @@ -34,7 +34,7 @@ module.exports = { */ createScope: function createScope(date, region, serviceName) { return [ - date.substr(0, 8), + date.slice(0, 8), region, serviceName, v4Identifier diff --git a/lib/util.js b/lib/util.js index f4f54cf7fb..ba959eeb6e 100644 --- a/lib/util.js +++ b/lib/util.js @@ -203,11 +203,11 @@ var util = { }, upperFirst: function upperFirst(string) { - return string[0].toUpperCase() + string.substr(1); + return string[0].toUpperCase() + string.slice(1); }, lowerFirst: function lowerFirst(string) { - return string[0].toLowerCase() + string.substr(1); + return string[0].toLowerCase() + string.slice(1); } }, @@ -490,7 +490,7 @@ var util = { toHex: function toHex(data) { var out = []; for (var i = 0; i < data.length; i++) { - out.push(('0' + data.charCodeAt(i).toString(16)).substr(-2, 2)); + out.push(('0' + data.charCodeAt(i).toString(16)).slice(-2)); } return out.join(''); }, diff --git a/scripts/lib/translator.js b/scripts/lib/translator.js index 2c6825cffe..8451c31430 100644 --- a/scripts/lib/translator.js +++ b/scripts/lib/translator.js @@ -7,7 +7,7 @@ function each(obj, iter) { } function nextString(str) { - return 'S' + (parseInt(str.substr(1), 36) + 1).toString(36); + return 'S' + (parseInt(str.slice(1), 36) + 1).toString(36); } /* End utility methods */ diff --git a/test/event-stream/scripts/build-test-vectors-fixture.js b/test/event-stream/scripts/build-test-vectors-fixture.js index 6090e01661..5f79680c00 100644 --- a/test/event-stream/scripts/build-test-vectors-fixture.js +++ b/test/event-stream/scripts/build-test-vectors-fixture.js @@ -96,7 +96,7 @@ function headerValue(type, vectorRepresentation) { return `new Date(${vectorRepresentation})`; case 9: const hex = Buffer.from(vectorRepresentation, 'base64').toString('hex'); - return `'${hex.substr(0, 8)}-${hex.substr(8, 4)}-${hex.substr(12, 4)}-${hex.substr(16, 4)}-${hex.substr(20)}'`; + return `'${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}'`; default: return vectorRepresentation; }