rspec-terraform 0.1.0.pre.37 → 0.1.0.pre.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5d0cfbad94632db8e93fd7d1747f84d6c1b41f2210e97108a0809685ebe248f
-  data.tar.gz: 1fda168e5e4bf24e8d9c6a89bc602974b3a865e94a22cf2bef7421c96e980d43
+  metadata.gz: 12e11f477f99fd41080131cf322d8d6dedf40645e04bb41b66de3b5cee3128b5
+  data.tar.gz: 47ccbe633464a8a414b9ea950a27c664bae5bef3e60155463b9a979f398900ac
 SHA512:
-  metadata.gz: e35006b4b7834783ae18eeded06ef9bd29d52322718ab51c9cb7c09403d28e83e69cc7835bb63a75a565dac10094eb89b4602aaf77e2a1b925953fe17daf504d
-  data.tar.gz: 1fff5187933552ed362c84114470adadb9cab8799420df6b3ce6a945d9cda5d1d614fec5dec6a672675a6e98a2de83fbeb2f75caf6861f2434b0da324dd732f4
+  metadata.gz: 19aa8f5adeedf3bc1a71129205363f7eca9a843d47462345c34ee8a36358ee35e9d4ad2ea9bf1ac63bb8846c789181c88039428cc1514bfbd1f500ce3ca7b145
+  data.tar.gz: 3c338a356d1ad4ff0264f1bcef7e756ea743c0f3582865bb62cfaadcc6bb539b4467a7c239836cb0c5f285362d313d9f1ab22aca62203d55816cdc8855c69287

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.37)
+    rspec-terraform (0.1.0.pre.40)
       confidante (>= 0.27)
       rspec (>= 3.0)
       ruby-terraform (= 1.7.0.pre.16)
@@ -30,7 +30,7 @@ GEM
       partialruby (~> 0.3)
       sexp_processor (~> 4.0)
     excon (0.92.4)
-    faker (2.22.0)
+    faker (2.23.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.5.2)
       faraday-net_http (>= 2.0, < 3.1)
