inspec 1.51.25 → 2.0.16

data/lib/resources/registry_key.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
-# author: Christoph Hartmann
 
 require 'json'
 
@@ -49,6 +48,7 @@ require 'json'
 module Inspec::Resources
   class RegistryKey < Inspec.resource(1)
     name 'registry_key'
+    supports platform: 'windows'
     desc 'Use the registry_key InSpec audit resource to test key values in the Microsoft Windows registry.'
     example "
       describe registry_key('path\to\key') do

data/lib/resources/security_policy.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 #
 # Security Configuration and Analysis
 #
@@ -69,6 +67,7 @@ module Inspec::Resources
 
   class SecurityPolicy < Inspec.resource(1)
     name 'security_policy'
+    supports platform: 'windows'
     desc 'Use the security_policy InSpec audit resource to test security policies on the Microsoft Windows platform.'
     example "
       describe security_policy do

data/lib/resources/service.rb

@@ -1,7 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
-# author: Stephan Renatus
 
 require 'hashie'
 
@@ -70,6 +67,8 @@ module Inspec::Resources
   # TODO: extend the logic to detect the running init system, independently of OS
   class Service < Inspec.resource(1)
     name 'service'
+    supports platform: 'unix'
+    supports platform: 'windows'
     desc 'Use the service InSpec audit resource to test if the named service is installed, running and/or enabled.'
     example "
       describe service('service_name') do
@@ -652,6 +651,7 @@ module Inspec::Resources
 
   class SystemdService < Service
     name 'systemd_service'
+    supports platform: 'unix'
     desc 'Use the systemd_service InSpec audit resource to test if the named service (controlled by systemd) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection
@@ -674,6 +674,7 @@ module Inspec::Resources
 
   class UpstartService < Service
     name 'upstart_service'
+    supports platform: 'unix'
     desc 'Use the upstart_service InSpec audit resource to test if the named service (controlled by upstart) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection
@@ -696,6 +697,7 @@ module Inspec::Resources
 
   class SysVService < Service
     name 'sysv_service'
+    supports platform: 'unix'
     desc 'Use the sysv_service InSpec audit resource to test if the named service (controlled by SysV) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection
@@ -718,6 +720,7 @@ module Inspec::Resources
 
   class BSDService < Service
     name 'bsd_service'
+    supports platform: 'unix'
     desc 'Use the bsd_service InSpec audit resource to test if the named service (controlled by BSD init) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection
@@ -740,6 +743,7 @@ module Inspec::Resources
 
   class LaunchdService < Service
     name 'launchd_service'
+    supports platform: 'unix'
     desc 'Use the launchd_service InSpec audit resource to test if the named service (controlled by launchd) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection
@@ -762,6 +766,7 @@ module Inspec::Resources
 
   class RunitService < Service
     name 'runit_service'
+    supports platform: 'unix'
     desc 'Use the runit_service InSpec audit resource to test if the named service (controlled by runit) is installed, running and/or enabled.'
     example "
       # to override service mgmt auto-detection

data/lib/resources/shadow.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 # copyright: 2016, Chef Software Inc.
-# author: Dominik Richter
-# author: Christoph Hartmann
 
 require 'forwardable'
 
@@ -18,6 +16,7 @@ require 'forwardable'
 module Inspec::Resources
   class Shadow < Inspec.resource(1)
     name 'shadow'
+    supports platform: 'unix'
     desc 'Use the shadow InSpec resource to test the contents of /etc/shadow, '\
          'which contains the following information for users that may log into '\
          'the system and/or as users that own running processes.'

data/lib/resources/ssh_conf.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 # copyright: 2015, Vulcano Security GmbH
-# author: Dominik Richter
-# author: Christoph Hartmann
 
 require 'utils/simpleconfig'
 
 module Inspec::Resources
   class SshConf < Inspec.resource(1)
     name 'ssh_config'
+    supports platform: 'unix'
     desc 'Use the `ssh_config` InSpec audit resource to test OpenSSH client configuration data located at `/etc/ssh/ssh_config` on Linux and Unix platforms.'
     example "
       describe ssh_config do
@@ -84,6 +83,7 @@ module Inspec::Resources
 
   class SshdConf < SshConf
     name 'sshd_config'
+    supports platform: 'unix'
     desc 'Use the sshd_config InSpec audit resource to test configuration data for the Open SSH daemon located at /etc/ssh/sshd_config on Linux and UNIX platforms. sshd---the Open SSH daemon---listens on dedicated ports, starts a daemon for each incoming connection, and then handles encryption, authentication, key exchanges, command execution, and data exchanges.'
     example "
       describe sshd_config do

