chef-config 19.2.12 → 19.2.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea55ab8eb7a297d9cb3c659129bf6dec381a9ea0f04642aca950589b8519bcf7
-  data.tar.gz: 6bf7b00213a4ff9f8a0f4b7f249cff6c9963ab5c17fe4cbf0759aa599acba499
+  metadata.gz: ca5fb5fc3d18ac20b341fe25bcf9e8af0a1a90ae0cfd770ceb48a37a781f6dde
+  data.tar.gz: ae0031d5fa88a0043a7a3aa4d1a5a6f3c91d567c0b33be4a4a94dcefccafb5bd
 SHA512:
-  metadata.gz: d3fa388e8d7f0673f5dff57fd123e4e1a0701b6e5b1ee004e6d557b8ea6fcb0c050cc9d9b3fe03904a67642781364600f549d1de4d1cda4fbbd9d623ded3f5e8
-  data.tar.gz: e13531ec7bf469de4f3dfd11a9895ff9cb9d260fc51ef292854352938b9297ddbbe3d634bb1d7d0cdc403ddcce0cba49e3fe3735799a2af13929d6cf29bd9409
+  metadata.gz: 20b103258efcd8180aec43c7d8a61bd777b7a38434655b135d137d517d9d862f18fa494bb6cabf01d554762341d07688a26ad955e905ea32437d2018e5824363
+  data.tar.gz: 4c4e0fed39c55cc995403b101df099257b45523988a1278f1320ffb78f247338aa0bf6dd71fedf513cddcfe41f90b276e2795e9e00c851a41e4148b5430a84cd

data/chef-config.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mixlib-config", ">= 2.2.12", "< 4.0"
   spec.add_dependency "fuzzyurl"
   spec.add_dependency "addressable"
-  spec.add_dependency "tomlrb", "~> 1.2"
+  spec.add_dependency "tomlrb", ">= 1.2", "< 3.0"
   spec.add_dependency "racc"
 
   spec.files = %w{Rakefile LICENSE} + Dir.glob("*.gemspec") +

data/lib/chef-config/config.rb

@@ -484,6 +484,14 @@ module ChefConfig
     # toggle info level log items that can create a lot of output
     default :verbose_logging, true
     default :node_name, nil
+
+    # When target mode is active, these hold the operator's original Chef Server
+    # identity so that API auth uses the admin credentials rather than the
+    # target node name.  Set in Chef::Application::Client#reconfigure before
+    # target_mode.enabled is flipped to true.
+    default :api_client_name, nil
+    default :api_client_key, nil
+
     default :diff_disabled,           false
     default :diff_filesize_threshold, 10000000
     default :diff_output_threshold,   1000000

data/lib/chef-config/version.rb

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

data/spec/unit/config_spec.rb

@@ -26,6 +26,9 @@ RSpec.describe ChefConfig::Config do
 
   before(:each) do
     ChefConfig::Config.reset
+    ChefConfig::Config.instance_variable_set(:@var_chef_dir, nil)
+    ChefConfig::Config.instance_variable_set(:@etc_chef_dir, nil)
+    ChefConfig::Config.instance_variable_set(:@var_root_dir, nil)
 
     # By default, treat deprecation warnings as errors in tests.
     ChefConfig::Config.treat_deprecation_warnings_as_errors(true)
@@ -245,16 +248,18 @@ RSpec.describe ChefConfig::Config do
     end
 
     context "on windows", :windows_only do
-      it "var_chef_dir is C:\\chef" do
-        expect(ChefConfig::Config.var_chef_dir).to eql("C:\\#{dirname}")
+      let(:windows_drive) { ChefConfig::Config.windows_installation_drive || "C:" }
+
+      it "var_chef_dir is on the windows installation drive" do
+        expect(ChefConfig::Config.var_chef_dir).to eql("#{windows_drive}\\#{dirname}")
       end
 
       it "var_root_dir is C:\\" do
         expect(ChefConfig::Config.var_root_dir).to eql("C:\\")
       end
 
