npm - serverless-vpc-discovery - Versions diffs - 5.0.2 → 7.0.0 - Mend

serverless-vpc-discovery 5.0.2 → 7.0.0

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.

Files changed (11) hide show

package/.mocharc.json +5 -0
package/README.md +3 -2
package/dist/src/aws/ec2-wrapper.js +76 -92
package/dist/src/common/lambda-function.js +70 -87
package/dist/src/globals.js +9 -15
package/dist/src/index.js +68 -84
package/dist/src/utils.js +17 -31
package/dist/src/validation.js +1 -2
package/package.json +32 -36
package/tsconfig.json +1 -1
package/.eslintrc.json +0 -41

package/.mocharc.json ADDED Viewed

@@ -0,0 +1,5 @@
+{
+  "require": ["tsx"],
+  "extensions": ["ts"],
+  "spec": ["test/unit-tests/**/*.test.ts"]
+}

package/README.md CHANGED Viewed

@@ -183,10 +183,11 @@ All tests should pass.
 To run integration tests, set an environment variable TEST\_VPC\_NAME to the VPC you will be testing for. Then,
 ```
+export SERVERLESS_LICENSE_KEY=<license_key>
 export AWS_PROFILE=your_profile
 export TEST_VPC_NAME=vpc_name
-npm run build
-npm run integration-test
+npx npm run build
+npx npm run integration-test
 ```
 If there is an error build and install the node\_module inside the serverless-vpc-discovery folder:

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

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -17,6 +8,7 @@ const utils_1 = require("../utils");
 const client_ec2_1 = require("@aws-sdk/client-ec2");
 const globals_1 = __importDefault(require("../globals"));
 class EC2Wrapper {
+    ec2;
     constructor(credentials) {
         this.ec2 = new client_ec2_1.EC2Client({
             credentials,
@@ -28,29 +20,25 @@ class EC2Wrapper {
      *  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({}));
-        });
+    async getVpcs() {
+        return await (0, utils_1.getAWSPagedResults)(this.ec2, "Vpcs", "NextToken", "NextToken", new client_ec2_1.DescribeVpcsCommand({}));
     }
     /**
      *  Returns the promise that contains the vpc-id
      * @param {string} vpcName
      * @returns {Promise.<string>}
      */
-    getVpcId(vpcName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const vpcItems = yield (0, utils_1.getAWSPagedResults)(this.ec2, "Vpcs", "NextToken", "NextToken", new client_ec2_1.DescribeVpcsCommand({
-                Filters: [{
-                        Name: "tag:Name",
-                        Values: [vpcName]
-                    }]
-            }));
-            if (vpcItems.length === 0) {
-                throw new Error(`VPC with tag key 'Name' and tag value '${vpcName}' does not exist.`);
-            }
-            return vpcItems[0].VpcId;
-        });
+    async getVpcId(vpcName) {
+        const vpcItems = await (0, utils_1.getAWSPagedResults)(this.ec2, "Vpcs", "NextToken", "NextToken", new client_ec2_1.DescribeVpcsCommand({
+            Filters: [{
+                    Name: "tag:Name",
+                    Values: [vpcName]
+                }]
+        }));
+        if (vpcItems.length === 0) {
+            throw new Error(`VPC with tag key 'Name' and tag value '${vpcName}' does not exist.`);
+        }
+        return vpcItems[0].VpcId;
     }
     /**
      * Returns the promise that contains the subnet IDs
@@ -60,30 +48,28 @@ class EC2Wrapper {
      * @param {string[]} tagValues
      * @returns {Promise.<string[]>}
      */
-    getSubnetIds(vpcId, tagKey, tagValues) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const subnets = yield (0, utils_1.getAWSPagedResults)(this.ec2, "Subnets", "NextToken", "NextToken", new client_ec2_1.DescribeSubnetsCommand({
-                Filters: [{
-                        Name: "vpc-id",
-                        Values: [vpcId]
-                    }, {
-                        Name: `tag:${tagKey}`,
-                        Values: tagValues
-                    }]
-            }));
-            const missingSubnetValues = tagValues.filter((tagValue) => {
-                // collect subnets by name
-                const subnetsByName = subnets.filter((subnet) => {
-                    return (0, utils_1.wildcardMatches)(tagValue, (0, utils_1.getValueFromTags)(subnet.Tags, tagKey));
-                });
-                return subnetsByName.length === 0;
+    async getSubnetIds(vpcId, tagKey, tagValues) {
+        const subnets = await (0, utils_1.getAWSPagedResults)(this.ec2, "Subnets", "NextToken", "NextToken", new client_ec2_1.DescribeSubnetsCommand({
+            Filters: [{
+                    Name: "vpc-id",
+                    Values: [vpcId]
+                }, {
+                    Name: `tag:${tagKey}`,
+                    Values: tagValues
+                }]
+        }));
+        const missingSubnetValues = tagValues.filter((tagValue) => {
+            // collect subnets by name
+            const subnetsByName = subnets.filter((subnet) => {
+                return (0, utils_1.wildcardMatches)(tagValue, (0, utils_1.getValueFromTags)(subnet.Tags, tagKey));
             });
-            if (!subnets.length || missingSubnetValues.length) {
-                throw new Error(`Subnets with vpc id '${vpcId}', tag key '${tagKey}' and tag values '${missingSubnetValues}' do not exist. ` +
-                    "Please check the `tagKey` and `tagValues` are correct or remove it.");
-            }
-            return subnets.map((subnet) => subnet.SubnetId);
+            return subnetsByName.length === 0;
         });
+        if (!subnets.length || missingSubnetValues.length) {
+            throw new Error(`Subnets with vpc id '${vpcId}', tag key '${tagKey}' and tag values '${missingSubnetValues}' do not exist. ` +
+                "Please check the `tagKey` and `tagValues` are correct or remove it.");
+        }
+        return subnets.map((subnet) => subnet.SubnetId);
     }
     /**
      *  Returns the promise that contains the security group IDs
@@ -93,54 +79,52 @@ class EC2Wrapper {
      * @param {string[]} tagValues
      * @returns {Promise.<string[]>}
      */
-    getSecurityGroupIds(vpcId, names, tagKey, tagValues) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // init filter by vpc id
-            const input = { Filters: [{ Name: "vpc-id", Values: [vpcId] }] };
-            // update filters with names if specified
-            if (names) {
-                input.Filters.push({ Name: "group-name", Values: names });
-            }
-            // update filters with tag and values if specified
-            if (tagKey && tagValues) {
-                input.Filters.push({ Name: `tag:${tagKey}`, Values: tagValues });
-            }
-            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}'` : "";
-                throw new Error(`Security groups with vpc id '${vpcId}'${namesErrorText}${tagErrorText} do not exist`);
-            }
-            if (names) {
-                const missingGroupsNames = names.filter((groupName) => {
-                    // collect security groups by name
-                    const securityGroupsByName = securityGroups.filter((securityGroup) => {
-                        return (0, utils_1.wildcardMatches)(groupName, securityGroup.GroupName);
-                    });
-                    return securityGroupsByName.length === 0;
+    async getSecurityGroupIds(vpcId, names, tagKey, tagValues) {
+        // init filter by vpc id
+        const input = { Filters: [{ Name: "vpc-id", Values: [vpcId] }] };
+        // update filters with names if specified
+        if (names) {
+            input.Filters.push({ Name: "group-name", Values: names });
+        }
+        // update filters with tag and values if specified
+        if (tagKey && tagValues) {
+            input.Filters.push({ Name: `tag:${tagKey}`, Values: tagValues });
+        }
+        const securityGroups = await (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}'` : "";
+            throw new Error(`Security groups with vpc id '${vpcId}'${namesErrorText}${tagErrorText} do not exist`);
+        }
+        if (names) {
+            const missingGroupsNames = names.filter((groupName) => {
+                // collect security groups by name
+                const securityGroupsByName = securityGroups.filter((securityGroup) => {
+                    return (0, utils_1.wildcardMatches)(groupName, securityGroup.GroupName);
                 });
-                if (missingGroupsNames.length) {
-                    throw new Error(`Security groups do not exist for the names: ${missingGroupsNames}. ` +
-                        "Please check the 'names' are correct or remove it.");
-                }
+                return securityGroupsByName.length === 0;
+            });
+            if (missingGroupsNames.length) {
+                throw new Error(`Security groups do not exist for the names: ${missingGroupsNames}. ` +
+                    "Please check the 'names' are correct or remove it.");
             }
-            if (tagKey && tagValues) {
-                tagValues = tagValues || [];
-                const missingGroupsTagNames = tagValues.filter((tagValue) => {
-                    // collect subnets by name
-                    const groupsByName = securityGroups.filter((securityGroup) => {
-                        const groupTagValue = (0, utils_1.getValueFromTags)(securityGroup.Tags, tagKey);
-                        return groupTagValue === tagValue;
-                    });
-                    return groupsByName.length === 0;
+        }
+        if (tagKey && tagValues) {
+            tagValues = tagValues || [];
+            const missingGroupsTagNames = tagValues.filter((tagValue) => {
+                // collect subnets by name
+                const groupsByName = securityGroups.filter((securityGroup) => {
+                    const groupTagValue = (0, utils_1.getValueFromTags)(securityGroup.Tags, tagKey);
+                    return groupTagValue === tagValue;
                 });
-                if (missingGroupsTagNames.length) {
-                    throw new Error(`Security groups do not exist for the tag '${tagKey}' and tag values: '${missingGroupsTagNames}'. ` +
-                        "Please check the 'tagKey' and 'tagValues' are correct or remove it.");
-                }
+                return groupsByName.length === 0;
+            });
+            if (missingGroupsTagNames.length) {
+                throw new Error(`Security groups do not exist for the tag '${tagKey}' and tag values: '${missingGroupsTagNames}'. ` +
+                    "Please check the 'tagKey' and 'tagValues' are correct or remove it.");
             }
-            return securityGroups.map((group) => group.GroupId);
-        });
+        }
+        return securityGroups.map((group) => group.GroupId);
     }
 }
 exports.EC2Wrapper = EC2Wrapper;

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

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,10 +10,12 @@ const validation_1 = require("../validation");
 const logging_1 = __importDefault(require("../logging"));
 const ts_md5_1 = require("ts-md5");
 class LambdaFunction {
+    ec2Wrapper;
+    basicVPCDiscovery;
+    vpcIdsCache = {};
+    subnetsIdsCache = {};
+    SGIdsCache = {};
     constructor(credentials, basicVPCDiscovery) {
-        this.vpcIdsCache = {};
-        this.subnetsIdsCache = {};
-        this.SGIdsCache = {};
         this.ec2Wrapper = new ec2_wrapper_1.EC2Wrapper(credentials);
         this.basicVPCDiscovery = basicVPCDiscovery;
     }
@@ -30,105 +23,95 @@ class LambdaFunction {
      * Validate and return VPC config for the given function
      * @returns {Promise<VPC>}
      */
-    getFuncVPC(funcName, funcVPCDiscovery) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof funcVPCDiscovery === "boolean" && !funcVPCDiscovery) {
-                // skip vpc setup for `vpcDiscovery=false` option
-                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 ((0, utils_1.isObjectEmpty)(vpcDiscovery)) {
-                return null;
-            }
-            // validate func vpcDiscovery config
-            try {
-                (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 {
-                logging_1.default.logInfo(`Getting VPC config for the function: '${funcName}'\n`);
-                return yield this.getVpcConfig(vpcDiscovery);
-            }
-            catch (e) {
-                logging_1.default.logError(`Function '${funcName}' VPC not configured based on the error: ${e}`);
-            }
+    async getFuncVPC(funcName, funcVPCDiscovery) {
+        if (typeof funcVPCDiscovery === "boolean" && !funcVPCDiscovery) {
+            // skip vpc setup for `vpcDiscovery=false` option
+            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 ((0, utils_1.isObjectEmpty)(vpcDiscovery)) {
             return null;
-        });
+        }
+        // validate func vpcDiscovery config
+        try {
+            (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 {
+            logging_1.default.logInfo(`Getting VPC config for the function: '${funcName}'\n`);
+            return await this.getVpcConfig(vpcDiscovery);
+        }
+        catch (e) {
+            logging_1.default.logError(`Function '${funcName}' VPC not configured based on the error: ${e}`);
+        }
+        return null;
     }
     /**
      * Gets the desired vpc with the designated subnets and security groups
      * that were set in serverless config file
      * @returns {Promise<object>}
      */
-    getVpcConfig(vpcDiscovery) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const vpc = {};
-            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.getVPCSubnets(vpcId, subnet.tagKey, subnet.tagValues);
-                    vpc.subnetIds = vpc.subnetIds.concat(subnetIds);
-                }
-                // remove duplicate elements from the array
-                vpc.subnetIds = [...new Set(vpc.subnetIds)];
+    async getVpcConfig(vpcDiscovery) {
+        const vpc = {};
+        const vpcId = await 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 = await this.getVPCSubnets(vpcId, subnet.tagKey, subnet.tagValues);
+                vpc.subnetIds = vpc.subnetIds.concat(subnetIds);
             }
-            if (vpcDiscovery.securityGroups) {
-                vpc.securityGroupIds = [];
-                for (const group of vpcDiscovery.securityGroups) {
-                    const groupIds = yield this.getVPCSecurityGroups(vpcId, group.names, group.tagKey, group.tagValues);
-                    vpc.securityGroupIds = vpc.securityGroupIds.concat(groupIds);
-                }
-                // remove duplicate elements from the array
-                vpc.securityGroupIds = [...new Set(vpc.securityGroupIds)];
+            // remove duplicate elements from the array
+            vpc.subnetIds = [...new Set(vpc.subnetIds)];
+        }
+        if (vpcDiscovery.securityGroups) {
+            vpc.securityGroupIds = [];
+            for (const group of vpcDiscovery.securityGroups) {
+                const groupIds = await this.getVPCSecurityGroups(vpcId, group.names, group.tagKey, group.tagValues);
+                vpc.securityGroupIds = vpc.securityGroupIds.concat(groupIds);
             }
-            return vpc;
-        });
+            // remove duplicate elements from the array
+            vpc.securityGroupIds = [...new Set(vpc.securityGroupIds)];
+        }
+        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];
-        });
+    async getVPCId(vpcName) {
+        if (this.vpcIdsCache[vpcName] === undefined) {
+            this.vpcIdsCache[vpcName] = await 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];
-        });
+    async getVPCSubnets(vpcId, tagKey, tagValues) {
+        const hash = ts_md5_1.Md5.hashStr(vpcId + tagKey + tagValues.join());
+        if (!this.subnetsIdsCache[hash]) {
+            this.subnetsIdsCache[hash] = await 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];
-        });
+    async getVPCSecurityGroups(vpcId, names, tagKey, tagValues) {
+        const hash = ts_md5_1.Md5.hashStr(vpcId + (names || []).join() + tagKey + (tagValues || []).join());
+        if (!this.SGIdsCache[hash]) {
+            this.SGIdsCache[hash] = await this.ec2Wrapper.getSecurityGroupIds(vpcId, names, tagKey, tagValues);
+        }
+        return this.SGIdsCache[hash];
     }
 }
 exports.LambdaFunction = LambdaFunction;

