inspec-core 4.50.3 → 5.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506be4d9918c8af46f6b3784e8a18550cee990ad73c7c731bb1afea7197c5370
-  data.tar.gz: b48fa274325e96ac07185653b2eeb997ed5ea6fa39f570b0400706331a3b4d52
+  metadata.gz: 4c3af1b1fd71ded2286e8aa90c46c74dd20f7fb31c525e56ae03e52952c26b0f
+  data.tar.gz: 507db51585f790cc26af852626b3bb52f8a35f36870ee563902234f1c2664a2a
 SHA512:
-  metadata.gz: 4eb19bed92e35c49395e513e263f3afdb3f59abcf873b88f0c7dc07775a64c4e6aea3db57f069b19be73e9aa92de106db95ecb4b60fc3fc4c5b080f4fc97df6c
-  data.tar.gz: e8eac56320e4c0e36078bdcef95dde1b6ec710d7bfdba1bbd4f8301ee0f5799c5a913f96edc5c31ba78c2dcc3647e671454b30ac430729943a0dca071191aa63
+  metadata.gz: 00447ba26c980417a501be959fb8ca85268db4e600417c11a912181da2c75c41169d419f1177fac484a12c1c405cae3aab5912ec9cab24f9a9e4adf355d40faa
+  data.tar.gz: f007b4bc1998187a7313f34f8739145f5e511500e2c9ca280b7163495a6909646be25fed9b4307a27f370e5e36b94b36b558c9e8d5c67079dc6cf24fb93029ea

data/Gemfile

@@ -11,11 +11,6 @@ gem "inspec-bin", path: "./inspec-bin"
 
 gem "ffi", ">= 1.9.14", "!= 1.13.0", "!= 1.14.2"
 
-if Gem.ruby_version.to_s.start_with?("2.5")
-  # 16.7.23 required ruby 2.6+
-  gem "chef-utils", "< 16.7.23" # TODO: remove when we drop ruby 2.5
-end
-
 # inspec tests depend text output that changed in the 3.10 release
 # but our runtime dep is still 3.9+
 gem "rspec", ">= 3.10"
@@ -30,11 +25,7 @@ end
 group :test do
   gem "chefstyle", "~> 2.0.3"
   gem "concurrent-ruby", "~> 1.0"
-  if Gem.ruby_version.to_s.start_with?("2.5")
-    gem "html-proofer", "= 3.19.1" , platforms: :ruby # do not attempt to run proofer on windows
-  else
-    gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
-  end
+  gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
   gem "json_schemer", ">= 0.2.1", "< 0.2.19"
   gem "m"
   gem "minitest-sprint", "~> 1.0"
@@ -45,7 +36,8 @@ group :test do
   gem "pry", "~> 0.10"
   gem "rake", ">= 10"
   gem "ruby-progressbar", "~> 1.8"
-  gem "simplecov", "~> 0.18"
+  gem "simplecov", "~> 0.21"
+  gem "simplecov_json_formatter"
   gem "webmock", "~> 3.0"
 end
 
@@ -66,3 +58,7 @@ if Gem.ruby_version >= Gem::Version.new("2.7.0")
     gem "git"
   end
 end
+
+if Gem.ruby_version < Gem::Version.new("2.7.0")
+  gem "activesupport", "6.1.4.4"
+end

data/etc/deprecations.json

@@ -17,9 +17,14 @@
       "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",
-      "prefix": "AWS resources shipped with core InSpec are being to moved to a resource pack for faster iteration. Please update your profiles to depend on git@github.com:inspec/inspec-aws.git ."
+      "comment": "Deprecated in InSpec 5",
+      "action": "exit",
+      "prefix": "AWS resources in core InSpec are deprecated and have been removed in InSpec 5. They are now part of a resource pack. Please update your profiles to depend on git@github.com:inspec/inspec-aws.git ."
+    },
+    "azure_resources_in_resource_pack": {
+      "comment": "Deprecated in InSpec 5",
+      "action": "exit",
+      "prefix": "Azure resources in core InSpec are deprecated and have been removed in InSpec 5. They are now part of a resource pack. Please update your profiles to depend on git@github.com:inspec/inspec-azure.git ."
     },
     "cli_option_json_config": {
       "action": "ignore",
@@ -55,10 +60,6 @@
       "action": "fail_control",
       "suffix": "This property was removed in InSpec 4.0."
     },