-      it "etc_chef_dir is C:\\chef" do
-        expect(ChefConfig::Config.etc_chef_dir).to eql("C:\\#{dirname}")
+      it "etc_chef_dir is on the windows installation drive" do
+        expect(ChefConfig::Config.etc_chef_dir).to eql("#{windows_drive}\\#{dirname}")
       end
     end
 
@@ -273,16 +278,18 @@ RSpec.describe ChefConfig::Config do
     end
 
     context "when forced to windows" do
-      it "var_chef_dir is C:\\chef" do
-        expect(ChefConfig::Config.var_chef_dir(windows: true)).to eql("C:\\#{dirname}")
+      let(:windows_drive) { ChefConfig::Config.windows_installation_drive || "C:" }
+
+      it "var_chef_dir is on the windows installation drive" do
+        expect(ChefConfig::Config.var_chef_dir(windows: true)).to eql("#{windows_drive}\\#{dirname}")
       end
 
       it "var_root_dir is C:\\" do
         expect(ChefConfig::Config.var_root_dir(windows: true)).to eql("C:\\")
       end
 
-      it "etc_chef_dir is C:\\chef" do
-        expect(ChefConfig::Config.etc_chef_dir(windows: true)).to eql("C:\\#{dirname}")
+      it "etc_chef_dir is on the windows installation drive" do
+        expect(ChefConfig::Config.etc_chef_dir(windows: true)).to eql("#{windows_drive}\\#{dirname}")
       end
     end
 
@@ -728,9 +735,9 @@ RSpec.describe ChefConfig::Config do
 
         end
 
-        # On Windows, we'll detect an omnibus build and set this to the
+        # On Windows, we'll detect embedded install and set this to the
         # cacert.pem included in the package, but it's nil if you're on Windows
-        # w/o omnibus (e.g., doing development on Windows, custom build, etc.)
+        # w/o embedded install (e.g., doing development on Windows, custom build, etc.)
         unless is_windows
           it "ChefConfig::Config[:ssl_ca_file] defaults to nil" do
             expect(ChefConfig::Config[:ssl_ca_file]).to be_nil
@@ -860,7 +867,7 @@ RSpec.describe ChefConfig::Config do
           describe "finding the windows embedded dir" do
             let(:default_config_location) { "c:/opscode/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
             let(:alternate_install_location) { "c:/my/alternate/install/place/chef/embedded/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
-            let(:non_omnibus_location) { "c:/my/dev/stuff/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
+            let(:non_package_location) { "c:/my/dev/stuff/lib/ruby/gems/1.9.1/gems/chef-11.6.0/lib/chef/config.rb" }
 
             let(:default_ca_file) { "c:/opscode/chef/embedded/ssl/certs/cacert.pem" }
 
@@ -874,8 +881,8 @@ RSpec.describe ChefConfig::Config do
               expect(ChefConfig::Config.embedded_dir).to eq("c:/my/alternate/install/place/chef/embedded")
             end
 
-            it "doesn't error when not in an omnibus install" do
-              allow(ChefConfig::Config).to receive(:_this_file).and_return(non_omnibus_location)
+            it "doesn't error when not in an package install" do
+              allow(ChefConfig::Config).to receive(:_this_file).and_return(non_package_location)
               expect(ChefConfig::Config.embedded_dir).to be_nil
             end
 

data/spec/unit/workstation_config_loader_spec.rb

@@ -480,11 +480,10 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
             node_name = 'barney'
             client_key = "barney_rubble.pem"
             chef_server_url = "https://api.chef.io/organizations/bedrock"
-            knife = {
-              secret_file = "/home/barney/.chef/encrypted_data_bag_secret.pem"
-            }
+
             [default.knife]
             ssh_user = "knife_ssh_user"
+            secret_file = "/home/barney/.chef/encrypted_data_bag_secret.pem"
           EOH
           content
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-config
 version: !ruby/object:Gem::Version
-  version: 19.2.12
+  version: 19.2.98
 platform: ruby
 authors:
 - Adam Jacob
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.2.12
+        version: 19.2.98
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 19.2.12
+        version: 19.2.98
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -95,16 +95,22 @@ dependencies:
   name: tomlrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement