inspec 4.3.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b914b39e42bc9b11d4969b21634765b74555ecec86b6fab6eaed25c468e26cbf
-  data.tar.gz: cdfcbfda7bf8607219c27ebe3078f69e83b70121f49ba6261fe8247d1a9c9382
+  metadata.gz: 342d597b601b1ed2b14456b9e39deac862424c66a99cfe2a3fa79831d458e5fb
+  data.tar.gz: 10821307e9cacabc4a5882b8f7575b74354c00ad26227a51b8e5b7ef9d829ebc
 SHA512:
-  metadata.gz: 139866572fc50b631bafb7b3538a5a20e0eb9000df69c7e117227f365e5f0763377e9ae07b94b6b4d7c942189c6fd01aa49379a99e0bff9223026985a4d38603
-  data.tar.gz: 6d0b71d14fb76a39a09a928370cd00202366cb9afc7d316fa0398f64a3f79380aed67047757aee06ea5a77571f1537d1e7118b027358deecae77371344e8126a
+  metadata.gz: c666a05ddd18e116d76c584eb8f5f1744d6839e8b4869d72c488e151bd13feb76a29a39abf07c91c9a6d25be2f7723289240a442dd6f62181a8043087eca1081
+  data.tar.gz: 48b65e1c3face5d5c73b5b89617566e83ba8c7db03d0daafb52cc7033b025d087bbb2bbabc8d8162484234e25dc7f3334f427616f5ead61dccc82e9e85e2eba9

data/Gemfile

@@ -1,64 +1,62 @@
-# encoding: utf-8
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'inspec', path: '.'
+gem "inspec", path: "."
 
 # This dependency is NOT used for normal gem deployment
 # - instead, inspec-bin gemspec-depends on inspec
 #
 # However, AppBundler requires a top-level Gemfile.lock with inspec-bin
 # in it in order to package the executable. Hence the odd backwards dependency.
-gem 'inspec-bin', path: './inspec-bin'
+gem "inspec-bin", path: "./inspec-bin"
 
-gem 'ffi', '>= 1.9.14'
+gem "ffi", ">= 1.9.14"
 
 group :omnibus do
-  gem 'rb-readline'
-  gem 'appbundler'
-  gem 'ed25519' # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
-  gem 'bcrypt_pbkdf' # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
+  gem "rb-readline"
+  gem "appbundler"
+  gem "ed25519" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
+  gem "bcrypt_pbkdf" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
 end
 
 group :test do
-  gem 'minitest', '~> 5.5'
-  gem 'rake', '>= 10'
-  gem 'rubocop', '= 0.49.1'
-  gem 'simplecov', '~> 0.10'
-  gem 'concurrent-ruby', '~> 1.0'
-  gem 'mocha', '~> 1.1'
-  gem 'ruby-progressbar', '~> 1.8'
-  gem 'webmock', '~> 3.0'
-  gem 'jsonschema', '~> 2.0.2'
-  gem 'passgen'
-  gem 'm'
-  gem 'pry-byebug'
+  gem "chefstyle", "~> 0.6"
+  gem "coveralls", require: false
+  gem "minitest", "~> 5.5"
+  gem "rake", ">= 10"
+  gem "simplecov", "~> 0.10"
+  gem "concurrent-ruby", "~> 1.0"
+  gem "mocha", "~> 1.1"
+  gem "ruby-progressbar", "~> 1.8"
+  gem "webmock", "~> 3.0"
+  gem "passgen"
+  gem "m"
+  gem "pry", "~> 0.10"
+  gem "pry-byebug"
 end
 
 group :integration do
-  gem 'berkshelf', '~> 7'
-  gem 'test-kitchen', '>= 1.24'
-  gem 'kitchen-vagrant'
-  # we need winrm v2 support >= 0.15.1
-  gem 'kitchen-inspec', '>= 0.15.1'
-  gem 'kitchen-ec2'
-  gem 'kitchen-dokken'
-end
-
-group :tools do
-  gem 'pry', '~> 0.10'
-  gem 'license_finder'
-  gem 'git', '~> 1.4'
+  gem "berkshelf"
+  gem "chef", "< 15"
+  gem "test-kitchen"
+  gem "kitchen-vagrant"
+  gem "kitchen-inspec"
+  gem "kitchen-ec2"
+  gem "kitchen-dokken"
+  gem "git"
 end
 
 # gems for Maintainers.md generation
 group :maintenance do
-  gem 'tomlrb'
+  gem "tomlrb"
 
   # To sync maintainers with github
