inspec 4.23.4 → 4.24.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b07924a474d7ac0d047016b6c4c03a90ed56f602ba4d5db02b7253cdf79e542
-  data.tar.gz: b31506850208f9d6b124d07cd7055845cbff2bdaa8368a3b09969ba32609324e
+  metadata.gz: be5768a960a2f1c9972d9fe1e6b5dfd785d3df2d121d45c6a2d757a525b28af8
+  data.tar.gz: 2fd650afd210bc5074bef623a6ce128a4d8979bdd744aadcbf2e1cda3554043d
 SHA512:
-  metadata.gz: 0e01909a0aa538e237e5320e0d413f38b20a31c7db95c1d517d23048db7324d343eac0ff4092e930ec8f794adbed40e61cee1f69ffe1d6ebcf731f928b5fcb15
-  data.tar.gz: 1075618b354463ba60b5e06ff1e70409809d4923505b5ccae1e02b5a473bedb35262040af3010cf65d9673d4a8b1771bd0216e93a4c3f0ddb119cff1dbded0c8
+  metadata.gz: 07e76e5279b846f48885f192b09745684acbe9affaba38d1d700bbe763a858ce01b6b2fd360efbc7d6d6a8cdfee09b9a4359d102ed90cd2601fd7fb8ed217581
+  data.tar.gz: f3d1a9d78c4510d55b29be8f54f58f9a835f7c4d5bb83582a75889858aa132291a9a4e3d8471e0e497c7c2a07057897cefeba9e9018f37e0aaad1356cf130915

data/Gemfile

@@ -11,6 +11,11 @@ gem "inspec-bin", path: "./inspec-bin"
 
 gem "ffi", ">= 1.9.14", "!= 1.13.0"
 
+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
+
 group :omnibus do
   gem "rb-readline"
   gem "appbundler"
@@ -19,45 +24,23 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 1.2.1"
-  gem "minitest", "~> 5.5"
-  gem "minitest-sprint", "~> 1.0"
-  gem "rake", ">= 10"
-  gem "simplecov", ["~> 0.10", "<=0.18.2"]
+  gem "chefstyle", "~> 1.5.7"
   gem "concurrent-ruby", "~> 1.0"
+  gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
+  gem "json_schemer", ">= 0.2.1", "< 0.2.12"
+  gem "m"
+  gem "minitest-sprint", "~> 1.0"
+  gem "minitest", "~> 5.5"
   gem "mocha", "~> 1.1"
+  gem "nokogiri", "~> 1.9"
+  gem "pry-byebug"
+  gem "pry", "~> 0.10"
+  gem "rake", ">= 10"
   gem "ruby-progressbar", "~> 1.8"
+  gem "simplecov", "~> 0.18"
   gem "webmock", "~> 3.0"
-  gem "m"
-  gem "pry", "~> 0.10"
-  gem "pry-byebug"
-  gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
-end
-
-group :integration do
-  gem "berkshelf"
-  gem "test-kitchen"
-  gem "kitchen-vagrant"
-  gem "chef", "< 15"
-  gem "chef-zero", "< 15"
-  gem "kitchen-inspec"
-  gem "kitchen-ec2"
-  gem "kitchen-dokken"
-  gem "git"
-end
-
-# gems for Maintainers.md generation
-group :maintenance do
-  gem "tomlrb"
-
-  # To sync maintainers with github
-  gem "octokit"
-  gem "netrc"
 end
 
 group :deploy do
   gem "inquirer"
 end
-
-# add these additional dependencies into Gemfile.local
-eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")

data/inspec.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "inspec/version"
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "Apache-2.0"
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.4"
+  spec.required_ruby_version = ">= 2.5"
 
   # ONLY the aws/azure/gcp files. The rest will come in from inspec-core
   # the gemspec is necessary for appbundler so don't remove it
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "train", "~> 3.0"
 
   # Used for Azure profile until integrated into train
-  spec.add_dependency "faraday_middleware", "~> 0.12.2"
+  spec.add_dependency "faraday_middleware", ">= 0.12.2", "< 1.1"
 
   # Train plugins we ship with InSpec
   spec.add_dependency "train-habitat", "~> 0.1"

data/lib/plugins/inspec-init/templates/profiles/aws/README.md

