inspec 2.1.0 → 2.1.10

data/lib/resources/azure/azure_virtual_machine_data_disk.rb

@@ -1,136 +1,136 @@
-# encoding: utf-8
-
-require 'resources/azure/azure_backend'
-require 'uri'
-
-module Inspec::Resources
-  class AzureVirtualMachineDataDisk < AzureResourceBase
-    name 'azure_virtual_machine_data_disk'
-
-    desc '
-      Inspec Resource to ensure that the data disks attached to a machine are correct
-    '
-
-    supports platform: 'azure'
-
-    # Create a filter table so that tests on the disk can be performed
-    filter = FilterTable.create
-    filter.add_accessor(:where)
-          .add_accessor(:entries)
-          .add_accessor(:has_data_disks?)
-          .add_accessor(:count)
-          .add(:exists?) { |x| !x.entries.empty? }
-          .add(:disk, field: :disk)
-          .add(:number, field: :number)
-          .add(:name, field: :name)
-          .add(:size, field: :size)
-          .add(:vhd_uri, field: :vhd_uri)
-          .add(:storage_account_name, field: :storage_account_name)
-          .add(:lun, field: :lun)
-          .add(:caching, field: :caching)
-          .add(:create_option, field: :create_option)
-          .add(:is_managed_disk?, field: :is_managed_disk?)
-          .add(:storage_account_type, field: :storage_account_type)
-          .add(:subscription_id, field: :subscription_id)
-          .add(:resource_group, field: :resource_group)
-    filter.connect(self, :datadisk_details)
-
-    # Constructor for the resource. This calls the parent constructor to
-    # get the generic resource for the specified machine. This will provide
-    # static methods that are documented
-    #
-    # @author Russell Seymour
-    def initialize(opts = {})
-      # The generic resource needs to pass back a Microsoft.Compute/virtualMachines object so force it
-      opts[:type] = 'Microsoft.Compute/virtualMachines'
-      super(opts)
-
-      # Get the data disks
-      resources
-    end
-
-    # Return information about the disks and add to the filter table so that
-    # assertions can be performed
-    #
-    # @author Russell Seymour
-    def datadisk_details
-      return if failed_resource?
-      # Iterate around the data disks on the machine
-      properties.storageProfile.dataDisks.each_with_index.map do |datadisk, index|
-        # Call function to parse the data disks and return an object based on the parameters
-        parse_datadisk(datadisk, index)
-      end
-    end
-
-    # Return boolean to denote if the machine has data disks attached or not
-    def has_data_disks?
-      !entries.empty?
-    end
-
-    # Return an integer stating how many data disks are attached to the machine
-    def count
-      entries.count
-    end
-
-    # Return boolean to state if the machine is using managed disks for data disks
-    def has_managed_disks?
-      # iterate around the entries
-      result = entries.each.select { |e| e[:is_managed_disk?] }
-      result.empty? ? false : true
-    end
-
-    private
-
-    # Parse the data disk to determine if these are managed disks or in a storage account
-    # for example. The disk index, name and size will be returned
-    #
-    # params object disk Object containing the details of the disk
-    # params integer index Index denoting which disk number this is on the machine
-    #
-    # return hashtable
-    def parse_datadisk(disk, index)
-      # Configure parsed hashtable to hold the information
-      # Initialise this with common attributes from the different types of disk
-      parsed = {
-        disk: index,
-        number: index + 1,
-        lun: disk.lun,
-        name: disk.name,
-        size: disk.diskSizeGB,
-        caching: disk.caching,
-        create_option: disk.createOption,
-      }
-
-      # Determine if the current disk is a managed disk or not
-      if defined?(disk.vhd)
-        # As this is in a storage account this is not a managed disk
-        parsed[:is_managed_disk?] = false
-
-        # Set information about the disk
-        # Parse the uri of the disk URI so that the storage account can be retrieved
-        uri = URI.parse(disk.vhd.uri)
-        parsed[:vhd_uri] = disk.vhd.uri
-        parsed[:storage_account_name] = uri.host.split('.').first
-
-      elsif defined?(disk.managedDisk)
-        # State that this is a managed disk
-        parsed[:is_managed_disk?] = true
-
-        # Get information about the managed disk
-        parsed[:storage_account_type] = disk.managedDisk.storageAccountType
-        parsed[:id] = disk.managedDisk.id
-
-        # Break up the ID string so that the following information can get retreived
-        # - subscription_id
-        # - resource_group
-        id_parts = parsed[:id].split(%r{/}).reject(&:empty?)
-
-        parsed[:subscription_id] = id_parts[1]
-        parsed[:resource_group] = id_parts[3]
-      end
-
-      # return the parsed object
-      parsed
-    end
-  end
-end
+# encoding: utf-8
+
+require 'resources/azure/azure_backend'
+require 'uri'
+
+module Inspec::Resources
+  class AzureVirtualMachineDataDisk < AzureResourceBase
+    name 'azure_virtual_machine_data_disk'
+
+    desc '
+      Inspec Resource to ensure that the data disks attached to a machine are correct
+    '
+
+    supports platform: 'azure'
+
+    # Create a filter table so that tests on the disk can be performed
+    filter = FilterTable.create
+    filter.add_accessor(:where)
+          .add_accessor(:entries)
+          .add_accessor(:has_data_disks?)
+          .add_accessor(:count)
+          .add(:exists?) { |x| !x.entries.empty? }
+          .add(:disk, field: :disk)
+          .add(:number, field: :number)
+          .add(:name, field: :name)
+          .add(:size, field: :size)
+          .add(:vhd_uri, field: :vhd_uri)
+          .add(:storage_account_name, field: :storage_account_name)
+          .add(:lun, field: :lun)
+          .add(:caching, field: :caching)
+          .add(:create_option, field: :create_option)
+          .add(:is_managed_disk?, field: :is_managed_disk?)
+          .add(:storage_account_type, field: :storage_account_type)
+          .add(:subscription_id, field: :subscription_id)
+          .add(:resource_group, field: :resource_group)
+    filter.connect(self, :datadisk_details)
+
+    # Constructor for the resource. This calls the parent constructor to
+    # get the generic resource for the specified machine. This will provide
+    # static methods that are documented
+    #
+    # @author Russell Seymour
+    def initialize(opts = {})
+      # The generic resource needs to pass back a Microsoft.Compute/virtualMachines object so force it
+      opts[:type] = 'Microsoft.Compute/virtualMachines'
+      super(opts)
+
+      # Get the data disks
+      resources
+    end
+
+    # Return information about the disks and add to the filter table so that
+    # assertions can be performed
+    #
+    # @author Russell Seymour
+    def datadisk_details
+      return if failed_resource?
+      # Iterate around the data disks on the machine
+      properties.storageProfile.dataDisks.each_with_index.map do |datadisk, index|
+        # Call function to parse the data disks and return an object based on the parameters
+        parse_datadisk(datadisk, index)
+      end
+    end
+
+    # Return boolean to denote if the machine has data disks attached or not
+    def has_data_disks?
+      !entries.empty?
+    end
+
+    # Return an integer stating how many data disks are attached to the machine
+    def count
+      entries.count
+    end
+
+    # Return boolean to state if the machine is using managed disks for data disks
+    def has_managed_disks?
+      # iterate around the entries
+      result = entries.each.select { |e| e[:is_managed_disk?] }
+      result.empty? ? false : true
+    end
+
+    private
+
+    # Parse the data disk to determine if these are managed disks or in a storage account
+    # for example. The disk index, name and size will be returned
+    #
+    # params object disk Object containing the details of the disk
+    # params integer index Index denoting which disk number this is on the machine
+    #
+    # return hashtable
+    def parse_datadisk(disk, index)
+      # Configure parsed hashtable to hold the information
+      # Initialise this with common attributes from the different types of disk
+      parsed = {
+        disk: index,
+        number: index + 1,
+        lun: disk.lun,
+        name: disk.name,
+        size: disk.diskSizeGB,
+        caching: disk.caching,
+        create_option: disk.createOption,
+      }
+
+      # Determine if the current disk is a managed disk or not
+      if defined?(disk.vhd)
+        # As this is in a storage account this is not a managed disk
+        parsed[:is_managed_disk?] = false
+
+        # Set information about the disk
+        # Parse the uri of the disk URI so that the storage account can be retrieved
+        uri = URI.parse(disk.vhd.uri)
+        parsed[:vhd_uri] = disk.vhd.uri
+        parsed[:storage_account_name] = uri.host.split('.').first
+
+      elsif defined?(disk.managedDisk)
+        # State that this is a managed disk
+        parsed[:is_managed_disk?] = true
+
+        # Get information about the managed disk
+        parsed[:storage_account_type] = disk.managedDisk.storageAccountType
+        parsed[:id] = disk.managedDisk.id
+
+        # Break up the ID string so that the following information can get retreived
+        # - subscription_id
+        # - resource_group
+        id_parts = parsed[:id].split(%r{/}).reject(&:empty?)
+
+        parsed[:subscription_id] = id_parts[1]
+        parsed[:resource_group] = id_parts[3]
+      end
+
+      # return the parsed object
+      parsed
+    end
+  end
+end

