Skip to content

Commit 0556c1d

Browse files
author
kkuzmin
authored
Merge pull request #18 from alertlogic/update-linting-rules
update linter rules and fix linter violations
2 parents 442992f + 8a8030b commit 0556c1d

File tree

4 files changed

+58
-53
lines changed

4 files changed

+58
-53
lines changed

‎.jshintrc‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
{
2-
"esversion": 6
2+
"esversion": 6,
3+
"shadow": "outer",
4+
"undef": true,
5+
"unused": "vars",
6+
"node": true,
7+
"predef": [
8+
"it",
9+
"describe",
10+
"before",
11+
"after",
12+
"beforeEach",
13+
"afterEach"
14+
]
315
}

‎test/al_aws_collector_test.js‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ function mockLambdaGetFunctionConfiguration(returnObject) {
103103
});
104104
}
105105

106-
function mockLambdaUpdateFunctionConfiguration(returnObject) {
107-
AWS.mock('Lambda', 'updateFunctionConfiguration', function (params, callback) {
108-
return callback(null, returnObject);
109-
});
110-
}
111-
112106
function mockLambdaEndpointsUpdateConfiguration() {
113107
AWS.mock('Lambda', 'updateFunctionConfiguration', function (params, callback) {
114108
assert.equal(params.FunctionName, colMock.FUNCTION_NAME);
@@ -134,7 +128,7 @@ var formatFun = function (event, context, callback) {
134128
return callback(null, event);
135129
};
136130

137-
describe('al_aws_collector tests', function(done) {
131+
describe('al_aws_collector tests', function() {
138132

139133
beforeEach(function(){
140134
AWS.mock('KMS', 'decrypt', function (params, callback) {
@@ -145,8 +139,8 @@ describe('al_aws_collector tests', function(done) {
145139
});
146140

147141
responseStub = sinon.stub(m_response, 'send').callsFake(
148-
function fakeFn(event, context, responseStatus, responseData, physicalResourceId) {
149-
context.succeed();
142+
function fakeFn(event, mockContext, responseStatus, responseData, physicalResourceId) {
143+
mockContext.succeed();
150144
});
151145

152146
setAlServiceStub();
@@ -158,7 +152,7 @@ describe('al_aws_collector tests', function(done) {
158152
});
159153

160154
it('register success', function(done) {
161-
var context = {
155+
var mockContext = {
162156
invokedFunctionArn : colMock.FUNCTION_ARN,
163157
succeed : () => {
164158
sinon.assert.calledWith(alserviceStub.post, colMock.REG_URL, colMock.REG_AZCOLLECT_QUERY);
@@ -167,14 +161,14 @@ describe('al_aws_collector tests', function(done) {
167161
};
168162
AlAwsCollector.load().then(function(creds) {
169163
var collector = new AlAwsCollector(
170-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds, function() {});
164+
mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds, function() {});
171165
collector.register(colMock.REGISTRATION_TEST_EVENT, colMock.REG_PARAMS);
172166
});
173167
});
174168

175-
describe('checkin success', function(done) {
169+
describe('checkin success', function() {
176170

177-
var context = {
171+
var mockContext = {
178172
invokedFunctionArn : colMock.FUNCTION_ARN,
179173
functionName : colMock.FUNCTION_NAME
180174
};
@@ -195,7 +189,7 @@ describe('al_aws_collector tests', function(done) {
195189
it('checkin success', function(done) {
196190
AlAwsCollector.load().then(function(creds) {
197191
var collector = new AlAwsCollector(
198-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
192+
mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
199193
collector.checkin(function(error) {
200194
assert.equal(error, undefined);
201195
sinon.assert.calledWith(alserviceStub.post, colMock.CHECKIN_URL, colMock.CHECKIN_AZCOLLECT_QUERY);
@@ -210,7 +204,7 @@ describe('al_aws_collector tests', function(done) {
210204
return callback(null);
211205
});
212206
var collector = new AlAwsCollector(
213-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0',
207+
mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0',
214208
creds, undefined, [spyHealthCheck], []
215209
);
216210
collector.checkin(function(error) {
@@ -228,7 +222,7 @@ describe('al_aws_collector tests', function(done) {
228222
return callback(m_healthChecks.errorMsg('MYCODE', 'error message'));
229223
});
230224
var collector = new AlAwsCollector(
231-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0',
225+
mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0',
232226
creds, undefined, [spyHealthCheck], []
233227
);
234228
collector.checkin(function(error) {
@@ -245,9 +239,9 @@ describe('al_aws_collector tests', function(done) {
245239
});
246240
});
247241

248-
describe('checkin error', function(done) {
242+
describe('checkin error', function() {
249243

250-
var context = {
244+
var checkinContext = {
251245
invokedFunctionArn : colMock.FUNCTION_ARN,
252246
functionName : colMock.FUNCTION_NAME
253247
};
@@ -268,7 +262,7 @@ describe('al_aws_collector tests', function(done) {
268262
it('checkin error with healthCheck', function(done) {
269263
AlAwsCollector.load().then(function(creds) {
270264
var collector = new AlAwsCollector(
271-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
265+
checkinContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
272266
collector.checkin(function(error) {
273267
assert.equal(error, undefined);
274268
sinon.assert.calledWith(
@@ -283,7 +277,7 @@ describe('al_aws_collector tests', function(done) {
283277
});
284278

285279
it('deregister success', function(done) {
286-
var context = {
280+
var deregisterContext = {
287281
invokedFunctionArn : colMock.FUNCTION_ARN,
288282
succeed : () => {
289283
sinon.assert.calledWith(alserviceStub.del, colMock.DEREG_URL);
@@ -292,7 +286,7 @@ describe('al_aws_collector tests', function(done) {
292286
};
293287
AlAwsCollector.load().then(function(creds) {
294288
var collector = new AlAwsCollector(
295-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds);
289+
deregisterContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds);
296290
collector.deregister(colMock.DEREGISTRATION_TEST_EVENT, colMock.DEREG_PARAMS);
297291
});
298292
});
@@ -321,7 +315,7 @@ describe('al_aws_collector tests', function(done) {
321315
});
322316
});
323317

324-
describe('mocking ingestC', function(done) {
318+
describe('mocking ingestC', function() {
325319
var ingestCSecmsgsStub;
326320
var ingestCVpcFlowStub;
327321
before(function() {
@@ -380,7 +374,7 @@ describe('al_aws_collector tests', function(done) {
380374
});
381375
});
382376

383-
describe('mocking send', function(done) {
377+
describe('mocking send', function() {
384378
var sendStub;
385379
before(function() {
386380
sendStub = sinon.stub(AlAwsCollector.prototype, 'send').callsFake(
@@ -410,13 +404,13 @@ describe('al_aws_collector tests', function(done) {
410404

411405
describe('isConfigDifferent() method', () => {
412406
var collector;
413-
var context = {
407+
var isConfigDifferentContext = {
414408
invokedFunctionArn : colMock.FUNCTION_ARN,
415409
functionName : colMock.FUNCTION_NAME
416410
};
417411

418412
beforeEach(() => {
419-
collector = new AlAwsCollector(context, 'cwe',
413+
collector = new AlAwsCollector(isConfigDifferentContext, 'cwe',
420414
AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', colMock.AIMS_TEST_CREDS);
421415
});
422416

@@ -445,13 +439,13 @@ describe('al_aws_collector tests', function(done) {
445439
var collector;
446440
var objectRef;
447441
var object;
448-
var context = {
442+
var changeObjectContext = {
449443
invokedFunctionArn : colMock.FUNCTION_ARN,
450444
functionName : colMock.FUNCTION_NAME
451445
};
452446

453447
beforeEach(() => {
454-
collector = new AlAwsCollector(context, 'cwe',
448+
collector = new AlAwsCollector(changeObjectContext, 'cwe',
455449
AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', colMock.AIMS_TEST_CREDS);
456450

457451
object = {
@@ -496,13 +490,13 @@ describe('al_aws_collector tests', function(done) {
496490
var object;
497491
var newValues;
498492
var collector;
499-
var context = {
493+
var applyConfigChangesContext = {
500494
invokedFunctionArn : colMock.FUNCTION_ARN,
501495
functionName : colMock.FUNCTION_NAME
502496
};
503497

504498
beforeEach(() => {
505-
collector = new AlAwsCollector(context, 'cwe',
499+
collector = new AlAwsCollector(applyConfigChangesContext, 'cwe',
506500
AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', colMock.AIMS_TEST_CREDS);
507501
object = JSON.parse(JSON.stringify(colMock.LAMBDA_FUNCTION_CONFIGURATION));
508502
newValues = colMock.S3_CONFIGURATION_FILE_CHANGE;
@@ -539,13 +533,13 @@ describe('al_aws_collector tests', function(done) {
539533

540534
describe('selfConfigUpdate() function', () => {
541535
var collector;
542-
var context = {
536+
var selfConfigUpdateContext = {
543537
invokedFunctionArn : colMock.FUNCTION_ARN,
544538
functionName : colMock.FUNCTION_NAME
545539
};
546540

547541
beforeEach(() => {
548-
collector = new AlAwsCollector(context, 'cwe',
542+
collector = new AlAwsCollector(selfConfigUpdateContext, 'cwe',
549543
AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', colMock.AIMS_TEST_CREDS);
550544
});
551545

@@ -611,13 +605,13 @@ describe('al_aws_collector tests', function(done) {
611605
var collector;
612606
var fakeSelfUpdate;
613607
var fakeSelfConfigUpdate;
614-
var context = {
608+
var updateContext = {
615609
invokedFunctionArn : colMock.FUNCTION_ARN,
616610
functionName : colMock.FUNCTION_NAME
617611
};
618612

619613
beforeEach(() => {
620-
collector = new AlAwsCollector(context, 'cwe',
614+
collector = new AlAwsCollector(updateContext, 'cwe',
621615
AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', colMock.AIMS_TEST_CREDS);
622616
fakeSelfUpdate = sinon.stub(AlAwsCollector.prototype, 'selfUpdate').callsFake(
623617
(callback) => { callback(); });
@@ -656,7 +650,7 @@ describe('al_aws_collector tests', function(done) {
656650

657651
describe('al_aws_collector tests for setDecryptedCredentials()', function() {
658652
var rewireGetDecryptedCredentials;
659-
var stub;
653+
var collectRewire;
660654

661655
const ACCESS_KEY_ID = 'access_key_id';
662656
const ENCRYPTED_SECRET_KEY = 'encrypted_secret_key';
@@ -724,7 +718,7 @@ describe('al_aws_collector tests for setDecryptedCredentials()', function() {
724718
});
725719
});
726720

727-
describe('al_aws_collector error tests', function(done) {
721+
describe('al_aws_collector error tests', function() {
728722

729723
beforeEach(function(){
730724
AWS.mock('KMS', 'decrypt', function (params, callback) {
@@ -735,8 +729,8 @@ describe('al_aws_collector error tests', function(done) {
735729
});
736730

737731
responseStub = sinon.stub(m_response, 'send').callsFake(
738-
function fakeFn(event, context, responseStatus, responseData, physicalResourceId) {
739-
context.done();
732+
function fakeFn(event, fakeContext, responseStatus, responseData, physicalResourceId) {
733+
fakeContext.done();
740734
});
741735

742736
setAlServiceErrorStub();
@@ -755,7 +749,7 @@ describe('al_aws_collector error tests', function(done) {
755749
});
756750

757751
it('register error', function(done) {
758-
var context = {
752+
var registerContext = {
759753
invokedFunctionArn : colMock.FUNCTION_ARN,
760754
done : () => {
761755
sinon.assert.calledWith(alserviceStub.post, colMock.REG_URL, colMock.REG_AZCOLLECT_QUERY);
@@ -765,13 +759,13 @@ describe('al_aws_collector error tests', function(done) {
765759
};
766760
AlAwsCollector.load().then(function(creds) {
767761
var collector = new AlAwsCollector(
768-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds, function() {});
762+
registerContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds, function() {});
769763
collector.register(colMock.REGISTRATION_TEST_EVENT, colMock.REG_PARAMS);
770764
});
771765
});
772766

773767
it('deregister error', function(done) {
774-
var context = {
768+
var deregisterContext = {
775769
invokedFunctionArn : colMock.FUNCTION_ARN,
776770
done : () => {
777771
sinon.assert.calledWith(alserviceStub.del, colMock.DEREG_URL);
@@ -781,7 +775,7 @@ describe('al_aws_collector error tests', function(done) {
781775
};
782776
AlAwsCollector.load().then(function(creds) {
783777
var collector = new AlAwsCollector(
784-
context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds);
778+
deregisterContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS, '1.0.0', creds);
785779
collector.deregister(colMock.DEREGISTRATION_TEST_EVENT, colMock.DEREG_PARAMS);
786780
});
787781
});

‎test/al_aws_test.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
const assert = require('assert');
22
const rewire = require('rewire');
3-
const sinon = require('sinon');
43
const m_alAws = require('../al_aws');
54
const colMock = require('./collector_mock');
65
var AWS = require('aws-sdk-mock');
76

87
const alAwsRewire = rewire('../al_aws');
98

109
describe('al_aws Tests', function() {
11-
describe('arnToName() tests', function(done) {
10+
describe('arnToName() tests', function() {
1211
it('Valid input', function(done) {
1312
assert.equal(m_alAws.arnToName('arn:aws:iam::123456789101:role/testRole'), 'testRole');
1413
assert.equal(m_alAws.arnToName('arn:aws:kinesis:us-east-1:123456789101:stream/test-KinesisStream'), 'test-KinesisStream');
@@ -25,7 +24,7 @@ describe('al_aws Tests', function() {
2524
});
2625
});
2726

28-
describe('arnToAccId() tests', function(done) {
27+
describe('arnToAccId() tests', function() {
2928
it('Valid input', function(done) {
3029
assert.equal(m_alAws.arnToAccId('arn:aws:iam::123456789101:role/testRole'), '123456789101');
3130
assert.equal(m_alAws.arnToAccId('arn:aws:kinesis:us-east-1:123456789101:stream/test-KinesisStream'), '123456789101');

‎test/collector_mock.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ const CHECKIN_URL = '/aws/cwe/checkin/123456789012/us-east-1/' + encodeURICompon
9292
// }
9393
// ]
9494
// };
95-
const CHECKIN_TEST_EVENT = {
96-
'RequestType': 'ScheduledEvent',
97-
'Type': 'Checkin',
98-
'AwsAccountId': '353333894008',
99-
'StackName' : STACK_NAME,
100-
'Region' : 'us-east-1'
101-
};
95+
// const CHECKIN_TEST_EVENT = {
96+
// 'RequestType': 'ScheduledEvent',
97+
// 'Type': 'Checkin',
98+
// 'AwsAccountId': '353333894008',
99+
// 'StackName' : STACK_NAME,
100+
// 'Region' : 'us-east-1'
101+
// };
102102

103103

104104
const CHECKIN_AZCOLLECT_QUERY = {
@@ -324,4 +324,4 @@ module.exports = {
324324
S3_CONFIGURATION_FILE_CHANGE : S3_CONFIGURATION_FILE_CHANGE,
325325
LAMBDA_FUNCTION_CONFIGURATION : LAMBDA_FUNCTION_CONFIGURATION,
326326
LAMBDA_FUNCTION_CONFIGURATION_CHANGED : LAMBDA_FUNCTION_CONFIGURATION_CHANGED
327-
};
327+
};

0 commit comments

Comments
 (0)