From 42d963fd3a394bb0c6c496bddd4c474803141228 Mon Sep 17 00:00:00 2001 From: abetomo Date: Thu, 9 Nov 2017 10:44:43 +0900 Subject: [PATCH 1/3] Change short option of `--tracingConfig` to `-c` --- bin/node-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node-lambda b/bin/node-lambda index 731c0bcd..589040d0 100755 --- a/bin/node-lambda +++ b/bin/node-lambda @@ -82,7 +82,7 @@ program .option('-K, --kmsKeyArn [' + AWS_KMS_KEY_ARN + ']', 'Lambda KMS Key ARN', AWS_KMS_KEY_ARN) .option('-Q, --deadLetterConfigTargetArn [' + AWS_DLQ_TARGET_ARN + ']', 'Lambda DLQ resource', AWS_DLQ_TARGET_ARN) - .option('-T, --tracingConfig [' + AWS_TRACING_CONFIG + ']', 'Lambda tracing settings', + .option('-c, --tracingConfig [' + AWS_TRACING_CONFIG + ']', 'Lambda tracing settings', AWS_TRACING_CONFIG) .option('-R, --retentionInDays [' + AWS_LOGS_RETENTION_IN_DAYS + ']', 'CloudWatchLogs retentionInDays settings', AWS_LOGS_RETENTION_IN_DAYS) From b39bc663e3866f56a5d815a65e31288e41eee0a7 Mon Sep 17 00:00:00 2001 From: abetomo Date: Thu, 9 Nov 2017 10:45:10 +0900 Subject: [PATCH 2/3] Update README for short option of `--tracingConfig` -T => -c --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03372451..00a55728 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ Options: -g, --vpcSecurityGroups [] Lambda VPC Security Group -K, --kmsKeyArn [] Lambda KMS Key ARN -Q, --deadLetterConfigTargetArn [] Lambda DLQ resource - -T, --tracingConfig [] Lambda tracing settings + -c, --tracingConfig [] Lambda tracing settings -R, --retentionInDays [] CloudWatchLogs retentionInDays settings -A, --packageDirectory [build] Local Package Directory -G, --sourceDirectory [] Path to lambda source Directory (e.g. "./some-lambda") From a24231e5255eb84088e36270fa263583d812a883 Mon Sep 17 00:00:00 2001 From: abetomo Date: Thu, 9 Nov 2017 10:45:53 +0900 Subject: [PATCH 3/3] Add a test to check for duplicate short options --- test/node-lambda.js | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/test/node-lambda.js b/test/node-lambda.js index 857b3030..2e51b454 100644 --- a/test/node-lambda.js +++ b/test/node-lambda.js @@ -246,6 +246,37 @@ describe('bin/node-lambda', () => { }) }) + describe('node-lambda duplicate check of short option', () => { + const duplicateCheckTestFunc = (type, done) => { + const cmd = spawn('node', [nodeLambdaPath, type, '-h']) + let stdoutString = '' + cmd.stdout.on('data', (data) => { + stdoutString += data.toString() + }) + + cmd.on('exit', (code) => { + assert.equal(code, 0) + + const shortOptions = stdoutString.split('\n').filter(line => { + return line.match(/^\s+-/) + }).map(line => { + return line.split(/\s+/)[1] + }) + const uniqueShortOptions = shortOptions.filter((option, index, array) => { + return array.indexOf(option) === index + }) + assert.equal(shortOptions.length, uniqueShortOptions.length) + done() + }) + } + + ['deploy', 'run', 'setup'].forEach(type => { + it(`cmd:${type}`, (done) => { + duplicateCheckTestFunc(type, done) + }) + }) + }) + describe('node-lambda --version', () => { const packageJson = require(path.join(__dirname, '..', 'package.json')) it('The current version is displayed', () => {