data/lib/resources/bash.rb

@@ -1,35 +1,35 @@
-# encoding: utf-8
-
-require 'utils/command_wrapper'
-require 'resources/command'
-
-module Inspec::Resources
-  class Bash < Cmd
-    name 'bash'
-    supports platform: 'unix'
-    desc 'Run a command or script in BASH.'
-    example "
-      describe bash('ls -al /') do
-        its('stdout') { should match /bin/ }
-        its('stderr') { should eq '' }
-        its('exit_status') { should eq 0 }
-      end
-
-      # Specify the path of the executable:
-      bash('...', path: '/bin/bash')
-
-      # Specify arguments (defaults to -c)
-      bash('...', args: '-x -c')
-    "
-
-    def initialize(command, options = {})
-      @raw_command = command
-      options[:shell] = 'bash' if options.is_a?(Hash)
-      super(CommandWrapper.wrap(command, options))
-    end
-
-    def to_s
-      "Bash command #{@raw_command}"
-    end
-  end
-end
+# encoding: utf-8
+
+require 'utils/command_wrapper'
+require 'resources/command'
+
+module Inspec::Resources
+  class Bash < Cmd
+    name 'bash'
+    supports platform: 'unix'
+    desc 'Run a command or script in BASH.'
+    example "
+      describe bash('ls -al /') do
+        its('stdout') { should match /bin/ }
+        its('stderr') { should eq '' }
+        its('exit_status') { should eq 0 }
+      end
+
+      # Specify the path of the executable:
+      bash('...', path: '/bin/bash')
+
+      # Specify arguments (defaults to -c)
+      bash('...', args: '-x -c')
+    "
+
+    def initialize(command, options = {})
+      @raw_command = command
+      options[:shell] = 'bash' if options.is_a?(Hash)
+      super(CommandWrapper.wrap(command, options))
+    end
+
+    def to_s
+      "Bash command #{@raw_command}"
+    end
+  end
+end