@@ -131,7 +131,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.35.1)
+    rubocop (1.36.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
@@ -205,4 +205,4 @@ DEPENDENCIES
   terminal-notifier-guard
 
 BUNDLED WITH
-   2.3.21
+   2.3.22

data/lib/rspec/terraform/helpers/plan.rb

@@ -32,10 +32,8 @@ module RSpec
           init(parameters)
           plan_file = plan(parameters)
           plan_contents = show(parameters, plan_file)
-
-          RubyTerraform::Models::Plan.new(
-            JSON.parse(plan_contents, symbolize_names: true)
-          )
+          remove(parameters, plan_file)
+          parse(plan_contents)
         end
 
         private
@@ -105,6 +103,18 @@ module RSpec
           stdout.string
         end
 
+        def parse(plan_contents)
+          RubyTerraform::Models::Plan.new(
+            JSON.parse(plan_contents, symbolize_names: true)
+          )
+        end
+
+        def remove(parameters, plan_file)
+          FileUtils.rm_f(
+            File.join(parameters[:configuration_directory], plan_file)
+          )
+        end
+
         def init_command
           RubyTerraform::Commands::Init.new(binary: binary)
         end
@@ -135,7 +145,8 @@ module RSpec
           plan_parameters =
             parameters.merge(
               chdir: parameters[:configuration_directory],
-              out: parameters[:plan_file_name] || SecureRandom.hex(10),
+              out: parameters[:plan_file_name] ||
+                "#{SecureRandom.hex[0, 10]}.tfplan",
               input: false
             )
 

data/lib/rspec/terraform/logging.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Logging
+      class << self
+        def resolve_streams(opts = {})
+          opts = resolve_opts(opts)
+          streams = opts[:streams]
+          level = opts[:level]
+          devices = devices(opts)
+
+          resolve_opts(opts)
+
+          {
+            logger: resolve_logger(opts[:logger], streams, devices, level),
+            stdout: resolve_stdout(opts[:stdout], streams, devices),
+            stderr: resolve_stderr(opts[:stderr], streams, devices)
+          }
+        end
+
+        private
+
+        def resolve_opts(opts)
+          streams = opts[:streams] || []
+          level = opts[:level] || Logger::INFO
+
+          if streams.include?(:file) && !opts[:file_path]
+            raise(
+              ArgumentError,
+              'File logging requested but no file path provided'
+            )
+          end
+
+          opts.merge(streams: streams, level: level)
+        end
+
+        def resolve_logger(logger, streams, devices, level)
+          return logger if logger
+
+          log_devices = []
+          log_devices << devices[:file] if streams.include?(:file)
+          log_devices << devices[:stdout] if streams.include?(:standard)
+
+          Logger.new(multi_io(log_devices), level: level)
+        end
+
+        def resolve_stdout(stdout, streams, devices)
+          return stdout if stdout
+
+          log_devices = []
+          log_devices << devices[:file] if streams.include?(:file)
+          log_devices << devices[:stdout] if streams.include?(:standard)
+
+          multi_io(log_devices)
+        end
+
+        def resolve_stderr(stderr, streams, devices)
+          return stderr if stderr
+
+          log_devices = []
+          log_devices << devices[:file] if streams.include?(:file)
+          log_devices << devices[:stderr] if streams.include?(:standard)
+
+          multi_io(log_devices)
+        end
+
+        def devices(opts)
+          {
+            file: log_device(opts[:file_path] || File::NULL),
+            stdout: log_device(opts[:stdout] || $stdout),
+            stderr: log_device($stderr)
+          }
+        end
+
+        def log_device(io)
+          Logger::LogDevice.new(io)
+        end
+
+        def multi_io(ios)
+          RubyTerraform::MultiIO.new(*ios)
+        end
+      end
+    end
+  end
+end

data/lib/rspec/terraform/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Terraform
-    VERSION = '0.1.0.pre.37'
+    VERSION = '0.1.0.pre.40'
   end
 end

data/lib/rspec/terraform.rb

@@ -2,33 +2,62 @@
 
 require 'rspec/core'
 require 'ruby_terraform'
+require 'logger'
 
 require_relative 'terraform/version'
 require_relative 'terraform/configuration'
 require_relative 'terraform/matchers'
 require_relative 'terraform/helpers'
+require_relative 'terraform/logging'
 
 # TODO
 # ====
 #
-# * Logging
 # * Test session
 # * Before support in matchers
 # * Reference support in matchers
 # * Sensitive support in matchers
 #
 
+# rubocop:disable Metrics/BlockLength
 RSpec.configure do |config|
   config.include(RSpec::Terraform::Matchers)
   config.prepend(RSpec::Terraform::Helpers)
 
   config.add_setting(:terraform_binary, default: 'terraform')
+
+  config.add_setting(:terraform_log_file_path, default: nil)
+  config.add_setting(:terraform_log_level, default: Logger::INFO)
+  config.add_setting(:terraform_log_streams, default: [:standard])
+
+  config.add_setting(:terraform_logger, default: nil)
+  config.add_setting(:terraform_stdin, default: nil)
+  config.add_setting(:terraform_stdout, default: nil)
+  config.add_setting(:terraform_stderr, default: nil)
+
   config.add_setting(:terraform_execution_mode, default: :in_place)
+
   config.add_setting(
     :terraform_configuration_provider,
     default: RSpec::Terraform::Configuration.identity_provider
   )
+
+  config.before(:suite) do
+    resolved_streams = RSpec::Terraform::Logging.resolve_streams(
+      file_path: RSpec.configuration.terraform_log_file_path,
+      level: RSpec.configuration.terraform_log_level,
+      streams: RSpec.configuration.terraform_log_streams,
+      logger: RSpec.configuration.terraform_logger,
+      stdout: RSpec.configuration.terraform_stdout,
+      stderr: RSpec.configuration.terraform_stderr
+    )
+
+    RSpec.configuration.terraform_logger = resolved_streams[:logger]
+    RSpec.configuration.terraform_stdout = resolved_streams[:stdout]
+    RSpec.configuration.terraform_stderr = resolved_streams[:stderr]
+  end
 end
+# rubocop:enable Metrics/BlockLength
 
 RSpec::Core::AnonymousExampleGroup
   .include(RSpec::Terraform::Helpers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.37
+  version: 0.1.0.pre.40
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confidante
@@ -309,6 +309,7 @@ files:
 - lib/rspec/terraform/helpers/output.rb
 - lib/rspec/terraform/helpers/plan.rb
 - lib/rspec/terraform/helpers/var.rb
+- lib/rspec/terraform/logging.rb
 - lib/rspec/terraform/matchers.rb
 - lib/rspec/terraform/matchers/include_output_change.rb
 - lib/rspec/terraform/matchers/include_resource_change.rb