package/dist/src/globals.js CHANGED Viewed

@@ -1,25 +1,21 @@
 "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 pluginName = "Serverless VPC Discovery";
+    static serverless;
+    static options;
+    static v3Utils;
+    static currentRegion;
+    static credentials;
+    static defaultRegion = "us-east-1";
     static getRegion() {
         const slsRegion = Globals.options.region || Globals.serverless.service.provider.region;
         return slsRegion || Globals.currentRegion || Globals.defaultRegion;
     }
-    static getProfileCreds(profile) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, credential_providers_1.fromIni)({ profile })();
-        });
+    static async getProfileCreds(profile) {
+        return await (0, credential_providers_1.fromIni)({ profile })();
     }
     static getRetryStrategy(attempts = 3, delay = 3000, backoff = 500) {
         return new util_retry_1.ConfiguredRetryStrategy(attempts, // max attempts.
@@ -29,6 +25,4 @@ class Globals {
         );
     }
 }
-Globals.pluginName = "Serverless VPC Discovery";
-Globals.defaultRegion = "us-east-1";
 exports.default = Globals;

package/dist/src/index.js CHANGED Viewed

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,11 +10,14 @@ 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 {
+    serverless;
+    hooks;
+    lambdaFunction;
     constructor(serverless, options, v3Utils) {
         this.serverless = serverless;
         globals_1.default.serverless = serverless;
         globals_1.default.options = options;
-        if (v3Utils === null || v3Utils === void 0 ? void 0 : v3Utils.log) {
+        if (v3Utils?.log) {
             globals_1.default.v3Utils = v3Utils;
         }
         /* hooks are the actual code that will run when called */
@@ -37,12 +31,10 @@ class VPCPlugin {
      * Wrapper for lifecycle function, initializes variables and checks if enabled.
      * @param lifecycleFunc lifecycle function that actually does desired action
      */
-    hookWrapper(lifecycleFunc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.validateCustomVPCDiscoveryConfig();
-            yield this.initResources();
-            return yield lifecycleFunc.call(this);
-        });
+    async hookWrapper(lifecycleFunc) {
+        this.validateCustomVPCDiscoveryConfig();
+        await this.initResources();
+        return await lifecycleFunc.call(this);
     }
     /**
      * Validate if the plugin config exists
@@ -86,89 +78,81 @@ class VPCPlugin {
     /**
      * Setup AWS resources
      */
-    initResources() {
-        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);
-                }
+    async initResources() {
+        // setup AWS resources
+        await this.initSLSCredentials();
+        await 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 {
+            await 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;
-        });
+    async initSLSCredentials() {
+        const slsProfile = globals_1.default.options["aws-profile"] || globals_1.default.serverless.service.provider.profile;
+        globals_1.default.credentials = slsProfile ? await 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.");
-            }
-        });
+    async initAWSRegion() {
+        try {
+            globals_1.default.currentRegion = await (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
      * @returns {Promise<object>}
      */
-    updateFunctionsVpcConfig() {
-        return __awaiter(this, void 0, void 0, function* () {
-            logging_1.default.logInfo("Updating VPC config...");
-            const service = this.serverless.service;
-            const functions = service.functions || {};
-            // Sets the serverless's vpc config
-            // loop through the functions and update VPC config
-            for (const funcName of Object.keys(functions)) {
-                const func = service.functions[funcName];
-                this.updateVPCDiscoveryConfigCompatibility(func.vpcDiscovery);
-                const funcVPC = yield this.lambdaFunction.getFuncVPC(funcName, func.vpcDiscovery);
-                if (!funcVPC) {
-                    continue;
-                }
-                // init vpc empty config in case not exists
-                func.vpc = func.vpc || {};
-                // log warning in case vpc.subnetIds and vpcDiscovery.subnetNames are specified.
-                if (func.vpc.subnetIds && func.vpcDiscovery && func.vpcDiscovery.subnets) {
-                    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) {
-                    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
-                if (!func.vpc.subnetIds && funcVPC.subnetIds) {
-                    func.vpc.subnetIds = funcVPC.subnetIds;
-                }
-                // set vpc.securityGroupIds if it does not exists
-                if (!func.vpc.securityGroupIds && funcVPC.securityGroupIds) {
-                    func.vpc.securityGroupIds = funcVPC.securityGroupIds;
-                }
+    async updateFunctionsVpcConfig() {
+        logging_1.default.logInfo("Updating VPC config...");
+        const service = this.serverless.service;
+        const functions = service.functions || {};
+        // Sets the serverless's vpc config
+        // loop through the functions and update VPC config
+        for (const funcName of Object.keys(functions)) {
+            const func = service.functions[funcName];
+            this.updateVPCDiscoveryConfigCompatibility(func.vpcDiscovery);
+            const funcVPC = await this.lambdaFunction.getFuncVPC(funcName, func.vpcDiscovery);
+            if (!funcVPC) {
+                continue;
             }
-            return service.functions;
-        });
+            // init vpc empty config in case not exists
+            func.vpc = func.vpc || {};
+            // log warning in case vpc.subnetIds and vpcDiscovery.subnetNames are specified.
+            if (func.vpc.subnetIds && func.vpcDiscovery && func.vpcDiscovery.subnets) {
+                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) {
+                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
+            if (!func.vpc.subnetIds && funcVPC.subnetIds) {
+                func.vpc.subnetIds = funcVPC.subnetIds;
+            }
+            // set vpc.securityGroupIds if it does not exists
+            if (!func.vpc.securityGroupIds && funcVPC.securityGroupIds) {
+                func.vpc.securityGroupIds = funcVPC.securityGroupIds;
+            }
+        }
+        return service.functions;
     }
 }
 module.exports = VPCPlugin;

package/dist/src/utils.js CHANGED Viewed

@@ -1,15 +1,10 @@
 "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 });
-exports.getValueFromTags = exports.wildcardMatches = exports.isObjectEmpty = exports.getAWSPagedResults = exports.sleep = void 0;
+exports.sleep = sleep;
+exports.getAWSPagedResults = getAWSPagedResults;
+exports.isObjectEmpty = isObjectEmpty;
+exports.wildcardMatches = wildcardMatches;
+exports.getValueFromTags = getValueFromTags;
 /**
  * Iterate through the pages of a AWS SDK response and collect them into a single array
  *
@@ -19,35 +14,28 @@ exports.getValueFromTags = exports.wildcardMatches = exports.isObjectEmpty = exp
  * @param nextRequestTokenKey - The response key name that has the next paging token value
  * @param params - Parameters to send in the request
  */
-function getAWSPagedResults(client, resultsKey, nextTokenKey, nextRequestTokenKey, params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let results = [];
-        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;
-    });
+async function getAWSPagedResults(client, resultsKey, nextTokenKey, nextRequestTokenKey, params) {
+    let results = [];
+    let response = await client.send(params);
+    results = results.concat(response[resultsKey] || results);
+    while (nextRequestTokenKey in response && response[nextRequestTokenKey]) {
+        params.input[nextTokenKey] = response[nextRequestTokenKey];
+        response = await client.send(params);
+        results = results.concat(response[resultsKey]);
+    }
+    return results;
 }
-exports.getAWSPagedResults = getAWSPagedResults;
 /**
  * Stops event thread execution for given number of seconds.
  * @param seconds
  * @returns {Promise<void>} Resolves after given number of seconds.
  */
-function sleep(seconds) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => setTimeout(resolve, 1000 * seconds));
-    });
+async function sleep(seconds) {
+    return new Promise((resolve) => setTimeout(resolve, 1000 * seconds));
 }
-exports.sleep = sleep;
 function isObjectEmpty(value) {
     return Object.keys(value).length === 0;
 }
-exports.isObjectEmpty = isObjectEmpty;
 function replaceAll(input, search, replace) {
     return input.split(search).join(replace);
 }
@@ -57,7 +45,6 @@ function wildcardMatches(inputArn, actualArn) {
     const inputArnRegex = new RegExp(`^${inputArnRegexStr}$`);
     return inputArnRegex.test(actualArn);
 }
-exports.wildcardMatches = wildcardMatches;
 function getValueFromTags(tags, tagKey) {
     const tagItem = tags.find((tag) => tag.Key === tagKey);
     if (tagItem) {
@@ -65,4 +52,3 @@ function getValueFromTags(tags, tagKey) {
     }
     return null;
 }
-exports.getValueFromTags = getValueFromTags;

package/dist/src/validation.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateVPCDiscoveryConfig = void 0;
+exports.validateVPCDiscoveryConfig = validateVPCDiscoveryConfig;
 /**
  * Validate vpc discovery subnets config
  * @param subnets - the `SubnetItem` options
@@ -61,4 +61,3 @@ function validateVPCDiscoveryConfig(vpcDiscovery) {
         validateVPCSecurityGroups(vpcDiscovery.securityGroups);
     }
 }
-exports.validateVPCDiscoveryConfig = validateVPCDiscoveryConfig;

package/package.json CHANGED Viewed

@@ -1,8 +1,8 @@
 {
   "name": "serverless-vpc-discovery",
-  "version": "5.0.2",
+  "version": "7.0.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   },
   "description": "Serverless Plugin to modify VPC values",
   "author": "Amplify Education Inc",
@@ -30,9 +30,9 @@
   "main": "dist/src/index.js",
   "bin": {},
   "scripts": {
-    "test": "nyc mocha -r ts-node/register --project tsconfig.json test/unit-tests/index.test.ts && nyc report --reporter=text-summary",
-    "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",
+    "test": "c8 mocha -r tsx test/unit-tests/index.test.ts",
+    "integration-test": "mocha -r tsx test/integration-tests/*.test.ts",
+    "lint": "eslint src",
     "lint:fix": "npm run lint -- --fix",
     "build": "tsc --project .",
     "prepare": "npm run build"
@@ -43,45 +43,41 @@
     "*.json",
     "dist/**/*.js"
   ],
-  "nyc": {
-    "extension": [
-      ".ts"
-    ]
-  },
   "devDependencies": {
-    "@aws-sdk/client-lambda": "^3.465.0",
+    "@aws-sdk/client-lambda": "~3.967.0",
+    "@types/chai": "^5.0.1",
+    "@types/chai-spies": "^1.0.6",
     "@types/js-yaml": "^4.0.9",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.3",
-    "@types/randomstring": "^1.1.11",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^18.0.0",
+    "@types/randomstring": "^1.3.0",
     "@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",
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "aws-sdk-client-mock": "^4.1.0",
+    "chai": "^6.2.2",
     "chai-spies": "^1.1.0",
-    "eslint": "^7.32.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.2.0",
-    "js-yaml": "^4.1.0",
-    "mocha": "^10.2.0",
+    "eslint": "^9.0.0",
+    "neostandard": "^0.12.0",
+    "js-yaml": "^4.1.1",
+    "mocha": "^11.0.0",
     "mocha-param": "^2.0.1",
-    "nyc": "^15.1.0",
-    "randomstring": "^1.3.0",
-    "serverless": "^3.38.0",
+    "c8": "^10.0.0",
+    "randomstring": "^1.3.1",
+    "serverless": "^4.32.0",
     "shelljs": "^0.8.5",
-    "ts-node": "^10.9.1",
-    "typescript": "5.1.6"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@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",
+    "@aws-sdk/client-ec2": "~3.967.0",
+    "@aws-sdk/credential-providers": "~3.967.0",
+    "@smithy/config-resolver": "~4.4.5",
+    "@smithy/node-config-provider": "~4.3.7",
+    "@smithy/smithy-client": "~4.10.4",
+    "@smithy/util-retry": "~4.2.7",
     "ts-md5": "^1.3.1"
+  },
+  "overrides": {
+    "fast-xml-parser": "^5.3.6"
   }
 }

package/tsconfig.json CHANGED Viewed

@@ -3,7 +3,7 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "rootDir": ".",
-    "target": "es6",
+    "target": "ES2022",
     "sourceMap": false,
     "outDir": "dist",
     "types": [

package/.eslintrc.json DELETED Viewed

@@ -1,41 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true,
-    "commonjs": true,
-    "node": true,
-    "mocha": true
-  },
-  "extends": [
-    "standard",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module"
-  },
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "rules": {
-    "quotes": [
-      "error",
-      "double"
-    ],
-    "semi": [
-      "error",
-      "always"
-    ],
-    "arrow-parens": [
-      "error",
-      "always"
-    ],
-    "complexity": [
-      "error",
-      15
-    ],
-    "guard-for-in": "error"
-  }
-}