serverless-vpc-discovery 4.1.0 → 5.0.1

package/.eslintrc.json

@@ -38,4 +38,4 @@
     ],
     "guard-for-in": "error"
   }
-}
+}

package/README.md

@@ -1,14 +1,17 @@
 # serverless-vpc-discovery
+
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
 [![Build Status](https://travis-ci.org/amplify-education/serverless-vpc-discovery.svg?branch=master)](https://travis-ci.org/amplify-education/serverless-vpc-discovery)
 [![npm version](https://badge.fury.io/js/serverless-vpc-discovery.svg)](https://badge.fury.io/js/serverless-vpc-discovery)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/amplify-education/serverless-vpc-discovery/master/LICENSE)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c3ba87d04fe24b8f881252705e51cc29)](https://www.codacy.com/app/CFER/serverless-vpc-discovery?utm_source=github.com&utm_medium=referral&utm_content=amplify-education/serverless-vpc-discovery&utm_campaign=badger)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/8135a66ac35648758d22e242fbdbd732)](https://app.codacy.com/gh/amplify-education/serverless-vpc-discovery/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![npm downloads](https://img.shields.io/npm/dt/serverless-vpc-discovery.svg?style=flat)](https://www.npmjs.com/package/serverless-vpc-discovery)
 
-The vpc discovery plugin takes the given vpc name, subnet tag key/value, and security group tag key/value or names in the serverless file to setup the vpc configuration for the lambda.
+The vpc discovery plugin takes the given vpc name, subnet tag key/value, and security group tag key/value or names in
+the serverless file to setup the vpc configuration for the lambda.
 
 Basically we use this config:
+
 ```
 vpcDiscovery:
     vpcName: '<vpc_name>'
@@ -21,7 +24,9 @@ vpcDiscovery:
         tagValues:
           - '<tag_value>'
 ```
+
 To generate this config:
+
 ```
 vpc:
     subnetIds:
@@ -31,30 +36,43 @@ vpc:
         - sg-123456789
         ...
 ```
+
 For each lambda function.
-      
-> Note: The core serverless `provider.vpc` settings will be used, if they are set, instead of `vpcDiscovery`. You can use also mix settings. For example you may set `provider.vpc.subnetIds` while using `vpcDiscovery` to set the `securityGroupIds`. Take a look at [official documentation](https://www.serverless.com/framework/docs/providers/aws/guide/functions#vpc-configuration). 
+
+> Note: The core serverless `provider.vpc` settings will be used, if they are set, instead of `vpcDiscovery`. You can
+> use also mix settings. For example you may set `provider.vpc.subnetIds` while using `vpcDiscovery` to set
+> the `securityGroupIds`. Take a look
+> at [official documentation](https://www.serverless.com/framework/docs/providers/aws/guide/functions#vpc-configuration).
 
 # About Amplify
-Amplify builds innovative and compelling digital educational products that empower teachers and students across the country. We have a long history as the leading innovator in K-12 education - and have been described as the best tech company in education and the best education company in tech. While others try to shrink the learning experience into the technology, we use technology to expand what is possible in real classrooms with real students and teachers.
+
+Amplify builds innovative and compelling digital educational products that empower teachers and students across the
+country. We have a long history as the leading innovator in K-12 education - and have been described as the best tech
+company in education and the best education company in tech. While others try to shrink the learning experience into the
+technology, we use technology to expand what is possible in real classrooms with real students and teachers.
 
 Learn more at https://www.amplify.com
 
 # Getting Started
 
 ## Prerequisites
+
 Make sure you have the following installed before starting:
+
 * [nodejs](https://nodejs.org/en/download/)
-* [npm](https://www.npmjs.com/get-npm?utm_source=house&utm_medium=homepage&utm_campaign=free%20orgs&utm_term=Install%20npm)
+* [npm](https://www.npmjs.com/get-npm?utm_source=house\&utm_medium=homepage\&utm_campaign=free%20orgs\&utm_term=Install%20npm)
 * [serverless](https://serverless.com/framework/docs/providers/aws/guide/installation/)
 
 Also allow the lambda to have the following IAM permissions:
+
 * ec2:CreateNetworkInterface
 * ec2:DescribeNetworkInterfaces
 * ec2:DeleteNetworkInterface
 
 ## Installation
+
 Run:
+
 ```
 # From npm (recommended)
 npm install serverless-vpc-discovery
@@ -62,7 +80,9 @@ npm install serverless-vpc-discovery
 # From github
 npm install https://github.com/amplify-education/serverless-vpc-discovery.git
 ```
+
 Then make the following edits to your serverless.yaml file:
+
 ```yaml
 plugins:
   - serverless-vpc-discovery
@@ -71,12 +91,12 @@ plugins:
 custom:
   vpcDiscovery:
     vpcName: '<vpc_name>'
-    
+
     # optional if `securityGroups` option is specified
     # list of tag key and values 
     subnets:
       - tagKey: <tag_name>
-        
+
         # an array of values
         tagValues:
           - '<tag_value>'
@@ -85,96 +105,103 @@ custom:
     # list of tag key and value or names
     securityGroups:
       - tagKey: <tag_name>
-        
+
         # an array of values
         tagValues:
           - '<tag_value>'
-      
+
       # optional if `tagKey` and `tagValues` are specified
       # an array of values
       - names:
-        - '<security_group_name>'
+          - '<security_group_name>'
 
 # Optional: Either set `custom.vpcDiscovery` or `functions.<function name>.vpcDiscovery`
 functions:
   example:
     handler: handler.example
     # inherit `custom.vpcDiscovery` config in case `custom.vpcDiscovery` is specified
-  
+
   example2:
     handler: handler.example
-    
+
     # skip vpc configuration for the current function
     vpcDiscovery: false
-    
+
   example3:
     handler: handler.example
-    
+
     # inherit `custom.vpcDiscovery` config in case `custom.vpcDiscovery` is specified and override security group names
     vpcDiscovery:
       vpcName: '<vpc_name>'
       securityGroups:
         - tagKey: <tag_name>
-          
+
           # an array of values
           tagValues:
             - '<tag_value>'
-  
+
   example4:
     handler: handler.example
     # override or set basic subnets and security groups items
     vpcDiscovery:
       vpcName: '<vpc_name>'
-      
+
       # optional if `custom.vpcDiscovery.securityGroups` option is specified
-      subnets: 
+      subnets:
         - tagKey: <tag_name>
-          
+
           # an array of values
           tagValues:
             - '<tag_value>'
 
       # optional if `custom.vpcDiscovery.subnets` option is specified
-      securityGroups: 
-        
+      securityGroups:
+
         # optional if `names` option is specified
         - tagKey: <tag_name>
-          
+
           # an array of values
           tagValues:
             - '<tag_value>'
-        
+
         # optional if `tagKey` and `tagValues` are specified
         # an array of values
-        - names: 
-          - '<security_group_name>'
+        - names:
+            - '<security_group_name>'
 ```
 
 ## Running Tests
+
 To run the test:
+
 ```
 npm test
 ```
+
 All tests should pass.
 
-To run integration tests, set an environment variable TEST_VPC_NAME to the VPC you will be testing for. Then,
+To run integration tests, set an environment variable TEST\_VPC\_NAME to the VPC you will be testing for. Then,
+
 ```
 export AWS_PROFILE=your_profile
 export TEST_VPC_NAME=vpc_name
-npm build
+npm run build
 npm run integration-test
 ```
 
-If there is an error build and install the node_module inside the serverless-vpc-discovery folder:
+If there is an error build and install the node\_module inside the serverless-vpc-discovery folder:
+
 ```
 npm build
 npm install .
 ```
 
 ## Deploying with the plugin
+
 When deploying run:
+
 ```
-serverless deploy --env 'VPC Name'
+serverless deploy
 ```
 
 And that should be it! Good Luck!
@@ -185,14 +212,18 @@ The vpc, subnets, and security groups are found by filtering based on a specifie
 Vpc and subnets are found under the tag name `tag:Name`.
 Security groups are found by the name of the group under `group-name`.
 
-The vpc is found first as it is used to find the subnets and security groups. Once all of the subnets and security groups are found the serverless service provider creates a vpc object and stores the subnets and security groups.
+The vpc is found first as it is used to find the subnets and security groups. Once all of the subnets and security
+groups are found the serverless service provider creates a vpc object and stores the subnets and security groups.
 
 # Responsible Disclosure
+
 If you have any security issue to report, contact project maintainers privately.
 You can reach us at <github@amplify.com>
 
 # Contributing
+
 We welcome pull requests! For your pull request to be accepted smoothly, we suggest that you:
+
 1. For any sizable change, first open a GitHub issue to discuss your idea.
-2. Create a pull request.  Explain why you want to make the change and what it’s for.
-We’ll try to answer any PR’s promptly.
+2. Create a pull request. Explain why you want to make the change and what it’s for.
+   We’ll try to answer any PR’s promptly.

package/dist/src/aws/ec2-wrapper.js

@@ -8,13 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EC2Wrapper = void 0;
-const aws_sdk_1 = require("aws-sdk");
 const utils_1 = require("../utils");
+const client_ec2_1 = require("@aws-sdk/client-ec2");
+const globals_1 = __importDefault(require("../globals"));
 class EC2Wrapper {
     constructor(credentials) {
-        this.ec2 = new aws_sdk_1.EC2(credentials);
+        this.ec2 = new client_ec2_1.EC2Client([{
+                credentials,
+                region: globals_1.default.getRegion(),
+                retryStrategy: globals_1.default.getRetryStrategy()
+            }]);
+    }
+    /**
+     *  Returns the promise that contains the vpc list
+     * @returns {Promise.<Vpc[]>}
+     */
+    getVpcs() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, utils_1.getAWSPagedResults)(this.ec2, "Vpcs", "NextToken", "NextToken", new client_ec2_1.DescribeVpcsCommand({}));
+        });
     }
     /**
      *  Returns the promise that contains the vpc-id
@@ -23,13 +40,12 @@ class EC2Wrapper {
      */
     getVpcId(vpcName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const params = {
+            const vpcItems = yield (0, utils_1.getAWSPagedResults)(this.ec2, "Vpcs", "NextToken", "NextToken", new client_ec2_1.DescribeVpcsCommand({
                 Filters: [{
                         Name: "tag:Name",
                         Values: [vpcName]
                     }]
-            };
-            const vpcItems = yield utils_1.getAWSPagedResults(this.ec2, "describeVpcs", "Vpcs", "NextToken", "NextToken", params);
+            }));
             if (vpcItems.length === 0) {
                 throw new Error(`VPC with tag key 'Name' and tag value '${vpcName}' does not exist.`);
             }
@@ -46,7 +62,7 @@ class EC2Wrapper {
      */
     getSubnetIds(vpcId, tagKey, tagValues) {
         return __awaiter(this, void 0, void 0, function* () {
-            const params = {
+            const subnets = yield (0, utils_1.getAWSPagedResults)(this.ec2, "Subnets", "NextToken", "NextToken", new client_ec2_1.DescribeSubnetsCommand({
                 Filters: [{
                         Name: "vpc-id",
                         Values: [vpcId]
@@ -54,12 +70,11 @@ class EC2Wrapper {
                         Name: `tag:${tagKey}`,
                         Values: tagValues
                     }]
-            };
-            const subnets = yield utils_1.getAWSPagedResults(this.ec2, "describeSubnets", "Subnets", "NextToken", "NextToken", params);
+            }));
             const missingSubnetValues = tagValues.filter((tagValue) => {
                 // collect subnets by name
                 const subnetsByName = subnets.filter((subnet) => {
-                    return utils_1.wildcardMatches(tagValue, utils_1.getValueFromTags(subnet.Tags, tagKey));
+                    return (0, utils_1.wildcardMatches)(tagValue, (0, utils_1.getValueFromTags)(subnet.Tags, tagKey));
                 });
                 return subnetsByName.length === 0;
             });
@@ -81,16 +96,16 @@ class EC2Wrapper {
     getSecurityGroupIds(vpcId, names, tagKey, tagValues) {
         return __awaiter(this, void 0, void 0, function* () {
             // init filter by vpc id
-            const params = { Filters: [{ Name: "vpc-id", Values: [vpcId] }] };
+            const input = { Filters: [{ Name: "vpc-id", Values: [vpcId] }] };
             // update filters with names if specified
             if (names) {
-                params.Filters.push({ Name: "group-name", Values: names });
+                input.Filters.push({ Name: "group-name", Values: names });
             }
             // update filters with tag and values if specified
             if (tagKey && tagValues) {
-                params.Filters.push({ Name: `tag:${tagKey}`, Values: tagValues });
+                input.Filters.push({ Name: `tag:${tagKey}`, Values: tagValues });
             }
-            const securityGroups = yield utils_1.getAWSPagedResults(this.ec2, "describeSecurityGroups", "SecurityGroups", "NextToken", "NextToken", params);
+            const securityGroups = yield (0, utils_1.getAWSPagedResults)(this.ec2, "SecurityGroups", "NextToken", "NextToken", new client_ec2_1.DescribeSecurityGroupsCommand(input));
             if (securityGroups.length === 0) {
                 const namesErrorText = names ? `, names '${names}'` : "";
                 const tagErrorText = tagKey && tagValues ? `, tag key '${tagKey}' and tag values '${tagValues}'` : "";
@@ -100,7 +115,7 @@ class EC2Wrapper {
                 const missingGroupsNames = names.filter((groupName) => {
                     // collect security groups by name
                     const securityGroupsByName = securityGroups.filter((securityGroup) => {
-                        return utils_1.wildcardMatches(groupName, securityGroup.GroupName);
+                        return (0, utils_1.wildcardMatches)(groupName, securityGroup.GroupName);
                     });
                     return securityGroupsByName.length === 0;
                 });
@@ -114,7 +129,7 @@ class EC2Wrapper {
                 const missingGroupsTagNames = tagValues.filter((tagValue) => {
                     // collect subnets by name
                     const groupsByName = securityGroups.filter((securityGroup) => {
-                        const groupTagValue = utils_1.getValueFromTags(securityGroup.Tags, tagKey);
+                        const groupTagValue = (0, utils_1.getValueFromTags)(securityGroup.Tags, tagKey);
                         return groupTagValue === tagValue;
                     });
                     return groupsByName.length === 0;

package/dist/src/common/lambda-function.js

@@ -14,11 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LambdaFunction = void 0;
 const ec2_wrapper_1 = require("../aws/ec2-wrapper");
-const globals_1 = __importDefault(require("../globals"));
 const utils_1 = require("../utils");
 const validation_1 = require("../validation");
+const logging_1 = __importDefault(require("../logging"));
+const ts_md5_1 = require("ts-md5");
 class LambdaFunction {
     constructor(credentials, basicVPCDiscovery) {
+        this.vpcIdsCache = {};
+        this.subnetsIdsCache = {};
+        this.SGIdsCache = {};
         this.ec2Wrapper = new ec2_wrapper_1.EC2Wrapper(credentials);
         this.basicVPCDiscovery = basicVPCDiscovery;
     }
@@ -30,29 +34,29 @@ class LambdaFunction {
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof funcVPCDiscovery === "boolean" && !funcVPCDiscovery) {
                 // skip vpc setup for `vpcDiscovery=false` option
-                globals_1.default.logInfo(`Skipping VPC config for the function '${funcName}'`);
+                logging_1.default.logInfo(`Skipping VPC config for the function '${funcName}'`);
                 return null;
             }
             // inherit the `custom.vpcDiscovery`
             const vpcDiscovery = Object.assign({}, this.basicVPCDiscovery, funcVPCDiscovery);
             // return null in case vpcDiscovery not setup
-            if (utils_1.isObjectEmpty(vpcDiscovery)) {
+            if ((0, utils_1.isObjectEmpty)(vpcDiscovery)) {
                 return null;
             }
             // validate func vpcDiscovery config
             try {
-                validation_1.validateVPCDiscoveryConfig(vpcDiscovery);
+                (0, validation_1.validateVPCDiscoveryConfig)(vpcDiscovery);
             }
             catch (e) {
                 throw new Error(`Function '${funcName}' is not configured correctly: ${e} VPC not configured. ` +
                     "Please see the README for the proper setup.");
             }
             try {
-                globals_1.default.logInfo(`Getting VPC config for the function: '${funcName}'\n`);
+                logging_1.default.logInfo(`Getting VPC config for the function: '${funcName}'\n`);
                 return yield this.getVpcConfig(vpcDiscovery);
             }
             catch (e) {
-                globals_1.default.logError(`Function '${funcName}' VPC not configured based on the error: ${e}`);
+                logging_1.default.logError(`Function '${funcName}' VPC not configured based on the error: ${e}`);
             }
             return null;
         });
@@ -65,12 +69,12 @@ class LambdaFunction {
     getVpcConfig(vpcDiscovery) {
         return __awaiter(this, void 0, void 0, function* () {
             const vpc = {};
-            const vpcId = yield this.ec2Wrapper.getVpcId(vpcDiscovery.vpcName);
-            globals_1.default.logInfo(`Found VPC with id '${vpcId}'`);
+            const vpcId = yield this.getVPCId(vpcDiscovery.vpcName);
+            logging_1.default.logInfo(`Found VPC with id '${vpcId}'`);
             if (vpcDiscovery.subnets) {
                 vpc.subnetIds = [];
                 for (const subnet of vpcDiscovery.subnets) {
-                    const subnetIds = yield this.ec2Wrapper.getSubnetIds(vpcId, subnet.tagKey, subnet.tagValues);
+                    const subnetIds = yield this.getVPCSubnets(vpcId, subnet.tagKey, subnet.tagValues);
                     vpc.subnetIds = vpc.subnetIds.concat(subnetIds);
                 }
                 // remove duplicate elements from the array
@@ -79,7 +83,7 @@ class LambdaFunction {
             if (vpcDiscovery.securityGroups) {
                 vpc.securityGroupIds = [];
                 for (const group of vpcDiscovery.securityGroups) {
-                    const groupIds = yield this.ec2Wrapper.getSecurityGroupIds(vpcId, group.names, group.tagKey, group.tagValues);
+                    const groupIds = yield this.getVPCSecurityGroups(vpcId, group.names, group.tagKey, group.tagValues);
                     vpc.securityGroupIds = vpc.securityGroupIds.concat(groupIds);
                 }
                 // remove duplicate elements from the array
@@ -88,5 +92,43 @@ class LambdaFunction {
             return vpc;
         });
     }
+    /**
+     * Get the VPC id from cache or read from AWS
+     * @returns {Promise<object>}
+     */
+    getVPCId(vpcName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.vpcIdsCache[vpcName] === undefined) {
+                this.vpcIdsCache[vpcName] = yield this.ec2Wrapper.getVpcId(vpcName);
+            }
+            return this.vpcIdsCache[vpcName];
+        });
+    }
+    /**
+     * Get the subnet ids from cache or read from AWS
+     * @returns {Promise<object>}
+     */
+    getVPCSubnets(vpcId, tagKey, tagValues) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hash = ts_md5_1.Md5.hashStr(vpcId + tagKey + tagValues.join());
+            if (!this.subnetsIdsCache[hash]) {
+                this.subnetsIdsCache[hash] = yield this.ec2Wrapper.getSubnetIds(vpcId, tagKey, tagValues);
+            }
+            return this.subnetsIdsCache[hash];
+        });
+    }
+    /**
+     * Get the security group ids from cache or read from AWS
+     * @returns {Promise<object>}
+     */
+    getVPCSecurityGroups(vpcId, names, tagKey, tagValues) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hash = ts_md5_1.Md5.hashStr(vpcId + (names || []).join() + tagKey + (tagValues || []).join());
+            if (!this.SGIdsCache[hash]) {
+                this.SGIdsCache[hash] = yield this.ec2Wrapper.getSecurityGroupIds(vpcId, names, tagKey, tagValues);
+            }
+            return this.SGIdsCache[hash];
+        });
+    }
 }
 exports.LambdaFunction = LambdaFunction;

package/dist/src/globals.js

@@ -1,42 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const util_retry_1 = require("@smithy/util-retry");
+const credential_providers_1 = require("@aws-sdk/credential-providers");
 class Globals {
-    static cliLog(prefix, message) {
-        Globals.serverless.cli.log(`${prefix} ${message}`, Globals.pluginName);
+    static getRegion() {
+        const slsRegion = Globals.options.region || Globals.serverless.service.provider.region;
+        return slsRegion || Globals.currentRegion || Globals.defaultRegion;
     }
-    /**
-     * Logs error message
-     */
-    static logError(message) {
-        if (Globals.v3Utils) {
-            Globals.v3Utils.log.error(message);
-        }
-        else {
-            Globals.cliLog("[Error]", message);
-        }
+    static getProfileCreds(profile) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, credential_providers_1.fromIni)({ profile })();
+        });
     }
-    /**
-     * Logs info message
-     */
-    static logInfo(message) {
-        if (Globals.v3Utils) {
-            Globals.v3Utils.log.verbose(message);
-        }
-        else {
-            Globals.cliLog("[Info]", message);
-        }
-    }
-    /**
-     * Logs warning message
-     */
-    static logWarning(message) {
-        if (Globals.v3Utils) {
-            Globals.v3Utils.log.warning(message);
-        }
-        else {
-            Globals.cliLog("[WARNING]", message);
-        }
+    static getRetryStrategy(attempts = 3, delay = 3000, backoff = 500) {
+        return new util_retry_1.ConfiguredRetryStrategy(attempts, // max attempts.
+        // This example sets the backoff at 500ms plus 3s per attempt.
+        // https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/modules/_aws_sdk_util_retry.html#aws-sdkutil-retry
+        (attempt) => backoff + attempt * delay // backoff function.
+        );
     }
 }
-exports.default = Globals;
 Globals.pluginName = "Serverless VPC Discovery";
+Globals.defaultRegion = "us-east-1";
+exports.default = Globals;

package/dist/src/index.js

@@ -15,11 +15,15 @@ const lambda_function_1 = require("./common/lambda-function");
 const globals_1 = __importDefault(require("./globals"));
 const validation_1 = require("./validation");
 const schema_1 = require("./schema");
+const logging_1 = __importDefault(require("./logging"));
+const node_config_provider_1 = require("@smithy/node-config-provider");
+const config_resolver_1 = require("@smithy/config-resolver");
 class VPCPlugin {
     constructor(serverless, options, v3Utils) {
         this.serverless = serverless;
         globals_1.default.serverless = serverless;
-        if (v3Utils) {
+        globals_1.default.options = options;
+        if (v3Utils === null || v3Utils === void 0 ? void 0 : v3Utils.log) {
             globals_1.default.v3Utils = v3Utils;
         }
         /* hooks are the actual code that will run when called */
@@ -36,7 +40,7 @@ class VPCPlugin {
     hookWrapper(lifecycleFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             this.validateCustomVPCDiscoveryConfig();
-            this.initResources();
+            yield this.initResources();
             return yield lifecycleFunc.call(this);
         });
     }
@@ -53,7 +57,7 @@ class VPCPlugin {
             try {
                 // the validateVPCDiscoveryConfig is general for custom and func configs
                 // so try catch for extend error message with `custom.vpcDiscovery` as a source
-                validation_1.validateVPCDiscoveryConfig(vpcDiscovery);
+                (0, validation_1.validateVPCDiscoveryConfig)(vpcDiscovery);
             }
             catch (e) {
                 throw new Error(`The \`custom.vpcDiscovery\` is not configured correctly: \n${e} ` + " Please see README for proper setup.");
@@ -74,24 +78,55 @@ class VPCPlugin {
                 if (vpcDiscovery.securityGroupNames) {
                     vpcDiscovery.securityGroups = [{ names: vpcDiscovery.securityGroupNames }];
                 }
-                globals_1.default.logWarning("The `vpcDiscovery.subnetNames` and `vpcDiscovery.securityGroupNames` options are deprecated " +
+                logging_1.default.logWarning("The `vpcDiscovery.subnetNames` and `vpcDiscovery.securityGroupNames` options are deprecated " +
                     "and will be removed in the future. Please see README for proper setup.");
             }
-            else {
-                // log warning in case mixed config are specified
-                globals_1.default.logWarning("The `vpcDiscovery.subnetNames` and `vpcDiscovery.securityGroupNames` are deprecated " +
-                    "and will not be applied. Please remove mentioned option to not see this warning message.");
-            }
         }
     }
     /**
      * Setup AWS resources
      */
     initResources() {
-        this.awsCredentials = this.serverless.providers.aws.getCredentials();
-        this.awsCredentials.region = this.serverless.providers.aws.getRegion();
-        const baseVPCDiscovery = this.serverless.service.custom ? this.serverless.service.custom.vpcDiscovery : null;
-        this.lambdaFunction = new lambda_function_1.LambdaFunction(this.awsCredentials, baseVPCDiscovery);
+        return __awaiter(this, void 0, void 0, function* () {
+            // setup AWS resources
+            yield this.initSLSCredentials();
+            yield this.initAWSRegion();
+            const baseVPCDiscovery = this.serverless.service.custom ? this.serverless.service.custom.vpcDiscovery : null;
+            this.lambdaFunction = new lambda_function_1.LambdaFunction(globals_1.default.credentials, baseVPCDiscovery);
+            // start of the legacy AWS SDK V2 creds support
+            // TODO: remove it in case serverless will add V3 support
+            try {
+                yield this.lambdaFunction.ec2Wrapper.getVpcs();
+            }
+            catch (error) {
+                if (error.message.includes("Could not load credentials from any providers")) {
+                    globals_1.default.credentials = this.serverless.providers.aws.getCredentials();
+                    this.lambdaFunction = new lambda_function_1.LambdaFunction(globals_1.default.credentials, baseVPCDiscovery);
+                }
+            }
+        });
+    }
+    /**
+     * Init AWS credentials based on sls `provider.profile`
+     */
+    initSLSCredentials() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const slsProfile = globals_1.default.options["aws-profile"] || globals_1.default.serverless.service.provider.profile;
+            globals_1.default.credentials = slsProfile ? yield globals_1.default.getProfileCreds(slsProfile) : null;
+        });
+    }
+    /**
+     * Init AWS current region based on Node options
+     */
+    initAWSRegion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                globals_1.default.currentRegion = yield (0, node_config_provider_1.loadConfig)(config_resolver_1.NODE_REGION_CONFIG_OPTIONS, config_resolver_1.NODE_REGION_CONFIG_FILE_OPTIONS)();
+            }
+            catch (err) {
+                logging_1.default.logInfo("Node region was not found.");
+            }
+        });
     }
     /**
      * Updates functions vpc config
@@ -99,7 +134,7 @@ class VPCPlugin {
      */
     updateFunctionsVpcConfig() {
         return __awaiter(this, void 0, void 0, function* () {
-            globals_1.default.logInfo("Updating VPC config...");
+            logging_1.default.logInfo("Updating VPC config...");
             const service = this.serverless.service;
             const functions = service.functions || {};
             // Sets the serverless's vpc config
@@ -115,12 +150,12 @@ class VPCPlugin {
                 func.vpc = func.vpc || {};
                 // log warning in case vpc.subnetIds and vpcDiscovery.subnetNames are specified.
                 if (func.vpc.subnetIds && func.vpcDiscovery && func.vpcDiscovery.subnets) {
-                    globals_1.default.logWarning(`vpc.subnetIds' are specified for the function '${funcName}' ` +
+                    logging_1.default.logWarning(`vpc.subnetIds' are specified for the function '${funcName}' ` +
                         "and overrides 'vpcDiscovery.subnets' discovery config.");
                 }
                 // log warning in case vpc.securityGroupIds and vpcDiscovery.securityGroupNames are specified.
                 if (func.vpc.securityGroupIds && func.vpcDiscovery && func.vpcDiscovery.securityGroups) {
-                    globals_1.default.logWarning(`vpc.securityGroupIds' are specified for the function '${funcName}' ` +
+                    logging_1.default.logWarning(`vpc.securityGroupIds' are specified for the function '${funcName}' ` +
                         "and overrides 'vpcDiscovery.securityGroups' discovery config.");
                 }
                 // set vpc.subnetIds if it does not exists

package/dist/src/logging.js

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const globals_1 = __importDefault(require("./globals"));
+class Logging {
+    static cliLog(prefix, message) {
+        globals_1.default.serverless.cli.log(`${prefix} ${message}`, globals_1.default.pluginName);
+    }
+    /**
+       * Logs error message
+       */
+    static logError(message) {
+        if (globals_1.default.v3Utils) {
+            globals_1.default.v3Utils.log.error(message);
+        }
+        else {
+            Logging.cliLog("[Error]", message);
+        }
+    }
+    /**
+       * Logs info message
+       */
+    static logInfo(message) {
+        if (globals_1.default.v3Utils) {
+            globals_1.default.v3Utils.log.verbose(message);
+        }
+        else {
+            Logging.cliLog("[Info]", message);
+        }
+    }
+    /**
+       * Logs warning message
+       */
+    static logWarning(message) {
+        if (globals_1.default.v3Utils) {
+            globals_1.default.v3Utils.log.warning(message);
+        }
+        else {
+            Logging.cliLog("[WARNING]", message);
+        }
+    }
+}
+exports.default = Logging;

package/dist/src/utils.js

@@ -9,65 +9,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getValueFromTags = exports.wildcardMatches = exports.isObjectEmpty = exports.throttledCall = exports.getAWSPagedResults = exports.sleep = void 0;
-const RETRYABLE_ERRORS = ["Throttling", "RequestLimitExceeded", "TooManyRequestsException"];
+exports.getValueFromTags = exports.wildcardMatches = exports.isObjectEmpty = exports.getAWSPagedResults = exports.sleep = void 0;
 /**
  * Iterate through the pages of a AWS SDK response and collect them into a single array
  *
- * @param service - The AWS service instance to use to make the calls
- * @param funcName - The function name in the service to call
+ * @param client - The AWS service instance to use to make the calls
  * @param resultsKey - The key name in the response that contains the items to return
  * @param nextTokenKey - The request key name to append to the request that has the paging token value
  * @param nextRequestTokenKey - The response key name that has the next paging token value
  * @param params - Parameters to send in the request
  */
-function getAWSPagedResults(service, funcName, resultsKey, nextTokenKey, nextRequestTokenKey, params) {
+function getAWSPagedResults(client, resultsKey, nextTokenKey, nextRequestTokenKey, params) {
     return __awaiter(this, void 0, void 0, function* () {
         let results = [];
-        let response = yield throttledCall(service, funcName, params);
-        results = results.concat(response[resultsKey]);
-        // eslint-disable-next-line no-prototype-builtins
-        while (response.hasOwnProperty(nextRequestTokenKey) && response[nextRequestTokenKey]) {
-            params[nextTokenKey] = response[nextRequestTokenKey];
-            response = yield service[funcName](params).promise();
+        let response = yield client.send(params);
+        results = results.concat(response[resultsKey] || results);
+        while (nextRequestTokenKey in response && response[nextRequestTokenKey]) {
+            params.input[nextTokenKey] = response[nextRequestTokenKey];
+            response = yield client.send(params);
             results = results.concat(response[resultsKey]);
         }
         return results;
     });
 }
 exports.getAWSPagedResults = getAWSPagedResults;
-function throttledCall(service, funcName, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const maxTimePassed = 5 * 60;
-        let timePassed = 0;
-        let previousInterval = 0;
-        const minWait = 3;
-        const maxWait = 60;
-        while (true) {
-            try {
-                return yield service[funcName](params).promise();
-            }
-            catch (ex) {
-                // rethrow the exception if it is not a type of retryable exception
-                if (RETRYABLE_ERRORS.indexOf(ex.code) === -1) {
-                    throw ex;
-                }
-                // rethrow the exception if we have waited too long
-                if (timePassed >= maxTimePassed) {
-                    throw ex;
-                }
-                // Sleep using the Decorrelated Jitter algorithm recommended by AWS
-                // https://aws.amazon.com/blogs/architecture/exponential-backoff-and-jitter/
-                let newInterval = Math.random() * Math.min(maxWait, previousInterval * 3);
-                newInterval = Math.max(minWait, newInterval);
-                yield sleep(newInterval);
-                previousInterval = newInterval;
-                timePassed += previousInterval;
-            }
-        }
-    });
-}
-exports.throttledCall = throttledCall;
 /**
  * Stops event thread execution for given number of seconds.
  * @param seconds
@@ -79,8 +44,8 @@ function sleep(seconds) {
     });
 }
 exports.sleep = sleep;
-function isObjectEmpty(object) {
-    return Object.keys(object).length === 0;
+function isObjectEmpty(value) {
+    return Object.keys(value).length === 0;
 }
 exports.isObjectEmpty = isObjectEmpty;
 function replaceAll(input, search, replace) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-vpc-discovery",
-  "version": "4.1.0",
+  "version": "5.0.1",
   "engines": {
     "node": ">=14"
   },
@@ -34,7 +34,8 @@
     "integration-test": "nyc mocha -r ts-node/register --project tsconfig.json test/integration-tests/*.test.ts && nyc report --reporter=text-summary",
     "lint": "eslint src --ext .ts",
     "lint:fix": "npm run lint -- --fix",
-    "build": "tsc --project ."
+    "build": "tsc --project .",
+    "prepare": "npm run build"
   },
   "files": [
     "*.js",
@@ -48,33 +49,39 @@
     ]
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^16.18.14",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "aws-sdk-mock": "^5.8.0",
-    "chai": "^4.3.7",
-    "chai-spies": "^1.0.0",
+    "@aws-sdk/client-lambda": "^3.465.0",
+    "@types/js-yaml": "^4.0.9",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.3",
+    "@types/randomstring": "^1.1.11",
+    "@types/shelljs": "^0.8.15",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "aws-sdk-client-mock": "^3.0.0",
+    "chai": "^4.3.10",
+    "chai-spies": "^1.1.0",
     "eslint": "^7.32.0",
-    "eslint-config-airbnb": "^18.2.1",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsx-a11y": "6.4.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.2.0",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
     "js-yaml": "^4.1.0",
-    "mocha": "^9.2.2",
+    "mocha": "^10.2.0",
     "mocha-param": "^2.0.1",
     "nyc": "^15.1.0",
-    "randomstring": "^1.2.3",
-    "serverless": "^3.28.1",
+    "randomstring": "^1.3.0",
+    "serverless": "^3.38.0",
     "shelljs": "^0.8.5",
     "ts-node": "^10.9.1",
-    "typescript": "~4.3.5"
+    "typescript": "5.1.6"
   },
   "dependencies": {
-    "aws-sdk": "^2.1331.0"
+    "@aws-sdk/client-ec2": "^3.467.0",
+    "@aws-sdk/credential-providers": "^3.495.0",
+    "@smithy/config-resolver": "^2.1.0",
+    "@smithy/node-config-provider": "^2.2.0",
+    "@smithy/smithy-client": "^2.1.18",
+    "@smithy/util-retry": "^2.0.8",
+    "ts-md5": "^1.3.1"
   }
 }