-    "properties_aws_iam_user": {
-      "action": "fail_control",
-      "suffix": "This property was removed in InSpec 4.0."
-    },
     "properties_shadow": {
       "action": "fail_control",
       "suffix": "This property was removed in InSpec 4.0."
@@ -72,10 +73,6 @@
       "action": "exit",
       "suffix": "This resource was removed in InSpec 4.0."
     },
-    "resource_azure_generic_resource": {
-      "action": "warn",
-      "prefix": "The azure_generic_resource is deprecated. Please use a specific resource. See: 'https://github.com/inspec/inspec/issues/3131'"
-    },
     "resource_iis_website": {
       "action": "exit",
       "suffix": "This resource was removed in InSpec 4.0.",
@@ -125,6 +122,10 @@
       "action": "warn",
       "prefix": "The --hook option is being replaced by the --activator option.",
       "suffix": "This options will be removed in InSpec 4.0."
+    },
+    "cli_option_target_id":{
+      "action": "warn",
+      "prefix": "The --target-id option is deprecated in InSpec 5. Its value will be ignored."
     }
   }
 }

data/inspec-core.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.7"
 
   # the gemfile and gemspec are necessary for appbundler so don't remove it
   spec.files =
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor",               ">= 0.20", "< 2.0"
   spec.add_dependency "method_source",      ">= 0.8", "< 2.0"
   spec.add_dependency "rubyzip",            ">= 1.2.2", "< 3.0"
-  spec.add_dependency "rspec",              ">= 3.9", "< 3.11"
+  spec.add_dependency "rspec",              ">= 3.9", "<= 3.11"
   spec.add_dependency "rspec-its",          "~> 1.2"
   spec.add_dependency "pry",                "~> 0.13"
   spec.add_dependency "hashie",             ">= 3.4", "< 5.0"

data/lib/bundles/inspec-supermarket/README.md

@@ -8,8 +8,27 @@ To use the CLI, this InSpec add-on adds the following commands:
 
  Compliance profiles from Supermarket can be executed in two ways:
 
- - via supermarket exec: `inspec supermarket exec nathenharvey/tmp-compliance-profile`
- - via supermarket scheme: `inspec exec supermarket://nathenharvey/tmp-compliance-profile`
+ - via supermarket exec:
+
+ **Public Supermarket**
+
+ `inspec supermarket exec nathenharvey/tmp-compliance-profile`
+
+ **Private Supermarket**
+
+ `inspec supermarket exec nathenharvey/tmp-compliance-profile --supermarket_url="PRIVATE_SUPERMARKET_URL"`
+
+
+ - via supermarket scheme:
+
+ **Public Supermarket**
+
+ `inspec exec supermarket://nathenharvey/tmp-compliance-profile`
+
+ **Private Supermarket**
+
+ `inspec exec supermarket://nathenharvey/tmp-compliance-profile --supermarket_url="PRIVATE_SUPERMARKET_URL"`
+
 
 ## Usage
 

data/lib/bundles/inspec-supermarket/cli.rb

@@ -15,10 +15,18 @@ module Supermarket
     end
 
     desc "profiles", "list all available profiles in Chef Supermarket"
+    supermarket_options
     def profiles
-      # display profiles in format user/profile
-      supermarket_profiles = Supermarket::API.profiles
+      o = config
+      diagnose(o)
+      configure_logger(o)
 
+      # display profiles in format user/profile
+      supermarket_profiles =  if o["supermarket_url"]
+                                Supermarket::API.profiles(o["supermarket_url"])
+                              else
+                                Supermarket::API.profiles
+                              end
       headline("Available profiles:")
       supermarket_profiles.each do |p|
         li("#{p["tool_name"]} #{mark_text(p["tool_owner"] + "/" + p["slug"])}")
@@ -45,9 +53,18 @@ module Supermarket
     end
 
     desc "info PROFILE", "display Supermarket profile details"
+    supermarket_options
     def info(profile)
+      o = config
+      diagnose(o)
+      configure_logger(o)
+
       # check that the profile is available
-      supermarket_profiles = Supermarket::API.profiles
+      supermarket_profiles =  if o["supermarket_url"]
+                                Supermarket::API.profiles(o["supermarket_url"])
+                              else
+                                Supermarket::API.profiles
+                              end
       found = supermarket_profiles.select do |p|
         profile == "#{p["tool_owner"]}/#{p["slug"]}"
       end

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

@@ -9,10 +9,11 @@ module Supermarket
     priority 500
 
     def self.resolve(target, opts = {})
