@pi-r/aws-v3 0.10.1 → 0.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/client/index.js CHANGED
@@ -220,22 +220,27 @@ async function setBucketTagging(credential, Bucket, options, service = "aws-v3",
220
220
  return false;
221
221
  }
222
222
  const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
223
- const deleting = options.Tagging.TagSet.length === 0;
224
- const command = () => {
225
- this.formatMessage(64, service, [deleting ? "Tags deleted" : "Tags created", Bucket], null, { ...Cloud.LOG_CLOUD_COMMAND });
223
+ let command, message;
224
+ if (options.Tagging.TagSet.length === 0) {
225
+ command = new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner });
226
+ message = "Tags deleted";
227
+ }
228
+ else {
229
+ options.Bucket = Bucket;
230
+ command = new AWS.PutBucketTaggingCommand(options);
231
+ message = "Tags created";
232
+ }
233
+ return client.send(command)
234
+ .then(() => {
235
+ this.formatMessage(64, service, [message, Bucket], null, { ...Cloud.LOG_CLOUD_COMMAND });
226
236
  return true;
227
- };
228
- const error = (err) => {
237
+ })
238
+ .catch((err) => {
229
239
  if (!isNoSuchBucket(err)) {
230
240
  this.formatFail(64, service, ["Unable to update bucket tagging", Bucket], err, { ...Cloud.LOG_CLOUD_FAIL, fatal: false });
231
241
  }
232
242
  return false;
233
- };
234
- if (deleting) {
235
- return client.send(new AWS.DeleteBucketTaggingCommand({ Bucket, ExpectedBucketOwner: options.ExpectedBucketOwner })).then(command).catch(error);
236
- }
237
- options.Bucket = Bucket;
238
- return client.send(new AWS.PutBucketTaggingCommand(options)).then(command).catch(error);
243
+ });
239
244
  }
240
245
  async function setBucketWebsite(credential, Bucket, options, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
241
246
  const [client, AWS] = createStorageClient.call(this, credential, service, sdk);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pi-r/aws-v3",
3
- "version": "0.10.1",
3
+ "version": "0.10.2",
4
4
  "description": "AWS cloud functions for E-mc.",
5
5
  "main": "client/index.js",
6
6
  "publishConfig": {
@@ -19,14 +19,14 @@
19
19
  "license": "MIT",
20
20
  "homepage": "https://github.com/anpham6/pi-r#readme",
21
21
  "dependencies": {
22
- "@e-mc/cloud": "^0.12.3",
23
- "@e-mc/module": "^0.12.3",
24
- "@e-mc/types": "^0.12.3",
25
- "@pi-r/aws-lib": "^0.10.1",
26
- "@aws-sdk/client-dynamodb": "^3.808.0",
27
- "@aws-sdk/client-s3": "^3.808.0",
22
+ "@e-mc/cloud": "^0.12.5",
23
+ "@e-mc/module": "^0.12.5",
24
+ "@e-mc/types": "^0.12.5",
25
+ "@pi-r/aws-lib": "^0.10.2",
26
+ "@aws-sdk/client-dynamodb": "^3.864.0",
27
+ "@aws-sdk/client-s3": "^3.864.0",
28
28
  "@aws-sdk/credential-providers": "*",
29
- "@aws-sdk/lib-dynamodb": "^3.808.0",
30
- "@aws-sdk/lib-storage": "^3.808.0"
29
+ "@aws-sdk/lib-dynamodb": "^3.864.0",
30
+ "@aws-sdk/lib-storage": "^3.864.0"
31
31
  }
32
32
  }
package/upload/index.js CHANGED
@@ -202,7 +202,7 @@ function upload(credential, service = "aws-v3", sdk = "@aws-sdk/client-s3") {
202
202
  this.formatMessage(64, service, "Upload success", url, { ...Cloud.LOG_CLOUD_UPLOAD });
203
203
  if (first) {
204
204
  if (length === 0) {
205
- client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), error => {
205
+ client.send(new AWS.DeleteObjectTaggingCommand({ Bucket, Key: params.Key, ExpectedBucketOwner: params.ExpectedBucketOwner }), (error) => {
206
206
  if (!error) {
207
207
  this.formatMessage(64, service, ["Tags deleted", Bucket], params.Key, { ...Cloud.LOG_CLOUD_COMMAND });
208
208
  }