Skip to content
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

Jump to bottom

CIS DIL Benchmark V2 #90

Merged
merged 24 commits into from
Nov 30, 2020
Merged

CIS DIL Benchmark V2 #90

merged 24 commits into from
Nov 30, 2020

Conversation

deric4
Copy link
Member

@deric4 deric4 commented Nov 11, 2020

Updates to InSpec style guide recommendations and version 2 of the CIS DIL Benchmark

Deric Miguel and others added 23 commits November 10, 2020 20:04
@amlodzianowski @gagarin-dev
update section 1.1 to v2
35e7eb5 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 1.3 to v2
cc8d9f3 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 1.6 to v2
8a8f156 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 1.7 to v2
14f8ab3 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 2.1 to v2
771902f 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 2.2 to v2
ad4e0f7 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 2.3 to v2
1bd52c6 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.1 to v2
c1a22d6 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.2 to v2
6658a32 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.3 to v2
4883cb7 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.4 to v2
9a6201d 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.5 to v2
49f0066 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.6 to v2
9bb4e6f 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 3.7 to v2
c509b37 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 4.1 to v2
a475972 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 4.2 to v2
2e654da 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 5.1 to v2
e02a7d5 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 5.2 to v2
3e32463 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 5.3 to v2
c861b18 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 5.4 to v2
559d1fe 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 6.1 to v2
3fbb861 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update section 6.2 to v2
2ba50a3 
* CIS DIL v2 changes
* inspec styleguide changes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@amlodzianowski @gagarin-dev
update .rubocop
a57e08b 
needed for 6.1.1

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom<drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
@micheelengronne
Copy link
Member

Thank you @deric4

Can you solve the coding styles problems detected by rubocop ?

@amlodzianowski @gagarin-dev
lint rubocop offences
cbb3183 
* Disables Lint/AmbiguousRegexpLiteral

  Inspec Style Guide suggests avoiding in matchers
  - https://docs.chef.io/inspec/style/#avoid-unnecessary-parentheses-in-matchers

  Examples in the documentation
  - https://docs.chef.io/inspec/matchers/#match
  - https://docs.chef.io/inspec/dsl_inspec/#test-if-mysql-passwords-are-in-env
  - https://docs.chef.io/inspec/dsl_inspec/#interactive-debugging-with-pry

* Other whitespace fixes

on-behalf-of: @Logicworks <dmiguel@logicworks.net>
Co-authored-by: amlodzianowski <adrianmlodzianowski@gmail.com>
Co-authored-by: gagarin-dev <37323962+gagarin-dev@users.noreply.github.com>
Signed-off-by: Deric Miguel <dmiguel@logicworks.net>
Signed-off-by: Dan Rosenbloom <drosenbloom@logicworks.net>
Signed-off-by: amlodzianowski <amlodzianowski@logicworks.net>
Signed-off-by: gagarin-dev <ygagarin@logicworks.net>
micheelengronne
micheelengronne requested changes Nov 12, 2020
View reviewed changes
Copy link
Member

@micheelengronne micheelengronne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer not to disable linter checks globally but only where it is absolutely needed. Can you disable in source code instead ? @chris-rock what do you think ?

@deric4
Copy link
Member Author

deric4 commented Nov 13, 2020

I would prefer not to disable linter checks globally but only where it is absolutely needed. Can you disable in source code instead ?

Hi @micheelengronne ! Ya can def do that if you'd like, but not sure if you saw the reasoning in the latest commit message:

Inspec Style Guide suggests avoiding in matchers

Examples in the documentation

Appreciate the feedback! 😄

@micheelengronne
Copy link
Member

You are right. There is a conflict of conventions here. @chris-rock is the arbitrator. Do we stick to the Chef convention or the rubocop one ?

@micheelengronne
Copy link
Member

As the Inspec convention is followed, I will merge it. If we have to change the convention, we can do it after.

@micheelengronne micheelengronne merged commit 907e58f into dev-sec:master Nov 30, 2020
@cawamata cawamata mentioned this pull request Dec 22, 2020
Closed
This was referenced Jan 26, 2021
Merged
Merged
@deric4 deric4 mentioned this pull request Apr 14, 2021
Closed
@jrbeilke jrbeilke mentioned this pull request Apr 20, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@micheelengronne micheelengronne micheelengronne requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@deric4 @micheelengronne