inspec 4.31.1 → 4.37.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9298a40b73dee82eada552bb1b9259729ecaa912e121ce707f2764942850027b
-  data.tar.gz: e6524804558b1d23e175160b9d322228d7b43b6fcf1de6cb9d0b744616ef5633
+  metadata.gz: f91388610faecff1f170219dc2de6a6f0a1b19639576e978d005bb44133a7c95
+  data.tar.gz: e39bfbeea1568f75a6847b131fadc4ab6bccefaaefa9edbc53ac360db81c0221
 SHA512:
-  metadata.gz: 8d4fd9a0280a8a921d275aba2c62b8ba3cefce484f157cf1b08b6f698893477be8d3d4ada3019d0a9b3b0b5aca27ff5fe2bed56d68f9cf381c6e21cbc13009bc
-  data.tar.gz: 361a638e33b529c7bdb5ead6cc6aa46f20ef9c220506246e90887c51043eeb381f44f14a72b277837ddf7cbf55ef346cb6085f2202b5b45ca4006e90e6fcc992
+  metadata.gz: 56c5f8aa6e31177111234df6a83f7e5abfe72d8122d80edddcabb3931dd3f253df65b719d313b9278af2459812852af01e0e3742388e7d4567604960ab1f98c8
+  data.tar.gz: 298dc39c21b0a1f6125807ecc7a12c70514bd68138c5b3eb72c721d404740d8e9d07076d24c753bda360c3428c1f2a5442a78148f2d987fda08a6b770924592f

data/Gemfile

@@ -28,7 +28,7 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 1.7.1"
+  gem "chefstyle", "~> 2.0.3"
   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.19"
@@ -48,3 +48,16 @@ end
 group :deploy do
   gem "inquirer"
 end
+
+# Only include Test Kitchen support if we are on Ruby 2.7 or higher
+# as chef-zero support requires Ruby 2.6
+# See https://github.com/inspec/inspec/pull/5341
+if Gem.ruby_version >= Gem::Version.new("2.7.0")
+  group :kitchen do
+    gem "berkshelf"
+    gem "test-kitchen", ">= 2.8"
+    gem "kitchen-inspec", ">= 2.0"
+    gem "kitchen-dokken", ">= 2.11"
+    gem "git"
+  end
+end

data/lib/resources/aws/aws_cloudtrail_trail.rb

@@ -36,12 +36,12 @@ class AwsCloudTrailTrail < Inspec.resource(1)
   def delivered_logs_days_ago
     query = { name: @trail_name }
     catch_aws_errors do
-      begin
-        resp = BackendFactory.create(inspec_runner).get_trail_status(query).to_h
-        ((Time.now - resp[:latest_cloud_watch_logs_delivery_time]) / (24 * 60 * 60)).to_i unless resp[:latest_cloud_watch_logs_delivery_time].nil?
-      rescue Aws::CloudTrail::Errors::TrailNotFoundException
-        nil
-      end
+
+      resp = BackendFactory.create(inspec_runner).get_trail_status(query).to_h
+      ((Time.now - resp[:latest_cloud_watch_logs_delivery_time]) / (24 * 60 * 60)).to_i unless resp[:latest_cloud_watch_logs_delivery_time].nil?
+    rescue Aws::CloudTrail::Errors::TrailNotFoundException
+      nil
+
     end
   end
 

data/lib/resources/aws/aws_iam_access_keys.rb

@@ -101,27 +101,27 @@ class AwsIamAccessKeys < Inspec.resource(1)
 
         access_key_data = []
         user_details.each_key do |username|
-          begin
-            user_keys = iam_client.list_access_keys(user_name: username)
-              .access_key_metadata
-            user_keys = user_keys.map do |metadata|
-              {
-                access_key_id: metadata.access_key_id,
-                username: username,
-                status: metadata.status,
-                create_date: metadata.create_date, # DateTime.parse(metadata.create_date),
-              }
-            end
 
-            # Copy in from user data
-            # Synthetics
-            user_keys.each do |key_info|
-              add_synthetic_fields(key_info, user_details[username])
-            end
-            access_key_data.concat(user_keys)
-          rescue Aws::IAM::Errors::NoSuchEntity # rubocop:disable Lint/HandleExceptions
-            # Swallow - a miss on search results should return an empty table
+          user_keys = iam_client.list_access_keys(user_name: username)
+            .access_key_metadata
+          user_keys = user_keys.map do |metadata|
+            {
+              access_key_id: metadata.access_key_id,
+              username: username,
+              status: metadata.status,
+              create_date: metadata.create_date, # DateTime.parse(metadata.create_date),
+            }
+          end
+
+          # Copy in from user data
+          # Synthetics
+          user_keys.each do |key_info|
+            add_synthetic_fields(key_info, user_details[username])
           end