data/lib/resources/ssl.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 # copyright: 2015, Chef Software Inc.
-# author: Dominik Richter
-# author: Christoph Hartmann
 
 require 'sslshake'
 require 'utils/filter'
@@ -11,6 +9,8 @@ require 'parallel'
 # Custom resource based on the InSpec resource DSL
 class SSL < Inspec.resource(1)
   name 'ssl'
+  supports platform: 'unix'
+  supports platform: 'windows'
 
   desc "
     SSL test resource

data/lib/resources/sys_info.rb

@@ -3,6 +3,8 @@ module Inspec::Resources
   # this resource returns additional system informatio
   class System < Inspec.resource(1)
     name 'sys_info'
+    supports platform: 'unix'
+    supports platform: 'windows'
 
     desc 'Use the user InSpec system resource to test for operating system properties.'
     example "

data/lib/resources/users.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 require 'utils/parser'
 require 'utils/convert'
@@ -55,6 +53,8 @@ module Inspec::Resources
     include UserManagementSelector
 
     name 'users'
+    supports platform: 'unix'
+    supports platform: 'windows'
     desc 'Use the users InSpec audit resource to test local user profiles. Users can be filtered by groups to which they belong, the frequency of required password changes, the directory paths to home and shell.'
     example "
       describe users.where { uid == 0 }.entries do
@@ -140,6 +140,8 @@ module Inspec::Resources
   class User < Inspec.resource(1)
     include UserManagementSelector
     name 'user'
+    supports platform: 'unix'
+    supports platform: 'windows'
     desc 'Use the user InSpec audit resource to test user profiles, including the groups to which they belong, the frequency of required password changes, the directory paths to home and shell.'
     example "
       describe user('root') do

data/lib/resources/vbscript.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 require 'securerandom'
 
@@ -23,6 +21,7 @@ module Inspec::Resources
   # @see https://msdn.microsoft.com/en-us/library/aa364991.aspx
   class VBScript < PowershellScript
     name 'vbscript'
+    supports platform: 'windows'
     desc ''
     example "
       script = <<-EOH

data/lib/resources/virtualization.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
-# author: Takaaki Furukawa
 
 require 'hashie/mash'
 
 module Inspec::Resources
   class Virtualization < Inspec.resource(1)
     name 'virtualization'
+    supports platform: 'unix'
     desc 'Use the virtualization InSpec audit resource to test the virtualization platform on which the system is running'
     example "
       describe virtualization do

data/lib/resources/windows_feature.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 # check for a Windows feature
 # Usage:
@@ -30,6 +28,7 @@
 module Inspec::Resources
   class WindowsFeature < Inspec.resource(1)
     name 'windows_feature'
+    supports platform: 'windows'
     desc 'Use the windows_feature InSpec audit resource to test features on Microsoft Windows.'
     example "
       describe windows_feature('dhcp') do

data/lib/resources/windows_hotfix.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
-# author: Matt Ray
 
 module Inspec::Resources
   class WindowsHotfix < Inspec.resource(1)
     name 'windows_hotfix'
+    supports platform: 'windows'
     desc 'Use the windows_hotfix InSpec audit resource to test if the hotfix has been installed on the Windows system.'
     example "
       describe windows_hotfix('KB4012212') do

data/lib/resources/windows_task.rb

@@ -1,9 +1,8 @@
 # encoding: utf-8
-# author: Gary Bright @username-is-already-taken2
-# author: Chris Beard @cdbeard2016
 module Inspec::Resources
   class WindowsTasks < Inspec.resource(1)
     name 'windows_task'
+    supports platform: 'windows'
     desc 'Use the windows_task InSpec audit resource to test task schedules on Microsoft Windows.'
     example "
       describe windows_task('\\Microsoft\\Windows\\Time Synchronization\\SynchronizeTime') do

data/lib/resources/wmi.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 require 'utils/object_traversal'
 
@@ -11,6 +9,7 @@ module Inspec::Resources
   # We use Get-WmiObject via Powershell to retrieve all values.
   class WMI < Inspec.resource(1)
     name 'wmi'