+      supermarket_url = opts["supermarket_url"] || Supermarket::API::SUPERMARKET_URL
       supermarket_uri, supermarket_server = if target.is_a?(String) && URI(target).scheme == "supermarket"
-                                              [target, Supermarket::API::SUPERMARKET_URL]
+                                              [target, supermarket_url]
                                             elsif target.respond_to?(:key?) && target.key?(:supermarket)
-                                              supermarket_server = target[:supermarket_url] || Supermarket::API::SUPERMARKET_URL
+                                              supermarket_server = target[:supermarket_url] || supermarket_url
                                               ["supermarket://#{target[:supermarket]}", supermarket_server]
                                             end
       return nil unless supermarket_uri

data/lib/inspec/base_cli.rb

@@ -99,8 +99,18 @@ module Inspec
         desc: "Specify a particular shell to use."
       option :ssl, type: :boolean,
         desc: "Use SSL for transport layer encryption (WinRM)."
+      option :ssl_peer_fingerprint, type: :string,
+        desc: "Specify peer fingerprint for SSL authentication, used in lieu of certificates"
       option :self_signed, type: :boolean,
         desc: "Allow remote scans with self-signed certificates (WinRM)."
+      option :ca_trust_file, type: :string,
+        desc: "Specify CA trust file for SSL authentication"
+      option :client_cert, type: :string,
+        desc: "Specify client certificate for SSL authentication"
+      option :client_key, type: :string,
+        desc: "Specify client key required with client cert for SSL authentication"
+      option :client_key_pass, type: :string, lazy_default: -1,
+        desc: "Specify client cert password, if required for SSL authentication"
       option :winrm_transport, type: :string, default: "negotiate",
         desc: "Specify which transport to use, defaults to negotiate (WinRM)."
       option :winrm_disable_sspi, type: :boolean,
@@ -121,11 +131,13 @@ module Inspec
       option :insecure, type: :boolean, default: false,
         desc: "Disable SSL verification on select targets"
       option :target_id, type: :string,
-        desc: "Provide a ID which will be included on reports"
+        desc: "Provide a ID which will be included on reports - deprecated"
       option :winrm_shell_type, type: :string, default: "powershell",
         desc: "Specify a shell type for winrm (eg. 'elevated' or 'powershell')"
       option :docker_url, type: :string,
         desc: "Provides path to Docker API endpoint (Docker)"
+      option :ssh_config_file, type: :array,
+        desc: "A list of paths to the ssh config file, e.g ~/.ssh/config or /etc/ssh/ssh_config"
     end
 
     def self.profile_options
@@ -133,18 +145,26 @@ module Inspec
         desc: "Folder which contains referenced profiles."
       option :vendor_cache, type: :string,
         desc: "Use the given path for caching dependencies. (default: ~/.inspec/cache)"
+      option :auto_install_gems, type: :boolean, default: false,
+        desc: "Auto installs gem dependencies of the profile or resource pack."
+    end
+
+    def self.supermarket_options
+      option :supermarket_url, type: :string,
+        desc: "Specify the URL of a private Chef Supermarket."
     end
 
     def self.exec_options
       target_options
       profile_options
+      supermarket_options
       option :controls, type: :array,
         desc: "A list of control names to run, or a list of /regexes/ to match against control names. Ignore all other tests."
       option :tags, type: :array,
         desc: "A list of tags names that are part of controls to filter and run controls, or a list of /regexes/ to match against tags names of controls. Ignore all other tests."
       option :reporter, type: :array,
         banner: "one two:/output/file/path",
-        desc: "Enable one or more output reporters: cli, documentation, html, progress, json, json-min, json-rspec, junit, yaml"
+        desc: "Enable one or more output reporters: cli, documentation, html, progress, progress-bar, json, json-min, json-rspec, junit, yaml"
       option :reporter_message_truncation, type: :string,
         desc: "Number of characters to truncate failure messages and code_desc in report data to (default: no truncation)"
       option :reporter_backtrace_inclusion, type: :boolean,

data/lib/inspec/cli.rb

@@ -201,6 +201,12 @@ class Inspec::InspecCLI < Inspec::BaseCLI
     vendor_deps(path, vendor_options)
 
     profile = Inspec::Profile.for_target(path, o)
+    gem_deps = profile.metadata.gem_dependencies + \
+      profile.locked_dependencies.list.map { |_k, v| v.profile.metadata.gem_dependencies }.flatten
+    unless gem_deps.empty?
+      o[:logger].warn "Archiving a profile that contains gem dependencies, but InSpec cannot package gems with the profile! Please archive your ~/.inspec/gems directory separately."
+    end
+
     result = profile.check
 
     if result && !o[:ignore_errors] == false