+          access_key_data.concat(user_keys)
+        rescue Aws::IAM::Errors::NoSuchEntity # rubocop:disable Lint/HandleExceptions
+          # Swallow - a miss on search results should return an empty table
+
         end
         access_key_data
       end

data/lib/resources/aws/aws_iam_password_policy.rb

@@ -20,19 +20,19 @@ class AwsIamPasswordPolicy < Inspec.resource(1)
   # TODO: rewrite to avoid direct injection, match other resources, use AwsSingularResourceMixin
   def initialize(conn = nil)
     catch_aws_errors do
-      begin
-        if conn
-          # We're in a mocked unit test.
-          @policy = conn.iam_resource.account_password_policy
-        else
-          # Don't use the resource approach.  It's a CRUD operation
-          # - if the policy does not exist, you get back a blank object to  populate and save.
-          # Using the Client will throw an exception if no policy exists.
-          @policy = inspec_runner.backend.aws_client(Aws::IAM::Client).get_account_password_policy.password_policy
-        end
-      rescue Aws::IAM::Errors::NoSuchEntity
-        @policy = nil
+
+      if conn
+        # We're in a mocked unit test.
+        @policy = conn.iam_resource.account_password_policy
+      else
+        # Don't use the resource approach.  It's a CRUD operation
+        # - if the policy does not exist, you get back a blank object to  populate and save.
+        # Using the Client will throw an exception if no policy exists.
+        @policy = inspec_runner.backend.aws_client(Aws::IAM::Client).get_account_password_policy.password_policy
       end
+    rescue Aws::IAM::Errors::NoSuchEntity
+      @policy = nil
+
     end
   end
 

data/lib/resources/aws/aws_kms_key.rb

@@ -56,30 +56,30 @@ class AwsKmsKey < Inspec.resource(1)
 
     query = { key_id: @key_id }
     catch_aws_errors do
-      begin
-        resp = backend.describe_key(query)
-
-        @exists = true
-        @key = resp.key_metadata.to_h
-        @key_id = @key[:key_id]
-        @arn = @key[:arn]
-        @creation_date = @key[:creation_date]
-        @enabled = @key[:enabled]
-        @description = @key[:description]
-        @key_usage = @key[:key_usage]
-        @key_state = @key[:key_state]
-        @deletion_date = @key[:deletion_date]
-        @valid_to = @key[:valid_to]
-        @external = @key[:origin] == "EXTERNAL"
-        @has_key_expiration = @key[:expiration_model] == "KEY_MATERIAL_EXPIRES"
-        @managed_by_aws = @key[:key_manager] == "AWS"
-
-        resp = backend.get_key_rotation_status(query)
-        @has_rotation_enabled = resp.key_rotation_enabled unless resp.empty?
-      rescue Aws::KMS::Errors::NotFoundException
-        @exists = false
-        return
-      end
+
+      resp = backend.describe_key(query)
+
+      @exists = true
+      @key = resp.key_metadata.to_h
+      @key_id = @key[:key_id]
+      @arn = @key[:arn]
+      @creation_date = @key[:creation_date]
+      @enabled = @key[:enabled]
+      @description = @key[:description]
+      @key_usage = @key[:key_usage]
+      @key_state = @key[:key_state]
+      @deletion_date = @key[:deletion_date]
+      @valid_to = @key[:valid_to]
+      @external = @key[:origin] == "EXTERNAL"
+      @has_key_expiration = @key[:expiration_model] == "KEY_MATERIAL_EXPIRES"
+      @managed_by_aws = @key[:key_manager] == "AWS"
+
+      resp = backend.get_key_rotation_status(query)
+      @has_rotation_enabled = resp.key_rotation_enabled unless resp.empty?
+    rescue Aws::KMS::Errors::NotFoundException
+      @exists = false
+      return
+
     end
   end
 

data/lib/resources/aws/aws_rds_instance.rb

@@ -43,13 +43,13 @@ class AwsRdsInstance < Inspec.resource(1)
     backend = BackendFactory.create(inspec_runner)
     dsg_response = nil
     catch_aws_errors do
-      begin
-        dsg_response = backend.describe_db_instances(db_instance_identifier: db_instance_identifier)
-        @exists = true
-      rescue Aws::RDS::Errors::DBInstanceNotFound
-        @exists = false
-        return
-      end
+
+      dsg_response = backend.describe_db_instances(db_instance_identifier: db_instance_identifier)
+      @exists = true
+    rescue Aws::RDS::Errors::DBInstanceNotFound
+      @exists = false
+      return
+
     end
 
     if dsg_response.db_instances.empty?