@@ -26,7 +26,7 @@ Creating new profile at /Users/spaterson/my-profile
 aws_vpc_id: 'custom-vpc-id'
 ```
 
-The related control will simply be skipped if this is not provided.  See the [InSpec DSL documentation](https://www.inspec.io/docs/reference/dsl_inspec/) for more details on conditional execution using `only_if`.
+The related control will simply be skipped if this is not provided.  See the [InSpec DSL documentation](https://docs.chef.io/inspec/dsl_inspec/) for more details on conditional execution using `only_if`.
 
 ## Run the tests
 

data/lib/resource_support/aws/aws_resource_mixin.rb

@@ -61,7 +61,7 @@ module AwsResourceMixin
   rescue Aws::Errors::MissingCredentialsError
     # The AWS error here is unhelpful:
     # "unable to sign request without credentials set"
-    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://www.inspec.io/docs/reference/platforms for details."
+    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://docs.chef.io/inspec/platforms/ for details."
     fail_resource("No AWS credentials available")
   rescue Aws::Errors::ServiceError => e
     fail_resource e.message

data/lib/resources/aws/aws_billing_report.rb

@@ -1,9 +1,7 @@
 require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 
-require "resource_support/aws/aws_singular_resource_mixin"
-require "resource_support/aws/aws_backend_base"
-require "aws-sdk-costandusagereportservice.rb"
+require "aws-sdk-costandusagereportservice"
 
 class AwsBillingReport < Inspec.resource(1)
   name "aws_billing_report"

data/lib/resources/aws/aws_ebs_volume.rb

@@ -34,7 +34,7 @@ class AwsEbsVolume < Inspec.resource(1)
   rescue Aws::Errors::MissingCredentialsError
     # The AWS error here is unhelpful:
     # "unable to sign request without credentials set"
-    Inspec::Log.error "It appears that you have not set your AWS credentials. You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target. See https://www.inspec.io/docs/reference/platforms for details."
+    Inspec::Log.error "It appears that you have not set your AWS credentials. You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target. See https://docs.chef.io/inspec/platforms/ for details."
     fail_resource("No AWS credentials available")
   rescue Aws::Errors::ServiceError => e
     fail_resource(e.message)

data/lib/resources/aws/aws_ec2_instance.rb

@@ -35,7 +35,7 @@ class AwsEc2Instance < Inspec.resource(1)
   rescue Aws::Errors::MissingCredentialsError
     # The AWS error here is unhelpful:
     # "unable to sign request without credentials set"
-    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://www.inspec.io/docs/reference/platforms for details."
+    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://docs.chef.io/inspec/platforms/ for details."
     fail_resource("No AWS credentials available")
   rescue Aws::Errors::ServiceError => e
     fail_resource e.message

data/lib/resources/aws/aws_ecs_cluster.rb

@@ -37,19 +37,18 @@ class AwsEcsCluster < Inspec.resource(1)
 
   def fetch_from_api
     backend = BackendFactory.create(inspec_runner)
-    begin
-      # Use default cluster if no cluster name is specified
-      params = cluster_name.nil? ? {} : { clusters: [cluster_name] }
-      clusters = backend.describe_clusters(params).clusters
 
-      # Cluster name is unique, we either get back one cluster, or none
-      if clusters.length == 1
-        @exists = true
-        unpack_describe_clusters_response(clusters.first)
-      else
-        @exists = false
-        populate_as_missing
-      end
+    # Use default cluster if no cluster name is specified
+    params = cluster_name.nil? ? {} : { clusters: [cluster_name] }
+    clusters = backend.describe_clusters(params).clusters
+
+    # Cluster name is unique, we either get back one cluster, or none
+    if clusters.length == 1
+      @exists = true
+      unpack_describe_clusters_response(clusters.first)
+    else
+      @exists = false
+      populate_as_missing
     end
   end
 

data/lib/resources/aws/aws_iam_password_policy.rb

@@ -43,7 +43,7 @@ class AwsIamPasswordPolicy < Inspec.resource(1)
   rescue Aws::Errors::MissingCredentialsError
     # The AWS error here is unhelpful:
     # "unable to sign request without credentials set"
-    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://www.inspec.io/docs/reference/platforms for details."
+    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://docs.chef.io/inspec/platforms/ for details."
     fail_resource("No AWS credentials available")
   rescue Aws::Errors::ServiceError => e
     fail_resource e.message

data/lib/resources/aws/aws_iam_policy.rb

@@ -2,9 +2,9 @@ require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 require "aws-sdk-iam"
 
-require "json"
-require "set"
-require "uri"
+require "json" unless defined?(JSON)
+require "set" unless defined?(Set)
+require "uri" unless defined?(URI)
 
 class AwsIamPolicy < Inspec.resource(1)
   name "aws_iam_policy"

data/lib/resources/aws/aws_iam_root_user.rb

@@ -24,7 +24,7 @@ class AwsIamRootUser < Inspec.resource(1)
   rescue Aws::Errors::MissingCredentialsError
     # The AWS error here is unhelpful:
     # "unable to sign request without credentials set"
-    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://www.inspec.io/docs/reference/platforms for details."
+    Inspec::Log.error "It appears that you have not set your AWS credentials.  You may set them using environment variables, or using the 'aws://region/aws_credentials_profile' target.  See https://docs.chef.io/inspec/platforms/ for details."
     fail_resource("No AWS credentials available")
   rescue Aws::Errors::ServiceError => e
     fail_resource e.message

data/lib/resources/aws/aws_security_group.rb

@@ -1,5 +1,5 @@
-require "set"
-require "ipaddr"
+require "set" unless defined?(Set)
+require "ipaddr" unless defined?(IPAddr)
 
 require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"

data/lib/resources/aws/aws_sqs_queue.rb

@@ -2,7 +2,7 @@ require "resource_support/aws/aws_singular_resource_mixin"
 require "resource_support/aws/aws_backend_base"
 require "aws-sdk-sqs"
 
-require "uri"
+require "uri" unless defined?(URI)
 
 class AwsSqsQueue < Inspec.resource(1)
   name "aws_sqs_queue"

data/lib/resources/azure/azure_virtual_machine_data_disk.rb

@@ -1,5 +1,5 @@
 require "resources/azure/azure_backend"
-require "uri"
+require "uri" unless defined?(URI)
 
 module Inspec::Resources
   class AzureVirtualMachineDataDisk < AzureResourceBase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.23.4
+  version: 4.24.26
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.23.4
+        version: 4.24.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.23.4
+        version: 4.24.26
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,22 @@ dependencies:
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.12.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: train-habitat
   requirement: !ruby/object:Gem::Requirement
@@ -186,9 +192,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="