diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a51596e..ce48c801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ and this project adheres to ## [Unreleased][unreleased] +## [7.0.2] - 2023-04-24 + +### Fixed + +- Transport connections no longer override provided loggers. + ## [7.0.1] - 2023-04-20 ### Fixed @@ -819,7 +825,8 @@ Free-As-In-Beer - Initial release [unreleased]: - https://github.com/newcontext/kitchen-terraform/compare/v7.0.1...HEAD + https://github.com/newcontext/kitchen-terraform/compare/v7.0.2...HEAD +[7.0.2]: https://github.com/newcontext/kitchen-terraform/compare/v7.0.1...v7.0.2 [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 diff --git a/README.md b/README.md index 675c5388..b95962cb 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ example. --- ```sh -gem install kitchen-terraform --version 7.0.1 +gem install kitchen-terraform --version 7.0.2 ``` --- diff --git a/lib/kitchen/terraform/version.rb b/lib/kitchen/terraform/version.rb index beb70c12..ba8f3ae5 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.1" if not @value + self.value = ::Gem::Version.new "7.0.2" if not @value @value end diff --git a/lib/kitchen/transport/terraform.rb b/lib/kitchen/transport/terraform.rb index 6168f6ae..bc9ece69 100644 --- a/lib/kitchen/transport/terraform.rb +++ b/lib/kitchen/transport/terraform.rb @@ -125,10 +125,9 @@ def initialize(config = {}) # @return [Hash] hash of connection options. # @api private def connection_options(data) - opts = super + opts = super.merge! data - opts.merge! data - opts.merge! logger: logger + opts.merge! logger: logger if !opts.key? :logger opts end diff --git a/spec/lib/kitchen/terraform/version_spec.rb b/spec/lib/kitchen/terraform/version_spec.rb index 4f5929b6..43617b1a 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.1" + ::Gem::Version.new "7.0.2" 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 eb4904fe..d41a1930 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.1" + expect(described_class.instance_variable_get(:@plugin_version)).to eq "7.0.2" end end