chef-config 17.6.18 → 17.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9f805dc17067907307b97b0d431a28168a071498ee6bd09181f55cf4c863f3
-  data.tar.gz: 9010e52a7f281e6defa72dd1c537f9adccdc0b947e7a9b23723a76f99708bc6e
+  metadata.gz: e5ed8b08f30c0832843cb6f65184e754df43412175f7e8e8791b832a1789d776
+  data.tar.gz: f03dfe4de2076250ea235da89ab661464063fa5d435788f2e02d382184381f48
 SHA512:
-  metadata.gz: 66f24661fca63bd746ead9587415e02fb856b4a643724f384e45752c814ca135309c28a66c2aa50a98cbbc8927f4877d98b899b527b05c4e994cb18d46cd0e42
-  data.tar.gz: 6a92eb34046432e35e6c419623479e72f61d64e410f4d93df7cbf86610c1ddc5d18d308d5dce0672134ccf87b15cbff1f154a465f554acf7492737803f113529
+  metadata.gz: 912db29f2ccbbe90ec3e9169ea20ada94ffe0a70816af4afeafba4e4c152a4344417ee0afe853cd440dd0932cc5542cfabc55a5b22dccaf87c40bd8311965647
+  data.tar.gz: 21ee47419e5b8e554bcfb513e967b05a2a0d380b893f80c3209a72f76c36d550edee178d500b99d14a8b59c990e82d47492a97cfcc6b484147f49cdf46ffb30e

data/lib/chef-config/fips.rb

@@ -39,7 +39,7 @@ module ChefConfig
           Win32::Registry::KEY_READ
         end
       begin
-        Win32::Registry::HKEY_LOCAL_MACHINE.open('System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy', reg_type) do |policy|
+        Win32::Registry::HKEY_LOCAL_MACHINE.open("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy", reg_type) do |policy|
           policy["Enabled"] != 0
         end
       rescue Win32::Registry::Error

data/lib/chef-config/mixin/train_transport.rb

@@ -108,12 +108,14 @@ module ChefConfig
 
         # Load the target_mode config context from config, and place any valid settings into the train configuration
         tm_config = config.target_mode
