serverless-vpc-discovery 4.0.2 → 5.0.0

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,8 +1,8 @@
 {
   "name": "serverless-vpc-discovery",
-  "version": "4.0.2",
+  "version": "5.0.0",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "description": "Serverless Plugin to modify VPC values",
   "author": "Amplify Education Inc",
@@ -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,36 @@
     ]
   },
   "devDependencies": {
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.7.10",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
-    "aws-sdk-mock": "^5.2.2",
-    "chai": "^4.3.4",
-    "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.24.2",
-    "eslint-plugin-jsx-a11y": "6.4.1",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-react": "^7.25.1",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint-plugin-promise": "^5.2.0",
     "js-yaml": "^4.1.0",
-    "mocha": "^9.1.1",
+    "mocha": "^10.2.0",
     "mocha-param": "^2.0.1",
     "nyc": "^15.1.0",
-    "randomstring": "^1.2.1",
-    "serverless": "^3.12.0",
-    "shelljs": "^0.8.4",
-    "ts-node": "^10.2.1",
-    "typescript": "~4.3.5"
+    "randomstring": "^1.3.0",
+    "serverless": "^3.38.0",
+    "shelljs": "^0.8.5",
+    "ts-node": "^10.9.1",
+    "typescript": "5.1.6"
   },
   "dependencies": {
-    "aws-sdk": "^2.980.0 "
+    "@aws-sdk/client-ec2": "^3.467.0",
+    "@smithy/smithy-client": "^2.1.18",
+    "@smithy/util-retry": "^2.0.8",
+    "ts-md5": "^1.3.1"
   }
 }

package/CHANGELOG.md

@@ -1,72 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [4.0.2] - 2022-04-11
-### Changed
- - Add integration with serverless 3 logging
- - Change Github workflows to run tests both with sls 2 and 3
-
-## [4.0.1] - 2022-04-08
-### Changed
- - Fixed audit issues. Added dependabot config
-
-## [4.0.0] - 2022-04-08
-### Changed
- - Added compability with serverless 3
-
-## [3.1.2] - 2021-09-01
-### Changed
- - Fixed y18n vulnerability
-
-## [3.1.1] - 2021-09-01
-### Changed
-- Added serverless schema validation. Thank you @ROSeaboyer ([53](https://github.com/amplify-education/serverless-vpc-discovery/pull/53))
-
-## [3.1.0] - 2021-09-01
-### Changed
-- Dropped support of node versions < 12
-- Replaced Travis pipeline items with GitHub workflow
-
-## [3.0.0] - 2020-12-24
-### Added
-- Support for getting subnets and security groups by any tag key/value  
-### Changed
-- ***Important!*** The `subnetNames` and `securityGroupNames` options have been deprecated and will be removed in the next major release. The new options are `subnets` and `securityGroups`.
-- ***Important!*** Drop `vpc` option support. The new option is `vpcDiscovery`.
-
-## [2.3.0] - 2020-12-11
-### Changed
-- Allow usage of wildcards in subnet and security group names. Thank you @RLRabinowitz ([#41](https://github.com/amplify-education/serverless-vpc-discovery/pull/41))
-
-## [2.2.1] - 2020-12-02
-### Changed
-- Fixed travis build
-
-## [2.2.0] - 2020-12-02
-### Changed
-- Set `custom.vpcDiscovery` optional.
-- Update travis config for github release tagging
-
-## [2.1.0] - 2020-11-17
-### Changed
-- ***Important!*** The `vpc` option has been deprecated but it still will work for a while. The new option is `vpcDiscovery`.
-- The VPC config applies to each function instead of the provider option.
-- Fixed logic for checking missing subnets and security groups.
-### Added
-- A possibility to specify custom config for each function by specifying `function.vpcDiscovery` config
-- Added `warning` and `info` messages
-
-## [2.0.0] - 2020-11-13
-### Changed
-- The code rewritten to TypeScript. Added improvements. Updated travis config, lint and test scripts.
-
-## [1.0.13] - 2018-10-10
-### Added
-- Added our own configuration for AWS SDK's built in retry mechanism, increasing it from 3 retries to 20 so that this plugin is more easily used in an automated environment.
-
-## [1.0.12] - 2018-08-01
-### Added
-- This CHANGELOG file to make it easier for future updates to be documented. Sadly, will not be going back to document changes made for previous versions.