Merge pull request #451 from medikoo/0716-upgrade-to-latest-serverless

horike37 · web-flow · commit c48d99df2edb · 2021-07-31T14:26:24.000+09:00
Upgrade to new Serverless Framework variables resolver
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -1,6 +1,6 @@
 name: CI
 
-on: push
+on: [push, pull_request]
 
 jobs:
   test:
diff --git a/lib/deploy/events/apiGateway/apiKeys.test.js b/lib/deploy/events/apiGateway/apiKeys.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#methods()', () => {
diff --git a/lib/deploy/events/apiGateway/authorizers.test.js b/lib/deploy/events/apiGateway/authorizers.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileAuthorizers()', () => {
diff --git a/lib/deploy/events/apiGateway/cors.test.js b/lib/deploy/events/apiGateway/cors.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileCors()', () => {
diff --git a/lib/deploy/events/apiGateway/deployment.test.js b/lib/deploy/events/apiGateway/deployment.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileDeployment()', () => {
diff --git a/lib/deploy/events/apiGateway/endpointInfo.test.js b/lib/deploy/events/apiGateway/endpointInfo.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 
diff --git a/lib/deploy/events/apiGateway/iamRole.test.js b/lib/deploy/events/apiGateway/iamRole.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileHttpIamRole()', () => {
diff --git a/lib/deploy/events/apiGateway/lambdaPermissions.test.js b/lib/deploy/events/apiGateway/lambdaPermissions.test.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileHttpLambdaPermissions()', () => {
diff --git a/lib/deploy/events/apiGateway/methods.test.js b/lib/deploy/events/apiGateway/methods.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#methods()', () => {
diff --git a/lib/deploy/events/apiGateway/resources.test.js b/lib/deploy/events/apiGateway/resources.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileResources()', () => {
diff --git a/lib/deploy/events/apiGateway/restApi.test.js b/lib/deploy/events/apiGateway/restApi.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileRestApi()', () => {
diff --git a/lib/deploy/events/apiGateway/usagePlan.test.js b/lib/deploy/events/apiGateway/usagePlan.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileUsagePlan()', () => {
diff --git a/lib/deploy/events/apiGateway/usagePlanKeys.test.js b/lib/deploy/events/apiGateway/usagePlanKeys.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#compileUsagePlanKeys()', () => {
diff --git a/lib/deploy/events/apiGateway/validate.test.js b/lib/deploy/events/apiGateway/validate.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#httpValidate()', () => {
diff --git a/lib/deploy/events/cloudWatchEvent/compileCloudWatchEventEvents.test.js b/lib/deploy/events/cloudWatchEvent/compileCloudWatchEventEvents.test.js
@@ -3,7 +3,7 @@
 const itParam = require('mocha-param');
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('awsCompileCloudWatchEventEvents', () => {
diff --git a/lib/deploy/events/schedule/compileScheduledEvents.test.js b/lib/deploy/events/schedule/compileScheduledEvents.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../../index');
 
 describe('#httpValidate()', () => {
diff --git a/lib/deploy/stepFunctions/compileActivities.test.js b/lib/deploy/stepFunctions/compileActivities.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../index');
 
 describe('#compileStateMachines', () => {
diff --git a/lib/deploy/stepFunctions/compileAlarms.test.js b/lib/deploy/stepFunctions/compileAlarms.test.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../index');
 
 describe('#compileAlarms', () => {
diff --git a/lib/deploy/stepFunctions/compileIamRole.test.js b/lib/deploy/stepFunctions/compileIamRole.test.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../index');
 
 describe('#compileIamRole', () => {
diff --git a/lib/deploy/stepFunctions/compileNotifications.test.js b/lib/deploy/stepFunctions/compileNotifications.test.js
@@ -4,7 +4,7 @@ const _ = require('lodash');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../index');
 
 describe('#compileNotifications', () => {
diff --git a/lib/deploy/stepFunctions/compileStateMachines.test.js b/lib/deploy/stepFunctions/compileStateMachines.test.js
@@ -3,7 +3,7 @@
 const _ = require('lodash');
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./../../index');
 
 describe('#compileStateMachines', () => {
diff --git a/lib/index.test.js b/lib/index.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const CLI = require('serverless/lib/classes/CLI');
 const chalk = require('chalk');
 const ServerlessStepFunctions = require('./index');
diff --git a/lib/invoke/invoke.test.js b/lib/invoke/invoke.test.js
@@ -7,7 +7,7 @@ const BbPromise = require('bluebird');
 const sinon = require('sinon');
 const path = require('path');
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const CLI = require('serverless/lib/classes/CLI');
 const ServerlessStepFunctions = require('./../index');
 
diff --git a/lib/naming.test.js b/lib/naming.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const Serverless = require('serverless/lib/Serverless');
-const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+const AwsProvider = require('serverless/lib/plugins/aws/provider');
 const ServerlessStepFunctions = require('./index');
 
 describe('#naming', () => {
diff --git a/lib/yamlParser.js b/lib/yamlParser.js
@@ -1,66 +1,33 @@
 'use strict';
 
-const BbPromise = require('bluebird');
-const path = require('path');
 const _ = require('lodash');
 
 module.exports = {
   yamlParse() {
-    const servicePath = this.serverless.config.servicePath;
-    if (!servicePath) {
-      return BbPromise.resolve();
+    const parsedObject = this.serverless.configurationInput;
+
+    this.serverless.service.stepFunctions = {
+      validate: parsedObject.stepFunctions ? parsedObject.stepFunctions.validate : false,
+      noOutput: parsedObject.stepFunctions ? parsedObject.stepFunctions.noOutput : false,
+    };
+    this.serverless.service.stepFunctions.stateMachines = parsedObject.stepFunctions
+      && parsedObject.stepFunctions.stateMachines
+      ? parsedObject.stepFunctions.stateMachines : {};
+    this.serverless.service.stepFunctions.activities = parsedObject.stepFunctions
+      && parsedObject.stepFunctions.activities
+      ? parsedObject.stepFunctions.activities : [];
+
+    if (!this.serverless.pluginManager.cliOptions.stage) {
+      this.serverless.pluginManager.cliOptions.stage = this.options.stage
+      || (this.serverless.service.provider && this.serverless.service.provider.stage)
+      || 'dev';
     }
 
-    const fromYamlFile = serverlessYmlPath => this.serverless.yamlParser.parse(serverlessYmlPath);
-
-    let parse = null;
-    const serviceFileName = this.options.config || this.serverless.config.serverless.service.serviceFilename || 'serverless.yml';
-    const serverlessYmlPath = path.join(servicePath, serviceFileName);
-
-    if (['.js', '.json', '.ts'].includes(path.extname(serverlessYmlPath))) {
-      parse = this.loadFromRequiredFile;
-    } else {
-      parse = fromYamlFile;
+    if (!this.serverless.pluginManager.cliOptions.region) {
+      this.serverless.pluginManager.cliOptions.region = this.options.region
+      || (this.serverless.service.provider && this.serverless.service.provider.region)
+      || 'us-east-1';
     }
-    return parse(serverlessYmlPath)
-      .then(serverlessFileParam => this.serverless.variables.populateObject(serverlessFileParam)
-        .then((parsedObject) => {
-          this.serverless.service.stepFunctions = {
-            validate: parsedObject.stepFunctions ? parsedObject.stepFunctions.validate : false,
-            noOutput: parsedObject.stepFunctions ? parsedObject.stepFunctions.noOutput : false,
-          };
-          this.serverless.service.stepFunctions.stateMachines = parsedObject.stepFunctions
-            && parsedObject.stepFunctions.stateMachines
-            ? parsedObject.stepFunctions.stateMachines : {};
-          this.serverless.service.stepFunctions.activities = parsedObject.stepFunctions
-            && parsedObject.stepFunctions.activities
-            ? parsedObject.stepFunctions.activities : [];
-
-          if (!this.serverless.pluginManager.cliOptions.stage) {
-            this.serverless.pluginManager.cliOptions.stage = this.options.stage
-            || (this.serverless.service.provider && this.serverless.service.provider.stage)
-            || 'dev';
-          }
-
-          if (!this.serverless.pluginManager.cliOptions.region) {
-            this.serverless.pluginManager.cliOptions.region = this.options.region
-            || (this.serverless.service.provider && this.serverless.service.provider.region)
-            || 'us-east-1';
-          }
-
-          this.serverless.variables.populateService(this.serverless.pluginManager.cliOptions);
-          return BbPromise.resolve();
-        }));
-  },
-
-  // This function must be ignored since mocking the require system is more
-  // dangerous than beneficial
-  loadFromRequiredFile(serverlessYmlPath) {
-    /* istanbul ignore next */
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const fileContents = require(serverlessYmlPath);
-    /* istanbul ignore next */
-    return BbPromise.resolve(fileContents);
   },
 
   getAllStateMachines() {
diff --git a/lib/yamlParser.test.js b/lib/yamlParser.test.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
