inspec 4.7.3 → 4.7.18

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

@@ -45,6 +45,7 @@ module InspecPlugins
       def self.post_file(url, headers, file_path, insecure)
         uri = _parse_url(url)
         raise "Unable to parse URL: #{url}" if uri.nil? || uri.host.nil?
+
         http = Net::HTTP.new(uri.host, uri.port)
 
         # set connection flags
@@ -69,6 +70,7 @@ module InspecPlugins
       def self.post_multipart_file(url, headers, file_path, insecure)
         uri = _parse_url(url)
         raise "Unable to parse URL: #{url}" if uri.nil? || uri.host.nil?
+
         http = Net::HTTP.new(uri.host, uri.port)
 
         # set connection flags
@@ -93,6 +95,7 @@ module InspecPlugins
         opts[:verify_mode] = OpenSSL::SSL::VERIFY_NONE if insecure
 
         raise "Unable to parse URI: #{uri}" if uri.nil? || uri.host.nil?
+
         res = Net::HTTP.start(uri.host, uri.port, opts) do |http|
           http.request(req)
         end

data/lib/plugins/inspec-compliance/test/unit/api_test.rb

@@ -292,8 +292,8 @@ describe InspecPlugins::Compliance::API do
       good_response.stubs(:code).returns("400")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(good_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(good_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_equal(:automate2)
     end
@@ -303,11 +303,11 @@ describe InspecPlugins::Compliance::API do
       bad_response.stubs(:code).returns("404")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate_endpoint, headers, insecure)
-                      .returns(good_response)
+        .with(url + automate_endpoint, headers, insecure)
+        .returns(good_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_equal(:automate)
     end
@@ -321,11 +321,11 @@ describe InspecPlugins::Compliance::API do
       good_response.stubs(:body).returns("Are You Looking For the Chef Server?")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate_endpoint, headers, insecure)
-                      .returns(good_response)
+        .with(url + automate_endpoint, headers, insecure)
+        .returns(good_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_equal(:automate)
     end
@@ -335,17 +335,17 @@ describe InspecPlugins::Compliance::API do
       bad_response.stubs(:body).returns("No Chef Manage here")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(bad_response)
 
       mock_compliance_response = mock
       mock_compliance_response.stubs(:code).returns("404")
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + compliance_endpoint, headers, insecure)
-                      .returns(mock_compliance_response)
+        .with(url + compliance_endpoint, headers, insecure)
+        .returns(mock_compliance_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_be_nil
     end
@@ -355,14 +355,14 @@ describe InspecPlugins::Compliance::API do
       bad_response.stubs(:code).returns("404")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + compliance_endpoint, headers, insecure)
-                      .returns(good_response)
+        .with(url + compliance_endpoint, headers, insecure)
+        .returns(good_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_equal(:compliance)
     end
@@ -371,14 +371,14 @@ describe InspecPlugins::Compliance::API do
       bad_response.stubs(:code).returns("404")
 
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate2_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate2_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + automate_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + automate_endpoint, headers, insecure)
+        .returns(bad_response)
       InspecPlugins::Compliance::HTTP.expects(:get)
-                      .with(url + compliance_endpoint, headers, insecure)
-                      .returns(bad_response)
+        .with(url + compliance_endpoint, headers, insecure)
+        .returns(bad_response)
 
       InspecPlugins::Compliance::API.determine_server_type(url, insecure).must_be_nil
     end

data/lib/plugins/inspec-compliance/test/unit/target_test.rb

@@ -147,7 +147,7 @@ describe InspecPlugins::Compliance::Fetcher do
     it "contains the upstream_sha256" do
       InspecPlugins::Compliance::API.stubs(:profiles).returns(["success", profiles_result])
       prof = profiles_result[0]
-      target = "compliance://#{prof['owner']}/#{prof['name']}"
+      target = "compliance://#{prof["owner"]}/#{prof["name"]}"
       fetcher = InspecPlugins::Compliance::Fetcher.resolve(target)
       fetcher.upstream_sha256.must_equal prof["sha256"]
     end

data/lib/plugins/inspec-habitat/lib/inspec-habitat/profile.rb

@@ -194,7 +194,7 @@ module InspecPlugins
         FileUtils.mkdir_p(File.dirname(file))
         template_path = File.join(__dir__, "../../templates/habitat", template)
         contents = ERB.new(File.read(template_path))
-                      .result(OpenStruct.new(vars).instance_eval { binding })
+          .result(OpenStruct.new(vars).instance_eval { binding })
         File.write(file, contents)
       end
 

data/lib/plugins/inspec-habitat/test/unit/profile_test.rb

@@ -116,8 +116,8 @@ class InspecPlugins::Habitat::ProfileTest < Minitest::Test
   def test_duplicate_profile
     current_profile = @test_profile
     duplicated_profile = @hab_profile.send(:duplicate_profile,
-                                           @test_profile_path,
-                                           @tmpdir)
+      @test_profile_path,
+      @tmpdir)
     assert duplicated_profile.is_a?(Inspec::Profile)
     assert duplicated_profile.sha256 == current_profile.sha256.to_s
     refute_same duplicated_profile.root_path, current_profile.root_path