@@ -296,6 +302,7 @@ class Inspec::InspecCLI < Inspec::BaseCLI
   def exec(*targets)
     o = config
     diagnose(o)
+    deprecate_target_id(config)
     configure_logger(o)
 
     runner = Inspec::Runner.new(o)
@@ -314,6 +321,7 @@ class Inspec::InspecCLI < Inspec::BaseCLI
   option :format, type: :string
   def detect
     o = config
+    deprecate_target_id(config)
     o[:command] = "platform.params"
 
     configure_logger(o)
@@ -354,6 +362,7 @@ class Inspec::InspecCLI < Inspec::BaseCLI
     desc: "Specify one or more inputs directly on the command line to the shell, as --input NAME=VALUE. Accepts single-quoted YAML and JSON structures."
   def shell_func
     o = config
+    deprecate_target_id(config)
     diagnose(o)
     o[:debug_shell] = true
 
@@ -441,6 +450,12 @@ class Inspec::InspecCLI < Inspec::BaseCLI
 
   private
 
+  def deprecate_target_id(config)
+    unless config[:target_id].nil?
+      Inspec.deprecate "cli_option_target_id"
+    end
+  end
+
   def run_command(opts)
     runner = Inspec::Runner.new(Inspec::Config.new(opts))
     res = runner.eval_with_virtual_profile(opts[:command])

data/lib/inspec/config.rb

@@ -367,7 +367,11 @@ module Inspec
         .find_activators(plugin_type: :reporter)\
         .map(&:activator_name).map(&:to_s)
 
-      valid_types = rspec_built_in_formatters + inspec_reporters_that_are_not_yet_plugins + plugin_reporters
+      streaming_reporters = Inspec::Plugin::V2::Registry.instance\
+        .find_activators(plugin_type: :streaming_reporter)\
+        .map(&:activator_name).map(&:to_s)
+
+      valid_types = rspec_built_in_formatters + inspec_reporters_that_are_not_yet_plugins + plugin_reporters + streaming_reporters
 
       reporters.each do |reporter_name, reporter_config|
         raise NotImplementedError, "'#{reporter_name}' is not a valid reporter type." unless valid_types.include?(reporter_name)

data/lib/inspec/dependencies/requirement.rb

@@ -102,7 +102,8 @@ module Inspec
     end
 
     def fetcher
-      @fetcher ||= Inspec::CachedFetcher.new(opts, @cache)
+      @runner_options ||= (Inspec::Config.cached || {})
+      @fetcher ||= Inspec::CachedFetcher.new(opts, @cache, @runner_options)
     end
 
     # load dependencies of the dependency

data/lib/inspec/dependency_installer.rb

@@ -0,0 +1,74 @@
+# This class will install the gem depedencies for profiles etc.
+# The basic things which is required to install dependencies is the gem path where gem needs to be installed
+# and the list of gems needs to be installed.
+require "rubygems/remote_fetcher"
+require "forwardable" unless defined?(Forwardable)
+
+module Inspec
+  class DependencyInstaller
+    extend Forwardable
+
+    attr_reader :gem_path, :requested_gems, :dependency_loader
+
+    def_delegator :dependency_loader, :inspec_gem_path
+
+    def initialize(gem_path = nil, requested_gems = [])
+      @dependency_loader = Inspec::DependencyLoader.new
+      @gem_path = gem_path || inspec_gem_path
+      @requested_gems = requested_gems
+    end
+
+    def install
+      requested_gems.each do |requested_gem|
+        version = requested_gem[:version].nil? ? "> 0" : requested_gem[:version]
+        install_from_remote_gems(requested_gem[:name], { version: version })
+      end
+    end
+
+    private
+
+    def install_from_remote_gems(requested_gem_name, opts)
+      version = opts[:version].split(",")
+      begin
+        gem_dependency = Gem::Dependency.new(requested_gem_name, version || "> 0")
+
+        # BestSet is rubygems.org API + indexing, APISet is for custom sources
+        sources = if opts[:source]
+                    Gem::Resolver::APISet.new(URI.join(opts[:source] + "/api/v1/dependencies"))
+                  else
+                    Gem::Resolver::BestSet.new
+                  end
+
+        install_gem_to_gems_dir(gem_dependency, [sources], opts[:update_mode])
+      rescue Gem::RemoteFetcher::FetchError => gem_ex
+        ex = Inspec::GemDependencyInstallError.new(gem_ex.message)
+        ex.gem_name = requested_gem_name
+        raise ex
+      rescue Gem::Requirement::BadRequirementError => gem_ex
+        ex = Inspec::GemDependencyInstallError.new(gem_ex.message)
+        ex.gem_name = requested_gem_name
+        raise "Unparseable gem dependency '#{version}' for '#{ex.gem_name}'"
+      end
+    end
+
+    def install_gem_to_gems_dir(gem_dependency, extra_request_sets = [], update_mode = false)
+      # Solve the dependency (that is, find a way to install the new gem and anything it needs)
+      request_set = Gem::RequestSet.new(gem_dependency)
+
+      begin
+        solution = request_set.resolve
+      rescue Gem::UnsatisfiableDependencyError => gem_ex
+        ex = Inspec::GemDependencyInstallError.new(gem_ex.message)
+        ex.gem_name = gem_dependency.name
+        raise ex
+      end
+
+      # OK, perform the installation.
+      # Ignore deps here, because any needed deps should already be baked into gem_dependency
+      request_set.install_into(gem_path, true, ignore_dependencies: true, document: [])
+
+      # Locate the GemVersion for the new dependency and return it
+      solution.detect { |g| g.name == gem_dependency.name }.version
+    end
+  end
+end

