inspec-chef 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3689a6a012e43692366a808c0b50e67e7ef4cb35b303593f84ca0d0cd485fd9
-  data.tar.gz: 9c21ced8d8c706daf806553c6317b8ff375b3f5d40b0a6ac06573a33c6cb5df4
+  metadata.gz: 5d92257a6fe51e2e753b38cec027da0e1d81578cf9cd96bc941e17ffbf2957ab
+  data.tar.gz: 93d8dea2ff6a1f8d8040543e4bccb4316001c017459cb392f12edaf49ec33633
 SHA512:
-  metadata.gz: b2f09ae34094154758c65afa303f4311ab2a4ea85f70b0a9e96a4cf58791c03cf74b33efce3f9477c26464de24027ce36c80fed92b3902949a7ecbef0219db62
-  data.tar.gz: a71465e35f0ed3a99b5ce1e61f8252669b8a4544d1bddac24c447bdfbf55d66a58598bc4644b412975c50fdf8c8ca5a5ca269255d46a7552030b094459385dae
+  metadata.gz: c43fc11316341123dfff07d7eb1d8afe4515d53ab4f0bb7c8d36cb5e7f94683dad316be341d79fbd3f484f23dabdd554e5ae17bacef97e6b02fa17fc8422c09c
+  data.tar.gz: de6d24d7ed8d75e6f297d9ca30605db58009308b1e09397f9f8c46413f173037501cec8afb2533665fb7b98b7e2d881e056d4ce77b748d824b36f7275142fab7

data/inspec-chef.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["theinen@tecracer.de"]
   spec.summary       = "InSpec input plugin to access Chef Infra Server databags and attributes."
   spec.description   = "This plugin allows InSpec 'inputs' to be provided by Chef Server."
-  spec.homepage      = "https://github.com/tecracer-theinen/inspec-chef"
+  spec.homepage      = "https://github.com/sgre-chef/inspec-chef"
   spec.license       = "Apache-2.0"
 
   # Though complicated-looking, this is pretty standard for a gemspec.

data/lib/inspec-chef/input.rb

@@ -16,26 +16,15 @@ module InspecPlugins::Chef
     # Set up new class
     def initialize
       @plugin_conf = Inspec::Config.cached.fetch_plugin_config("inspec-chef")
-
-      unless defined?(Kitchen)
-        @chef_endpoint = fetch_plugin_setting("endpoint")
-        @chef_client   = fetch_plugin_setting("client")
-        @chef_api_key  = fetch_plugin_setting("key")
-
-        if chef_endpoint.nil? || chef_client.nil? || chef_api_key.nil?
-          raise "ERROR: Need configuration of chef endpoint, client name and api key."
-        end
-
-        connect_to_chef_server
-      end
     end
 
     # Fetch method used for Input plugins
     def fetch(_profile_name, input_uri)
       return nil unless valid_plugin_input? input_uri
 
-      input = parse_input(input_uri)
+      connect_to_chef_server
 
+      input = parse_input(input_uri)
       if input[:type] == :databag
         data = get_databag_item(input[:object], input[:item])
       elsif input[:type] == :node
@@ -92,13 +81,33 @@ module InspecPlugins::Chef
 
     # Establish a Chef Server connection
     def connect_to_chef_server
-      @chef_api ||= ChefAPI::Connection.new(
-        endpoint: chef_endpoint,
-        client:   chef_client,
-        key:      chef_api_key
-      )
+      # From within TestKitchen we need no Chef Server connection
+      if defined?(Kitchen)
+        Inspec::Log.info "Running from TestKitchen, using provisioner settings instead of Chef Server"
+
+      # Only connect once
+      elsif !connected?
+        @chef_endpoint = fetch_plugin_setting("endpoint")
+        @chef_client   = fetch_plugin_setting("client")
+        @chef_api_key  = fetch_plugin_setting("key")
+
+        if chef_endpoint.nil? || chef_client.nil? || chef_api_key.nil?
+          raise "ERROR: Plugin inspec-chef needs configuration of chef endpoint, client name and api key."
+        end
+
+        @chef_api ||= ChefAPI::Connection.new(
+          endpoint: chef_endpoint,
+          client:   chef_client,
+          key:      chef_api_key
+        )
+
+        Inspec::Log.debug format("Connected to %s as client %s", chef_endpoint, chef_client)
+      end
+    end
 
-      Inspec::Log.debug format("Connected to %s as client %s", chef_endpoint, chef_client)
+    # Return if connection is established
+    def connected?
+      ! @chef_api.nil?
     end
 
     # Retrieve a Databag item from Chef Server

data/lib/inspec-chef/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inspec-chef
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Thomas Heinen
@@ -66,7 +66,7 @@ files:
 - lib/inspec-chef/input.rb
 - lib/inspec-chef/plugin.rb
 - lib/inspec-chef/version.rb
-homepage: https://github.com/tecracer-theinen/inspec-chef
+homepage: https://github.com/sgre-chef/inspec-chef
 licenses:
 - Apache-2.0
 metadata: {}