inspec 4.24.8 → 4.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1312dec49f5e5f0d4c8bd2f7ede8f82763a0a5bf5514a3a5c928d73e83205c67
-  data.tar.gz: 10d3f0695c61fa19e7df838f38ac865960538ac9231d8740d84faac2c29bba25
+  metadata.gz: de243ae0659831318be79b4a3874352ce6337576e1afa8aade56ea4e292a696c
+  data.tar.gz: be1b06b69ec83d8087a68507f3928a09f29f039b83e1ef9decb7026d3b36a653
 SHA512:
-  metadata.gz: 2f46963e6fba977b4715dcc555665f7328d9d6e8ecad6d95280ce7191f24ea581a373271120b6a9590b9b4880560e5b8049c4f39c391b14e4f9c7848dadab6a7
-  data.tar.gz: 98c8444ec22092aa17178f7be25344664085ce361f39f3072f9340b7832466690c26b8fe07df5805a367521f0680ec3a80ebccd3fe5b995a32654b77ea9ac3eb
+  metadata.gz: 02f43ae4fbd0c33cf3083c2506637f6c10b8c8674cb2637ebae7580837dd458ea9a10a5abbe2f1d44211ba98a8f9ebbb2dc721b204b002b7858fb5c982e16d28
+  data.tar.gz: cb14f56b29ab4d84a34122dc2be897eb698efd3ec4260bf29cb6db4ff61a59700765799ec839218389d8f5653010cdaa2d9dbbe2bab20bda9289cc7c5697c74f

data/Gemfile

@@ -9,13 +9,17 @@ gem "inspec", path: "."
 # in it in order to package the executable. Hence the odd backwards dependency.
 gem "inspec-bin", path: "./inspec-bin"
 
-gem "ffi", ">= 1.9.14", "!= 1.13.0"
+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"
+
 group :omnibus do
   gem "rb-readline"
   gem "appbundler"
@@ -24,10 +28,10 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 1.2.1"
+  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 "json_schemer", ">= 0.2.1", "< 0.2.18"
   gem "m"
   gem "minitest-sprint", "~> 1.0"
   gem "minitest", "~> 5.5"
@@ -37,19 +41,10 @@ group :test do
   gem "pry", "~> 0.10"
   gem "rake", ">= 10"
   gem "ruby-progressbar", "~> 1.8"
-  gem "simplecov", ["~> 0.10", "<=0.18.2"]
+  gem "simplecov", "~> 0.18"
   gem "webmock", "~> 3.0"
 end
 
-group :integration do
-  gem "berkshelf"
-  gem "test-kitchen", ">= 2.8"
-  gem "kitchen-vagrant", ">= 1.7"
-  gem "kitchen-inspec", ">= 2.0"
-  gem "kitchen-dokken", ">= 2.11"
-  gem "git"
-end
-
 group :deploy do
   gem "inquirer"
-end
+end

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

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_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_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_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.24.8
+  version: 4.26.4
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-01-27 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.24.8
+        version: 4.26.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.24.8
+        version: 4.26.4
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement
@@ -192,16 +192,16 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.