data/lib/resources/bond.rb

@@ -1,68 +1,69 @@
-# encoding: utf-8
-
-require 'resources/file'
-
-module Inspec::Resources
-  class Bond < FileResource
-    name 'bond'
-    supports platform: 'unix'
-    desc 'Use the bond InSpec audit resource to test a logical, bonded network interface (i.e. "two or more network interfaces aggregated into a single, logical network interface"). On Linux platforms, any value in the /proc/net/bonding directory may be tested.'
-    example "
-      describe bond('bond0') do
-        it { should exist }
-      end
-    "
-
-    def initialize(bond)
-      @bond = bond
-      @path = "/proc/net/bonding/#{bond}"
-      @file = inspec.file(@path)
-      @content = nil
-      @params = {}
-      @loaded = false
-    end
-
-    def read_content
-      # parse the file
-      @content = @file.content
-      @params = SimpleConfig.new(
-        @file.content,
-        assignment_regex: /^\s*([^:]*?)\s*:\s*(.*?)\s*$/,
-        multiple_values: true,
-      ).params if @file.exist?
-      @loaded = true
-      @content
-    end
-
-    # ensures the content is loaded before we return the params
-    def params
-      read_content if @loaded == false
-      @params
-    end
-
-    def content
-      read_content if @loaded == false
-      @content
-    end
-
-    def exist?
-      @file.exist?
-    end
-
-    def has_interface?(interface)
-      params['Slave Interface'].include?(interface)
-    end
-
-    def interfaces
-      params['Slave Interface']
-    end
-
-    def mode
-      params['Bonding Mode'].first
-    end
-
-    def to_s
-      "Bond #{@bond}"
-    end
-  end
-end
+# encoding: utf-8
+
+require 'resources/file'
+require 'utils/file_reader'
+
+module Inspec::Resources
+  class Bond < FileResource
+    name 'bond'
+    supports platform: 'unix'
+    desc 'Use the bond InSpec audit resource to test a logical, bonded network interface (i.e. "two or more network interfaces aggregated into a single, logical network interface"). On Linux platforms, any value in the /proc/net/bonding directory may be tested.'
+    example "
+      describe bond('bond0') do
+        it { should exist }
+      end
+    "
+
+    include FileReader
+
+    def initialize(bond)
+      @bond = bond
+      @path = "/proc/net/bonding/#{bond}"
+      @file = inspec.file(@path)
+      @content = read_file_content(@path, allow_empty: true)
+      @params = {}
+      @loaded = false
+    end
+
+    def read_content
+      @params = SimpleConfig.new(
+        @content,
+        assignment_regex: /^\s*([^:]*?)\s*:\s*(.*?)\s*$/,
+        multiple_values: true,
+      ).params if @file.exist?
+      @loaded = true
+      @content
+    end
+
+    # ensures the content is loaded before we return the params
+    def params
+      read_content if @loaded == false
+      @params
+    end
+
+    def content
+      read_content if @loaded == false
+      @content
+    end
+
+    def exist?
+      @file.exist?
+    end
+
+    def has_interface?(interface)
+      params['Slave Interface'].include?(interface)
+    end
+
+    def interfaces
+      params['Slave Interface']
+    end
+
+    def mode
+      params['Bonding Mode'].first
+    end
+
+    def to_s
+      "Bond #{@bond}"
+    end
+  end
+end