inspec-core 3.7.11 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc2e24a1d0645cf7af9be7f62ba7552950180e2691f40202035a9829d4281f0d
-  data.tar.gz: 97c73d5944fc426dc72ba45db473dbd4bf0688b8da2119f64aced481a4b64989
+  metadata.gz: 6060db98285f1a0cdb5d521ad533a502a0481c57ad613baf2c0469d520966f23
+  data.tar.gz: 0ccdf80c41296d07328c5fd7bb172e75aca2e9c40acbef9813d7aa442be95c89
 SHA512:
-  metadata.gz: 4ac5832d0b35aead187e3c262a4febfcf4133d32296ac0ebf4a2532e816415410530d4d9ec146e516b66332708f926c035a530b4fbeec4b3bbfffaecb6b4c263
-  data.tar.gz: e6db3be4591461e56cc43f0c1258e43bf7fd625d2e7c24497b22c89c4b7be02272d327aa04ea143252ba5046911da3f12a8e04b71a9c0eb3c6c850bff7489530
+  metadata.gz: 5199f204d872c74e1091021828b28f210ba2eb81d164af3365edcddb9ffe6bdb45b261fddb3109c27bd77ac5345cf009145e7c0606754a27530c594e2e511d63
+  data.tar.gz: e2c1e9ac924684a2dfb26665a88ee31fc66c6813c7aeb04bf6e312875c5efd69aea924da4e1bf43b27483adaaa1516c35711d8b69aa12c40b0853ac70c234e9a

data/README.md

@@ -454,3 +454,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
+

data/lib/inspec/reporters/automate.rb

@@ -28,10 +28,6 @@ module Inspec::Reporters
 
       final_report[:report_uuid] = @config['report_uuid'] || uuid_from_string(final_report[:end_time] + final_report[:node_uuid])
 
-      # optional json-config passthrough options
-      %w{node_name environment roles recipies job_uuid}.each do |option|
-        final_report[option.to_sym] = @config[option] unless @config[option].nil?
-      end
       final_report
     end
 

data/lib/inspec/reporters/json_automate.rb

@@ -17,7 +17,7 @@ module Inspec::Reporters
       # grab profiles from the json parent class
       @profiles = profiles
 
