rspec-terraform 0.1.0.pre.36 → 0.1.0.pre.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde90bef4a301ed3039f8dd05483f9a1719e0a242f6b322df14075301e1bbbf1
-  data.tar.gz: 7d2608383fc8cf88398b3ba89cec45879c9c4631869026febcf22604f6665fcf
+  metadata.gz: d9e77a423f915bda9a4d02a980a21a1755a6dde139dc3d1890414eacfa72c1c8
+  data.tar.gz: 6e2ff10778fd5641f717fb2cf9e23d59e39312179a76cffa40d49ece0ae7a001
 SHA512:
-  metadata.gz: b598fdbc496757b7ae6280a5ed07d27f37ebd6077f26b640cf49ddf2ecb711376ed3da081b98b96e2e374dab98d7c57e179d31798c6931633a525022737dbe64
-  data.tar.gz: 85ceeb2799d89e0d73a2949fe3aeaf19a1c22b0810133371bd628aa54d09eb1b9ebd49a8c843f51c9ad24b04baac7062e35c49c13727747825ee2dfb626b8a19
+  metadata.gz: a74ba985ec614bcdf6bcf1c9d031d663341f5f41a40feb513d03313d41cbbd97104c784c806ca5a64b38dffeaf5eea822722a0db2e3f1f78bd402ab18a19093a
+  data.tar.gz: e7c2d9563eb65a3931a4d51d775d1c07e9449a748b15cd1a06e1404a3c9d74d4f65634674d2a88ce736982a75642a3bfb2d6bcadeaef39db9f2182dacc3b3a51

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec-terraform (0.1.0.pre.36)
+    rspec-terraform (0.1.0.pre.39)
       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)

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,68 @@
+# frozen_string_literal: true
+
+module RSpec
+  module Terraform
+    module Logging
+      class << self
+        def resolve_streams(opts = {})
+          streams = opts[:streams] || []
+          devices = devices(opts)
+
+          {
+            logger: resolve_logger(opts[:logger], streams, devices),
+            stdout: resolve_stdout(opts[:stdout], streams, devices),
+            stderr: resolve_stderr(opts[:stderr], streams, devices)
+          }
+        end
+
+        private
+
+        def resolve_logger(logger, streams, devices)
+          return logger if logger
+
+          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_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($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.36'
+    VERSION = '0.1.0.pre.39'
   end
 end

data/lib/rspec/terraform.rb

@@ -7,6 +7,7 @@ require_relative 'terraform/version'
 require_relative 'terraform/configuration'
 require_relative 'terraform/matchers'
 require_relative 'terraform/helpers'
+require_relative 'terraform/logging'
 
 # TODO
 # ====
@@ -18,14 +19,43 @@ require_relative 'terraform/helpers'
 # * Sensitive support in matchers
 #
 
+# rubocop:disable Metrics/BlockLength
 RSpec.configure do |config|
   config.include(RSpec::Terraform::Matchers)
-  config.include(RSpec::Terraform::Helpers)
+  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_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,
+      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.36
+  version: 0.1.0.pre.39
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-09-03 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