Check serverless.yml to correct no-default false positives

src/components/resourceTable.js

@@ -7,6 +7,7 @@ import { getStackResources } from "../services/stackResources";
 import { padString } from "../utils/padString";
 import { lambdaStatisticsModal, lambdaInvokeModal } from "../modals";
 import { getLambdaFunctions } from "../services";
+import { abbreviateFunction } from "../utils/abbreviateFunction";
 
 const contrib = require("blessed-contrib");
 const open = require("open");
@@ -256,9 +257,9 @@ class ResourceTable {
     this.table.data = lambdaFunctionResources.map((lam) => {
       const funcName = lam.PhysicalResourceId;
       const func = this.lambdaFunctions[funcName];
-      const shortenedFuncName = lam.PhysicalResourceId.replace(
-        `${this.program.stackName}-`,
-        ""
+      const shortenedFuncName = abbreviateFunction(
+        lam.PhysicalResourceId,
+        this.program.stackName
       );
       this.fullFunctionNames[shortenedFuncName] = funcName;
       let timeout = "?";

src/guardian/index.js

@@ -12,6 +12,7 @@ import {
   getStackResources,
   getLambdaFunctions,
 } from "../services";
+import Serverless from "../services/serverless";
 
 const infoLog = chalk.greenBright;
 const titleLog = chalk.greenBright.underline.bold;
@@ -55,6 +56,8 @@ class GuardianCI {
     if (this.config) {
       this.ignoreConfig = this.config.ignore;
     }
+
+    this.SLS = new Serverless(program.location);
   }
 
   async getAllLambdaFunctions() {
@@ -139,7 +142,12 @@ class GuardianCI {
     // eslint-disable-next-line no-restricted-syntax
     for (const Check of this.checksToRun) {
       console.group();
-      const check = new Check(this.AWS, this.stackName, this.stackFunctions);
+      const check = new Check(
+        this.AWS,
+        this.stackName,
+        this.stackFunctions,
+        this.SLS
+      );
       if (!this.ignoreCheck(check)) {
         const filteredStack = this.ignoreArns(check, this.stackFunctions);
         check.stackFunctions = filteredStack;

src/guardian/rules/best_practices/no-default-memory/index.js

@@ -1,20 +1,30 @@
+import { abbreviateFunction } from "../../../../utils/abbreviateFunction";
+
 class NoDefaultMemory {
-  constructor(AWS, stackName, stackFunctions) {
+  constructor(AWS, stackName, stackFunctions, SLS) {
     this.name = "no-default-memory";
     this.AWS = AWS;
     this.stackName = stackName;
     this.stackFunctions = stackFunctions;
     this.result = false;
     this.defaultMemory = 1024;
     this.failingResources = [];
+    this.SLS = SLS;
     this.failureMessage =
       "The following functions have their memory set as default.";
     this.rulePage =
       "See (https://theodo-uk.github.io/sls-dev-tools/docs/no-default-memory) for impact and how to to resolve.";
   }
 
   hasDefaultMemory(lambdaFunction) {
-    return lambdaFunction.MemorySize === this.defaultMemory;
+    const shortenedName = abbreviateFunction(
+      lambdaFunction.FunctionName,
+      this.stackName
+    );
+    return (
+      lambdaFunction.MemorySize === this.defaultMemory &&
+      !this.SLS.getFunctionConfig(shortenedName).memorySize
+    );
   }
 
   async run() {

src/guardian/rules/best_practices/no-default-timeout/index.js

@@ -1,5 +1,7 @@
+import { abbreviateFunction } from "../../../../utils/abbreviateFunction";
+
 class NoDefaultTimeout {
-  constructor(AWS, stackName, stackFunctions) {
+  constructor(AWS, stackName, stackFunctions, SLS) {
     this.name = "no-default-timeout";
     this.AWS = AWS;
     this.stackName = stackName;
@@ -8,17 +10,23 @@ class NoDefaultTimeout {
     this.defaultTimeoutAWS = 3;
     this.defaultTimeoutServerlessFramework = 6;
     this.failingResources = [];
+    this.SLS = SLS;
     this.failureMessage =
       "The following functions have their timeout set as default.";
     this.rulePage =
       "See (https://theodo-uk.github.io/sls-dev-tools/docs/no-default-timeout) for impact and how to to resolve.";
   }
 
   hasDefaultTimeout(lambdaFunction) {
-    return [
-      this.defaultTimeoutAWS,
-      this.defaultTimeoutServerlessFramework,
-    ].includes(lambdaFunction.Timeout);
+    const shortenedName = abbreviateFunction(
+      lambdaFunction.FunctionName,
+      this.stackName
+    );
+    return (
+      [this.defaultTimeoutAWS, this.defaultTimeoutServerlessFramework].includes(
+        lambdaFunction.Timeout
+      ) && !this.SLS.getFunctionConfig(shortenedName).timeout
+    );
   }
 
   async run() {

src/services/serverless.js

@@ -20,6 +20,10 @@ class Serverless {
     }
   }
 
+  getFunctionConfig(functionName) {
+    return this.config.functions[functionName];
+  }
+
   getStage() {
     if (typeof this.config !== "object") {
       return "dev";

src/utils/abbreviateFunction.js

@@ -0,0 +1,7 @@
+function abbreviateFunction(fullFuncName, stackName) {
+  return fullFuncName.replace(`${stackName}-`, "");
+}
+
+module.exports = {
+  abbreviateFunction,
+};