diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a9f56baa..9a51596e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,14 @@ and this project adheres to ## [Unreleased][unreleased] +## [7.0.1] - 2023-04-20 + ### Fixed - The doctor check for the `client` attribute uses the PATH to validate the value. +- The debug connection logger for `kitchen converge` is properly + initialized. ## [7.0.0] - 2023-04-09 @@ -815,7 +819,8 @@ Free-As-In-Beer - Initial release [unreleased]: - https://github.com/newcontext/kitchen-terraform/compare/v7.0.0...HEAD + https://github.com/newcontext/kitchen-terraform/compare/v7.0.1...HEAD +[7.0.1]: https://github.com/newcontext/kitchen-terraform/compare/v7.0.0...v7.0.1 [7.0.0]: https://github.com/newcontext/kitchen-terraform/compare/v6.1.0...v7.0.0 [6.1.0]: https://github.com/newcontext/kitchen-terraform/compare/v6.0.0...v6.1.0 [6.0.0]: https://github.com/newcontext/kitchen-terraform/compare/v5.8.0...v6.0.0 diff --git a/README.md b/README.md index 3bcb6c327..675c5388b 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ example. --- ```sh -gem install kitchen-terraform --version 7.0.0 +gem install kitchen-terraform --version 7.0.1 ``` --- diff --git a/docs/apple-touch-icon-114x114-precomposed.png b/docs/apple-touch-icon-114x114-precomposed.png index 81d2f4769..cc7ae2ace 100644 Binary files a/docs/apple-touch-icon-114x114-precomposed.png and b/docs/apple-touch-icon-114x114-precomposed.png differ diff --git a/docs/apple-touch-icon-120x120-precomposed.png b/docs/apple-touch-icon-120x120-precomposed.png index 7a97ca425..43110086e 100644 Binary files a/docs/apple-touch-icon-120x120-precomposed.png and b/docs/apple-touch-icon-120x120-precomposed.png differ diff --git a/docs/apple-touch-icon-144x144-precomposed.png b/docs/apple-touch-icon-144x144-precomposed.png index c1192e3d0..2b6dced1e 100644 Binary files a/docs/apple-touch-icon-144x144-precomposed.png and b/docs/apple-touch-icon-144x144-precomposed.png differ diff --git a/docs/apple-touch-icon-152x152-precomposed.png b/docs/apple-touch-icon-152x152-precomposed.png index 5c14d66ce..161a3040f 100644 Binary files a/docs/apple-touch-icon-152x152-precomposed.png and b/docs/apple-touch-icon-152x152-precomposed.png differ diff --git a/docs/apple-touch-icon-180x180-precomposed.png b/docs/apple-touch-icon-180x180-precomposed.png index 6ad0d5de8..efd289e25 100644 Binary files a/docs/apple-touch-icon-180x180-precomposed.png and b/docs/apple-touch-icon-180x180-precomposed.png differ diff --git a/docs/apple-touch-icon-57x57-precomposed.png b/docs/apple-touch-icon-57x57-precomposed.png index e10ab118a..dbc1c5bc7 100644 Binary files a/docs/apple-touch-icon-57x57-precomposed.png and b/docs/apple-touch-icon-57x57-precomposed.png differ diff --git a/docs/apple-touch-icon-60x60-precomposed.png b/docs/apple-touch-icon-60x60-precomposed.png index ab814dcc1..dc0617afe 100644 Binary files a/docs/apple-touch-icon-60x60-precomposed.png and b/docs/apple-touch-icon-60x60-precomposed.png differ diff --git a/docs/apple-touch-icon-72x72-precomposed.png b/docs/apple-touch-icon-72x72-precomposed.png index ee542d425..c370d2419 100644 Binary files a/docs/apple-touch-icon-72x72-precomposed.png and b/docs/apple-touch-icon-72x72-precomposed.png differ diff --git a/docs/apple-touch-icon-76x76-precomposed.png b/docs/apple-touch-icon-76x76-precomposed.png index 6ae6685e5..fe84a3f51 100644 Binary files a/docs/apple-touch-icon-76x76-precomposed.png and b/docs/apple-touch-icon-76x76-precomposed.png differ diff --git a/docs/apple-touch-icon-precomposed.png b/docs/apple-touch-icon-precomposed.png index e10ab118a..dbc1c5bc7 100644 Binary files a/docs/apple-touch-icon-precomposed.png and b/docs/apple-touch-icon-precomposed.png differ diff --git a/docs/apple-touch-icon.png b/docs/apple-touch-icon.png index e10ab118a..dbc1c5bc7 100644 Binary files a/docs/apple-touch-icon.png and b/docs/apple-touch-icon.png differ diff --git a/docs/favicon-160x160.png b/docs/favicon-160x160.png index 42fe98888..4060227c8 100644 Binary files a/docs/favicon-160x160.png and b/docs/favicon-160x160.png differ diff --git a/docs/favicon-16x16.png b/docs/favicon-16x16.png index c24a789fb..2c90ea957 100644 Binary files a/docs/favicon-16x16.png and b/docs/favicon-16x16.png differ diff --git a/docs/favicon-196x196.png b/docs/favicon-196x196.png index 0ec5c521e..ec84874bc 100644 Binary files a/docs/favicon-196x196.png and b/docs/favicon-196x196.png differ diff --git a/docs/favicon-32x32.png b/docs/favicon-32x32.png index b0319a1e5..d696ba298 100644 Binary files a/docs/favicon-32x32.png and b/docs/favicon-32x32.png differ diff --git a/docs/favicon-96x96.png b/docs/favicon-96x96.png index 9aaba11ca..48099749d 100644 Binary files a/docs/favicon-96x96.png and b/docs/favicon-96x96.png differ diff --git a/docs/favicon.ico b/docs/favicon.ico index 6033ba95e..9709d42c9 100644 Binary files a/docs/favicon.ico and b/docs/favicon.ico differ diff --git a/docs/favicon.png b/docs/favicon.png index c24a789fb..2c90ea957 100644 Binary files a/docs/favicon.png and b/docs/favicon.png differ diff --git a/docs/mstile-144x144.png b/docs/mstile-144x144.png index c1192e3d0..2b6dced1e 100644 Binary files a/docs/mstile-144x144.png and b/docs/mstile-144x144.png differ diff --git a/docs/mstile-150x150.png b/docs/mstile-150x150.png index 52ebd94a1..de18e09e6 100644 Binary files a/docs/mstile-150x150.png and b/docs/mstile-150x150.png differ diff --git a/docs/mstile-310x150.png b/docs/mstile-310x150.png index b133e9cde..309dd59e0 100644 Binary files a/docs/mstile-310x150.png and b/docs/mstile-310x150.png differ diff --git a/docs/mstile-310x310.png b/docs/mstile-310x310.png index 749b8e05f..f7ae6d21a 100644 Binary files a/docs/mstile-310x310.png and b/docs/mstile-310x310.png differ diff --git a/docs/mstile-70x70.png b/docs/mstile-70x70.png index 3a337ebcd..2aec7c219 100644 Binary files a/docs/mstile-70x70.png and b/docs/mstile-70x70.png differ diff --git a/lib/kitchen/provisioner/terraform.rb b/lib/kitchen/provisioner/terraform.rb index b45bc55a4..b090423ae 100644 --- a/lib/kitchen/provisioner/terraform.rb +++ b/lib/kitchen/provisioner/terraform.rb @@ -86,7 +86,7 @@ def call(state) ::Kitchen::Terraform::Provisioner::Converge.new( config: driver.send(:config), connection: transport.connection({}), - debug_connection: transport.connection(logger: ::Kitchen::Terraform::DebugLogger.new(logger: logger)), + debug_connection: transport.connection(logger: ::Kitchen::Terraform::DebugLogger.new(logger)), logger: logger, version_requirement: version_requirement, workspace_name: workspace_name, diff --git a/lib/kitchen/terraform/debug_logger.rb b/lib/kitchen/terraform/debug_logger.rb index b9a7a5272..89cb60e05 100644 --- a/lib/kitchen/terraform/debug_logger.rb +++ b/lib/kitchen/terraform/debug_logger.rb @@ -20,6 +20,19 @@ module Kitchen module Terraform # This class delegates to a logger but ensures the debug level is the default level used for logging messages. class DebugLogger < ::SimpleDelegator + class << self + # .new creates a new instance of the class. + # + # @return [Kitchen::Terraform::DebugLogger] + def new(obj) + if !obj.kind_of? ::Kitchen::Logger + raise ::TypeError, "delegate must be a Kitchen::Logger; recevied #{obj.class}" + end + + super + end + end + # This method overrides the #<< method of the delegate to call #debug. # # @param message [#to_s] the message to be logged. diff --git a/lib/kitchen/terraform/version.rb b/lib/kitchen/terraform/version.rb index b7b421c3a..beb70c126 100644 --- a/lib/kitchen/terraform/version.rb +++ b/lib/kitchen/terraform/version.rb @@ -71,7 +71,7 @@ def temporarily_override(version:) # @api private def value - self.value = ::Gem::Version.new "7.0.0" if not @value + self.value = ::Gem::Version.new "7.0.1" if not @value @value end diff --git a/spec/lib/kitchen/terraform/debug_logger_spec.rb b/spec/lib/kitchen/terraform/debug_logger_spec.rb index c4dfaac21..7a712d28c 100644 --- a/spec/lib/kitchen/terraform/debug_logger_spec.rb +++ b/spec/lib/kitchen/terraform/debug_logger_spec.rb @@ -16,23 +16,30 @@ require "kitchen" require "kitchen/terraform/debug_logger" +require "support/kitchen/logger_context" ::RSpec.describe ::Kitchen::Terraform::DebugLogger do - subject do - described_class.new logger + describe ".new" do + specify "raises an error if the delegate is not a Kitchen::Logger" do + expect do + described_class.new ::Object.new + end.to raise_error ::TypeError + end end - let :logger do - instance_double ::Kitchen::Logger + subject do + described_class.new ::Kitchen.logger end + include_context "Kitchen::Logger" + shared_examples "#debug" do after do subject << "message" end specify "forwards the message to #debug of the wrapped logger" do - expect(logger).to receive(:debug).with "message" + expect(::Kitchen.logger).to receive(:debug).with "message" end end diff --git a/spec/lib/kitchen/terraform/version_spec.rb b/spec/lib/kitchen/terraform/version_spec.rb index 1413ef78d..4f5929b6f 100644 --- a/spec/lib/kitchen/terraform/version_spec.rb +++ b/spec/lib/kitchen/terraform/version_spec.rb @@ -24,7 +24,7 @@ end let :version do - ::Gem::Version.new "7.0.0" + ::Gem::Version.new "7.0.1" end describe ".assign_plugin_version" do diff --git a/spec/support/kitchen/terraform/configurable_examples.rb b/spec/support/kitchen/terraform/configurable_examples.rb index 28af0346e..eb4904fe5 100644 --- a/spec/support/kitchen/terraform/configurable_examples.rb +++ b/spec/support/kitchen/terraform/configurable_examples.rb @@ -26,7 +26,7 @@ describe "@plugin_version" do it "equals the gem version" do - expect(described_class.instance_variable_get(:@plugin_version)).to eq "7.0.0" + expect(described_class.instance_variable_get(:@plugin_version)).to eq "7.0.1" end end