data/lib/resources/aws/aws_s3_bucket.rb

@@ -85,30 +85,29 @@ class AwsS3Bucket < Inspec.resource(1)
   def fetch_bucket_policy
     backend = BackendFactory.create(inspec_runner)
     catch_aws_errors do
-      begin
-        # AWS SDK returns a StringIO, we have to read()
-        raw_policy = backend.get_bucket_policy(bucket: bucket_name).policy
-        return JSON.parse(raw_policy.read)["Statement"].map do |statement|
-          lowercase_hash = {}
-          statement.each_key { |k| lowercase_hash[k.downcase] = statement[k] }
-          @bucket_policy = OpenStruct.new(lowercase_hash)
-        end
-      rescue Aws::S3::Errors::NoSuchBucketPolicy
-        @bucket_policy = []
+
+      # AWS SDK returns a StringIO, we have to read()
+      raw_policy = backend.get_bucket_policy(bucket: bucket_name).policy
+      return JSON.parse(raw_policy.read)["Statement"].map do |statement|
+        lowercase_hash = {}
+        statement.each_key { |k| lowercase_hash[k.downcase] = statement[k] }
+        @bucket_policy = OpenStruct.new(lowercase_hash)
       end
+    rescue Aws::S3::Errors::NoSuchBucketPolicy
+      @bucket_policy = []
+
     end
   end
 
   def fetch_bucket_encryption_configuration
     @has_default_encryption_enabled ||= catch_aws_errors do
-      begin
-        !BackendFactory.create(inspec_runner)
-          .get_bucket_encryption(bucket: bucket_name)
-          .server_side_encryption_configuration
-          .nil?
-      rescue Aws::S3::Errors::ServerSideEncryptionConfigurationNotFoundError
-        false
-      end
+      !BackendFactory.create(inspec_runner)
+        .get_bucket_encryption(bucket: bucket_name)
+        .server_side_encryption_configuration
+        .nil?
+    rescue Aws::S3::Errors::ServerSideEncryptionConfigurationNotFoundError
+      false
+
     end
   end
 

data/lib/resources/aws/aws_s3_bucket_object.rb

@@ -55,16 +55,16 @@ class AwsS3BucketObject < Inspec.resource(1)
   def fetch_from_api
     backend = BackendFactory.create(inspec_runner)
     catch_aws_errors do
-      begin
-        # Just use get_object to detect if the bucket exists
-        backend.get_object(bucket: bucket_name, key: key)
-      rescue Aws::S3::Errors::NoSuchBucket
-        @exists = false
-        return
-      rescue Aws::S3::Errors::NoSuchKey
-        @exists = false
-        return
-      end
+
+      # Just use get_object to detect if the bucket exists
+      backend.get_object(bucket: bucket_name, key: key)
+    rescue Aws::S3::Errors::NoSuchBucket
+      @exists = false
+      return
+    rescue Aws::S3::Errors::NoSuchKey
+      @exists = false
+      return
+
     end
     @exists = true
   end

data/lib/resources/aws/aws_sns_subscription.rb

@@ -53,19 +53,19 @@ class AwsSnsSubscription < Inspec.resource(1)
   def fetch_from_api
     backend = BackendFactory.create(inspec_runner)
     catch_aws_errors do
-      begin
-        aws_response = backend.get_subscription_attributes(subscription_arn: @subscription_arn).attributes
-        @exists = true
-        @owner = aws_response["Owner"]
-        @raw_message_delivery = aws_response["RawMessageDelivery"].eql?("true")
-        @topic_arn = aws_response["TopicArn"]
-        @endpoint = aws_response["Endpoint"]
-        @protocol = aws_response["Protocol"]
-        @confirmation_was_authenticated = aws_response["ConfirmationWasAuthenticated"].eql?("true")
-      rescue Aws::SNS::Errors::NotFound
-        @exists = false
-        return
-      end
+
+      aws_response = backend.get_subscription_attributes(subscription_arn: @subscription_arn).attributes
+      @exists = true
+      @owner = aws_response["Owner"]
+      @raw_message_delivery = aws_response["RawMessageDelivery"].eql?("true")
+      @topic_arn = aws_response["TopicArn"]
+      @endpoint = aws_response["Endpoint"]
+      @protocol = aws_response["Protocol"]
+      @confirmation_was_authenticated = aws_response["ConfirmationWasAuthenticated"].eql?("true")
+    rescue Aws::SNS::Errors::NotFound
+      @exists = false
+      return
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.31.1
+  version: 4.37.8
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-10 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.31.1
+        version: 4.37.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.31.1
+        version: 4.37.8
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement