Skip to content

Modify var of global variable to const#317

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

Merged
DeviaVir merged 8 commits into from
Jun 10, 2017
Merged

Modify var of global variable to const#317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32b8db9
Replace async with Promise
abetomo Jun 9, 2017
9964180
Modify to arrow function
abetomo Jun 9, 2017
bdacf97
Modify from var to const
abetomo Jun 9, 2017
c13e995
Merge remote-tracking branch 'upstream/master'
abetomo Jun 9, 2017
4a65d75
Modify `var` of global variable to `const`
abetomo Jun 9, 2017
03ac5e1
Merge branch 'master' of github.com:abetomo/node-lambda
abetomo Jun 9, 2017
0a1b4c2
Merge branch 'master' into modify_var_of_global_variable_to_const
abetomo Jun 9, 2017
9a02a91
Modify `var` of global variable to `const`
abetomo Jun 10, 2017
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
76 changes: 38 additions & 38 deletions bin/node-lambda
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,48 +34,48 @@ if (commandTypes.indexOf(process.argv[2]) === -1){
process.exit(1)
}

var path = require('path')
var dotenv = require('dotenv')
var lambda = require(path.join(__dirname, '..', 'lib', 'main.js'))
var program = require('commander')
var fs = require('fs')
var packageJson = fs.existsSync(path.join(process.cwd(), 'package.json'))
const path = require('path')
const dotenv = require('dotenv')
const lambda = require(path.join(__dirname, '..', 'lib', 'main.js'))
const program = require('commander')
const fs = require('fs')
const packageJson = fs.existsSync(path.join(process.cwd(), 'package.json'))
? require(path.join(process.cwd(), 'package.json')) :{}
var packageJsonName = packageJson.name || 'UnnamedFunction'
const packageJsonName = packageJson.name || 'UnnamedFunction'

dotenv.load()

var AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || ''
var CONFIG_FILE = process.env.CONFIG_FILE || ''
var EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || ''
var EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || ''
var AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID
var AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY
var AWS_PROFILE = process.env.AWS_PROFILE || ''
var AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || ''
var AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1'
var AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName
var AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler'
var AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing'
var AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128
var AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60
var AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3
var AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''
var AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10'
var AWS_PUBLISH = process.env.AWS_PUBLISH || false
var AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || ''
var AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || ''
var AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || ''
var AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || ''
var EVENT_FILE = process.env.EVENT_FILE || 'event.json'
var PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY
var CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json'
var PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || ''
var SRC_DIRECTORY = process.env.SRC_DIRECTORY || ''
var DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000
var DOCKER_IMAGE = process.env.DOCKER_IMAGE || ''
var DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''
var AWS_DLQ_TARGET_ARN = (function (){
const AWS_ENVIRONMENT = process.env.AWS_ENVIRONMENT || ''
const CONFIG_FILE = process.env.CONFIG_FILE || ''
const EVENT_SOURCE_FILE = process.env.EVENT_SOURCE_FILE || ''
const EXCLUDE_GLOBS = process.env.EXCLUDE_GLOBS || ''
const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID
const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY
const AWS_PROFILE = process.env.AWS_PROFILE || ''
const AWS_SESSION_TOKEN = process.env.AWS_SESSION_TOKEN || ''
const AWS_REGION = process.env.AWS_REGION || 'us-east-1,us-west-2,eu-west-1'
const AWS_FUNCTION_NAME = process.env.AWS_FUNCTION_NAME || packageJsonName
const AWS_HANDLER = process.env.AWS_HANDLER || 'index.handler'
const AWS_ROLE = process.env.AWS_ROLE_ARN || process.env.AWS_ROLE || 'missing'
const AWS_MEMORY_SIZE = process.env.AWS_MEMORY_SIZE || 128
const AWS_TIMEOUT = process.env.AWS_TIMEOUT || 60
const AWS_RUN_TIMEOUT = process.env.AWS_RUN_TIMEOUT || 3
const AWS_DESCRIPTION = process.env.AWS_DESCRIPTION || packageJson.description || ''
const AWS_RUNTIME = process.env.AWS_RUNTIME || 'nodejs6.10'
const AWS_PUBLISH = process.env.AWS_PUBLISH || false
const AWS_FUNCTION_VERSION = process.env.AWS_FUNCTION_VERSION || ''
const AWS_VPC_SUBNETS = process.env.AWS_VPC_SUBNETS || ''
const AWS_VPC_SECURITY_GROUPS = process.env.AWS_VPC_SECURITY_GROUPS || ''
const AWS_TRACING_CONFIG = process.env.AWS_TRACING_CONFIG || ''
const EVENT_FILE = process.env.EVENT_FILE || 'event.json'
const PACKAGE_DIRECTORY = process.env.PACKAGE_DIRECTORY
const CONTEXT_FILE = process.env.CONTEXT_FILE || 'context.json'
const PREBUILT_DIRECTORY = process.env.PREBUILT_DIRECTORY || ''
const SRC_DIRECTORY = process.env.SRC_DIRECTORY || ''
const DEPLOY_TIMEOUT = process.env.DEPLOY_TIMEOUT || 120000
const DOCKER_IMAGE = process.env.DOCKER_IMAGE || ''
const DEPLOY_ZIPFILE = process.env.DEPLOY_ZIPFILE || ''
const AWS_DLQ_TARGET_ARN = (function (){
// You can clear the setting by passing an empty string
// when executing updateFunctionConfiguration
if (process.env.AWS_DLQ_TARGET_ARN !== undefined){
Expand Down
32 changes: 16 additions & 16 deletions lib/main.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
'use strict'

var path = require('path')
var aws = require('aws-sdk')
var exec = require('child_process').exec
var execSync = require('child_process').execSync
var execFile = require('child_process').execFile
var fs = require('fs-extra')
var packageJson = require(path.join(__dirname, '..', 'package.json'))
var minimatch = require('minimatch')
var async = require('async')
var zip = new (require('node-zip'))()
var dotenv = require('dotenv')
var ScheduleEvents = require(path.join(__dirname, 'schedule_events'))

var maxBufferSize = 50 * 1024 * 1024

var Lambda = function (){
const path = require('path')
const aws = require('aws-sdk')
const exec = require('child_process').exec
const execSync = require('child_process').execSync
const execFile = require('child_process').execFile
const fs = require('fs-extra')
const packageJson = require(path.join(__dirname, '..', 'package.json'))
const minimatch = require('minimatch')
const async = require('async')
const zip = new (require('node-zip'))()
const dotenv = require('dotenv')
const ScheduleEvents = require(path.join(__dirname, 'schedule_events'))

const maxBufferSize = 50 * 1024 * 1024

const Lambda = function (){
this.version = packageJson.version

return this
Expand Down