inspec 1.28.1 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e85e45e04bc18a16384094f928312ced530555
-  data.tar.gz: a7212297dbebbfff82d361783023260b691e3241
+  metadata.gz: a517bb883e12e171576ca6d64da4005fc89eb117
+  data.tar.gz: '04879fa4af63f6e2274b2965d1167bc5971c9b59'
 SHA512:
-  metadata.gz: 1441aca0a41c7282725538090d035951afc2182e477028fa3ae6b6acd79c7773cced561a2d249fdb63875ab955653b728e28fd7b0f84795ffa3e4a0d123b0727
-  data.tar.gz: 6785041126e8b742e273209e9bcfe2c62884433157266832169741f4a4a548c421767f75e6f3dc42ab1fc3489d24adc1f650c78669bcf39e8baaa3f706acd47d
+  metadata.gz: f97bd24162ff420b55122fdfe53abecdb06085d2fce6dddbea87eb47f140e30785e1d607ddd081dcf45a0ed3ff11112a9a48eca02ed2c22d2b6023492cc9294a
+  data.tar.gz: 20b0a7c4dc401b382d99c9bbb6c691bf4ffbbe147dda7c1d2e24076a851ed746b3bbf89539b12a1329cec87f8fe04c2e8f699fb736d31478b2bf53d92f736b4f

data/CHANGELOG.md

@@ -1,8 +1,21 @@
 # Change Log
 
+## [v1.29.0](https://github.com/chef/inspec/tree/v1.29.0) (2017-06-22)
+[Full Changelog](https://github.com/chef/inspec/compare/v1.28.1...v1.29.0)
+
+**Fixed bugs:**
+
+- Don't send HTTP headers that have nil values [\#1948](https://github.com/chef/inspec/pull/1948) ([adamleff](https://github.com/adamleff))
+- small typo in the postgres resource with exist? function and assignment of data\_dir\_loc. [\#1937](https://github.com/chef/inspec/pull/1937) ([aaronlippold](https://github.com/aaronlippold))
+- reject `nil` as a command input [\#1863](https://github.com/chef/inspec/pull/1863) ([arlimus](https://github.com/arlimus))
+
 ## [v1.28.1](https://github.com/chef/inspec/tree/v1.28.1) (2017-06-16)
 [Full Changelog](https://github.com/chef/inspec/compare/v1.28.0...v1.28.1)
 
+**Implemented enhancements:**
+
+- Adding toml resource [\#1924](https://github.com/chef/inspec/pull/1924) ([nsdavidson](https://github.com/nsdavidson))
+
 **Fixed bugs:**
 
 - Update zlib to 1.2.11 to address known CVEs [\#1934](https://github.com/chef/inspec/issues/1934)

data/lib/fetchers/url.rb

@@ -143,21 +143,6 @@ module Fetchers
     def download_archive_to_temp
       return @temp_archive_path if ! @temp_archive_path.nil?
       Inspec::Log.debug("Fetching URL: #{@target}")
-      http_opts = {}
-      http_opts['ssl_verify_mode'.to_sym] = OpenSSL::SSL::VERIFY_NONE if @insecure
-      if @config
-        if @config['server_type'] == 'automate'
-          http_opts['chef-delivery-enterprise'] = @config['automate']['ent']
-          if @config['automate']['token_type'] == 'dctoken'
-            http_opts['x-data-collector-token'] = @config['token']
-          else
-            http_opts['chef-delivery-user'] = @config['user']
-            http_opts['chef-delivery-token'] = @config['token']
-          end
-        elsif @token
-          http_opts['Authorization'] = "Bearer #{@token}"
-        end
-      end
       remote = open(@target, http_opts)
       @archive_type = file_type_from_remote(remote) # side effect :(
       archive = Tempfile.new(['inspec-dl-', @archive_type])
@@ -178,5 +163,42 @@ module Fetchers
       @temp_archive_path = nil
       final_path
     end
+
+    def http_opts
+      opts = {}
+      opts[:ssl_verify_mode] = OpenSSL::SSL::VERIFY_NONE if @insecure
+
+      if @config['server_type'] == 'automate'
+        opts['chef-delivery-enterprise'] = @config['automate']['ent']
+        if @config['automate']['token_type'] == 'dctoken'
+          opts['x-data-collector-token'] = @config['token']
+        else
+          opts['chef-delivery-user'] = @config['user']
+          opts['chef-delivery-token'] = @config['token']
+        end
+      elsif @token
+        opts['Authorization'] = "Bearer #{@token}"
+      end
+
+      # Do not send any headers that have nil values.
+      # Net::HTTP does not gracefully handle this situation.
+      check_for_missing_values!(opts)
+
+      opts
+    end
+
+    def check_for_missing_values!(opts)
+      keys_missing_values = opts.keys.delete_if do |k|
+        if opts[k].nil?
+          false
+        elsif opts[k].respond_to?(:empty?) && opts[k].empty?
+          false
+        else
+          true
+        end
+      end
+      raise 'Unable to fetch profile - the following HTTP headers have no value: ' \
+        "#{keys_missing_values.join(', ')}" unless keys_missing_values.empty?
+    end
   end
 end

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '1.28.1'.freeze
+  VERSION = '1.29.0'.freeze
 end

data/lib/resources/command.rb

@@ -24,6 +24,9 @@ module Inspec::Resources
     attr_reader :command
 
     def initialize(cmd)
+      if cmd.nil?
+        raise 'InSpec `command` was called with `nil` as the argument. This is not supported. Please provide a valid command instead.'
+      end
       @command = cmd
     end
 

data/lib/resources/postgres.rb

@@ -75,7 +75,7 @@ module Inspec::Resources
       ]
 
       dir_list.each do |dir|
-        data_dir_loc if inspec.directory(dir).exists?
+        data_dir_loc = dir if inspec.directory(dir).exist?
         break
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 1.28.1
+  version: 1.29.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train