kitchen-pulumi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c0ce9de8379c66a261cbc65cf916a72cc46f44b1dd1fa75351807a9a38d828
-  data.tar.gz: 7e346277daebaa03ca622ca61a694004d412d6a0b6f2fc1badea8d8f752b33f9
+  metadata.gz: bef54f1efc387dfe35e325959ecccb66b21d8e8c5073b3d29b6d525f22c4ffd1
+  data.tar.gz: b2452427f21971500e1c1a426b59c5ba079c2ca03694b5d2cd10753e9c788112
 SHA512:
-  metadata.gz: 88631c7633e26c60539e22deefb778bf44e5f438d2af53101ea5645a02d3633997358ef04747f85f3f12a405ad797e76a96b469eceb262850bd0b4e275eec0d5
-  data.tar.gz: b1ec83259b24dad3c038c77f471655ee34ead9b3478cbf5db9942f5c8db4c264d801fae99e14bc889e9f13a4a0b1d9eaeaebb820a1de779d4b13d1b7f8719fd9
+  metadata.gz: cf7d2e24412bbff79c4405d5bf1c2d0e377c7bb2e16ba273c053bbd93403094930a6179e7482fa22ebb9f506990670a3ce379ec41999c2e28219e40266f55cc6
+  data.tar.gz: d0d04b21f872eb55305c728d11682913d69673ed163e73f2d84e050a3c7ce8a340ffc1e2b672710f37fafe0e4e622ae1e3a1b8e621e462f7417e4df8f0d9910f

data/lib/kitchen/pulumi/system.rb

@@ -3,19 +3,19 @@
 require 'kitchen/pulumi/error'
 require 'kitchen/pulumi/inspec_with_hosts'
 require 'kitchen/pulumi/inspec_without_hosts'
-require 'kitchen/pulumi/system_attrs_resolver'
+require 'kitchen/pulumi/system_inputs_resolver'
 require 'kitchen/pulumi/system_hosts_resolver'
 
 module Kitchen
   module Pulumi
     # System is the class of objects which are verified by the Pulumi Verifier.
     class System
-      # #add_attrs adds attributes to the system.
+      # #add_inputs adds Inspec Inputs to the system.
       #
-      # @param attrs [#to_hash] the attributes to be added.
+      # @param inputs [#to_hash] the inputs to be added.
       # @return [self]
-      def add_attrs(attrs:)
-        @attributes = @attributes.merge Hash attrs
+      def add_inputs(inputs:)
+        @inputs = @inputs.merge Hash inputs
 
         self
       end
@@ -51,15 +51,15 @@ module Kitchen
 
       # #verify verifies the system by executing InSpec.
       #
-      # @param inputs [::Hash] the Pulumi input values to be utilized as
-      #   InSpec profile attributes.
+      # @param pulumi_inputs [::Hash] the Pulumi input values to be utilized as
+      #   InSpec profile Input.
+      # @param pulumi_outputs [::Hash] the Pulumi output values to be utilized as
+      #   InSpec profile Input.
       # @param inspec_options [::Hash] the options to be passed to InSpec.
-      # @param outputs [::Hash] the Pulumi output values to be utilized as
-      #   InSpec profile attributes.
       # @return [self]
-      def verify(inputs:, inspec_options:, outputs:)
-        resolve inputs: inputs, outputs: outputs
-        execute_inspec options: inspec_options
+      def verify(pulumi_inputs:, pulumi_outputs:, inspec_options:)
+        resolve(pulumi_inputs: pulumi_inputs, pulumi_outputs: pulumi_outputs)
+        execute_inspec(options: inspec_options)
 
         self
       rescue StandardError => e
@@ -70,16 +70,13 @@ module Kitchen
 
       def execute_inspec(options:)
         inspec.new(
-          options: options_with_attributes(options: options),
+          options: options_with_inputs(options: options),
           profile_locations: @mapping.fetch(:profile_locations),
         ).exec(system: self)
       end
 
       def initialize(mapping:)
-        @attributes = {}
-        @attrs_outputs = mapping.fetch :attrs_outputs do
-          {}
-        end
+        @inputs = {}
         @hosts = mapping.fetch :hosts do
           []
         end
@@ -94,31 +91,27 @@ module Kitchen
         end
       end
 
-      def options_with_attributes(options:)
-        options.merge attributes: @attributes
+      def options_with_inputs(options:)
+        options.merge(inputs: @inputs)
       end
 