data/lib/inspec/dependency_loader.rb

@@ -0,0 +1,97 @@
+# This class will load the gem depedencies for profiles etc.
+# The basic things which is required to load gem dependencies is the path from which gems needs to be loaded
+# and the list of gems needs to be loaded.
+
+module Inspec
+  class DependencyLoader
+    attr_accessor :gem_path, :gem_list
+
+    # initializes the dependency_loader
+    def initialize(gem_path = nil, gem_list = [])
+      @gem_path = gem_path || inspec_gem_path
+      @gem_list = gem_list
+    end
+
+    def load
+      Gem.path << gem_path
+      Gem.refresh
+
+      gem_list.each do |gem_data|
+        version = gem_data[:version].nil? ? "> 0" : gem_data[:version]
+        activate_gem_dependency(gem_data[:name], version)
+      end
+    end
+
+    def inspec_gem_path
+      self.class.inspec_gem_path
+    end
+
+    def self.inspec_gem_path
+      require "rbconfig" unless defined?(RbConfig)
+      ruby_abi_version = RbConfig::CONFIG["ruby_version"]
+      # TODO: why are we installing under the api directory for plugins?
+      base_dir = Inspec.config_dir
+      base_dir = File.realpath base_dir if File.exist? base_dir
+      File.join(base_dir, "gems", ruby_abi_version)
+    end
+
+    # Lists all gems found in the inspec_gem_path.
+    # @return [Array[Gem::Specification]] Specs of all gems found.
+    def list_managed_gems
+      Dir.glob(File.join(gem_path, "specifications", "*.gemspec")).map { |p| Gem::Specification.load(p) }
+    end
+
+    def list_installed_gems
+      list_managed_gems
+    end
+
+    def gem_installed?(name)
+      list_installed_gems.any? { |spec| spec.name == name }
+    end
+
+    def gem_version_installed?(name, version)
+      list_installed_gems.any? { |s| s.name == name && Gem::Requirement.new(version.split(",")) =~ s.version }
+    end
+
+    private
+
+    def activate_gem_dependency(name, version_constraint = "> 0")
+      version_constraint = version_constraint.split(",")
+      gem_deps = [Gem::Dependency.new(name.to_s, version_constraint)]
+      managed_gem_set = Gem::Resolver::VendorSet.new
+
+      # Note: There is an issue in resolving gem dependency.
+      # This block resolves that issue partially.
+      # But this will still fail for the gems which don't have the .gemspec file.
+      # TODO: Find the solution to resolve gem dependencies that work for the unpackaged gems which don't have the .gemspec file.
+      list_managed_gems.each do |spec|
+        unless Dir["#{spec.gem_dir}/*.gemspec"].empty?
+          managed_gem_set.add_vendor_gem(spec.name, spec.gem_dir)
+        end
+      end
+
+      # TODO: Next two lines merge our managed gems with the other gems available
+      # in our "local universe" - which may be the system, or it could be in a Bundler microcosm,
+      # or rbenv, etc. Do we want to merge that, though?
+      distrib_gem_set = Gem::Resolver::CurrentSet.new
+      installed_gem_set = Gem::Resolver.compose_sets(managed_gem_set, distrib_gem_set)
+
+      # So, given what we need, and what we have available, what activations are needed?
+      resolver = Gem::Resolver.new(gem_deps, installed_gem_set)
+
+      begin
+        solution = resolver.resolve
+      rescue Gem::UnsatisfiableDependencyError => gem_ex
+        # If you broke your install, or downgraded to a plugin with a bad gemspec, you could get here.
+        ex = Inspec::GemDependencyLoadError.new(gem_ex.message)
+        raise ex
+      end
+      solution.each do |activation_request|
+        next if activation_request.full_spec.activated?
+
+        activation_request.full_spec.activate
+        # TODO: If we are under Bundler, inform it that we loaded a gem
+      end
+    end
+  end
+end