-        protocol = tm_config.protocol
-        train_config = tm_config.to_hash.select { |k| Train.options(protocol).key?(k) }
-        logger.trace("Using target mode options from #{ChefUtils::Dist::Infra::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config
 
         # Load the credentials file, and place any valid settings into the train configuration
         credentials = load_credentials(tm_config.host)
+
+        protocol = credentials[:transport_protocol] || tm_config.protocol
+        train_config = tm_config.to_hash.select { |k| Train.options(protocol).key?(k) }
+        logger.trace("Using target mode options from #{ChefUtils::Dist::Infra::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config
+
         if credentials
           valid_settings = credentials.select { |k| Train.options(protocol).key?(k) }
           valid_settings[:enable_password] = credentials[:enable_password] if credentials.key?(:enable_password)
@@ -126,7 +128,7 @@ module ChefConfig
         # Train handles connection retries for us
         Train.create(protocol, train_config)
       rescue SocketError => e # likely a dns failure, not caught by train
-        e.message.replace "Error connecting to #{train_config[:target]} - #{e.message}"
+        e.message.replace "Error connecting to #{train_config[:target]} via #{protocol} - #{e.message}"
         raise e
       rescue Train::PluginLoadError
         logger.error("Invalid target mode protocol: #{protocol}")

data/lib/chef-config/path_helper.rb

@@ -335,7 +335,7 @@ module ChefConfig
       line.scan(/\s*(?>([^\s\\"]+|"([^"]*)"|'([^']*)')|(\S))(\s|\z)?/m) do |word, within_dq, within_sq, esc, sep|
 
         # Append the string with Word & Escape Character
-        field << (word || esc.gsub(/\\(.)/, '\\1'))
+        field << (word || esc.gsub(/\\(.)/, "\\1"))
 
         # Re-build the field when any whitespace character or
         # End of string is encountered

data/lib/chef-config/version.rb

@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
-  VERSION = "17.6.18".freeze
+  VERSION = "17.7.22".freeze
 end

data/spec/unit/fips_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe "ChefConfig.fips?" do
   end
 
   context "on windows", :windows_only do
-    let(:fips_key) { 'System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy' }
+    let(:fips_key) { "System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy" }
     let(:win_reg_entry) { { "Enabled" => enabled } }
 
     before(:each) do

data/spec/unit/path_helper_spec.rb

@@ -62,31 +62,31 @@ RSpec.describe ChefConfig::PathHelper do
       context "platform-specific #join behavior" do
         it "joins components on Windows when some end with unix separators" do
           expected = "C:\\foo\\bar\\baz"
-          expect(path_helper.join('C:\\foo/', "bar", "baz", windows: true)).to eq(expected)
+          expect(path_helper.join("C:\\foo/", "bar", "baz", windows: true)).to eq(expected)
         end
 
         it "joins components when some end with separators" do
           expected = "C:\\foo\\bar\\baz"
-          expect(path_helper.join('C:\\foo\\', "bar", "baz", windows: true)).to eq(expected)
+          expect(path_helper.join("C:\\foo\\", "bar", "baz", windows: true)).to eq(expected)
         end
 
         it "joins components when some end and start with separators" do
           expected = "C:\\foo\\bar\\baz"
-          expect(path_helper.join('C:\\foo\\', "bar/", "/baz", windows: true)).to eq(expected)
+          expect(path_helper.join("C:\\foo\\", "bar/", "/baz", windows: true)).to eq(expected)
         end
 
         it "joins components that don't end in separators" do
           expected = "C:\\foo\\bar\\baz"
-          expect(path_helper.join('C:\\foo', "bar", "baz", windows: true)).to eq(expected)
+          expect(path_helper.join("C:\\foo", "bar", "baz", windows: true)).to eq(expected)
         end
       end
 
       it "cleanpath changes slashes into backslashes and leaves backslashes alone" do
-        expect(path_helper.cleanpath('/a/b\\c/d/', windows: true)).to eq('\\a\\b\\c\\d')
+        expect(path_helper.cleanpath("/a/b\\c/d/", windows: true)).to eq("\\a\\b\\c\\d")
       end
 
       it "cleanpath does not remove leading double backslash" do
-        expect(path_helper.cleanpath('\\\\a/b\\c/d/', windows: true)).to eq('\\\\a\\b\\c\\d')
+        expect(path_helper.cleanpath("\\\\a/b\\c/d/", windows: true)).to eq("\\\\a\\b\\c\\d")
       end
     end
 
@@ -117,11 +117,11 @@ RSpec.describe ChefConfig::PathHelper do
       end
 
       it "cleanpath changes backslashes into slashes and leaves slashes alone" do
-        expect(path_helper.cleanpath('/a/b\\c/d/', windows: false)).to eq("/a/b/c/d")
+        expect(path_helper.cleanpath("/a/b\\c/d/", windows: false)).to eq("/a/b/c/d")
       end
 
       it "cleanpath does not remove leading double backslash" do
-        expect(path_helper.cleanpath('\\\\a/b\\c/d/', windows: false)).to eq("//a/b/c/d")
+        expect(path_helper.cleanpath("\\\\a/b\\c/d/", windows: false)).to eq("//a/b/c/d")
       end
     end
   end
@@ -139,31 +139,31 @@ RSpec.describe ChefConfig::PathHelper do
     context "platform-specific #join behavior" do
       it "joins components on Windows when some end with unix separators" do
         expected = "C:\\foo\\bar\\baz"
-        expect(path_helper.join('C:\\foo/', "bar", "baz")).to eq(expected)
+        expect(path_helper.join("C:\\foo/", "bar", "baz")).to eq(expected)
       end
 
       it "joins components when some end with separators" do
         expected = "C:\\foo\\bar\\baz"
-        expect(path_helper.join('C:\\foo\\', "bar", "baz")).to eq(expected)
+        expect(path_helper.join("C:\\foo\\", "bar", "baz")).to eq(expected)
       end
 
       it "joins components when some end and start with separators" do
         expected = "C:\\foo\\bar\\baz"
-        expect(path_helper.join('C:\\foo\\', "bar/", "/baz")).to eq(expected)
+        expect(path_helper.join("C:\\foo\\", "bar/", "/baz")).to eq(expected)
       end
 
       it "joins components that don't end in separators" do
         expected = "C:\\foo\\bar\\baz"
-        expect(path_helper.join('C:\\foo', "bar", "baz")).to eq(expected)
+        expect(path_helper.join("C:\\foo", "bar", "baz")).to eq(expected)
       end
     end
 
     it "cleanpath changes slashes into backslashes and leaves backslashes alone" do
-      expect(path_helper.cleanpath('/a/b\\c/d/')).to eq('\\a\\b\\c\\d')
+      expect(path_helper.cleanpath("/a/b\\c/d/")).to eq("\\a\\b\\c\\d")
     end
 
     it "cleanpath does not remove leading double backslash" do
-      expect(path_helper.cleanpath('\\\\a/b\\c/d/')).to eq('\\\\a\\b\\c\\d')
+      expect(path_helper.cleanpath("\\\\a/b\\c/d/")).to eq("\\\\a\\b\\c\\d")
     end
   end
 
@@ -198,12 +198,12 @@ RSpec.describe ChefConfig::PathHelper do
     end
 
     it "cleanpath changes backslashes into slashes and leaves slashes alone" do
-      expect(path_helper.cleanpath('/a/b\\c/d/', windows: false)).to eq("/a/b/c/d")
+      expect(path_helper.cleanpath("/a/b\\c/d/", windows: false)).to eq("/a/b/c/d")
     end
 
     # NOTE: this seems a bit weird to me, but this is just the way Pathname#cleanpath works
     it "cleanpath does not remove leading double backslash" do
-      expect(path_helper.cleanpath('\\\\a/b\\c/d/')).to eq("//a/b/c/d")
+      expect(path_helper.cleanpath("\\\\a/b\\c/d/")).to eq("//a/b/c/d")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 17.6.18
+  version: 17.7.22
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.6.18
+        version: 17.7.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.6.18
+        version: 17.7.22
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement