chef-config 17.6.15 → 17.8.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2698d992c2723d0ef823fb493ac6122ce4e1b1a84d894f9a8665843eda27c53
-  data.tar.gz: f965c38b631b145cfd13a192bd3fb394f96417a140c4874905d4bdf4e0314267
+  metadata.gz: 6ef38cbac12b91756af0268a4fb20af473602e7b7ce89c04a6965cf2d6657598
+  data.tar.gz: 5dd4b7f8fd4ed702e4747d9cacff788c5652944b5424f4a251bf337f4a5c9a2b
 SHA512:
-  metadata.gz: cd6d25c4697fd6c9de573d974786c6a68b96bbe583497e55c608621d54e336c682ba6a4bb737132e930d1b8ad2c00b3c743e133354e9cc6a14bef853b4cfe73c
-  data.tar.gz: 7e743937e28c6357fda5e2c9cfd19bc9353b4336428cf630725a9100aa949160665775435ef19f2a9108686f21736ceb6b1cb2aac91c4f3f8b1bbb1e4b8906af
+  metadata.gz: 6e7f2a3eb0a6f1f321a89fd720c316f7a3e71ad889572d5f639167c790926ab1e3456aac6833604ff480169a75a55828489115e683a9f40527f2e7d429afc4d7
+  data.tar.gz: 0f11a96931bbab034e6d288a4f63c20b39eb02e86ced12a72b63cc9d60fa3d4fa8876ea345816b3fccbea64db6e76a9f7718d04e73b3f2aef9c25b59a5d8b6b9

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.15".freeze
+  VERSION = "17.8.25".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.15
+  version: 17.8.25
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-12-01 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.15
+        version: 17.8.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 17.6.15
+        version: 17.8.25
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Chef Infra's default configuration and config loading library