update aws package (#4)

* update aws package

* add link with available AWS regions to readme && fixes

* update package.json to version 0.4.0

Author: devfilatov

README.md

@@ -26,9 +26,12 @@ $ ucdn upload -c /path/to/config/file.yaml -C production
 
 All following options except `config` and `config-key` can be configured using the config file.
 
+Available AWS regions can be viewed at https://docs.aws.amazon.com/sns/latest/dg/sns-supported-regions-countries.html.
+
 ```
 --config, -c                            path to config file     [default: "./ucdn.yml"]
 --config-key, -C                        root config key         [default: null]
+--region, -r                            AWS geographical area   [default: "eu-west-1"]
 --dir, -d                               assets directory        [default: "dist/"]
 --bucket, -b                            AWS bucket for upload   [required]
 --exclude, -e                           excluded extenstions    [default: ["html","gz"]]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbrellio/ucdn",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "bin": "ucdn",
   "main": "index.js",
   "repository": "git@github.com:umbrellio/ucdn.git",
@@ -11,7 +11,7 @@
     "lint": "eslint . ucdn"
   },
   "dependencies": {
-    "aws-sdk": "2.701.0",
+    "@aws-sdk/client-s3": "^3.19.0",
     "js-yaml": "^3.14.0",
     "mime-types": "^2.1.27",
     "yargs": "^15.3.1"

ucdn

@@ -15,6 +15,12 @@ const yargsOptions = {
     default: "./ucdn.yml",
     type: "string",
   },
+  region: {
+    alias: "r",
+    describe: "AWS geographical area",
+    default: "eu-west-1",
+    type: "string",
+  },
   dir: {
     alias: "d",
     describe: "assets directory",

upload.js

@@ -1,10 +1,10 @@
 const fs = require("fs")
 const path = require("path")
 const mime = require("mime-types")
-const AWS = require("aws-sdk")
+const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
 
-const s3 = new AWS.S3()
 const configDefaults = {
+  region: null,
   dir: null,
   bucket: null,
   exclude: [],
@@ -29,7 +29,7 @@ const findFiles = directory => {
 
 const getKey = (file, root) => path.relative(root, file)
 
-const uploadFile = (config, file, key) => new Promise((resolve, reject) => {
+const uploadFile = (s3, config, file, key) => new Promise((resolve, reject) => {
   const { bucket } = config
   const stream = fs.createReadStream(file)
   const basename = path.basename(file)
@@ -41,20 +41,22 @@ const uploadFile = (config, file, key) => new Promise((resolve, reject) => {
   }
 
   stream.on("error", reject)
-  s3.upload(params, (err, data) => {
-    stream.close()
-    if (err) reject(err)
-    else resolve(data)
-  })
+  s3.send(new PutObjectCommand(params))
+    .then(data => resolve(data))
+    .catch(err => reject(err))
+    .finally(() => stream.close())
 })
 
 const upload = argv => {
   const config = getConfig(argv)
-  const { accessKeyId, secretAccessKey, dir, exclude } = config
+  const { region, accessKeyId, secretAccessKey, dir, exclude } = config
 
-  AWS.config.update({
-    accessKeyId: accessKeyId || "unknown",
-    secretAccessKey: secretAccessKey || "unknown",
+  const s3 = new S3Client({
+    region,
+    credentials: {
+      accessKeyId: accessKeyId || "unknown",
+      secretAccessKey: secretAccessKey || "unknown",
+    }
   })
 
   const directory = path.resolve(dir)
@@ -65,8 +67,8 @@ const upload = argv => {
 
   const promises = files.map(file => {
     const key = getKey(file, directory)
-    return uploadFile(config, file, key)
-      .then(data => console.log("Uploaded", data.Location))
+    return uploadFile(s3, config, file, key)
+      .then(() => console.log("Uploaded", file))
   })
 
   return Promise.all(promises)