Skip to content

Commit

Permalink
Trying merge
Browse files Browse the repository at this point in the history
  • Loading branch information
kevindiamond committed Nov 17, 2017
1 parent 20e06cc commit 7ecd231
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ class SplunkPlugin {
service.provider.environment.SPLUNK_HEC_URL = service.custom.splunk.url
service.provider.environment.SPLUNK_HEC_TOKEN = service.custom.splunk.token


const functionPath = path.relative(this.serverless.config.servicePath,path.resolve(__dirname, 'splunk/splunk-cloudwatch-logs-processor'))
const functionPath = path.relative(this.serverless.config.servicePath, path.resolve(__dirname, 'splunk/splunk-cloudwatch-logs-processor'))
console.log(functionPath)

service.functions.splunk = {
Expand Down Expand Up @@ -118,7 +117,7 @@ class SplunkPlugin {
}
}

_.extend(resource, splunkLambdaPermission)
_.merge(resource, splunkLambdaPermission)

service.getAllFunctions().forEach((functionName) => {
if (functionName !== `${serviceName}-splunk`) {
Expand All @@ -133,7 +132,7 @@ class SplunkPlugin {
log.DependsOn.push(logicalName)

console.log(log)
_.extend(resource, { [`${logName}`]: log })
_.merge(resource, { [`${logName}`]: log })
}
})

Expand Down

0 comments on commit 7ecd231

Please sign in to comment.