Merge branch 'master' of github.com:serverless-operations/serverless-apigateway-service-proxy

horike37 · horike37 · commit a4a31fd62b3d · 2022-03-17T21:30:32.000+09:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -24,7 +24,7 @@ jobs:
 
       - run: npm install
       - run: npm run lint
-      - run: npm run test -- --coverageDirectory coverage/unit_tests
+      - run: npm run coverage
       - run: npm run integration-test -- --coverageDirectory coverage/integration_tests
         env:
           AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -20,7 +20,7 @@ jobs:
             ${{ runner.os }}-node-
       - run: npm install
       - run: npm run lint
-      - run: npm run test -- --coverageDirectory coverage/unit_tests
+      - run: npm run coverage
       - name: integration-test
         if: ${{ github.actor != 'dependabot[bot]' }}
         run: npm run integration-test -- --coverageDirectory coverage/integration_tests
diff --git a/__tests__/integration/eventbridge/multiple-integrations/service/serverless.yml b/__tests__/integration/eventbridge/multiple-integrations/service/serverless.yml
@@ -64,4 +64,4 @@ resources:
     YourBus:
       Type: AWS::Events::EventBus
       Properties:
-        Name: YourEventBus-${self:provider.stage}-multi
+        Name: YourEventBus-${sls:stage}-multi
diff --git a/__tests__/integration/eventbridge/single-integration/service/serverless.yml b/__tests__/integration/eventbridge/single-integration/service/serverless.yml
@@ -23,4 +23,4 @@ resources:
     YourBus:
       Type: AWS::Events::EventBus
       Properties:
-        Name: YourEventBus-${self:provider.stage}-single
+        Name: YourEventBus-${sls:stage}-single
diff --git a/lib/apiGateway/methods.test.js b/lib/apiGateway/methods.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../index')
 
@@ -13,7 +13,7 @@ describe('#getAllServiceProxies()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/apiGateway/validate.test.js b/lib/apiGateway/validate.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../index')
 
@@ -13,7 +13,7 @@ describe('#validateServiceProxies()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/index.test.js b/lib/index.test.js
@@ -3,7 +3,7 @@ const chalk = require('chalk')
 const sinon = require('sinon')
 const chai = require('chai')
 const BbPromise = require('bluebird')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./index')
 
@@ -17,7 +17,7 @@ describe('#index()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/dynamodb/compileIamRoleToDynamodb.test.js b/lib/package/dynamodb/compileIamRoleToDynamodb.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToDynamodb()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/dynamodb/compileMethodsToDynamodb.test.js b/lib/package/dynamodb/compileMethodsToDynamodb.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const _ = require('lodash')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -71,7 +71,7 @@ describe('#compileMethodsToDynamodb()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/eventbridge/compileEventBridgeServiceProxy.test.js b/lib/package/eventbridge/compileEventBridgeServiceProxy.test.js
@@ -1,6 +1,6 @@
 const sinon = require('sinon')
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('../../index')
 
@@ -13,7 +13,7 @@ describe('#compileEventBridgeServiceProxy', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/eventbridge/compileIamRoleToEventBridge.test.js b/lib/package/eventbridge/compileIamRoleToEventBridge.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToEventBridge()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/eventbridge/compileMethodsToEventBridge.test.js b/lib/package/eventbridge/compileMethodsToEventBridge.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('../../index')
 
@@ -11,7 +11,7 @@ describe('#compileMethodsToEventBridge()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/kinesis/compileIamRoleToKinesis.test.js b/lib/package/kinesis/compileIamRoleToKinesis.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToKinesis()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/kinesis/compileKinesisServiceProxy.test.js b/lib/package/kinesis/compileKinesisServiceProxy.test.js
@@ -1,6 +1,6 @@
 const sinon = require('sinon')
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -13,7 +13,7 @@ describe('#compileKinesisServiceProxy', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/kinesis/compileMethodsToKinesis.test.js b/lib/package/kinesis/compileMethodsToKinesis.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileMethodsToKinesis()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/s3/compileIamRoleToS3.test.js b/lib/package/s3/compileIamRoleToS3.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToS3()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/s3/compileMethodsToS3.test.js b/lib/package/s3/compileMethodsToS3.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const _ = require('lodash')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -56,7 +56,7 @@ describe('#compileMethodsToS3()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/s3/compileS3ServiceProxy.test.js b/lib/package/s3/compileS3ServiceProxy.test.js
@@ -1,6 +1,6 @@
 const sinon = require('sinon')
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -13,7 +13,7 @@ describe('#compileS3ServiceProxy', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sns/compileIamRoleToSns.test.js b/lib/package/sns/compileIamRoleToSns.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToSns()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sns/compileMethodsToSns.test.js b/lib/package/sns/compileMethodsToSns.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileMethodsToSns()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sns/compileSnsServiceProxy.test.js b/lib/package/sns/compileSnsServiceProxy.test.js
@@ -1,6 +1,6 @@
 const sinon = require('sinon')
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -13,7 +13,7 @@ describe('#compileSnsServiceProxy', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sqs/compileIamRoleToSqs.test.js b/lib/package/sqs/compileIamRoleToSqs.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileIamRoleToSqs()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sqs/compileMethodsToSqs.test.js b/lib/package/sqs/compileMethodsToSqs.test.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -11,7 +11,7 @@ describe('#compileMethodsToSqs()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/package/sqs/compileSqsServiceProxy.test.js b/lib/package/sqs/compileSqsServiceProxy.test.js
@@ -1,6 +1,6 @@
 const sinon = require('sinon')
 const chai = require('chai')
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./../../index')
 
@@ -13,7 +13,7 @@ describe('#compileSqsServiceProxy', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/lib/utils.test.js b/lib/utils.test.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const expect = require('chai').expect
-const Serverless = require('serverless/lib/Serverless')
+const Serverless = require('serverless/lib/serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider')
 const ServerlessApigatewayServiceProxy = require('./index')
 
@@ -10,7 +10,7 @@ describe('#utils()', () => {
   let serverlessApigatewayServiceProxy
 
   beforeEach(() => {
-    serverless = new Serverless()
+    serverless = new Serverless({ commands: [], options: {} })
     serverless.servicePath = true
     serverless.service.service = 'apigw-service-proxy'
     const options = {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
