From e1c712ba15cb48f29932c68e4d5acdab089df2a5 Mon Sep 17 00:00:00 2001 From: Rafal Wilinski Date: Sun, 21 Oct 2018 08:44:07 +0200 Subject: [PATCH 1/2] Move uppercase bucket name error statement --- lib/plugins/aws/lib/validateS3BucketName.js | 53 ++++++++++----------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/lib/plugins/aws/lib/validateS3BucketName.js b/lib/plugins/aws/lib/validateS3BucketName.js index 4db9530fb..ce3483232 100644 --- a/lib/plugins/aws/lib/validateS3BucketName.js +++ b/lib/plugins/aws/lib/validateS3BucketName.js @@ -14,33 +14,32 @@ module.exports = { * @param bucketName */ validateS3BucketName(bucketName) { - return BbPromise.resolve() - .then(() => { - let error; - if (!bucketName) { - error = 'Bucket name cannot be undefined or empty'; - } else if (bucketName.length < 3) { - error = `Bucket name is shorter than 3 characters. ${bucketName}`; - } else if (bucketName.length > 63) { - error = `Bucket name is longer than 63 characters. ${bucketName}`; - } else if (/^[^a-z0-9]/.test(bucketName)) { - error = `Bucket name must start with a letter or number. ${bucketName}`; - } else if (/[^a-z0-9]$/.test(bucketName)) { - error = `Bucket name must end with a letter or number. ${bucketName}`; - } else if (/[A-Z]/.test(bucketName)) { - error = `Bucket name cannot contain uppercase letters. ${bucketName}`; - } else if (!/^[a-z0-9][a-z.0-9-]+[a-z0-9]$/.test(bucketName)) { - error = `Bucket name contains invalid characters, [a-z.0-9-] ${bucketName}`; - } else if (/\.{2,}/.test(bucketName)) { - error = `Bucket name cannot contain consecutive periods (.) ${bucketName}`; - } else if (/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(bucketName)) { - error = `Bucket name cannot look like an IPv4 address. ${bucketName}`; - } + return BbPromise.resolve().then(() => { + let error; + if (!bucketName) { + error = 'Bucket name cannot be undefined or empty'; + } else if (bucketName.length < 3) { + error = `Bucket name is shorter than 3 characters. ${bucketName}`; + } else if (bucketName.length > 63) { + error = `Bucket name is longer than 63 characters. ${bucketName}`; + } else if (/[A-Z]/.test(bucketName)) { + error = `Bucket name cannot contain uppercase letters. ${bucketName}`; + } else if (/^[^a-z0-9]/.test(bucketName)) { + error = `Bucket name must start with a letter or number. ${bucketName}`; + } else if (/[^a-z0-9]$/.test(bucketName)) { + error = `Bucket name must end with a letter or number. ${bucketName}`; + } else if (!/^[a-z0-9][a-z.0-9-]+[a-z0-9]$/.test(bucketName)) { + error = `Bucket name contains invalid characters, [a-z.0-9-] ${bucketName}`; + } else if (/\.{2,}/.test(bucketName)) { + error = `Bucket name cannot contain consecutive periods (.) ${bucketName}`; + } else if (/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(bucketName)) { + error = `Bucket name cannot look like an IPv4 address. ${bucketName}`; + } - if (error) { - throw new this.serverless.classes.Error(error); - } - return true; - }); + if (error) { + throw new this.serverless.classes.Error(error); + } + return true; + }); }, }; From 4cb7cccb3830861b25377a7457f5ff9559463892 Mon Sep 17 00:00:00 2001 From: Rafal Wilinski Date: Sun, 21 Oct 2018 08:45:45 +0200 Subject: [PATCH 2/2] Fix code formatting --- lib/plugins/aws/lib/validateS3BucketName.js | 53 +++++++++++---------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/lib/plugins/aws/lib/validateS3BucketName.js b/lib/plugins/aws/lib/validateS3BucketName.js index ce3483232..22286324e 100644 --- a/lib/plugins/aws/lib/validateS3BucketName.js +++ b/lib/plugins/aws/lib/validateS3BucketName.js @@ -14,32 +14,33 @@ module.exports = { * @param bucketName */ validateS3BucketName(bucketName) { - return BbPromise.resolve().then(() => { - let error; - if (!bucketName) { - error = 'Bucket name cannot be undefined or empty'; - } else if (bucketName.length < 3) { - error = `Bucket name is shorter than 3 characters. ${bucketName}`; - } else if (bucketName.length > 63) { - error = `Bucket name is longer than 63 characters. ${bucketName}`; - } else if (/[A-Z]/.test(bucketName)) { - error = `Bucket name cannot contain uppercase letters. ${bucketName}`; - } else if (/^[^a-z0-9]/.test(bucketName)) { - error = `Bucket name must start with a letter or number. ${bucketName}`; - } else if (/[^a-z0-9]$/.test(bucketName)) { - error = `Bucket name must end with a letter or number. ${bucketName}`; - } else if (!/^[a-z0-9][a-z.0-9-]+[a-z0-9]$/.test(bucketName)) { - error = `Bucket name contains invalid characters, [a-z.0-9-] ${bucketName}`; - } else if (/\.{2,}/.test(bucketName)) { - error = `Bucket name cannot contain consecutive periods (.) ${bucketName}`; - } else if (/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(bucketName)) { - error = `Bucket name cannot look like an IPv4 address. ${bucketName}`; - } + return BbPromise.resolve() + .then(() => { + let error; + if (!bucketName) { + error = 'Bucket name cannot be undefined or empty'; + } else if (bucketName.length < 3) { + error = `Bucket name is shorter than 3 characters. ${bucketName}`; + } else if (bucketName.length > 63) { + error = `Bucket name is longer than 63 characters. ${bucketName}`; + } else if (/[A-Z]/.test(bucketName)) { + error = `Bucket name cannot contain uppercase letters. ${bucketName}`; + } else if (/^[^a-z0-9]/.test(bucketName)) { + error = `Bucket name must start with a letter or number. ${bucketName}`; + } else if (/[^a-z0-9]$/.test(bucketName)) { + error = `Bucket name must end with a letter or number. ${bucketName}`; + } else if (!/^[a-z0-9][a-z.0-9-]+[a-z0-9]$/.test(bucketName)) { + error = `Bucket name contains invalid characters, [a-z.0-9-] ${bucketName}`; + } else if (/\.{2,}/.test(bucketName)) { + error = `Bucket name cannot contain consecutive periods (.) ${bucketName}`; + } else if (/^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/.test(bucketName)) { + error = `Bucket name cannot look like an IPv4 address. ${bucketName}`; + } - if (error) { - throw new this.serverless.classes.Error(error); - } - return true; - }); + if (error) { + throw new this.serverless.classes.Error(error); + } + return true; + }); }, };