serverless-vpc-discovery 5.0.0 → 5.0.1

package/README.md

@@ -185,7 +185,7 @@ To run integration tests, set an environment variable TEST\_VPC\_NAME to the VPC
 ```
 export AWS_PROFILE=your_profile
 export TEST_VPC_NAME=vpc_name
-npm build
+npm run build
 npm run integration-test
 ```
 

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

@@ -20,9 +20,19 @@ class EC2Wrapper {
     constructor(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
      * @param {string} vpcName

package/dist/src/globals.js

@@ -1,7 +1,26 @@
 "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 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 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.
@@ -11,4 +30,5 @@ class Globals {
     }
 }
 Globals.pluginName = "Serverless VPC Discovery";
+Globals.defaultRegion = "us-east-1";
 exports.default = Globals;

package/dist/src/index.js

@@ -16,10 +16,13 @@ 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;
+        globals_1.default.options = options;
         if (v3Utils === null || v3Utils === void 0 ? void 0 : v3Utils.log) {
             globals_1.default.v3Utils = v3Utils;
         }
@@ -37,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);
         });
     }
@@ -84,10 +87,46 @@ class VPCPlugin {
      * 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-vpc-discovery",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "engines": {
     "node": ">=14"
   },
@@ -77,6 +77,9 @@
   },
   "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",
     "ts-md5": "^1.3.1"