@@ -130,8 +130,8 @@ class InspecPlugins::Habitat::ProfileTest < Minitest::Test
 
   def test_copy_profile_to_working_dir
     duplicated_profile = @hab_profile.send(:duplicate_profile,
-                                           @test_profile_path,
-                                           @tmpdir)
+      @test_profile_path,
+      @tmpdir)
 
     dst = File.join(@tmpdir, "working_dir")
     FileUtils.mkdir_p(dst)
@@ -145,6 +145,7 @@ class InspecPlugins::Habitat::ProfileTest < Minitest::Test
 
     actual_files = Dir.glob(File.join(dst, "**/*")).map do |path|
       next unless File.file?(path)
+
       File.basename(path)
     end.compact
 
@@ -175,7 +176,7 @@ class InspecPlugins::Habitat::ProfileTest < Minitest::Test
 
     Inspec::ProfileVendor.stub :new, mock do
       new_profile = @hab_profile.send(:vendor_profile_dependencies!,
-                                      @test_profile)
+        @test_profile)
       assert new_profile.is_a?(Inspec::Profile)
     end
   end
@@ -191,7 +192,7 @@ class InspecPlugins::Habitat::ProfileTest < Minitest::Test
 
     Inspec::ProfileVendor.stub :new, mock do
       new_profile = @hab_profile.send(:vendor_profile_dependencies!,
-                                      @test_profile)
+        @test_profile)
       assert new_profile.is_a?(Inspec::Profile)
     end
     mock.verify

data/lib/plugins/inspec-init/lib/inspec-init/cli_profile.rb

@@ -21,12 +21,12 @@ module InspecPlugins
 
       desc "profile [OPTIONS] NAME", "Generate a new profile"
       option :platform, default: "os", type: :string, aliases: [:p],
-             desc: "Which platform to generate a profile for: choose from #{valid_profile_platforms.join(', ')}"
+             desc: "Which platform to generate a profile for: choose from #{valid_profile_platforms.join(", ")}"
       option :overwrite, type: :boolean, default: false,
              desc: "Overwrites existing directory"
       def profile(new_profile_name)
         unless valid_profile_platforms.include?(options[:platform])
-          ui.error "Unable to generate profile: No template available for platform '#{options[:platform]}' (expected one of: #{valid_profile_platforms.join(', ')})"
+          ui.error "Unable to generate profile: No template available for platform '#{options[:platform]}' (expected one of: #{valid_profile_platforms.join(", ")})"
           ui.exit(:usage_error)
         end
         template_path = File.join("profiles", options[:platform])

data/lib/plugins/inspec-init/lib/inspec-init/renderer.rb

@@ -54,6 +54,7 @@ module InspecPlugins
         Dir.glob(template_glob) do |source_file|
           relative_destination_item_path = Pathname.new(source_file).relative_path_from(Pathname.new(source_dir)).to_s
           next if skip_files.include? relative_destination_item_path
+
           relative_destination_item_path = file_rename_map[relative_destination_item_path] || relative_destination_item_path
           full_destination_item_path = Pathname.new(full_destination_path).join(relative_destination_item_path)
           if File.directory?(source_file)

