inspec-chef 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf13aeb2415399d3c00d3bf0e03f64aa6d46161dbcaf028f7ce9d105476b46c8
-  data.tar.gz: 9e721f499a57caf6ba16babc18c4e638a269db8fa6aa25f03048a0b3ef4049be
+  metadata.gz: '0787aed4a0054aa070d1457bc3d26e241ce74180199d0dd7a46ca4ec9acdc952'
+  data.tar.gz: 7d417717bfb8d91ad32e49217c86c1f12c90f8ae5469e76c6711561d507db64e
 SHA512:
-  metadata.gz: 1edb515f0338855b9c6a3b266a70c808b48fcf01b12b0e88f750e4a530be9770a01fefea0c67ea4145f04836b93e5af6668dcfdad2f29f8ab0ca5f6b76cd299b
-  data.tar.gz: '087bcae728e94fd4d4ea1c9f0f2774fe04c82b093bd5ecc61ffed86c61f9aedd757ca892fbf20293ce72f35560389699ca546a50908b8edf42421d2ef1198e96'
+  metadata.gz: a94ee8f3bfce202c599151468fda195ad8c4dfbd61b533bf11372306665a818b23fc0860c3e796c6573bb241f23e422c36f8a0fff10fee79ac2821bc4d14969d
+  data.tar.gz: c9730f1dd6dc92f0c8a0ddd72f7fd345213a7bb9eab1cf3a87e56615189699aaa0bc671f79e1a1a22bd2462738c2d609048a71e671748d50780ec2ac2c71d95d

data/lib/inspec-chef/input.rb

@@ -115,16 +115,24 @@ module InspecPlugins
 
       # ========================================================================
       # Interfacing with Inspec and Chef
+      #
 
-      # Reach for Kitchen data and return its evaluated config
-      # @todo DI
-      def kitchen_provisioner_config
+      # Access to kitchen data
+      def kitchen
         require "binding_of_caller"
-        kitchen = binding.callers.find { |b| b.frame_description == "verify" }.receiver
+        binding.callers.find { |b| b.frame_description == "verify" }.receiver
+      end
 
+      # Return provisioner config
+      def kitchen_provisioner_config
         kitchen.provisioner.send(:provided_config)
       end
 
+      # Return verifier config
+      def kitchen_verifier_config
+        kitchen.verifier.send(:provided_config)
+      end
+
       # Get plugin specific configuration
       def plugin_conf
         inspec_config.fetch_plugin_config("inspec-chef")
@@ -147,7 +155,7 @@ module InspecPlugins
       def connect_to_chef_server
         # From within TestKitchen we need no Chef Server connection
         if inside_testkitchen?
-          logger.info "Running from TestKitchen, using provisioner settings instead of Chef Server"
+          logger.info "Running from TestKitchen, using static settings instead of Chef Server"
 
         # Only connect once
         elsif !server_connected?
@@ -191,8 +199,7 @@ module InspecPlugins
 
           chef_server.data_bag_item.fetch(item, bag: databag).data
         else
-          config = kitchen_provisioner_config
-          filename = File.join(config[:data_bags_path], databag, item + ".json")
+          filename = File.join(data_bags_path, databag, item + ".json")
 
           begin
             return JSON.load(File.read(filename))
@@ -202,6 +209,12 @@ module InspecPlugins
         end
       end
 
+      # Calculate lookup path for databags within TestKitchen
+      def data_bags_path
+	# These can occur on suite-level, provisioner-level, verifier or at the default location
+        kitchen_provisioner_config[:data_bags_path] || kitchen_verifier_config[:data_bags_path] || File.join('test', 'data_bags')
+      end
+
       # Retrieve attributes of a node
       def get_attributes(node)
         unless inside_testkitchen?

data/lib/inspec-chef/version.rb

@@ -5,6 +5,6 @@
 # to learn the current version.
 module InspecPlugins
   module Chef
-    VERSION = "0.3.3".freeze
+    VERSION = "0.3.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-chef
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Thomas Heinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-api