-      def resolve(inputs:, outputs:)
-        resolve_attrs inputs: inputs, outputs: outputs
-        resolve_hosts outputs: outputs
+      def resolve(pulumi_inputs:, pulumi_outputs:)
+        resolve_inputs(pulumi_inputs: pulumi_inputs, pulumi_outputs: pulumi_outputs)
+        resolve_hosts(pulumi_outputs: pulumi_outputs)
       end
 
-      def resolve_attrs(inputs:, outputs:)
-        ::Kitchen::Pulumi::SystemAttrsResolver.new(
-          inputs: inputs, outputs: outputs,
-        ).resolve(
-          attrs_outputs_keys: @attrs_outputs.keys,
-          attrs_outputs_values: @attrs_outputs.values,
-          system: self,
-        )
+      def resolve_inputs(pulumi_inputs:, pulumi_outputs:)
+        ::Kitchen::Pulumi::SystemInputsResolver.new(
+          pulumi_inputs: pulumi_inputs, pulumi_outputs: pulumi_outputs, system: self,
+        ).resolve
 
         self
       end
 
-      def resolve_hosts(outputs:)
-        return self unless @mapping.key? :hosts_output
+      def resolve_hosts(pulumi_outputs:)
+        return self unless @mapping.key?(:hosts_output)
 
-        ::Kitchen::Pulumi::SystemHostsResolver.new(outputs: outputs).resolve(
+        ::Kitchen::Pulumi::SystemHostsResolver.new(outputs: pulumi_outputs).resolve(
           hosts_output: @mapping.fetch(:hosts_output),
           system: self,
         )

data/lib/kitchen/pulumi/system_hosts_resolver.rb

@@ -27,7 +27,7 @@ module Kitchen
       #
       # @param outputs [#to_hash] the outputs of the Pulumi stack under test.
       def initialize(outputs:)
-        @outputs = Hash[outputs]
+        @outputs = outputs.to_h
       end
     end
   end

data/lib/kitchen/pulumi/system_inputs_resolver.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'kitchen/pulumi'
+require 'kitchen/pulumi/error'
+
+module Kitchen
+  module Pulumi
+    # SystemInputssResolver is the class for resolving Pulumi stack inputs and
+    # outputs to provide them as Inspec Inputs.
+    class SystemInputsResolver
+      # #resolve resolves the inputs.
+      #
+      # @raise [::Kitchen::Pulumi::Error] if the fetching the value of the
+      #   output fails.
+      def resolve
+        @system.add_inputs(inputs: @pulumi_inputs.merge(@pulumi_outputs))
+        self
+      rescue ::KeyError => e
+        raise ::Kitchen::Pulumi::Error, "Resolving inputs failed\n#{e}"
+      end
+
+      private
+
+      # #initialize prepares the instance to be used.
+      #
+      # @param pulumi_inputs [#to_hash] the config inputs provided to a Pulumi stack
+      # @param pulumi_outputs [#to_hash] the outputs of the Pulumi stack under test.
+      # @param system [::Kitchen::Pulumi::System] the system.
+      def initialize(pulumi_inputs:, pulumi_outputs:, system:)
+        @system = system
+        @pulumi_inputs = pulumi_inputs.transform_values do |value|
+          value.fetch('value', nil)
+        end
+        @pulumi_inputs.merge!(@pulumi_inputs.transform_keys { |key| "input_#{key}" })
+
+        @pulumi_outputs = pulumi_outputs.to_h.map do |key, value|
+          [key, value]
+        end.to_h
+        @pulumi_outputs.merge!(@pulumi_outputs.transform_keys { |key| "output_#{key}" })
+      rescue ::KeyError => e
+        raise ::Kitchen::Pulumi::Error, "System input resolution failed\n#{e}"
+      end
+    end
+  end
+end

data/lib/kitchen/pulumi/version.rb

@@ -2,4 +2,4 @@
 
 require 'kitchen/pulumi'
 
-::Kitchen::Pulumi::VERSION = '0.1.0'
+::Kitchen::Pulumi::VERSION = '0.1.1'

data/lib/kitchen/verifier/pulumi.rb

@@ -72,14 +72,14 @@ module Kitchen
       include ::Kitchen::Pulumi::Configurable
       @api_version = 2
 
-      attr_reader :inputs, :outputs
+      attr_reader :pulumi_inputs, :pulumi_outputs
 
       def initialize(configuration = {})
         super(configuration)
-        self.inspec_options_mapper = ::Kitchen::Pulumi::InSpecOptionsMapper.new
-        self.error_messages = []
-        self.inputs = {}
-        self.outputs = {}
+        @inspec_options_mapper = ::Kitchen::Pulumi::InSpecOptionsMapper.new
+        @error_messages = []
+        @pulumi_inputs = {}
+        @pulumi_outputs = {}
       end
 
       # The verifier enumerates through each host of each system and verifies
@@ -112,7 +112,7 @@ module Kitchen
       private
 
       attr_accessor :inspec_options_mapper, :error_messages
-      attr_writer :inputs, :outputs
+      attr_writer :pulumi_inputs, :pulumi_outputs
 
       # Raises an error immediately if the `fail_fast` config attribute is set on the
       #   or collects all errors until execution has ended verifier
@@ -131,11 +131,11 @@ module Kitchen
       # @return [void]
       def load_variables
         instance.driver.stack_outputs do |outputs:|
-          self.outputs.replace(outputs)
+          @pulumi_outputs.replace(outputs)
         end
 
         instance.driver.stack_inputs do |inputs:|
-          self.inputs.replace(inputs)
+          @pulumi_inputs.replace(inputs)
         end
       end
 
@@ -171,9 +171,9 @@ module Kitchen
             ],
           }.merge(system),
         ).verify(
-          inputs: inputs,
+          pulumi_inputs: @pulumi_inputs,
+          pulumi_outputs: @pulumi_outputs,
           inspec_options: system_inspec_options(system: system),
-          outputs: outputs,
         )
       rescue StandardError => e
         handle_error message: e.message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-pulumi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jacob Learned
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +263,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,7 +273,7 @@ dependencies:
         version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -370,8 +370,8 @@ files:
 - lib/kitchen/pulumi/kitchen_instance.rb
 - lib/kitchen/pulumi/shell_out.rb
 - lib/kitchen/pulumi/system.rb