data/lib/plugins/inspec-init/test/functional/inspec_init_plugin_test.rb

@@ -35,7 +35,7 @@ class InitPluginCli < Minitest::Test
       # Each file must exist, and its contents must match each of the regexen given.
       {
         File.join(plugin, "README.md") => [
-          /#{plugin}/
+          /#{plugin}/,
         ],
         File.join(plugin, "LICENSE") => [
           /(?!opyright)/, # No copyright by default
@@ -44,7 +44,7 @@ class InitPluginCli < Minitest::Test
         File.join(plugin, "Gemfile") => [], # No interpolation
         File.join(plugin, "Rakefile") => [], # No interpolation
         File.join(plugin, plugin + ".gemspec") => [
-          /require '#{plugin}\/version'/,
+          %r{require '#{plugin}/version'},
           /spec\.name\s+=\s+'#{plugin}'/,
           /spec\.version\s+=\s+InspecPlugins::#{module_name}::VERSION/,
           /README\.md\s+#{snake_case}\.gemspec\s+Gemfile/,
@@ -52,20 +52,20 @@ class InitPluginCli < Minitest::Test
           /spec\.email\s+=\s+\['you@example\.com'\]/,
           /spec\.summary\s+=\s+'A plugin with a default summary'/,
           /spec\.description\s+=\s+''/,
-          /spec\.homepage\s+=\s+'https:\/\/github.com\/you\/#{plugin}'/,
+          %r{spec\.homepage\s+=\s+'https://github.com/you/#{plugin}'},
           /spec\.license\s+=\s+'Apache-2\.0'/,
         ],
         File.join(plugin, "lib", plugin + ".rb") => [
-          /require\s'#{plugin}\/plugin'/,
+          %r{require\s'#{plugin}/plugin'},
         ],
         File.join(plugin, "lib", plugin, "plugin.rb") => [
-          /require\s'#{plugin}\/version'/,
+          %r{require\s'#{plugin}/version'},
           /\#\s#{plugin}\s=>\s#{module_name}/,
           /module\s#{module_name}/,
           /plugin_name\s+:'#{plugin}'/,
           # Default assumes one cli hook
           /cli_command :my_command/,
-          /require\s'#{plugin}\/cli_command'/,
+          %r{require\s'#{plugin}/cli_command'},
           /InspecPlugins::#{module_name}::CliCommand/,
         ],
         File.join(plugin, "lib", plugin, "version.rb") => [
@@ -78,7 +78,7 @@ class InitPluginCli < Minitest::Test
           /\#\sas\s`inspec\smy-command\sdo-something/,
           /\#\sin\s`inspec\shelp\smy-command`/,
           /\#\sruns\s`inspec\smy-command\sdo-something`./,
-          /Edit\slib\/#{plugin}\/cli_command\.rb\sto\smake\sit\sdo/,
+          %r{Edit\slib/#{plugin}/cli_command\.rb\sto\smake\sit\sdo},
         ],
         File.join(plugin, "test", "helper.rb") => [], # No interpolation
         File.join(plugin, "test", "functional", "README.md") => [], # No interpolation
@@ -86,12 +86,12 @@ class InitPluginCli < Minitest::Test
           # Whatever goes here
         ],
         File.join(plugin, "test", "unit", "plugin_def_test.rb") => [
-          /require\s'#{plugin}\/plugin'/,
+          %r{require\s'#{plugin}/plugin'},
           /describe InspecPlugins::#{module_name}::Plugin\sdo/,
           /let\(:plugin_name\) \{ \:'#{plugin}\' \}/,
         ],
         File.join(plugin, "test", "unit", "cli_args_test.rb") => [
-          /require '#{plugin}\/cli_command'/,
+          %r{require '#{plugin}/cli_command'},
           /describe InspecPlugins::#{module_name}::CliCommand do/,
           /let\(\:cli_class\) \{ InspecPlugins::#{module_name}::CliCommand \}/,
         ],
@@ -102,6 +102,7 @@ class InitPluginCli < Minitest::Test
         full_path = File.join(dir, path)
         assert(File.exist?(full_path), "#{path} should have been generated")
         next if regexen.empty?
+
         contents = File.read(full_path)
         regexen.each do |re|
           assert_match re, contents, "#{path} should match #{re}"
@@ -148,7 +149,7 @@ class InitPluginCli < Minitest::Test
           /spec\.email\s+=\s+\['bob@example\.com'\]/,
           /spec\.summary\s+=\s+'A fantastic plugin'/,
           /spec\.description\s+=\s+'That you will really like'/,
-          /spec\.homepage\s+=\s+'http:\/\/example.com'/,
+          %r{spec\.homepage\s+=\s+'http://example.com'},
           /spec\.license\s+=\s+'BSD-3-Clause'/,
         ],
         File.join(plugin, "lib", plugin + ".rb") => [],
@@ -163,6 +164,7 @@ class InitPluginCli < Minitest::Test
         full_path = File.join(dir, path)
         assert(File.exist?(full_path), "#{path} should have been generated")
         next if regexen.empty?
+
         contents = File.read(full_path)
         regexen.each do |re|
           assert_match re, contents, "#{path} should match #{re}"

data/lib/plugins/inspec-plugin-manager-cli/lib/inspec-plugin-manager-cli/cli_command.rb

@@ -20,7 +20,7 @@ module InspecPlugins
       option :all, desc: "Include plugins shipped with #{PRODUCT_NAME} as well.", type: :boolean, aliases: [:a]
       def list
         plugin_statuses = Inspec::Plugin::V2::Registry.instance.plugin_statuses
-        plugin_statuses.reject! { |s| [:core, :bundle].include?(s.installation_type) } unless options[:all]
+        plugin_statuses.reject! { |s| %i{core bundle}.include?(s.installation_type) } unless options[:all]
 
         # TODO: ui object support
         puts
@@ -353,7 +353,7 @@ module InspecPlugins
           puts(red { "Plugin already installed at latest version" } + " - plugin #{plugin_name} #{requested_version} - refusing to install.")
         else
           # There are existing versions installed, but none of them are what was requested
-          puts(red { "Update required" } + " - plugin #{plugin_name}, requested #{requested_version}, have #{pre_installed_versions.join(', ')}; use `inspec plugin update` - refusing to install.")
+          puts(red { "Update required" } + " - plugin #{plugin_name}, requested #{requested_version}, have #{pre_installed_versions.join(", ")}; use `inspec plugin update` - refusing to install.")
         end
 
         exit 2
@@ -370,6 +370,7 @@ module InspecPlugins
         exit 2
       rescue Inspec::Plugin::V2::InstallError
         raise if Inspec::Log.level == :debug
+
         results = installer.search(plugin_name, exact: true)
         if results.empty?
           puts(red { "No such plugin gem " } + plugin_name + " could be found on rubygems.org - installation failed.")
@@ -433,9 +434,9 @@ module InspecPlugins
           # TODO: this is naive, and assumes the latest version is the one that will be used. Logged on #3317
           # In fact, the logic to determine "what version would be used" belongs in the Loader.
           Inspec::Plugin::V2::Loader.list_installed_plugin_gems
-                                    .select { |spec| spec.name == status.name.to_s }
-                                    .sort_by(&:version)
-                                    .last.version
+            .select { |spec| spec.name == status.name.to_s }
+            .sort_by(&:version)
+            .last.version
         when :path
           "src"
         end

data/lib/plugins/inspec-plugin-manager-cli/test/functional/inspec-plugin_test.rb

@@ -38,6 +38,7 @@ module PluginManagerHelpers
   def clear_empty_config_dir
     Dir.glob(File.join(project_config_dirs_path, "empty", "*")).each do |path|
       next if path.end_with? ".gitkeep"
+
       FileUtils.rm_rf(path)
     end
   end

data/lib/plugins/shared/core_plugin_test_helper.rb

@@ -126,6 +126,7 @@ module CorePluginFunctionalHelper
     plugin_name = project_dir.basename
     entry_point = File.join(project_dir.to_s, "lib", plugin_name.to_s + ".rb")
     raise "Could not find plugin entry point" unless File.exist?(entry_point)
+
     entry_point
   end
 

data/lib/resource_support/aws/aws_resource_mixin.rb

@@ -1,7 +1,7 @@
 module AwsResourceMixin
   def initialize(resource_params = {})
     Inspec.deprecate(:aws_resources_in_resource_pack,
-                     "Resource '#{@__resource_name__ ||= self.class.to_s}'")
+      "Resource '#{@__resource_name__ ||= self.class.to_s}'")
     validate_params(resource_params).each do |param, value|
       instance_variable_set(:"@#{param}", value)
     end
@@ -11,6 +11,7 @@ module AwsResourceMixin
   rescue ArgumentError => e
     # continue with ArgumentError if testing
     raise unless respond_to?(:inspec)
+
     raise Inspec::Exceptions::ResourceFailed, e.message
   end
 
@@ -39,7 +40,7 @@ module AwsResourceMixin
 
     # Any leftovers are unwelcome
     unless raw_params.empty?
-      raise ArgumentError, "Unrecognized resource param '#{raw_params.keys.first}'. Expected parameters: #{allowed_params.join(', ')}"
+      raise ArgumentError, "Unrecognized resource param '#{raw_params.keys.first}'. Expected parameters: #{allowed_params.join(", ")}"
     end
 
     recognized_params

data/lib/resources/aws/aws_billing_report.rb

@@ -23,7 +23,7 @@ class AwsBillingReport < Inspec.resource(1)
   include AwsSingularResourceMixin
 
   attr_reader :report_name, :time_unit, :format, :compression, :s3_bucket,
-              :s3_prefix, :s3_region
+    :s3_prefix, :s3_region
 
   def to_s
     "AWS Billing Report #{report_name}"

data/lib/resources/aws/aws_billing_reports.rb

@@ -24,19 +24,20 @@ class AwsBillingReports < Inspec.resource(1)
 
   filtertable = FilterTable.create
   filtertable.register_custom_matcher(:exists?) { |x| !x.entries.empty? }
-             .register_column(:report_names, field: :report_name)
-             .register_column(:time_units, field: :time_unit, style: :simple)
-             .register_column(:formats, field: :format, style: :simple)
-             .register_column(:compressions, field: :compression, style: :simple)
-             .register_column(:s3_buckets, field: :s3_bucket, style: :simple)
-             .register_column(:s3_prefixes, field: :s3_prefix, style: :simple)
-             .register_column(:s3_regions, field: :s3_region, style: :simple)
+    .register_column(:report_names, field: :report_name)
+    .register_column(:time_units, field: :time_unit, style: :simple)
+    .register_column(:formats, field: :format, style: :simple)
+    .register_column(:compressions, field: :compression, style: :simple)
+    .register_column(:s3_buckets, field: :s3_bucket, style: :simple)
+    .register_column(:s3_prefixes, field: :s3_prefix, style: :simple)
+    .register_column(:s3_regions, field: :s3_region, style: :simple)
   filtertable.install_filter_methods_on_resource(self, :table)
 
   def validate_params(resource_params)
     unless resource_params.empty?
       raise ArgumentError, "aws_billing_reports does not accept resource parameters."
     end
+
     resource_params
   end
 

data/lib/resources/aws/aws_cloudtrail_trail.rb

@@ -15,7 +15,7 @@ class AwsCloudTrailTrail < Inspec.resource(1)
 
   include AwsSingularResourceMixin
   attr_reader :cloud_watch_logs_log_group_arn, :cloud_watch_logs_role_arn, :home_region,
-              :kms_key_id, :s3_bucket_name, :trail_arn
+    :kms_key_id, :s3_bucket_name, :trail_arn
 
   def to_s
     "CloudTrail #{@trail_name}"

data/lib/resources/aws/aws_cloudtrail_trails.rb

@@ -18,6 +18,7 @@ class AwsCloudTrailTrails < Inspec.resource(1)
     unless resource_params.empty?
       raise ArgumentError, "aws_cloudtrail_trails does not accept resource parameters."
     end
+
     resource_params
   end