+    supports platform: 'windows'
     desc 'request wmi information'
     example "
       describe wmi({

data/lib/resources/x509_certificate.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Richard Nixon
-# author: Christoph Hartmann
 
 require 'openssl'
 require 'hashie/mash'
@@ -8,6 +6,8 @@ require 'hashie/mash'
 module Inspec::Resources
   class X509CertificateResource < Inspec.resource(1)
     name 'x509_certificate'
+    supports platform: 'unix'
+    supports platform: 'windows'
     desc 'Used to test x.509 certificates'
     example "
       describe x509_certificate('/etc/pki/www.mywebsite.com.pem') do

data/lib/resources/xinetd.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 require 'utils/parser'
 require 'utils/filter'
@@ -8,6 +6,7 @@ require 'utils/filter'
 module Inspec::Resources
   class XinetdConf < Inspec.resource(1)
     name 'xinetd_conf'
+    supports platform: 'unix'
     desc 'Xinetd services configuration.'
     example "
       describe xinetd_conf.services('chargen') do

data/lib/resources/xml.rb

@@ -1,9 +1,10 @@
 # encoding: utf-8
-# author: Jonathan Morley
 
 module Inspec::Resources
   class XmlConfig < JsonConfig
     name 'xml'
+    supports platform: 'unix'
+    supports platform: 'windows'
     desc 'Use the xml InSpec resource to test configuration data in an XML file'
     example "
       describe xml('default.xml') do

data/lib/resources/yaml.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 require 'yaml'
 
@@ -12,6 +10,10 @@ require 'yaml'
 module Inspec::Resources
   class YamlConfig < JsonConfig
     name 'yaml'
+    supports platform: 'unix'
+    supports platform: 'windows'
+    supports platform: 'esx'
+    supports platform: 'cisco'
     desc 'Use the yaml InSpec audit resource to test configuration data in a YAML file.'
     example "
       describe yaml('config.yaml') do

data/lib/resources/yum.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
 
 # Usage:
 # describe yum do
@@ -32,6 +30,7 @@
 module Inspec::Resources
   class Yum < Inspec.resource(1)
     name 'yum'
+    supports platform: 'unix'
     desc 'Use the yum InSpec audit resource to test the configuration of Yum repositories.'
     example "
       describe yum.repo('name') do

data/lib/resources/zfs_dataset.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
-# author: Joseph Benden
 
 module Inspec::Resources
   class ZfsDataset < Inspec.resource(1)
     name 'zfs_dataset'
+    supports platform: 'unix'
     desc "
       Use the zfs_dataset InSpec audit resource to test if the named
       ZFS Dataset is present and/or has certain properties.

data/lib/resources/zfs_pool.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
-# author: Joseph Benden
 
 module Inspec::Resources
   class ZfsPool < Inspec.resource(1)
     name 'zfs_pool'
+    supports platform: 'unix'
     desc "
       Use the zfs_pool InSpec audit resource to test if the named
       ZFS Pool is present and/or has certain properties.

data/lib/utils/simpleconfig.rb

@@ -54,18 +54,6 @@ class SimpleConfig
   end
 
   def parse_params_line(line, opts)
-    # Deprecation handling
-    if opts.key?(:assignment_re)
-      warn '[DEPRECATION] `:assignment_re` is deprecated in favor of `:assignment_regex` '\
-           'and will be removed in the next major version. See: https://github.com/chef/inspec/issues/1709'
-      opts[:assignment_regex] = opts[:assignment_re]
-    end
-    if opts.key?(:key_vals)
-      warn '[DEPRECATION] `:key_vals` is deprecated in favor of `:key_values` '\
-           'and will be removed in the next major version. See: https://github.com/chef/inspec/issues/1709'
-      opts[:key_values] = opts[:key_vals]
-    end
-
     # now line contains what we are interested in parsing
     # check if it is an assignment
     m = opts[:assignment_regex].match(line)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.51.25
+  version: 2.0.16
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +297,7 @@ files:
 - docs/inspec_and_friends.md
 - docs/matchers.md
 - docs/migration.md
+- docs/platforms.md
 - docs/plugin_kitchen_inspec.md
 - docs/profiles.md
 - docs/reporters.md
@@ -307,7 +308,36 @@ files:
 - docs/resources/audit_policy.md.erb
 - docs/resources/auditd.md.erb
 - docs/resources/auditd_conf.md.erb
-- docs/resources/auditd_rules.md.erb
+- docs/resources/aws_cloudtrail_trail.md.erb
+- docs/resources/aws_cloudtrail_trails.md.erb
+- docs/resources/aws_cloudwatch_alarm.md.erb
+- docs/resources/aws_cloudwatch_log_metric_filter.md.erb
+- docs/resources/aws_ec2_instance.md.erb
+- docs/resources/aws_iam_access_key.md.erb
+- docs/resources/aws_iam_access_keys.md.erb
+- docs/resources/aws_iam_group.md.erb
+- docs/resources/aws_iam_groups.md.erb
+- docs/resources/aws_iam_password_policy.md.erb
+- docs/resources/aws_iam_policies.md.erb
+- docs/resources/aws_iam_policy.md.erb
+- docs/resources/aws_iam_role.md.erb
+- docs/resources/aws_iam_root_user.md.erb
+- docs/resources/aws_iam_user.md.erb
+- docs/resources/aws_iam_users.md.erb
+- docs/resources/aws_kms_keys.md.erb
+- docs/resources/aws_route_table.md.erb
+- docs/resources/aws_s3_bucket.md.erb
+- docs/resources/aws_security_group.md.erb
+- docs/resources/aws_security_groups.md.erb
+- docs/resources/aws_sns_topic.md.erb
+- docs/resources/aws_subnet.md.erb
+- docs/resources/aws_subnets.md.erb
+- docs/resources/aws_vpc.md.erb
+- docs/resources/aws_vpcs.md.erb
+- docs/resources/azure_generic_resource.md.erb
+- docs/resources/azure_resource_group.md.erb
+- docs/resources/azure_virtual_machine.md.erb
+- docs/resources/azure_virtual_machine_data_disk.md.erb
 - docs/resources/bash.md.erb
 - docs/resources/bond.md.erb
 - docs/resources/bridge.md.erb
@@ -443,6 +473,15 @@ files:
 - examples/profile-attribute/README.md
 - examples/profile-attribute/controls/example.rb
 - examples/profile-attribute/inspec.yml
+- examples/profile-aws/controls/iam_password_policy_expiration.rb
+- examples/profile-aws/controls/iam_password_policy_max_age.rb
+- examples/profile-aws/controls/iam_root_user_mfa.rb
+- examples/profile-aws/controls/iam_users_access_key_age.rb
+- examples/profile-aws/controls/iam_users_console_users_mfa.rb
+- examples/profile-aws/inspec.yml
+- examples/profile-azure/controls/azure_resource_group_example.rb
+- examples/profile-azure/controls/azure_vm_example.rb
+- examples/profile-azure/inspec.yml
 - examples/profile-sensitive/README.md
 - examples/profile-sensitive/controls/sensitive-failures.rb
 - examples/profile-sensitive/controls/sensitive.rb
@@ -566,6 +605,12 @@ files:
 - lib/inspec/source_reader.rb
 - lib/inspec/version.rb
 - lib/matchers/matchers.rb
+- lib/resource_support/aws.rb
+- lib/resource_support/aws/aws_backend_base.rb
+- lib/resource_support/aws/aws_backend_factory_mixin.rb
+- lib/resource_support/aws/aws_plural_resource_mixin.rb
+- lib/resource_support/aws/aws_resource_mixin.rb
+- lib/resource_support/aws/aws_singular_resource_mixin.rb
 - lib/resources/aide_conf.rb
 - lib/resources/apache.rb
 - lib/resources/apache_conf.rb
@@ -573,7 +618,37 @@ files:
 - lib/resources/audit_policy.rb
 - lib/resources/auditd.rb
 - lib/resources/auditd_conf.rb
-- lib/resources/auditd_rules.rb
+- lib/resources/aws/aws_cloudtrail_trail.rb
+- lib/resources/aws/aws_cloudtrail_trails.rb
+- lib/resources/aws/aws_cloudwatch_alarm.rb
+- lib/resources/aws/aws_cloudwatch_log_metric_filter.rb
+- lib/resources/aws/aws_ec2_instance.rb
+- lib/resources/aws/aws_iam_access_key.rb
+- lib/resources/aws/aws_iam_access_keys.rb
+- lib/resources/aws/aws_iam_group.rb
+- lib/resources/aws/aws_iam_groups.rb
+- lib/resources/aws/aws_iam_password_policy.rb
+- lib/resources/aws/aws_iam_policies.rb
+- lib/resources/aws/aws_iam_policy.rb
+- lib/resources/aws/aws_iam_role.rb
+- lib/resources/aws/aws_iam_root_user.rb
+- lib/resources/aws/aws_iam_user.rb
+- lib/resources/aws/aws_iam_users.rb
+- lib/resources/aws/aws_kms_keys.rb
+- lib/resources/aws/aws_route_table.rb
+- lib/resources/aws/aws_s3_bucket.rb
+- lib/resources/aws/aws_security_group.rb
+- lib/resources/aws/aws_security_groups.rb
+- lib/resources/aws/aws_sns_topic.rb
+- lib/resources/aws/aws_subnet.rb
+- lib/resources/aws/aws_subnets.rb
+- lib/resources/aws/aws_vpc.rb
+- lib/resources/aws/aws_vpcs.rb
+- lib/resources/azure/azure_backend.rb
+- lib/resources/azure/azure_generic_resource.rb
+- lib/resources/azure/azure_resource_group.rb
+- lib/resources/azure/azure_virtual_machine.rb
+- lib/resources/azure/azure_virtual_machine_data_disk.rb
 - lib/resources/bash.rb
 - lib/resources/bond.rb
 - lib/resources/bridge.rb