-  gem 'octokit'
-  gem 'netrc'
+  gem "octokit"
+  gem "netrc"
 end
 
 group :deploy do
-  gem 'inquirer'
+  gem "inquirer"
 end
+
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/README.md

@@ -1,10 +1,17 @@
-# InSpec: Inspect Your Infrastructure
+# Chef InSpec: Inspect Your Infrastructure
+
+* **Project State: Active**
+* **Issues Response SLA: 3 business days**
+* **Pull Request Response SLA: 3 business days**
+
+For more information on project states and SLAs, see [this documentation](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md).
 
 [![Slack](https://community-slack.chef.io/badge.svg)](https://community-slack.chef.io/)
 [![Build Status Master](https://travis-ci.org/inspec/inspec.svg?branch=master)](https://travis-ci.org/inspec/inspec)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/inspec/inspec?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/inspec/branch/master)
+[![Coverage Status](https://coveralls.io/repos/github/inspec/inspec/badge.svg?branch=master)](https://coveralls.io/github/inspec/inspec?branch=master)
 
-InSpec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements.
+Chef InSpec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements.
 
 ```ruby
 # Disallow insecure protocols by testing
@@ -18,7 +25,7 @@ describe inetd_conf do
 end
 ```
 
-InSpec makes it easy to run your tests wherever you need. More options are found in our [CLI docs](https://www.inspec.io/docs/reference/cli/).
+Chef InSpec makes it easy to run your tests wherever you need. More options are found in our [CLI docs](https://www.inspec.io/docs/reference/cli/).
 
 ```bash
 # run test locally
@@ -27,7 +34,7 @@ inspec exec test.rb
 # run test on remote host on SSH
 inspec exec test.rb -t ssh://user@hostname -i /path/to/key
 
-# run test on remote host using SSH agent private key authentication. Requires InSpec 1.7.1
+# run test on remote host using SSH agent private key authentication. Requires Chef InSpec 1.7.1
 inspec exec test.rb -t ssh://user@hostname
 
 # run test on remote windows host on WinRM
@@ -40,17 +47,19 @@ inspec exec test.rb -t docker://container_id
 # Features
 
 - Built-in Compliance: Compliance no longer occurs at the end of the release cycle
-- Targeted Tests: InSpec writes tests that specifically target compliance issues
+- Targeted Tests: Chef InSpec writes tests that specifically target compliance issues
 - Metadata: Includes the metadata required by security and compliance pros
 - Easy Testing: Includes a command-line interface to run tests quickly
 
 ## Installation
 
-InSpec requires Ruby ( >= 2.4 ).
+Chef InSpec requires Ruby ( >= 2.4 ).
+
+Note: Versions of Chef InSpec 4.0 and later require accepting the EULA to use. Please visit the [license acceptance page](https://docs.chef.io/chef_license_accept.html) on the Chef docs site for more information.
 
 ### Install as package
 
-The InSpec package is available for MacOS, RedHat, Ubuntu and Windows. Download the latest package at [InSpec Downloads](https://downloads.chef.io/inspec) or install InSpec via script:
+The Chef InSpec package is available for MacOS, RedHat, Ubuntu and Windows. Download the latest package at [Chef InSpec Downloads](https://downloads.chef.io/inspec) or install Chef InSpec via script:
 
 ```
 # RedHat, Ubuntu, and macOS
@@ -76,12 +85,19 @@ For Ubuntu:
 apt-get -y install ruby ruby-dev gcc g++ make
 ```
 
-To install inspec from [rubygems](https://rubygems.org/):
+To install the `inspec` executable, which requires accepting the [Chef License](https://docs.chef.io/chef_license_accept.html), run:
+
+```bash
+gem install inspec-bin
+```
+
+You may also use `inspec` as a library, with no executable. This does not require accepting the license. To install the library as a gem, run:
 
 ```bash
 gem install inspec
 ```
 
+
 ### Usage via Docker
 
 Download the image and define a function for convenience:
@@ -135,11 +151,11 @@ gem install inspec-*.gem
 
 On Windows, you need to install [Ruby](http://rubyinstaller.org/downloads/) with [Ruby Development Kit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit) to build dependencies with its native extensions.
 
-### Install via Habitat
+### Install via Chef Habitat
 
-Currently, this method of installation only supports Linux. See the [Habitat site](https://www.habitat.sh/) for more information.
+Currently, this method of installation only supports Linux. See the [Chef Habitat site](https://www.habitat.sh/) for more information.
 
-Download the `hab` binary from the [Habitat](https://www.habitat.sh/docs/get-habitat/) site.
+Download the `hab` binary from the [Chef Habitat](https://www.habitat.sh/docs/get-habitat/) site.
 
 ```bash
 hab pkg install chef/inspec --binlink
@@ -147,7 +163,7 @@ hab pkg install chef/inspec --binlink
 inspec
 ```
 
-### Run InSpec
+### Run Chef InSpec
 
 You should now be able to run:
 
@@ -203,10 +219,10 @@ end
 ```
 
 Also have a look at our examples for:
-- [Using InSpec with Test Kitchen & Chef](https://github.com/chef/inspec/tree/master/examples/kitchen-chef)
-- [Using InSpec with Test Kitchen & Puppet](https://github.com/chef/inspec/tree/master/examples/kitchen-puppet)
-- [Using InSpec with Test Kitchen & Ansible](https://github.com/chef/inspec/tree/master/examples/kitchen-ansible)
-- [Implementing an InSpec profile](https://github.com/chef/inspec/tree/master/examples/profile)
+- [Using Chef InSpec with Test Kitchen & Chef Infra](https://github.com/chef/inspec/tree/master/examples/kitchen-chef)
+- [Using Chef InSpec with Test Kitchen & Puppet](https://github.com/chef/inspec/tree/master/examples/kitchen-puppet)
+- [Using Chef InSpec with Test Kitchen & Ansible](https://github.com/chef/inspec/tree/master/examples/kitchen-ansible)
+- [Implementing an Chef InSpec profile](https://github.com/chef/inspec/tree/master/examples/profile)
 
 ## Or tests: Testing for a OR b
 
@@ -335,13 +351,13 @@ Relationship to other tools (RSpec, Serverspec):
 
 ## Share your Profiles
 
-You may share your InSpec Profiles in the [Tools & Plugins section](https://supermarket.chef.io/tools-directory) of the [Chef Supermarket](https://supermarket.chef.io/).  [Sign in](https://supermarket.chef.io/sign-in) and [add the details of your profile](https://supermarket.chef.io/tools/new).
+You may share your Chef InSpec Profiles in the [Tools & Plugins section](https://supermarket.chef.io/tools-directory) of the [Chef Supermarket](https://supermarket.chef.io/). [Sign in](https://supermarket.chef.io/sign-in) and [add the details of your profile](https://supermarket.chef.io/tools/new).
 
 You may also [browse the Supermarket for shared Compliance Profiles](https://supermarket.chef.io/tools?type=compliance_profile).
 
 ## Kudos
 
-InSpec is inspired by the wonderful [Serverspec](http://serverspec.org) project. Kudos to [mizzy](https://github.com/mizzy) and [all contributors](https://github.com/mizzy/serverspec/graphs/contributors)!
+Chef InSpec is inspired by the wonderful [Serverspec](http://serverspec.org) project. Kudos to [mizzy](https://github.com/mizzy) and [all contributors](https://github.com/mizzy/serverspec/graphs/contributors)!
 
 The AWS resources were inspired by [inspec-aws](https://github.com/arothian/inspec-aws) from [arothian](https://github.com/arothian).
 
@@ -353,7 +369,7 @@ The AWS resources were inspired by [inspec-aws](https://github.com/arothian/insp
 1. Push to the branch (git push origin my-new-feature)
 1. Create new Pull Request
 
-The InSpec community and maintainers are very active and helpful. This project benefits greatly from this activity.
+The Chef InSpec community and maintainers are very active and helpful. This project benefits greatly from this activity.
 
 If you'd like to chat with the community and maintainers directly join us in the `#inspec` channel on the [Chef Community Slack](http://community-slack.chef.io/).
 
@@ -361,7 +377,7 @@ As a reminder, all participants are expected to follow the [Code of Conduct](htt
 
 [![Slack](https://community-slack.chef.io/badge.svg)](https://community-slack.chef.io/)
 
-## Testing InSpec
+## Testing Chef InSpec
 
 We offer `unit`, `integration`, and `aws` tests.
 
@@ -389,7 +405,7 @@ bundle exec m test/unit/resources/user_test.rb -l 123
 
 ### Integration tests
 
-These tests download various virtual machines, to ensure InSpec is working as expected across different operating systems.
+These tests download various virtual machines, to ensure Chef InSpec is working as expected across different operating systems.
 
 These tests require the following gems:
 

data/etc/deprecations.json

@@ -6,6 +6,16 @@
       "action": "warn",
       "prefix": "The 'default' option for attributes is being replaced by 'value' - please use it instead."
     },
+    "attrs_dsl": {
+      "action": "ignore",
+      "comment": "See #3853",
+      "prefix": "The 'attribute' DSL keyword is being replaced by 'input' - please use it instead."
+    },
+    "attrs_rename_in_metadata": {
+      "action": "ignore",
+      "comment": "See 3854",
+      "prefix": "Inputs should be specified by using the 'inputs' key in profile metadata, not 'attributes'."
+    },
     "aws_resources_in_resource_pack": {
       "comment": "See #3822",
       "action": "warn",

data/etc/plugin_filters.json

@@ -5,6 +5,14 @@
       "plugin_name": "inspec-core",
       "rationale": "This gem is a stripped-down alternate packaging of InSpec. It is not a plugin."
     },
+    {
+      "plugin_name": "inspec-bin",
+      "rationale": "This gem contains the executable for Chef InSpec.  It is not a plugin."
+    },
+    {
+      "plugin_name": "inspec-core-bin",
+      "rationale": "This gem contains the executable for a lightweight version of Chef InSpec. It is not a plugin."
+    },
     {
       "plugin_name": "inspec-k8s",
       "rationale": "This gem is currently only a placeholder, waiting to be built."

data/inspec.gemspec

@@ -1,57 +1,56 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'inspec/version'
+require "inspec/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'inspec'
+  spec.name          = "inspec"
   spec.version       = Inspec::VERSION
-  spec.authors       = ['Dominik Richter']
-  spec.email         = ['dominik.richter@gmail.com']
-  spec.summary       = 'Infrastructure and compliance testing.'
-  spec.description   = 'InSpec provides a framework for creating end-to-end infrastructure tests. You can use it for integration or even compliance testing. Create fully portable test profiles and use them in your workflow to ensure stability and security. Integrate InSpec in your change lifecycle for local testing, CI/CD, and deployment verification.'
-  spec.homepage      = 'https://github.com/inspec/inspec'
-  spec.license       = 'Apache-2.0'
+  spec.authors       = ["Chef InSpec Team"]
+  spec.email         = ["inspec@chef.io"]
+  spec.summary       = "Infrastructure and compliance testing."
+  spec.description   = "InSpec provides a framework for creating end-to-end infrastructure tests. You can use it for integration or even compliance testing. Create fully portable test profiles and use them in your workflow to ensure stability and security. Integrate InSpec in your change lifecycle for local testing, CI/CD, and deployment verification."
+  spec.homepage      = "https://github.com/inspec/inspec"
+  spec.license       = "Apache-2.0"
 
   # the gemfile and gemspec are necessary for appbundler so don't remove it
   spec.files = %w{Gemfile inspec.gemspec README.md LICENSE} + Dir.glob(
-    '{bin,lib,etc}/**/*', File::FNM_DOTMATCH
+    "{bin,lib,etc}/**/*", File::FNM_DOTMATCH
   ).reject { |f| File.directory?(f) }
 
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
                            .reject { |f| File.directory?(f) || f =~ %r{lib/plugins/.*/test/} }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = ">= 2.4"
 
-  spec.add_dependency 'train', '~> 2.0' # Inspec 4 must have train 2+
+  spec.add_dependency "train", "~> 2.0" # Inspec 4 must have train 2+
   # Train plugins we ship with InSpec
-  spec.add_dependency 'train-habitat', '~> 0.1'
-  spec.add_dependency 'train-aws', '~> 0.1'
+  spec.add_dependency "train-habitat", "~> 0.1"
+  spec.add_dependency "train-aws", "~> 0.1"
 
   # Implementation dependencies
-  spec.add_dependency 'license-acceptance', '>= 0.2.13', '< 2.0'
-  spec.add_dependency 'thor', '~> 0.20'
-  spec.add_dependency 'json', '>= 1.8', '< 3.0'
-  spec.add_dependency 'method_source', '~> 0.8'
-  spec.add_dependency 'rubyzip', '~> 1.2', '>= 1.2.2'
-  spec.add_dependency 'rspec', '~> 3'
-  spec.add_dependency 'rspec-its', '~> 1.2'
-  spec.add_dependency 'pry', '~> 0'
-  spec.add_dependency 'hashie', '~> 3.4'
-  spec.add_dependency 'mixlib-log'
-  spec.add_dependency 'sslshake', '~> 1.2'
-  spec.add_dependency 'parallel', '~> 1.9'
-  spec.add_dependency 'faraday', '>=0.9.0'
-  spec.add_dependency 'tty-table', '~> 0.10'
-  spec.add_dependency 'tty-prompt', '~> 0.17'
+  spec.add_dependency "license-acceptance", ">= 0.2.13", "< 2.0"
+  spec.add_dependency "thor", "~> 0.20"
+  spec.add_dependency "json-schema", "~> 2.8"
+  spec.add_dependency "method_source", "~> 0.8"
+  spec.add_dependency "rubyzip", "~> 1.2", ">= 1.2.2"
+  spec.add_dependency "rspec", "~> 3"
+  spec.add_dependency "rspec-its", "~> 1.2"
+  spec.add_dependency "pry", "~> 0"
+  spec.add_dependency "hashie", "~> 3.4"
+  spec.add_dependency "mixlib-log"
+  spec.add_dependency "sslshake", "~> 1.2"
+  spec.add_dependency "parallel", "~> 1.9"
+  spec.add_dependency "faraday", ">=0.9.0"
+  spec.add_dependency "tty-table", "~> 0.10"
+  spec.add_dependency "tty-prompt", "~> 0.17"
   # Used for Azure profile until integrated into train
-  spec.add_dependency 'faraday_middleware', '~> 0.12.2'
-  spec.add_dependency 'tomlrb', '~> 1.2'
-  spec.add_dependency 'addressable', '~> 2.4'
-  spec.add_dependency 'parslet', '~> 1.5'
-  spec.add_dependency 'semverse'
-  spec.add_dependency 'htmlentities'
-  spec.add_dependency 'multipart-post'
-  spec.add_dependency 'term-ansicolor'
+  spec.add_dependency "faraday_middleware", "~> 0.12.2"
+  spec.add_dependency "tomlrb", "~> 1.2"
+  spec.add_dependency "addressable", "~> 2.4"
+  spec.add_dependency "parslet", "~> 1.5"
+  spec.add_dependency "semverse"
+  spec.add_dependency "htmlentities"
+  spec.add_dependency "multipart-post"
+  spec.add_dependency "term-ansicolor"
 end

data/lib/bundles/inspec-compliance/api.rb

@@ -1,7 +1,7 @@
 # This file has been moved to the v2.0 plugins. This redirect allows for legacy use.
 # TODO: Remove in inspec 4.0
 
-require 'plugins/inspec-compliance/lib/inspec-compliance/api'
+require "plugins/inspec-compliance/lib/inspec-compliance/api"
 
 # Backport old namespace
 Compliance = InspecPlugins::Compliance unless defined?(Compliance)

data/lib/bundles/inspec-compliance/configuration.rb

@@ -1,7 +1,7 @@
 # This file has been moved to the v2.0 plugins. This redirect allows for legacy use.
 # TODO: Remove in inspec 4.0
 
-require 'plugins/inspec-compliance/lib/inspec-compliance/configuration'
+require "plugins/inspec-compliance/lib/inspec-compliance/configuration"
 
 # Backport old namespace
 Compliance = InspecPlugins::Compliance unless defined?(Compliance)

data/lib/bundles/inspec-compliance/http.rb

@@ -1,7 +1,7 @@
 # This file has been moved to the v2.0 plugins. This redirect allows for legacy use.
 # TODO: Remove in inspec 4.0
 
-require 'plugins/inspec-compliance/lib/inspec-compliance/http'
+require "plugins/inspec-compliance/lib/inspec-compliance/http"
 
 # Backport old namespace
 Compliance = InspecPlugins::Compliance unless defined?(Compliance)

data/lib/bundles/inspec-compliance/support.rb

@@ -1,7 +1,7 @@
 # This file has been moved to the v2.0 plugins. This redirect allows for legacy use.
 # TODO: Remove in inspec 4.0
 
-require 'plugins/inspec-compliance/lib/inspec-compliance/support'
+require "plugins/inspec-compliance/lib/inspec-compliance/support"
 
 # Backport old namespace
 Compliance = InspecPlugins::Compliance unless defined?(Compliance)

data/lib/bundles/inspec-compliance/target.rb

@@ -1,7 +1,7 @@
 # This file has been moved to the v2.0 plugins. This redirect allows for legacy use.
 # TODO: Remove in inspec 4.0
 
-require 'plugins/inspec-compliance/lib/inspec-compliance/target'
+require "plugins/inspec-compliance/lib/inspec-compliance/target"
 
 # Backport old namespace
 Compliance = InspecPlugins::Compliance unless defined?(Compliance)