data/lib/inspec/dsl.rb

@@ -1,6 +1,7 @@
 # copyright: 2015, Dominik Richter
 require "inspec/log"
 require "inspec/plugin/v2"
+require "inspec/utils/deprecated_cloud_resources_list"
 
 module Inspec::DSL
   attr_accessor :backend
@@ -38,8 +39,16 @@ module Inspec::DSL
 
     begin
       require "inspec/resources/#{id}"
-    rescue LoadError
-      require "resources/aws/#{id}"
+    rescue LoadError => e
+      include DeprecatedCloudResourcesList
+      cloud_resource = id.start_with?("aws_") ? "aws" : "azure"
+
+      # Deprecated AWS and Azure resources in InSpec 5.
+      if CLOUD_RESOURCES_DEPRECATED.include? id
+        Inspec.deprecate(:"#{cloud_resource}_resources_in_resource_pack", "Resource '#{id}'")
+      else
+        raise LoadError, "#{e.message}"
+      end
     end
 
     klass = Inspec::Resource.registry[id.to_s]

data/lib/inspec/errors.rb

@@ -15,4 +15,11 @@ module Inspec
   class ConfigError::Invalid < ConfigError; end
 
   class UserInteractionRequired < Error; end
+
+  class GemDependencyLoadError < Error; end
+
+  class GemDependencyInstallError < Error
+    attr_accessor :gem_name
+    attr_accessor :version
+  end
 end

data/lib/inspec/formatters/base.rb

@@ -1,5 +1,6 @@
 require "rspec/core"
 require "rspec/core/formatters/base_formatter"
+require "set" unless defined?(Set)
 
 module Inspec::Formatters
   class Base < RSpec::Core::Formatters::BaseFormatter
@@ -14,6 +15,8 @@ module Inspec::Formatters
       @profiles = []
       @profiles_info = nil
       @backend = nil
+      @all_controls_count = nil
+      @control_checks_count_map = {}
     end
 
     # RSpec Override: #dump_summary
@@ -70,6 +73,7 @@ module Inspec::Formatters
         name: platform(:name),
         release: platform(:release),
         target: backend_target,
+        target_id: platform(:uuid),
       }
     end
 
@@ -79,6 +83,26 @@ module Inspec::Formatters
       @profiles.push(profile)
     end
 
+    # These control count related methods are called via runner rspec library of inspec
+    # And these are used within streaming plugins to determine end of control
+    ######### Start of control count related methods
+    def set_controls_count(controls_count)
+      @all_controls_count = controls_count
+    end
+
+    def set_control_checks_count_map(mapping)
+      @control_checks_count_map = mapping
+    end
+
+    def get_controls_count
+      @all_controls_count
+    end
+
+    def get_control_checks_count_map
+      @control_checks_count_map
+    end
+    ######### end of control count related methods
+
     # Return all the collected output to the caller
     def results
       run_data
@@ -205,12 +229,13 @@ module Inspec::Formatters
     def platform(field)
       return nil if @backend.nil?
 
-      begin
-        @backend.platform[field]
-      rescue Train::Error => e
-        Inspec::Log.warn(e.message)
-        nil
-      end
+      @backend.platform[field]
+    rescue Train::PlatformUuidDetectionFailed
+      Inspec::Log.warn("Could not find platform target_id.")
+      nil
+    rescue Train::Error => e
+      Inspec::Log.warn(e.message)
+      nil
     end
 
     def backend_target

data/lib/inspec/library_eval_context.rb

@@ -30,6 +30,8 @@ module Inspec
 
       c3 = Class.new do
         include Inspec::DSL::RequireOverride
+        include Inspec::Resources
+
         def initialize(require_loader)
           @require_loader = require_loader
           @inspec_binding = nil