serverless-simple-middleware 0.0.61 → 0.0.62

package/dist/aws/simple.d.ts

@@ -2,7 +2,7 @@ import { CloudfrontSignedCookiesOutput } from '@aws-sdk/cloudfront-signer';
 import { SimpleAWSConfig } from './config';
 import { SQSMessageBody } from './define';
 import { DynamoDB } from '@aws-sdk/client-dynamodb';
-import { S3 } from '@aws-sdk/client-s3';
+import { S3, Tag } from '@aws-sdk/client-s3';
 import { SQS } from '@aws-sdk/client-sqs';
 import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
 import { PresignerOptions } from '../internal/s3';
@@ -13,6 +13,8 @@ export declare class SimpleAWS {
     private lazySqs;
     private lazyDynamodb;
     private lazyDynamodbAdmin;
+    private static readonly stageTag;
+    private static readonly stringifiedStageTag;
     constructor(config?: SimpleAWSConfig);
     get s3(): S3;
     get sqs(): SQS;
@@ -28,8 +30,8 @@ export declare class SimpleAWS {
     download: (bucket: string, key: string, localPath: string) => Promise<string>;
     readFile: (bucket: string, key: string) => Promise<string>;
     readFileBuffer: (bucket: string, key: string) => Promise<Buffer>;
-    upload: (bucket: string, localPath: string, key: string) => Promise<string>;
-    uploadFromBuffer: (bucket: string, key: string, buffer: Buffer) => Promise<string>;
+    upload: (bucket: string, localPath: string, key: string, tags?: Tag[]) => Promise<string>;
+    uploadFromBuffer: (bucket: string, key: string, buffer: Buffer, tags?: Tag[]) => Promise<string>;
     writeFile: (bucket: string, key: string, content: string) => Promise<void>;
     getSignedUrl(options: PresignerOptions): Promise<string>;
     getSignedCookie: (keyPairId: string, privateKey: string, url: string, expires: number) => CloudfrontSignedCookiesOutput;

package/dist/aws/simple.js

@@ -58,6 +58,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleAWS = void 0;
 var cloudfront_signer_1 = require("@aws-sdk/cloudfront-signer");
+var simple_staging_1 = require("simple-staging");
 var fs = require("fs");
 var os = require("os");
 var non_secure_1 = require("nanoid/non-secure");
@@ -366,7 +367,7 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
-        this.upload = function (bucket, localPath, key) { return __awaiter(_this, void 0, void 0, function () {
+        this.upload = function (bucket, localPath, key, tags) { return __awaiter(_this, void 0, void 0, function () {
             var upload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -381,6 +382,7 @@ var SimpleAWS = /** @class */ (function () {
                             },
                             partSize: 5 * 1024 * 1024, // 5MB
                             queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
                         });
                         return [4 /*yield*/, upload.done()];
                     case 1:
@@ -389,7 +391,7 @@ var SimpleAWS = /** @class */ (function () {
                 }
             });
         }); };
-        this.uploadFromBuffer = function (bucket, key, buffer) { return __awaiter(_this, void 0, void 0, function () {
+        this.uploadFromBuffer = function (bucket, key, buffer, tags) { return __awaiter(_this, void 0, void 0, function () {
             var upload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -404,6 +406,7 @@ var SimpleAWS = /** @class */ (function () {
                             },
                             partSize: 5 * 1024 * 1024, // 5MB
                             queueSize: 4,
+                            tags: __spreadArray([SimpleAWS.stageTag], (tags || []), true),
                         });
                         return [4 /*yield*/, upload.done()];
                     case 1:
@@ -696,12 +699,16 @@ var SimpleAWS = /** @class */ (function () {
     });
     SimpleAWS.prototype.getSignedUrl = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, expiresIn, unhoistableHeaders, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd;
-            return __generator(this, function (_b) {
+            var _a, expiresIn, unhoistableHeaders, tagging, cmd, cmd, cmd, cmd, cmd, cmd, cmd, cmd, tagging, cmd, cmd, cmd, cmd;
+            var _b, _c;
+            return __generator(this, function (_d) {
                 _a = options.expiresIn, expiresIn = _a === void 0 ? 600 : _a, unhoistableHeaders = options.unhoistableHeaders;
                 switch (options.operation) {
                     case 'putObject': {
-                        cmd = new client_s3_1.PutObjectCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        tagging = ((_b = options.params) === null || _b === void 0 ? void 0 : _b.Tagging)
+                            ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+                            : SimpleAWS.stringifiedStageTag;
+                        cmd = new client_s3_1.PutObjectCommand(__assign(__assign({ Bucket: options.bucket, Key: options.key }, options.params), { Tagging: tagging }));
                         return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
                                 expiresIn: expiresIn,
                                 unhoistableHeaders: unhoistableHeaders,
@@ -757,7 +764,10 @@ var SimpleAWS = /** @class */ (function () {
                             })];
                     }
                     case 'createMultipartUpload': {
-                        cmd = new client_s3_1.CreateMultipartUploadCommand(__assign({ Bucket: options.bucket, Key: options.key }, options.params));
+                        tagging = ((_c = options.params) === null || _c === void 0 ? void 0 : _c.Tagging)
+                            ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+                            : SimpleAWS.stringifiedStageTag;
+                        cmd = new client_s3_1.CreateMultipartUploadCommand(__assign(__assign({ Bucket: options.bucket, Key: options.key }, options.params), { Tagging: tagging }));
                         return [2 /*return*/, (0, s3_request_presigner_1.getSignedUrl)(this.s3, cmd, {
                                 expiresIn: expiresIn,
                                 unhoistableHeaders: unhoistableHeaders,
@@ -789,6 +799,11 @@ var SimpleAWS = /** @class */ (function () {
             });
         });
     };
+    SimpleAWS.stageTag = {
+        Key: 'STAGE',
+        Value: simple_staging_1.envDefault.level,
+    };
+    SimpleAWS.stringifiedStageTag = "STAGE=".concat(simple_staging_1.envDefault.level);
     return SimpleAWS;
 }());
 exports.SimpleAWS = SimpleAWS;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "serverless-simple-middleware",
   "description": "Simple middleware to translate the interface of lambda's handler to request => response",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "VoyagerX",

package/src/aws/simple.ts

@@ -3,6 +3,8 @@ import {
   getSignedCookies,
 } from '@aws-sdk/cloudfront-signer';
 
+import { envDefault as currentStage } from 'simple-staging';
+
 import * as fs from 'fs';
 import * as os from 'os';
 import { nanoid } from 'nanoid/non-secure';
@@ -24,6 +26,7 @@ import {
   ListPartsCommand,
   PutObjectCommand,
   S3,
+  Tag,
   UploadPartCommand,
   UploadPartCopyCommand,
 } from '@aws-sdk/client-s3';
@@ -42,6 +45,11 @@ export class SimpleAWS {
   private lazySqs: SQS | undefined;
   private lazyDynamodb: DynamoDBDocument | undefined;
   private lazyDynamodbAdmin: DynamoDB | undefined;
+  private static readonly stageTag: Tag = {
+    Key: 'STAGE',
+    Value: currentStage.level,
+  };
+  private static readonly stringifiedStageTag: string = `STAGE=${currentStage.level}`;
 
   constructor(config?: SimpleAWSConfig) {
     this.config = config || new SimpleAWSConfig();
@@ -301,6 +309,7 @@ export class SimpleAWS {
     bucket: string,
     localPath: string,
     key: string,
+    tags?: Tag[],
   ): Promise<string> => {
     logger.debug(`Upload item[${key}] into bucket[${bucket}]`);
     const upload = new Upload({
@@ -312,6 +321,7 @@ export class SimpleAWS {
       },
       partSize: 5 * 1024 * 1024, // 5MB
       queueSize: 4,
+      tags: [SimpleAWS.stageTag, ...(tags || [])],
     });
 
     await upload.done();
@@ -322,6 +332,7 @@ export class SimpleAWS {
     bucket: string,
     key: string,
     buffer: Buffer,
+    tags?: Tag[],
   ): Promise<string> => {
     logger.debug(`Upload item[${key}] into bucket[${bucket}]`);
     const upload = new Upload({
@@ -333,6 +344,7 @@ export class SimpleAWS {
       },
       partSize: 5 * 1024 * 1024, // 5MB
       queueSize: 4,
+      tags: [SimpleAWS.stageTag, ...(tags || [])],
     });
     await upload.done();
     return key;
@@ -367,10 +379,14 @@ export class SimpleAWS {
     const { expiresIn = 600, unhoistableHeaders } = options;
     switch (options.operation) {
       case 'putObject': {
+        const tagging = options.params?.Tagging
+          ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+          : SimpleAWS.stringifiedStageTag;
         const cmd = new PutObjectCommand({
           Bucket: options.bucket,
           Key: options.key,
           ...options.params,
+          Tagging: tagging,
         });
         return getSignedUrl(this.s3, cmd, {
           expiresIn: expiresIn,
@@ -454,10 +470,14 @@ export class SimpleAWS {
         });
       }
       case 'createMultipartUpload': {
+        const tagging = options.params?.Tagging
+          ? SimpleAWS.stringifiedStageTag + '&' + options.params.Tagging
+          : SimpleAWS.stringifiedStageTag;
         const cmd = new CreateMultipartUploadCommand({
           Bucket: options.bucket,
           Key: options.key,
           ...options.params,
+          Tagging: tagging,
         });
         return getSignedUrl(this.s3, cmd, {
           expiresIn: expiresIn,