-      {
+      output = {
         platform: platform,
         profiles: merge_profiles,
         statistics: {
@@ -25,6 +25,12 @@ module Inspec::Reporters
         },
         version: run_data[:version],
       }
+
+      # optional json-config passthrough options
+      %w{node_name environment roles job_uuid passthrough}.each do |option|
+        output[option.to_sym] = @config[option] unless @config[option].nil?
+      end
+      output
     end
 
     private

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '3.7.11'
+  VERSION = '3.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 3.7.11
+  version: 3.9.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-22 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -474,7 +474,6 @@ files:
 - lib/plugins/inspec-artifact/lib/inspec-artifact.rb
 - lib/plugins/inspec-artifact/lib/inspec-artifact/base.rb
 - lib/plugins/inspec-artifact/lib/inspec-artifact/cli.rb
-- lib/plugins/inspec-artifact/test/functional/inspec_artifact_test.rb
 - lib/plugins/inspec-compliance/README.md
 - lib/plugins/inspec-compliance/lib/inspec-compliance.rb
 - lib/plugins/inspec-compliance/lib/inspec-compliance/api.rb
@@ -485,11 +484,6 @@ files:
 - lib/plugins/inspec-compliance/lib/inspec-compliance/images/cc-token.png
 - lib/plugins/inspec-compliance/lib/inspec-compliance/support.rb
 - lib/plugins/inspec-compliance/lib/inspec-compliance/target.rb
-- lib/plugins/inspec-compliance/test/functional/inspec_compliance_test.rb
-- lib/plugins/inspec-compliance/test/integration/default/cli.rb
-- lib/plugins/inspec-compliance/test/unit/api/login_test.rb
-- lib/plugins/inspec-compliance/test/unit/api_test.rb
-- lib/plugins/inspec-compliance/test/unit/target_test.rb
 - lib/plugins/inspec-habitat/Berksfile
 - lib/plugins/inspec-habitat/README.md
 - lib/plugins/inspec-habitat/kitchen.yml
@@ -500,19 +494,6 @@ files:
 - lib/plugins/inspec-habitat/templates/habitat/default.toml.erb
 - lib/plugins/inspec-habitat/templates/habitat/hooks/run.erb
 - lib/plugins/inspec-habitat/templates/habitat/plan.sh.erb
-- lib/plugins/inspec-habitat/test/cookbooks/inspec_habitat_fixture/Berksfile
-- lib/plugins/inspec-habitat/test/cookbooks/inspec_habitat_fixture/README.md
-- lib/plugins/inspec-habitat/test/cookbooks/inspec_habitat_fixture/files/hab_setup.exp
-- lib/plugins/inspec-habitat/test/cookbooks/inspec_habitat_fixture/metadata.rb
-- lib/plugins/inspec-habitat/test/cookbooks/inspec_habitat_fixture/recipes/default.rb
-- lib/plugins/inspec-habitat/test/functional/inspec_habitat_test.rb
-- lib/plugins/inspec-habitat/test/integration/default/inspec_habitat/README.md
-- lib/plugins/inspec-habitat/test/integration/default/inspec_habitat/controls/inspec_habitat.rb
-- lib/plugins/inspec-habitat/test/integration/default/inspec_habitat/inspec.yml
-- lib/plugins/inspec-habitat/test/support/example_profile/README.md
-- lib/plugins/inspec-habitat/test/support/example_profile/controls/example.rb
-- lib/plugins/inspec-habitat/test/support/example_profile/inspec.yml
-- lib/plugins/inspec-habitat/test/unit/profile_test.rb
 - lib/plugins/inspec-init/README.md
 - lib/plugins/inspec-init/lib/inspec-init.rb
 - lib/plugins/inspec-init/lib/inspec-init/cli.rb
@@ -528,32 +509,14 @@ files:
 - lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/cli_command.rb
 - lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/plugin.rb
 - lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/lib/inspec-plugin-template/version.rb
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/functional/README.md
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/functional/inspec_plugin_template_test.rb
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/helper.rb
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/README.md
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/cli_args_test.rb
-- lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/unit/plugin_def_test.rb
 - lib/plugins/inspec-init/templates/profiles/os/README.md
 - lib/plugins/inspec-init/templates/profiles/os/controls/example.rb
 - lib/plugins/inspec-init/templates/profiles/os/inspec.yml
 - lib/plugins/inspec-init/templates/profiles/os/libraries/.gitkeep
-- lib/plugins/inspec-init/test/functional/inspec_init_plugin_test.rb
-- lib/plugins/inspec-init/test/functional/inspec_init_profile_test.rb
 - lib/plugins/inspec-plugin-manager-cli/README.md
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli.rb
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/cli_command.rb
 - lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/plugin.rb
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/config_dirs/empty/.gitkeep
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/plugins/inspec-egg-white-omelette/lib/inspec-egg-white-omelette.rb
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/plugins/inspec-egg-white-omelette/lib/inspec-egg-white-omelette/.gitkeep
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/plugins/inspec-wrong-structure/.gitkeep
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/plugins/wrong-name/lib/wrong-name.rb
-- lib/plugins/inspec-plugin-manager-cli/test/fixtures/plugins/wrong-name/lib/wrong-name/.gitkeep
-- lib/plugins/inspec-plugin-manager-cli/test/functional/inspec-plugin_test.rb
-- lib/plugins/inspec-plugin-manager-cli/test/unit/cli_args_test.rb
-- lib/plugins/inspec-plugin-manager-cli/test/unit/plugin_def_test.rb
 - lib/plugins/shared/core_plugin_test_helper.rb
 - lib/plugins/things-for-train-integration.rb
 - lib/resources/aide_conf.rb

data/lib/plugins/inspec-artifact/test/functional/inspec_artifact_test.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-
-require_relative '../../../shared/core_plugin_test_helper.rb'
-require 'fileutils'
-require 'securerandom'
-
-class ArtifactCli < MiniTest::Test
-  include CorePluginFunctionalHelper
-
-  def test_generating_archive_keys
-    Dir.mktmpdir do |dir|
-      unique_key_name = SecureRandom.uuid()
-      out = run_inspec_process("artifact generate --keyname #{unique_key_name}", prefix: "cd #{dir} &&")
-      assert_equal 0, out.exit_status
-
-      stdout = out.stdout.force_encoding(Encoding::UTF_8)
-      assert_includes stdout, 'Generating private key'
-      assert_includes stdout, 'Generating public key'
-    end
-  end
-
-  def test_verify_and_install_signed_profile
-    Dir.mktmpdir do |dir|
-      unique_key_name = SecureRandom.uuid()
-      install_dir = File.join(dir, SecureRandom.uuid())
-      profile = File.join(dir, 'profile')
-      FileUtils.mkdir(install_dir)
-
-      # create profile
-      profile = File.join(dir, 'artifact-profile')
-      run_inspec_process("init profile artifact-profile", prefix: "cd #{dir} &&")
-
-      out = run_inspec_process("artifact generate --keyname #{unique_key_name}", prefix: "cd #{dir} &&")
-      assert_equal 0, out.exit_status
-
-      out = run_inspec_process("artifact sign-profile --profile #{profile} --keyname #{unique_key_name}", prefix: "cd #{dir} &&")
-      assert_equal 0, out.exit_status
-
-      out = run_inspec_process("artifact install-profile --infile artifact-profile-0.1.0.iaf --destdir #{install_dir}", prefix: "cd #{dir} &&")
-      assert_equal 0, out.exit_status
-
-      assert_includes out.stdout.force_encoding(Encoding::UTF_8), "Installing to #{install_dir}"
-      assert_includes Dir.entries(install_dir).join, 'inspec.yml'
-    end
-  end
-end

data/lib/plugins/inspec-compliance/test/functional/inspec_compliance_test.rb

@@ -1,43 +0,0 @@
-# encoding: utf-8
-
-require_relative '../../../shared/core_plugin_test_helper.rb'
-
-class ComplianceCli < MiniTest::Test
-  include CorePluginFunctionalHelper
-
-  def test_help_output
-    out = run_inspec_process('compliance help')
-    assert_equal out.exit_status, 0
-    assert_includes out.stdout, 'inspec compliance exec PROFILE'
-  end
-
-  def test_logout_command
-    out = run_inspec_process('compliance logout')
-    assert_equal out.exit_status, 0
-    assert_includes out.stdout, ''
-  end
-
-  def test_error_login_with_invalid_url
-    out = run_inspec_process('compliance login')
-    assert_equal out.exit_status, 1
-    assert_includes out.stderr, 'ERROR: "inspec compliance login" was called with no arguments'
-  end
-
-  def test_profile_list_without_auth
-    out = run_inspec_process('compliance profiles')
-    assert_equal out.exit_status, 0 # TODO: make this error
-    assert_includes out.stdout, 'You need to login first with `inspec compliance login`'
-  end
-
-  def test_error_upload_without_args
-    out = run_inspec_process('compliance upload')
-    assert_equal out.exit_status, 1
-    assert_includes out.stderr, 'ERROR: "inspec compliance upload" was called with no arguments'
-  end
-
-  def test_error_upload_with_fake_path
-    out = run_inspec_process('compliance upload /path/to/dir')
-    assert_equal out.exit_status, 0 # TODO: make this error
-    assert_includes out.stdout, 'You need to login first with `inspec compliance login`'
-  end
-end

data/lib/plugins/inspec-compliance/test/integration/default/cli.rb

@@ -1,93 +0,0 @@
-# encoding: utf-8
-
-# options
-inspec_bin = 'BUNDLE_GEMFILE=/inspec/Gemfile bundle exec inspec'
-api_url = 'https://0.0.0.0'
-profile = '/inspec/examples/profile'
-
-user = command('whoami').stdout.strip
-pwd = command('pwd').stdout.strip
-puts "Run test as #{user} in path #{pwd}"
-
-# TODO: determine tokens automatically, define in kitchen yml
-access_token = ENV['COMPLIANCE_ACCESSTOKEN']
-refresh_token = ENV['COMPLIANCE_REFRESHTOKEN']
-
-%w{refresh_token access_token}.each do |type| # rubocop:disable Metrics/BlockLength
-  case type
-  when 'access_token'
-    token_options = "--token '#{access_token}'"
-  when 'refresh_token'
-    token_options = "--refresh_token '#{refresh_token}'"
-  end
-
-  # verifies that the help command works
-  describe command("#{inspec_bin} compliance help") do
-    its('stdout') { should include 'inspec compliance help [COMMAND]' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-
-  # version command fails gracefully when server not configured
-  describe command("#{inspec_bin} compliance version") do
-    its('stdout') { should include 'Server configuration information is missing' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 1 }
-  end
-
-  # submitting a wrong token should have an exit of 0
-  describe command("#{inspec_bin} compliance login #{api_url} --insecure --user 'admin' --token 'wrong-token'") do
-    its('stdout') { should include 'token stored' }
-  end
-
-  # compliance login --help should give an accurate message for login
-  describe command("#{inspec_bin} compliance login --help") do
-    its('stdout') { should include "inspec compliance login SERVER --insecure --user='USER' --token='TOKEN'" }
-    its('exit_status') { should eq 0 }
-  end
-
-  # profiles command fails gracefully when token/server info is incorrect
-  describe command("#{inspec_bin} compliance profiles") do
-    its('stdout') { should include '401 Unauthorized. Please check your token' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 1 }
-  end
-
-  # login via access token token
-  describe command("#{inspec_bin} compliance login #{api_url} --insecure --user 'admin' #{token_options}") do
-    its('stdout') { should include 'token', 'stored' }
-    its('stdout') { should_not include 'Your server supports --user and --password only' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-
-  # see available resources
-  describe command("#{inspec_bin} compliance profiles") do
-    its('stdout') { should include 'base/ssh' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-
-  # upload a compliance profile
-  describe command("#{inspec_bin} compliance upload #{profile} --overwrite") do
-    its('stdout') { should include 'Profile is valid' }
-    its('stdout') { should include 'Successfully uploaded profile' }
-    its('stdout') { should_not include 'error(s)' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-
-  # returns the version of the server
-  describe command("#{inspec_bin} compliance version") do
-    its('stdout') { should include 'Chef Compliance version:' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-
-  # logout
-  describe command("#{inspec_bin} compliance logout") do
-    its('stdout') { should include 'Successfully logged out' }
-    its('stderr') { should eq '' }
-    its('exit_status') { should eq 0 }
-  end
-end

data/lib/plugins/inspec-compliance/test/unit/api/login_test.rb

@@ -1,190 +0,0 @@
-require 'minitest/autorun'
-require 'mocha/setup'
-require 'webmock/minitest'
-require_relative '../../../lib/inspec-compliance/api.rb'
-
-describe InspecPlugins::Compliance::API do
-  let(:automate_options) do
-    {
-      'server' => 'https://automate.example.com',
-      'ent' => 'automate',
-      'user' => 'someone',
-      'token' => 'token',
-    }
-  end
-
-  let(:compliance_options) do
-    {
-      'server' => 'https://compliance.example.com',
-      'user' => 'someone',
-      'password' => 'password',
-      'token' => 'token',
-      'refresh_token' => 'refresh_token',
-    }
-  end
-
-  let(:fake_config) do
-    class FakeConfig
-      def initialize
-        @config = {}
-      end
-
-      def [](key)
-        @config[key]
-      end
-
-      def []=(key, value)
-        @config[key] = value
-      end
-
-      def clean
-        @config = {}
-      end
-
-      def store
-        nil
-      end
-    end
-
-    FakeConfig.new
-  end
-
-  describe '.login' do
-    describe 'when target is a Chef Automate2 server' do
-      before do
-        InspecPlugins::Compliance::API.expects(:determine_server_type).returns(:automate2)
-      end
-
-      it 'raises an error if `--user` is missing' do
-        options = automate_options
-        options.delete('user')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a user.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'raises an error if `--token` and `--dctoken` are missing' do
-        options = automate_options
-        options.delete('token')
-        options.delete('dctoken')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a token.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'stores an access token' do
-        stub_request(:get, automate_options['server'] + '/compliance/version')
-          .to_return(status: 200, body: '', headers: {})
-        options = automate_options
-        InspecPlugins::Compliance::Configuration.expects(:new).returns(fake_config)
-
-        InspecPlugins::Compliance::API.login(options)
-        fake_config['automate']['ent'].must_equal('automate')
-        fake_config['automate']['token_type'].must_equal('dctoken')
-        fake_config['user'].must_equal('someone')
-        fake_config['server'].must_equal('https://automate.example.com/api/v0')
-        fake_config['server_type'].must_equal('automate2')
-        fake_config['token'].must_equal('token')
-      end
-    end
-
-    describe 'when target is a Chef Automate server' do
-      before do
-        InspecPlugins::Compliance::API.expects(:determine_server_type).returns(:automate)
-      end
-
-      it 'raises an error if `--user` is missing' do
-        options = automate_options
-        options.delete('user')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a user.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'raises an error if `--ent` is missing' do
-        options = automate_options
-        options.delete('ent')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify an enterprise.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'raises an error if `--token` and `--dctoken` are missing' do
-        options = automate_options
-        options.delete('token')
-        options.delete('dctoken')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a token.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'stores an access token' do
-        stub_request(:get, automate_options['server'] + '/compliance/version')
-          .to_return(status: 200, body: '', headers: {})
-        options = automate_options
-        InspecPlugins::Compliance::Configuration.expects(:new).returns(fake_config)
-
-        InspecPlugins::Compliance::API.login(options)
-        fake_config['automate']['ent'].must_equal('automate')
-        fake_config['automate']['token_type'].must_equal('usertoken')
-        fake_config['user'].must_equal('someone')
-        fake_config['server'].must_equal('https://automate.example.com/compliance')
-        fake_config['server_type'].must_equal('automate')
-        fake_config['token'].must_equal('token')
-      end
-    end
-
-    describe 'when target is a Chef Compliance server' do
-      before do
-        InspecPlugins::Compliance::API.expects(:determine_server_type).returns(:compliance)
-      end
-
-      it 'raises an error if `--user` and `--refresh-token` are missing' do
-        options = automate_options
-        options.delete('user')
-        options.delete('refresh_token')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a.*--user.*--refresh-token.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'raises an error if `--user` is present but authentication method missing' do
-        options = automate_options
-        options.delete('password')
-        options.delete('token')
-        options.delete('refresh_token')
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify.*--password.*--token.*--refresh-token.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'stores an access token' do
-        stub_request(:get, compliance_options['server'] + '/api/version')
-          .to_return(status: 200, body: '', headers: {})
-        options = compliance_options
-        InspecPlugins::Compliance::Configuration.expects(:new).returns(fake_config)
-
-        InspecPlugins::Compliance::API.login(options)
-        fake_config['user'].must_equal('someone')
-        fake_config['server'].must_equal('https://compliance.example.com/api')
-        fake_config['server_type'].must_equal('compliance')
-        fake_config['token'].must_equal('token')
-      end
-    end
-
-    describe 'when target is neither a Chef Compliance nor Chef Automate server' do
-      it 'raises an error if `https://SERVER` is missing' do
-        options = {}
-        err = proc { InspecPlugins::Compliance::API.login(options) }.must_raise(ArgumentError)
-        err.message.must_match(/Please specify a server.*/)
-        err.message.lines.length.must_equal(1)
-      end
-
-      it 'rasies a `CannotDetermineServerType` error' do
-        InspecPlugins::Compliance::API.expects(:determine_server_type).returns(nil)
-        err = proc { InspecPlugins::Compliance::API.login(automate_options) }.must_raise(StandardError)
-        err.message.must_match(/Unable to determine/)
-      end
-    end
-  end
-end