-- lib/kitchen/pulumi/system_attrs_resolver.rb
 - lib/kitchen/pulumi/system_hosts_resolver.rb
+- lib/kitchen/pulumi/system_inputs_resolver.rb
 - lib/kitchen/pulumi/version.rb
 - lib/kitchen/verifier/pulumi.rb
 homepage: https://github.com/jacoblearned/kitchen-pulumi

data/lib/kitchen/pulumi/system_attrs_resolver.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require 'kitchen/pulumi'
-require 'kitchen/pulumi/error'
-
-module Kitchen
-  module Pulumi
-    # SystemAttrsResolver is the class of objects which resolve for systems the
-    # attrs which are contained in outputs.
-    class SystemAttrsResolver
-      # #resolve resolves the attrs.
-      #
-      # @param attrs_outputs_keys [::Array<::String>] the names of the InSpec
-      #   attributes.
-      # @param attrs_outputs_values [::Array<::String>] the names of the Pulumi
-      #   outputs.
-      # @param system [::Kitchen::Pulumi::System] the system.
-      # @raise [::Kitchen::Pulumi::Error] if the fetching the value of the
-      #   output fails.
-      def resolve(attrs_outputs_keys:, attrs_outputs_values:, system:)
-        system.add_attrs(attrs: @inputs.merge(
-          @outputs.merge(
-            attrs_outputs_keys.lazy.map(&:to_s).zip(
-              @outputs.fetch_values(*attrs_outputs_values),
-            ).to_h,
-          ),
-        ))
-
-        self
-      rescue ::KeyError => e
-        raise ::Kitchen::Pulumi::Error, "Resolving attrs failed\n#{e}"
-      end
-
-      private
-
-      # #initialize prepares the instance to be used.
-      #
-      # @param inputs [#to_hash] the config inputs provided to a stack
-      # @param outputs [#to_hash] the outputs of the Pulumi stack under test.
-      def initialize(inputs:, outputs:)
-        @inputs = inputs.transform_values do |value|
-          value.fetch('value', nil)
-        end
-        @inputs.merge!(@inputs.transform_keys { |key| "input_#{key}" })
-
-        @outputs = Hash[outputs].map do |key, value|
-          [key, value]
-        end.to_h
-        @outputs.merge!(@outputs.transform_keys { |key| "output_#{key}" })
-      rescue ::KeyError => e
-        raise ::Kitchen::Pulumi::Error, "System attrs resolution failed\n#{e}"
-      end
-    end
-  end
-end