CHANGE: lambda name

Author: borzav

src/cli/context/steppes/setFunctionalEnvironment.ts

@@ -5,8 +5,10 @@ export class SetFunctionalEnvironmentStep extends ExecuteStep {
         for (let serviceDefinition of context.publishedFunctions) {
             const setFuncEnvEnvAttrib = environment('FUNCTIONAL_ENVIRONMENT', context.FUNCTIONAL_ENVIRONMENT)
             const setStageEnvAttrib = environment('FUNCTIONAL_STAGE', context.stage)
+            const setProjectNameEnvAttrib = environment('FUNCTIONAL_PROJECTNAME', context.projectName)
             setFuncEnvEnvAttrib(serviceDefinition.service)
             setStageEnvAttrib(serviceDefinition.service)
+            setProjectNameEnvAttrib(serviceDefinition.service)
         }
     }
 }

src/cli/project/config.ts

@@ -13,7 +13,7 @@ try {
     if (packageJson && packageJson.version) {
         projectConfig.version = packageJson.version
     }
-    if (packageJson && packageJson.name) {
+    if (!projectConfig.name && packageJson && packageJson.name) {
         projectConfig.name = packageJson.name
     }
 } catch (e) { }

src/cli/providers/cloudFormation/context/resources.ts

@@ -179,7 +179,7 @@ export const logPolicy = async (context) => {
                 ],
                 "Resource": [
                     {
-                        "Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*-" + context.stage + ":*"
+                        "Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/" + context.projectName + "-*-" + context.stage + ":*"
                     }
                 ]
             }, {
@@ -189,7 +189,7 @@ export const logPolicy = async (context) => {
                 ],
                 "Resource": [
                     {
-                        "Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/*-" + context.stage + ":*:*"
+                        "Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:/aws/lambda/" + context.projectName + "-*-" + context.stage + ":*:*"
                     }
                 ]
             }]
@@ -276,7 +276,7 @@ export const lambdaResource = async (context) => {
             S3Key: context.S3Zip
         },
         Description: serviceDefinition[CLASS_DESCRIPTIONKEY] || getMetadata(CLASS_DESCRIPTIONKEY, serviceDefinition.service),
-        FunctionName: `${getFunctionName(serviceDefinition.service)}-${context.stage}`,
+        FunctionName: `${context.projectName}-${getFunctionName(serviceDefinition.service)}-${context.stage}`,
         Handler: serviceDefinition.handler,
         MemorySize: serviceDefinition[CLASS_AWSMEMORYSIZEKEY] || getMetadata(CLASS_AWSMEMORYSIZEKEY, serviceDefinition.service),
         Role: serviceDefinition[CLASS_ROLEKEY] || getMetadata(CLASS_ROLEKEY, serviceDefinition.service),
@@ -335,7 +335,7 @@ export const lambdaLogResource = async (context) => {
     const functionName = getFunctionName(serviceDefinition.service)
 
     const properties: any = {
-        "LogGroupName": `/aws/lambda/${functionName}-${context.stage}`
+        "LogGroupName": `/aws/lambda/${context.projectName}-${functionName}-${context.stage}`
     };
 
     const lambdaResource = {

src/providers/aws/index.ts

@@ -62,7 +62,7 @@ export class AWSProvider extends Provider {
         const resolvedFuncName = process.env[`FUNCTIONAL_SERVICE_${funcName.toUpperCase()}`] || funcName
 
         const invokeParams = {
-            FunctionName: resolvedFuncName,
+            FunctionName: `${process.env.FUNCTIONAL_PROJECTNAME}-${resolvedFuncName}`,
             Payload: JSON.stringify(params)
         };
 

test/invoke.tests.ts

@@ -9,6 +9,7 @@ import { httpTrigger, inject, injectable, param, rest, createParameterDecorator
 
 describe('invoke', () => {
     const FUNCTIONAL_ENVIRONMENT = 'custom'
+    const FUNCTIONAL_PROJECTNAME = 'my-test-project'
 
     describe('general', () => {
         beforeEach(() => {
@@ -878,9 +879,11 @@ describe('invoke', () => {
     describe('aws', () => {
         beforeEach(() => {
             process.env.FUNCTIONAL_ENVIRONMENT = FUNCTIONAL_ENVIRONMENT
+            process.env.FUNCTIONAL_PROJECTNAME = FUNCTIONAL_PROJECTNAME
         })
         afterEach(() => {
             delete process.env.FUNCTIONAL_ENVIRONMENT
+            delete process.env.FUNCTIONAL_PROJECTNAME
             removeProvider(FUNCTIONAL_ENVIRONMENT)
         })
 
@@ -891,7 +894,7 @@ describe('invoke', () => {
                 public async invokeExec(config: any): Promise<any> {
                     counter++
 
-                    expect(config).to.have.property('FunctionName', 'A')
+                    expect(config).to.have.property('FunctionName', `my-test-project-A`)
                     expect(config).to.have.property('Payload', JSON.stringify({ p1: 'p1' }))
                 }
             }