From 3e1572a8181d5485c84a2e520ba896e9062e067b Mon Sep 17 00:00:00 2001 From: Levon Becker Date: Thu, 19 Mar 2020 11:13:04 -0700 Subject: [PATCH 1/3] v2.1.1 Read Changelog --- .rubocop.yml | 37 +-- CHANGELOG.md | 11 +- Gemfile | 27 +-- Gemfile.lock | 635 +-------------------------------------------------- README.md | 14 +- Rakefile | 2 +- TODO.md | 3 + inspec.yml | 4 +- 8 files changed, 58 insertions(+), 675 deletions(-) create mode 100644 TODO.md diff --git a/.rubocop.yml b/.rubocop.yml index 7e3112c..6341a8d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,25 +1,37 @@ AllCops: + TargetRubyVersion: 2.6.5 Exclude: - - 'berks-cookbooks/**/*' - '.idea/**/*' - '.git/**/*' - - '.kitchen/**/*' - '*.lock' - - 'vendor/**/*' -Documentation: +Layout/AlignParameters: Enabled: false -Metrics/LineLength: - Max: 200 +Layout/CaseIndentation: + IndentOneStep: false + +Metrics/AbcSize: + Max: 28 Metrics/BlockLength: Enabled: false +Metrics/CyclomaticComplexity: + Enabled: false + +Metrics/LineLength: + Max: 256 + Metrics/MethodLength: - Max: 60 + Max: 128 CountComments: false - Enabled: true + +Metrics/PerceivedComplexity: + Max: 10 + +Style/Documentation: + Enabled: false Style/Encoding: Enabled: false @@ -30,14 +42,5 @@ Style/SignalException: Style/EmptyLiteral: Enabled: false -CyclomaticComplexity: - Enabled: false - -AlignParameters: - Enabled: false - -Encoding: - Enabled: false - Style/FrozenStringLiteralComment: Enabled: false \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ce1df1..bfe4580 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ # CHANGE LOG -## x.x.x - TODO List - Levon Becker -* Get jUnit test results working for rubocop rake task -* Add logic to packages control to test that packages aren't installed if chef attribute package install is false +## 2.1.1 - 03/19/2020 - Levon Becker +* Updated min inspec version to 4.18.85 +* Moved ToDo list to TODO.md +* Cleaned up Gemfile + * Updated to rubocop 0.75.1 + * Removed unused gems + * Added Ruby version 2.6.5 +* Cleaned up rubocop config and eliminated warnings by adding department to each rule that was missing it ## 2.1.0 - 01/06/2020 - Levon Becker * Removed string to boolean input syntax. Found it was giving odd false positive results. diff --git a/Gemfile b/Gemfile index 2eb8ffe..7098bf0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,24 +1,7 @@ -source 'https://rubygems.org' +ruby '~> 2.6.5' -gem 'aws-sdk-core', '3.68.1' -gem 'berkshelf', '7.0.8' -gem 'bundler', '1.17.2' -gem 'chef', '15.4.45' -gem 'chef-dk', '4.5.0' -gem 'rake' - -group :style do - gem 'foodcritic', '16.1.1' - gem 'rubocop', '0.72.0' -end - -group :unit do - gem 'chefspec', '7.4.0' - gem 'rspec_junit_formatter', '0.4.1' -end - -group :integration do - gem 'inspec', '4.18.0' - gem 'kitchen-docker', '2.9.0' - gem 'test-kitchen', '2.3.3' +source 'https://rubygems.org/' do + gem 'bundler', '1.17.2' + gem 'rake' + gem 'rubocop', '0.75.1' end diff --git a/Gemfile.lock b/Gemfile.lock index 9c3cfc5..9f5e389 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,460 +1,14 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) - aws-eventstream (1.0.3) - aws-partitions (1.223.0) - aws-sdk-apigateway (1.35.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.13.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-athena (1.20.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-autoscaling (1.22.0) - aws-sdk-core (~> 3, >= 3.52.1) - aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.18.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.18.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.17.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.28.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.28.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.26.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.37.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-core (3.68.1) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.17.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.36.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.112.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.20.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.51.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-eks (1.26.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.26.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.18.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.34.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.27.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.22.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-iam (1.30.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.13.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.19.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.30.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-organizations (1.17.0) - aws-sdk-core (~> 3, >= 3.39.0) - aws-sigv4 (~> 1.0) - aws-sdk-rds (1.67.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.32.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.29.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.17.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.10.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.49.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.13.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-ses (1.26.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-sms (1.16.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-sns (1.19.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.22.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.57.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - azure_graph_rbac (0.17.1) - ms_rest_azure (~> 0.11.0) - azure_mgmt_key_vault (0.17.4) - ms_rest_azure (~> 0.11.0) - azure_mgmt_resources (0.17.7) - ms_rest_azure (~> 0.11.1) - backports (3.15.0) - bcrypt_pbkdf (1.0.1) - berkshelf (7.0.8) - chef (>= 13.6.52) - chef-config - cleanroom (~> 1.0) - concurrent-ruby (~> 1.0) - minitar (>= 0.6) - mixlib-archive (>= 0.4, < 2.0) - mixlib-config (>= 2.2.5) - mixlib-shellout (>= 2.0, < 4.0) - octokit (~> 4.0) - retryable (>= 2.0, < 4.0) - solve (~> 4.0) - thor (>= 0.20) - builder (3.2.3) - chef (15.4.45) - addressable - bcrypt_pbkdf (~> 1.0) - bundler (>= 1.10) - chef-config (= 15.4.45) - chef-zero (>= 14.0.11) - diff-lcs (~> 1.2, >= 1.2.4) - ed25519 (~> 1.2) - erubis (~> 2.7) - ffi (~> 1.9, >= 1.9.25) - ffi-libarchive - ffi-yajl (~> 2.2) - highline (>= 1.6.9, < 2) - iniparse (~> 1.4) - license-acceptance (~> 1.0, >= 1.0.5) - mixlib-archive (>= 0.4, < 2.0) - mixlib-authentication (~> 2.1) - mixlib-cli (>= 2.1.1, < 3.0) - mixlib-log (>= 2.0.3, < 4.0) - mixlib-shellout (>= 3.0.3, < 4.0) - net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 4.2, < 6) - net-ssh-multi (~> 1.2, >= 1.2.1) - ohai (~> 15.0) - plist (~> 3.2) - proxifier (~> 1.0) - syslog-logger (~> 1.6) - train-core (~> 3.1) - train-winrm (>= 0.2.5) - tty-screen (~> 0.6) - uuidtools (~> 2.1.5) - chef-config (15.4.45) - addressable - fuzzyurl - mixlib-config (>= 2.2.12, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) - tomlrb (~> 1.2) - chef-dk (4.5.0) - addressable (>= 2.3.5, < 2.6) - chef (~> 15.0) - cookbook-omnifetch (~> 0.5) - diff-lcs (~> 1.0) - ffi-yajl (>= 1.0, < 3.0) - license-acceptance (~> 1.0, >= 1.0.11) - minitar (~> 0.6) - mixlib-cli (>= 1.7, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - paint (~> 1.0) - solve (> 2.0, < 5.0) - chef-zero (14.0.13) - ffi-yajl (~> 2.2) - hashie (>= 2.0, < 4.0) - mixlib-log (>= 2.0, < 4.0) - rack (~> 2.0, >= 2.0.6) - uuidtools (~> 2.1) - chefspec (7.4.0) - chef (>= 13) - fauxhai (>= 6.11) - rspec (~> 3.0) - cleanroom (1.0.0) - coderay (1.1.2) - concurrent-ruby (1.1.5) - cookbook-omnifetch (0.9.0) - mixlib-archive (>= 0.4, < 2.0) - cucumber-core (3.2.1) - backports (>= 3.8.0) - cucumber-tag_expressions (~> 1.1.0) - gherkin (~> 5.0) - cucumber-tag_expressions (1.1.1) - declarative (0.0.10) - declarative-option (0.1.0) - diff-lcs (1.3) - docker-api (1.34.2) - excon (>= 0.47.0) - multi_json - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - ed25519 (1.2.4) - equatable (0.6.1) - erubis (2.7.0) - excon (0.67.0) - faraday (0.17.0) - multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) - http-cookie (~> 1.0.0) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - fauxhai (7.4.0) - net-ssh - ffi (1.11.1) - ffi-libarchive (0.4.10) - ffi (~> 1.0) - ffi-yajl (2.3.1) - libyajl2 (~> 1.2) - foodcritic (16.1.1) - cucumber-core (>= 1.3, < 4.0) - erubis - ffi-yajl (~> 2.0) - nokogiri (>= 1.5, < 2.0) - rake - rufus-lru (~> 1.0) - treetop (~> 1.4) - fuzzyurl (0.9.0) - gherkin (5.1.0) - google-api-client (0.23.9) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) - httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.9) - googleauth (0.6.7) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.7) - gssapi (1.3.0) - ffi (>= 1.0.1) - gyoku (1.3.1) - builder (>= 2.1.2) - hashie (3.6.0) - highline (1.7.10) - htmlentities (4.3.4) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - inifile (3.0.0) - iniparse (1.4.4) - inspec (4.18.0) - addressable (~> 2.4) - faraday (>= 0.9.0) - faraday_middleware (~> 0.12.2) - hashie (~> 3.4) - htmlentities - json-schema (~> 2.8) - license-acceptance (>= 0.2.13, < 2.0) - method_source (~> 0.8) - mixlib-log - multipart-post - parallel (~> 1.9) - parslet (~> 1.5) - pry (~> 0) - rspec (~> 3.0, < 3.9) - rspec-its (~> 1.2) - rubyzip (~> 1.2, >= 1.2.2) - semverse - sslshake (~> 1.2) - term-ansicolor - thor (~> 0.20) - tomlrb (~> 1.2) - train (~> 3.0) - train-aws (~> 0.1) - train-habitat (~> 0.1) - train-winrm (~> 0.2) - tty-prompt (~> 0.17) - tty-table (~> 0.10) - ipaddress (0.8.3) - jaro_winkler (1.5.3) - jmespath (1.4.0) - json (2.2.0) - json-schema (2.8.1) - addressable (>= 2.4) - jwt (2.2.1) - kitchen-docker (2.9.0) - test-kitchen (>= 1.0.0) - libyajl2 (1.2.0) - license-acceptance (1.0.13) - pastel (~> 0.7) - tomlrb (~> 1.2) - tty-box (~> 0.3) - tty-prompt (~> 0.18) - little-plugger (1.1.4) - logging (2.2.2) - little-plugger (~> 1.1) - multi_json (~> 1.10) - memoist (0.16.0) - method_source (0.9.2) - mime-types (3.3) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) - mini_portile2 (2.4.0) - minitar (0.9) - mixlib-archive (1.0.1) - mixlib-log - mixlib-authentication (2.1.1) - mixlib-cli (2.1.1) - mixlib-config (3.0.1) - tomlrb - mixlib-install (3.11.21) - mixlib-shellout - mixlib-versioning - thor - mixlib-log (3.0.1) - mixlib-shellout (3.0.7) - mixlib-versioning (1.2.7) - molinillo (0.6.6) - ms_rest (0.7.4) - concurrent-ruby (~> 1.0) - faraday (~> 0.9) - timeliness (~> 0.3.10) - ms_rest_azure (0.11.1) - concurrent-ruby (~> 1.0) - faraday (~> 0.9) - faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.4) - unf_ext (= 0.0.7.2) - multi_json (1.14.1) - multipart-post (2.1.1) - necromancer (0.5.0) - net-scp (2.0.0) - net-ssh (>= 2.6.5, < 6.0.0) - net-sftp (2.1.2) - net-ssh (>= 2.6.5) - net-ssh (5.2.0) - net-ssh-gateway (2.0.0) - net-ssh (>= 4.0.0) - net-ssh-multi (1.2.1) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - nokogiri (1.10.4) - mini_portile2 (~> 2.4.0) - nori (2.6.0) - octokit (4.14.0) - sawyer (~> 0.8.0, >= 0.5.3) - ohai (15.3.1) - chef-config (>= 12.8, < 16) - ffi (~> 1.9) - ffi-yajl (~> 2.2) - ipaddress - mixlib-cli (>= 1.7.0) - mixlib-config (>= 2.0, < 4.0) - mixlib-log (>= 2.0.1, < 4.0) - mixlib-shellout (>= 2.0, < 4.0) - plist (~> 3.1) - systemu (~> 2.6.4) - wmi-lite (~> 1.0) - os (1.0.1) - paint (1.0.1) - parallel (1.18.0) - parser (2.6.5.0) + jaro_winkler (1.5.4) + parallel (1.19.1) + parser (2.7.0.2) ast (~> 2.4.0) - parslet (1.8.2) - pastel (0.7.3) - equatable (~> 0.6) - tty-color (~> 0.5) - plist (3.5.0) - polyglot (0.3.5) - proxifier (1.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.1.1) - rack (2.0.7) rainbow (3.0.0) - rake (12.3.2) - representable (3.0.4) - declarative (< 0.1.0) - declarative-option (< 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - retryable (3.0.4) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.6) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-its (1.3.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.8.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.3) - rspec_junit_formatter (0.4.1) - rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.72.0) + rake (12.3.3) + rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -462,183 +16,18 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - rubyntlm (0.6.2) - rubyzip (1.3.0) - rufus-lru (1.1.0) - sawyer (0.8.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - semverse (3.0.0) - signet (0.12.0) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - solve (4.0.2) - molinillo (~> 0.6) - semverse (>= 1.1, < 4.0) - sslshake (1.3.0) - strings (0.1.6) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) - unicode_utils (~> 1.4) - strings-ansi (0.1.0) - syslog-logger (1.6.8) - systemu (2.6.5) - term-ansicolor (1.7.1) - tins (~> 1.0) - test-kitchen (2.3.3) - bcrypt_pbkdf (~> 1.0) - ed25519 (~> 1.2) - license-acceptance (~> 1.0, >= 1.0.11) - mixlib-install (~> 3.6) - mixlib-shellout (>= 1.2, < 4.0) - net-scp (>= 1.1, < 3.0) - net-ssh (>= 2.9, < 6.0) - net-ssh-gateway (>= 1.2, < 3.0) - thor (~> 0.19) - winrm (~> 2.0) - winrm-elevated (~> 1.0) - winrm-fs (~> 1.1) - thor (0.20.3) - timeliness (0.3.10) - tins (1.21.1) - tomlrb (1.2.8) - train (3.1.4) - azure_graph_rbac (~> 0.16) - azure_mgmt_key_vault (~> 0.17) - azure_mgmt_resources (~> 0.15) - docker-api (~> 1.26) - google-api-client (~> 0.23.9) - googleauth (~> 0.6.6) - inifile - json (>= 1.8, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) - train-aws (0.1.11) - aws-sdk-apigateway (~> 1) - aws-sdk-apigatewayv2 (~> 1) - aws-sdk-athena (~> 1) - aws-sdk-autoscaling (~> 1.22.0) - aws-sdk-budgets (~> 1) - aws-sdk-cloudformation (~> 1) - aws-sdk-cloudhsm (~> 1) - aws-sdk-cloudhsmv2 (~> 1) - aws-sdk-cloudtrail (~> 1.8) - aws-sdk-cloudwatch (~> 1.13) - aws-sdk-cloudwatchlogs (~> 1.13) - aws-sdk-codecommit (~> 1) - aws-sdk-codedeploy (~> 1) - aws-sdk-codepipeline (~> 1) - aws-sdk-configservice (~> 1.21) - aws-sdk-core (~> 3.0) - aws-sdk-costandusagereportservice (~> 1.6) - aws-sdk-dynamodb (~> 1.31) - aws-sdk-ec2 (~> 1.70) - aws-sdk-ecr (~> 1.18) - aws-sdk-ecs (~> 1.30) - aws-sdk-eks (~> 1.9) - aws-sdk-elasticache (~> 1) - aws-sdk-elasticbeanstalk (~> 1) - aws-sdk-elasticloadbalancing (~> 1.8) - aws-sdk-elasticloadbalancingv2 (~> 1) - aws-sdk-elasticsearchservice (~> 1) - aws-sdk-firehose (~> 1) - aws-sdk-iam (~> 1.13) - aws-sdk-kafka (~> 1) - aws-sdk-kinesis (~> 1) - aws-sdk-kms (~> 1.13) - aws-sdk-lambda (~> 1) - aws-sdk-organizations (~> 1.17.0) - aws-sdk-rds (~> 1.43) - aws-sdk-redshift (~> 1) - aws-sdk-route53 (~> 1) - aws-sdk-route53domains (~> 1) - aws-sdk-route53resolver (~> 1) - aws-sdk-s3 (~> 1.30) - aws-sdk-securityhub (~> 1) - aws-sdk-ses (~> 1) - aws-sdk-sms (~> 1) - aws-sdk-sns (~> 1.9) - aws-sdk-sqs (~> 1.10) - aws-sdk-ssm (~> 1) - train-core (3.1.4) - json (>= 1.8, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) - train-habitat (0.2.11) - train-winrm (0.2.5) - winrm (~> 2.0) - winrm-fs (~> 1.0) - treetop (1.6.10) - polyglot (~> 0.3) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) - tty-cursor (~> 0.7) - tty-color (0.5.0) - tty-cursor (0.7.0) - tty-prompt (0.19.0) - necromancer (~> 0.5.0) - pastel (~> 0.7.0) - tty-reader (~> 0.6.0) - tty-reader (0.6.0) - tty-cursor (~> 0.7) - tty-screen (~> 0.7) - wisper (~> 2.0.0) - tty-screen (0.7.0) - tty-table (0.11.0) - equatable (~> 0.6) - necromancer (~> 0.5) - pastel (~> 0.7.2) - strings (~> 0.1.5) - tty-screen (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.6.0) - unicode_utils (1.4.0) - uuidtools (2.1.5) - winrm (2.3.2) - builder (>= 2.1.2) - erubis (~> 2.7) - gssapi (~> 1.2) - gyoku (~> 1.0) - httpclient (~> 2.2, >= 2.2.0.2) - logging (>= 1.6.1, < 3.0) - nori (~> 2.0) - rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.1.1) - winrm (~> 2.0) - winrm-fs (~> 1.0) - winrm-fs (1.3.2) - erubis (~> 2.7) - logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) - winrm (~> 2.0) - wisper (2.0.1) - wmi-lite (1.0.2) + unicode-display_width (1.6.1) PLATFORMS ruby DEPENDENCIES - aws-sdk-core (= 3.68.1) - berkshelf (= 7.0.8) - bundler (= 1.17.2) - chef (= 15.4.45) - chef-dk (= 4.5.0) - chefspec (= 7.4.0) - foodcritic (= 16.1.1) - inspec (= 4.18.0) - kitchen-docker (= 2.9.0) - rake - rspec_junit_formatter (= 0.4.1) - rubocop (= 0.72.0) - test-kitchen (= 2.3.3) + bundler (= 1.17.2)! + rake! + rubocop (= 0.75.1)! + +RUBY VERSION + ruby 2.6.5p114 BUNDLED WITH 1.17.2 diff --git a/README.md b/README.md index e0e4753..55126f7 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # InSpec Bonus Bits Base Cookbook Profile -[![Project Release](https://img.shields.io/badge/release-v2.1.0-blue.svg)](https://github.com/bonusbits/inspec_bonusbits_base) -[![CircleCI](https://circleci.com/gh/bonusbits/inspec_bonusbits_base.svg?style=shield)](https://circleci.com/gh/bonusbits/inspec_bonusbits_base) +[![Project Release](https://img.shields.io/badge/release-v2.1.1-blue.svg)](https://github.com/bonusbits/bonusbits_base_inspec) +[![CircleCI](https://circleci.com/gh/bonusbits/bonusbits_base_inspec.svg?style=shield)](https://circleci.com/gh/bonusbits/bonusbits_base_inspec) [![Join the chat at https://gitter.im/bonusbits](https://badges.gitter.im/bonusbits/bonusbits.svg)](https://gitter.im/bonusbits?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![GitHub issues](https://img.shields.io/github/issues/bonusbits/inspec_bonusbits_base.svg)](https://github.com/bonusbits/inspec_bonusbits_base/issues) +[![GitHub issues](https://img.shields.io/github/issues/bonusbits/bonusbits_base_inspec.svg)](https://github.com/bonusbits/bonusbits_base_inspec/issues) Used to run integration tests for when using the [bonusbits_base](https://github.com/bonusbits/bonusbits_base) Chef Cookbook. @@ -11,14 +11,14 @@ Used to run integration tests for when using the [bonusbits_base](https://github This Compliance Profile requires [InSpec](https://github.com/chef/inspec) for execution: ``` -$ git clone https://github.com/bonusbits/inspec_bonusbits_base.git -$ inspec exec inspec_bonusbits_base +$ git clone https://github.com/bonusbits/bonusbits_base_inspec.git +$ inspec exec bonusbits_base_inspec ``` You can also execute the profile directly from Github: ``` -$ inspec exec https://github.com/bonusbits/inspec_bonusbits_base +$ inspec exec https://github.com/bonusbits/bonusbits_base_inspec ``` ## Kitchen Usage @@ -35,7 +35,7 @@ suites: verifier: inspec_tests: - name: bonusbits_base - git: https://github.com/bonusbits/inspec_bonusbits_base.git + git: https://github.com/bonusbits/bonusbits_base_inspec.git release: 2.1.0 attributes: debug: false diff --git a/Rakefile b/Rakefile index e6d3bdf..533d011 100644 --- a/Rakefile +++ b/Rakefile @@ -10,5 +10,5 @@ namespace :style do end end -desc 'Rubocop' +desc 'Alias (style:ruby:auto_correct)' task default: %w[style:ruby:auto_correct] diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..84609ec --- /dev/null +++ b/TODO.md @@ -0,0 +1,3 @@ +## TODO List +1. Get jUnit test results working for rubocop rake task +1. Add logic to packages control to test that packages aren't installed if chef attribute package install is false \ No newline at end of file diff --git a/inspec.yml b/inspec.yml index fe3d8c1..d3abaf2 100644 --- a/inspec.yml +++ b/inspec.yml @@ -5,7 +5,7 @@ copyright: Bonus Bits copyright_email: levon.becker.github@bonusbits.com license: MIT license summary: Check Bonus Bits Base Cookbook Configurations -version: 2.1.0 +version: 2.1.1 supports: - os-family: linux -inspec_version: "~> 4.18.0" \ No newline at end of file +inspec_version: "~> 4.18.85" \ No newline at end of file From ceeb6fac3adbc46ed0b82e42deebc09b1e20efd1 Mon Sep 17 00:00:00 2001 From: Levon Becker Date: Thu, 19 Mar 2020 11:14:41 -0700 Subject: [PATCH 2/3] v2.1.1 Read Changelog updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfe4580..317f1cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGE LOG ## 2.1.1 - 03/19/2020 - Levon Becker +* Renamed repo from inspec_bonusbits_base to bonusbits_base_inspec * Updated min inspec version to 4.18.85 * Moved ToDo list to TODO.md * Cleaned up Gemfile @@ -8,6 +9,7 @@ * Removed unused gems * Added Ruby version 2.6.5 * Cleaned up rubocop config and eliminated warnings by adding department to each rule that was missing it +* Updated Readme with renamed repo name ## 2.1.0 - 01/06/2020 - Levon Becker * Removed string to boolean input syntax. Found it was giving odd false positive results. From 245ebe2f3c9d9bd34fe7f8ff51fa8d5586234ce0 Mon Sep 17 00:00:00 2001 From: Levon Becker Date: Thu, 19 Mar 2020 11:22:30 -0700 Subject: [PATCH 3/3] Need vendor directory exclude in rubocop because circleci bundles to vendor --- .rubocop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.rubocop.yml b/.rubocop.yml index 6341a8d..08f8020 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,6 +4,7 @@ AllCops: - '.idea/**/*' - '.git/**/*' - '*.lock' + - 'vendor/**/*' Layout/AlignParameters: Enabled: false