Skip to content

Fixed comparison checks for function names and general cleanup #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emilhdiaz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed comparison checks for function names and general cleanup #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
'use strict'

const naming = require('./naming')
const ref = {}

class AWSNaming {
constructor(serverless, options) {
const self = this
ref.self = self
this.serverless = serverless
this.service = serverless.service
this.serverlessLog = serverless.cli.log.bind(serverless.cli)
this.options = options
this.hooks = {
'before:package:finalize': naming.fixLogGroups.bind(this)
}

self.start()
}
this.provider = serverless.getProvider('aws')

// Overwrite the AWS provider's naming module
serverless.cli.log('Setting custom naming conventions...')
Object.assign(this.provider.naming, naming)

start() {
ref.self.serverlessLog('Setting custom naming conventions...')
var aws = ref.self.serverless.getProvider('aws')
Object.assign(aws.naming, naming)
ref.self.serverless.cli.log('Setting custom function names...')
naming.setFunctionNames(aws)
// Overwrite the function names
serverless.cli.log('Setting custom function names...')
naming.setFunctionNames(this.provider)
}
}
module.exports = AWSNaming
78 changes: 27 additions & 51 deletions naming.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,98 +2,74 @@

const fs = require('fs')
const _ = require('lodash')
const uuidv4 = require('uuid/v4');
const uuidv4 = require('uuid/v4')

module.exports = {
dataSource: undefined,

_getMappings(lambdaName) {
if (!this.dataSource) {
this.dataSource = fs.readFileSync(this.provider.serverless.service.custom['serverless-aws-resource-names'].source, 'utf8').replace(new RegExp('\\$rand', 'g'), uuidv4())
}
var data = this.dataSource.replace(new RegExp('\\$stage', 'g'), this.provider.getStage() || 'dev')
data = data.replace(new RegExp('\\$region', 'g'), this.provider.getRegion())
data = data.replace(new RegExp('\\$service', 'g'), this.provider.serverless.service.service)
if (lambdaName) {
data = data.replace(new RegExp('\\$lambda', 'g'), lambdaName)
} else {
data = data.replace(new RegExp('\\$lambda', 'g'), 'lambdaName')
}
return JSON.parse(data)
},

getCompiledTemplateFileName() {
return this._getMappings().template.compiled
},

getCoreTemplateFileName() {
return this._getMappings().template.core
},

getStackName() {
return this._getMappings().stack
},

getRoleName() {
return this._getMappings().role
},

getPolicyName() {
return this._getMappings().policy
},

getApiGatewayName() {
return this._getMappings().apiGateway
},
getLogGroupName(functionName) {

getLogGroupName(name) {
const self = this
var logGroup
_.forEach(self.provider.serverless.service.functions, (functionObj, name) => {
if (JSON.stringify(functionName).includes(name + '"') || JSON.stringify(functionName).includes(name + '-')) {
logGroup = this._getMappings(name).logGroup
_.forEach(self.provider.serverless.service.functions, (functionObj, functionName) => {
if (name === functionObj.name) {
logGroup = this._getMappings(functionName).logGroup
return false
}
})
return logGroup
},

setFunctionNames(provider) {
const self = this
var mappings
if (!self.provider) {
self.provider = provider
}
self.provider = provider

if (self.provider) {
_.forEach(self.provider.serverless.service.functions, (functionObj, functionName) => {
if (!functionObj.events) {
self.provider.serverless.service.functions[functionName].events = []
}
mappings = self._getMappings(functionName)
const mappings = self._getMappings(functionName)
self.provider.serverless.service.functions[functionName].name = mappings.lambda
})
}
},
fixLogGroups(args) {
var cft = this.serverless.service.provider.compiledCloudFormationTemplate
var role = cft.Resources.IamRoleLambdaExecution
for (var policy of role.Properties.Policies) {
for (var statement of policy.PolicyDocument.Statement) {
statement.Resource = []
if (statement.Action.includes("logs:CreateLogStream")) {
for (var resource of Object.keys(cft.Resources)) {
if (resource.includes("LogGroup")) {
statement.Resource.push({
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${" + resource + "}:*"
})
}
}
}
if (statement.Action.includes("logs:PutLogEvents")) {
for (var resource of Object.keys(cft.Resources)) {
if (resource.includes("LogGroup")) {
statement.Resource.push({
"Fn::Sub": "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:${" + resource + "}:*:*"
})
}
}
}
}
}

_getMappings(lambdaName) {
if (!this.dataSource) {
this.dataSource = fs.readFileSync(this.provider.serverless.service.custom['serverless-aws-resource-names'].source, 'utf8').replace(new RegExp('\\$rand', 'g'), uuidv4())
}
var data = this.dataSource.replace(new RegExp('\\$stage', 'g'), this.provider.getStage() || 'dev')
data = data.replace(new RegExp('\\$region', 'g'), this.provider.getRegion())
data = data.replace(new RegExp('\\$service', 'g'), this.provider.serverless.service.service)
if (lambdaName) {
data = data.replace(new RegExp('\\$lambda', 'g'), lambdaName)
} else {
data = data.replace(new RegExp('\\$lambda', 'g'), 'lambdaName')
}
return JSON.parse(data)
}
}
Loading