serverless-alpha - npm Package Compare versions

Comparing version 0.0.18 to 0.0.19

index.js

@@ -16,2 +16,3 @@ 'use strict' // eslint-disable-line strict
 const base64url = require('./utils/base64url')
+const fetchEndpoint = require('./utils/fetchEndpoint')
 const getHomeDirectory = require('./utils/getHomeDirectory')
@@ -499,40 +500,48 @@ const parseFunctionsYml = require('./utils/parseFunctionsYml')
     const region = this.serverless.service.provider.region
+    const stage = this.serverless.processedInput.options.stage
 
     return provider.getAccountId().then(accountId => {
-      const funcs = this.serverless.service.getAllFunctions().map(key => {
-        let funcAttributes = {
-          name: key,
-          runtime: functionInfoUtils.getRuntime(key, this.serverless),
-          memory: functionInfoUtils.getMemorySize(key, this.serverless),
-          timeout: functionInfoUtils.getTimeout(key, this.serverless),
-          provider: this.serverless.service.provider.name,
-          originId: `arn:aws:lambda:${region}:${accountId}:function:${functionInfoUtils.getArnName(key, this.serverless)}`
+      fetchEndpoint(provider, stage, region).then(endpoint => {
+        const funcs = this.serverless.service.getAllFunctions().map(key => {
+          let funcAttributes = {
+            name: key,
+            runtime: functionInfoUtils.getRuntime(key, this.serverless),
+            memory: functionInfoUtils.getMemorySize(key, this.serverless),
+            timeout: functionInfoUtils.getTimeout(key, this.serverless),
+            provider: this.serverless.service.provider.name,
+            originId: `arn:aws:lambda:${region}:${accountId}:function:${functionInfoUtils.getArnName(key, this.serverless)}`,
+            endpoints: functionInfoUtils.getEndpoints(
+              key,
+              this.serverless,
+              endpoint
+            )
+          }
+          if (this.serverless.service.functions[key].readme) {
+            funcAttributes = addReadme(
+              funcAttributes,
+              this.serverless.service.functions[key].readme
+            )
+          }
+          return funcAttributes
+        })
+
+        const serviceData = {
+          name: this.serverless.service.service,
+          stage: this.serverless.processedInput.options.stage,
+          functions: funcs
         }
-        if (this.serverless.service.functions[key].readme) {
-          funcAttributes = addReadme(
-            funcAttributes,
-            this.serverless.service.functions[key].readme
-          )
-        }
-        return funcAttributes
-      })
 
-      const serviceData = {
-        name: this.serverless.service.service,
-        stage: this.serverless.processedInput.options.stage,
-        functions: funcs
-      }
+        // TODO make sure it caputures multiple variations of readme file name
+        const readmePath = path.join(
+          this.serverless.config.servicePath,
+          'README.md'
+        )
+        const serviceDataWithReadme = addReadme(serviceData, readmePath)
 
-      // TODO make sure it caputures multiple variations of readme file name
-      const readmePath = path.join(
-        this.serverless.config.servicePath,
-        'README.md'
-      )
-      const serviceDataWithReadme = addReadme(serviceData, readmePath)
-
-      publishService(serviceDataWithReadme, clientWithAuth).catch(error => {
-        log(
-          "Couldn't publish this deploy information to the Serverless Platform due: \n",
-          error
-        )
+        publishService(serviceDataWithReadme, clientWithAuth).catch(error => {
+          log(
+            "Couldn't publish this deploy information to the Serverless Platform due: \n",
+            error
+          )
+        })
       })
@@ -539,0 +548,0 @@ })

package.json

 {
   "name": "serverless-alpha",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "author": "serverless.com",
@@ -5,0 +5,0 @@ "license": "MIT",

utils/functionInfoUtils.js

 module.exports = {
-  getMemorySize: (functionKey, serverless) => (
-    Number(serverless.service.functions[functionKey].memorySize)
-      || Number(serverless.service.provider.memorySize)
-      || 1024
-  ),
-  getTimeout: (functionKey, serverless) => (
-    Number(serverless.service.functions[functionKey].timeout)
-      || Number(serverless.service.provider.timeout)
-      || 6
-  ),
-  getRuntime: (functionKey, serverless) => (
-    serverless.service.functions[functionKey].runtime
-      || serverless.service.provider.runtime
-      || 'nodejs4.3'
-  ),
-  getArnName: (functionKey, serverless) => (
-    serverless.service.functions[functionKey].name
-      || `${serverless.service.service}-${serverless.service.provider.stage}-${functionKey}`
-  ),
+  getMemorySize: (functionKey, serverless) =>
+    Number(serverless.service.functions[functionKey].memorySize) ||
+    Number(serverless.service.provider.memorySize) ||
+    1024,
+  getTimeout: (functionKey, serverless) =>
+    Number(serverless.service.functions[functionKey].timeout) ||
+    Number(serverless.service.provider.timeout) ||
+    6,
+  getRuntime: (functionKey, serverless) =>
+    serverless.service.functions[functionKey].runtime ||
+    serverless.service.provider.runtime ||
+    'nodejs4.3',
+  getArnName: (functionKey, serverless) =>
+    serverless.service.functions[functionKey].name ||
+    `${serverless.service.service}-${serverless.service.provider.stage}-${functionKey}`,
+  getEndpoints: (functionKey, serverless, endpoint) => {
+    const func = serverless.service.functions[functionKey]
+    if (func.events) {
+      return func.events.filter(event => event.http).map(event => {
+        let method
+        let path
+
+        if (typeof event.http === 'object') {
+          method = event.http.method.toUpperCase()
+          path = event.http.path
+        } else {
+          method = event.http.split(' ')[0].toUpperCase()
+          path = event.http.split(' ')[1]
+        }
+        path = path !== '/'
+          ? `/${path.split('/').filter(p => p !== '').join('/')}`
+          : ''
+
+        return {
+          url: `${endpoint}${path}`,
+          method
+        }
+      })
+    }
+    return []
+  }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

60658

increased by2.75%

Number of package files

51

increased by2%

Lines of code

1365

increased by3.88%

No dependency changes