chef 16.4.41-universal-mingw32 → 16.8.9-universal-mingw32

data/spec/integration/client/exit_code_spec.rb

@@ -5,13 +5,14 @@ require "chef/mixin/shell_out"
 require "tiny_server"
 require "tmpdir"
 require "chef/platform"
+require "chef-utils/dist"
 
 describe "chef-client" do
 
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+  let(:chef_dir) { File.join(__dir__, "..", "..", "..", "bin") }
 
   # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
   # following constraints are satisfied:
@@ -22,7 +23,7 @@ describe "chef-client" do
   # machine that has omnibus chef installed. In that case we need to ensure
   # we're running `chef-client` from the source tree and not the external one.
   # cf. CHEF-4914
-  let(:chef_client) { "bundle exec #{Chef::Dist::CLIENT} --no-fork --minimal-ohai" }
+  let(:chef_client) { "bundle exec #{ChefUtils::Dist::Infra::CLIENT} --no-fork --minimal-ohai" }
 
   let(:critical_env_vars) { %w{PATH RUBYOPT BUNDLE_GEMFILE GEM_PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") }
 

data/spec/integration/client/ipv6_spec.rb

@@ -74,7 +74,7 @@ describe "chef-client" do
     basic_config_file
   end
 
-  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+  let(:chef_dir) { File.join(__dir__, "..", "..", "..", "bin") }
 
   let(:chef_client_cmd) { %Q{bundle exec chef-client --minimal-ohai -c "#{path_to("config/client.rb")}" -lwarn} }
 

data/spec/integration/compliance/compliance_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+require "support/shared/integration/integration_helper"
+require "chef/mixin/shell_out"
+require "chef-utils/dist"
+
+describe "chef-client with audit mode" do
+
+  include IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  let(:chef_dir) { File.join(__dir__, "..", "..", "..", "bin") }
+
+  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
+  # following constraints are satisfied:
+  # * Windows: windows can only run batch scripts as bare executables. Rubygems
+  # creates batch wrappers for installed gems, but we don't have batch wrappers
+  # in the source tree.
+  # * Other `chef-client` in PATH: A common case is running the tests on a
+  # machine that has omnibus chef installed. In that case we need to ensure
+  # we're running `chef-client` from the source tree and not the external one.
+  # cf. CHEF-4914
+  let(:chef_client) { "bundle exec #{ChefUtils::Dist::Infra::CLIENT} --minimal-ohai" }
+
+  when_the_repository "has a custom profile" do
+    let(:report_file) { path_to("report_file.json") }
+
+    before do
+      directory "profiles/my-profile" do
+        file "inspec.yml", <<~FILE
+          ---
+          name: my-profile
+        FILE
+
+        directory "controls" do
+          file "my_control.rb", <<~FILE
+            control "my control" do
+              describe Dir.home do
+                it { should be_kind_of String }
+              end
+            end
+          FILE
+        end
+      end
+
+      file "attributes.json", <<~FILE
+        {
+          "audit": {
+            "json_file": {
+              "location": "#{report_file}"
+            },
+            "profiles": {
+              "my-profile": {
+                "path": "#{path_to("profiles/my-profile")}"
+              }
+            }
+          }
+        }
+      FILE
+    end
+
+    it "should complete with success" do
+      result = shell_out!("#{chef_client} --local-mode --json-attributes #{path_to("attributes.json")}", cwd: chef_dir)
+      result.error!
+
+      inspec_report = JSON.parse(File.read(report_file))
+      expect(inspec_report["profiles"].length).to eq(1)
+
+      profile = inspec_report["profiles"].first
+      expect(profile["name"]).to eq("my-profile")
+      expect(profile["controls"].length).to eq(1)
+
+      control = profile["controls"].first
+      expect(control["id"]).to eq("my control")
+      expect(control["results"].length).to eq(1)
+
+      result = control["results"].first
+      expect(result["status"]).to eq("passed")
+    end
+  end
+end

data/spec/integration/knife/client_key_create_spec.rb

@@ -39,7 +39,7 @@ describe "knife client key create", :workstation do
     it "creates a new client key with an expiration date" do
       date = "2017-12-31T23:59:59Z"
       knife("client key create -k new -e #{date} bah").should_succeed stderr: /^#{out}/, stdout: /.*BEGIN RSA PRIVATE KEY/
-      knife("client key show bah new").should_succeed /expiration_date:.*#{date}/
+      knife("client key show bah new").should_succeed(/expiration_date:.*#{date}/)
     end
 
     it "refuses to add an already existing key" do

data/spec/integration/knife/{config_list_profiles_spec.rb → config_list_spec.rb}

@@ -17,7 +17,7 @@ require "spec_helper"
 require "support/shared/integration/integration_helper"
 require "support/shared/context/config"
 
-describe "knife config list-profiles", :workstation do
+describe "knife config list", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
@@ -25,14 +25,14 @@ describe "knife config list-profiles", :workstation do
 
   when_the_repository("has a custom env") do
     let(:cmd_args) { [] }
-    let(:knife_list_profiles) do
-      knife("config", "list-profiles", *cmd_args, instance_filter: lambda { |instance|
+    let(:knife_list) do
+      knife("config", "list", *cmd_args, instance_filter: lambda { |instance|
         # Fake the failsafe check because this command doesn't actually process knife.rb.
         $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
         allow(File).to receive(:file?).and_call_original
       })
     end
-    subject { knife_list_profiles.stdout }
+    subject { knife_list.stdout }
 
     around do |ex|
       # Store and reset the value of some env vars.
@@ -40,7 +40,7 @@ describe "knife config list-profiles", :workstation do
       old_wd = Dir.pwd
       # Clear these out because they are cached permanently.
       ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-      Chef::Knife::ConfigListProfiles.reset_config_loader!
+      Chef::Knife::ConfigList.reset_config_loader!
       begin
         ex.run
       ensure
@@ -57,6 +57,7 @@ describe "knife config list-profiles", :workstation do
       Dir.chdir(path_to("repo"))
       ENV[ChefUtils.windows? ? "CD" : "PWD"] = Dir.pwd
       ENV["HOME"] = path_to(".")
+      allow(TTY::Screen).to receive(:width).and_return(200)
     end
 
     # NOTE: The funky formatting with # at the end of the line of some of the
@@ -64,13 +65,13 @@ describe "knife config list-profiles", :workstation do
     # substantial trailing whitespace in most cases which many editors "helpfully" remove.
 
     context "with no credentials file" do
-      subject { knife_list_profiles.stderr }
+      subject { knife_list.stderr }
       it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
 
     context "with an empty credentials file" do
       before { file(".chef/credentials", "") }
-      subject { knife_list_profiles.stderr }
+      subject { knife_list.stderr }
       it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
 
@@ -82,9 +83,9 @@ describe "knife config list-profiles", :workstation do
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
       it { is_expected.to eq <<~EOH.delete("#") }
-         Profile  Client    Key                  Server                                   #
-        ----------------------------------------------------------------------------------#
-        *default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg#
+         Profile  Client    Key                  Server                                    #
+        --------------------------------------------------------------------------------#
+        *default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg #
       EOH
     end
 
@@ -106,11 +107,11 @@ describe "knife config list-profiles", :workstation do
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
       it { is_expected.to eq <<~EOH.delete("#") }
-         Profile  Client    Key                  Server                                   #
-        ----------------------------------------------------------------------------------#
-        *default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg#
-         prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod   #
-         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg#
+         Profile  Client    Key                  Server                                    #
+        --------------------------------------------------------------------------------#
+        *default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg #
+         prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod    #
+         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg #
       EOH
     end
 
@@ -133,11 +134,11 @@ describe "knife config list-profiles", :workstation do
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
       it { is_expected.to eq <<~EOH.delete("#") }
-         Profile  Client    Key                  Server                                   #
-        ----------------------------------------------------------------------------------#
-         default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg#
-        *prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod   #
-         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg#
+         Profile  Client    Key                  Server                                    #
+        --------------------------------------------------------------------------------#
+         default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg #
+        *prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod    #
+         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg #
       EOH
     end
 
@@ -160,11 +161,11 @@ describe "knife config list-profiles", :workstation do
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
       it { is_expected.to eq <<~EOH.delete("#") }
-         Profile  Client    Key                  Server                                   #
-         ---------------------------------------------------------------------------------#
-         default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg#
-         prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod   #
-         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg#
+         Profile  Client    Key                  Server                                    #
+        --------------------------------------------------------------------------------#
+         default  testuser  ~/.chef/testkey.pem  https://example.com/organizations/testorg #
+         prod     testuser  ~/.chef/testkey.pem  https://example.com/organizations/prod    #
+         qa       qauser    ~/src/qauser.pem     https://example.com/organizations/testorg #
       EOH
     end
 
@@ -173,7 +174,7 @@ describe "knife config list-profiles", :workstation do
         [default]
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
-      it { is_expected.to match %r{^*default .*? https://example.com/organizations/testorg$} }
+      it { is_expected.to match %r{^*default .*? https://example.com/organizations/testorg} }
     end
 
     context "with -i" do
@@ -183,9 +184,9 @@ describe "knife config list-profiles", :workstation do
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
       it { is_expected.to eq <<~EOH.delete("#") }
-         Profile  Client  Key  Server                                   #
-        ----------------------------------------------------------------#
-        *default               https://example.com/organizations/testorg#
+         Profile  Client  Key  Server                                    #
+        --------------------------------------------------------------#
+        *default               https://example.com/organizations/testorg #
       EOH
     end
 

data/spec/integration/knife/{config_get_spec.rb → config_show_spec.rb}

@@ -17,7 +17,7 @@ require "spec_helper"
 require "support/shared/integration/integration_helper"
 require "support/shared/context/config"
 
-describe "knife config get", :workstation do
+describe "knife config show", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
@@ -27,7 +27,7 @@ describe "knife config get", :workstation do
 
   when_the_repository("has a custom env") do
     subject do
-      cmd = knife("config", "get", *cmd_args, instance_filter: lambda { |instance|
+      cmd = knife("config", "show", *cmd_args, instance_filter: lambda { |instance|
         # Clear the stub set up in KnifeSupport.
         allow(File).to receive(:file?).and_call_original
         # Lies, damn lies, and config files. We need to allow normal config loading
@@ -47,7 +47,7 @@ describe "knife config get", :workstation do
       ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
       # Clear these out because they are cached permanently.
       ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-      Chef::Knife::ConfigGet.reset_config_loader!
+      Chef::Knife::ConfigShow.reset_config_loader!
       begin
         ex.run
       ensure

data/spec/integration/knife/{config_use_profile_spec.rb → config_use_spec.rb}

@@ -17,7 +17,7 @@ require "spec_helper"
 require "support/shared/integration/integration_helper"
 require "support/shared/context/config"
 
-describe "knife config use-profile", :workstation do
+describe "knife config use", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
@@ -26,15 +26,15 @@ describe "knife config use-profile", :workstation do
   let(:cmd_args) { [] }
 
   when_the_repository("has a custom env") do
-    let(:knife_use_profile) do
-      knife("config", "use-profile", *cmd_args, instance_filter: lambda { |instance|
+    let(:knife_use) do
+      knife("config", "use", *cmd_args, instance_filter: lambda { |instance|
         # Fake the failsafe check because this command doesn't actually process knife.rb.
         $__KNIFE_INTEGRATION_FAILSAFE_CHECK << " ole"
         allow(File).to receive(:file?).and_call_original
       })
     end
 
-    subject { knife_use_profile.stdout }
+    subject { knife_use.stdout }
 
     around do |ex|
       # Store and reset the value of some env vars.
@@ -45,7 +45,7 @@ describe "knife config use-profile", :workstation do
       ChefConfig::PathHelper.per_tool_home_environment = "KNIFE_HOME"
       # Clear these out because they are cached permanently.
       ChefConfig::PathHelper.class_exec { remove_class_variable(:@@home_dir) }
-      Chef::Knife::ConfigUseProfile.reset_config_loader!
+      Chef::Knife::ConfigUse.reset_config_loader!
       begin
         ex.run
       ensure
@@ -68,8 +68,51 @@ describe "knife config use-profile", :workstation do
     end
 
     context "with no argument" do
-      subject { knife_use_profile.stderr }
-      it { is_expected.to eq "FATAL: You must specify a profile\n" }
+      context "with no configuration" do
+        it { is_expected.to eq "default\n" }
+      end
+
+      context "with --profile" do
+        let(:cmd_args) { %w{--profile production} }
+        it { is_expected.to eq "production\n" }
+      end
+
+      context "with an environment variable" do
+        around do |ex|
+          old_chef_profile = ENV["CHEF_PROFILE"]
+          begin
+            ENV["CHEF_PROFILE"] = "staging"
+            ex.run
+          ensure
+            ENV["CHEF_PROFILE"] = old_chef_profile
+          end
+        end
+
+        it { is_expected.to eq "staging\n" }
+      end
+
+      context "with a context file" do
+        before { file(".chef/context", "development\n") }
+        it { is_expected.to eq "development\n" }
+      end
+
+      context "with a context file under $CHEF_HOME" do
+        before do
+          file("chefhome/.chef/context", "other\n")
+          ENV["CHEF_HOME"] = path_to("chefhome")
+        end
+
+        it { is_expected.to eq "other\n" }
+      end
+
+      context "with a context file under $KNIFE_HOME" do
+        before do
+          file("knifehome/.chef/context", "other\n")
+          ENV["KNIFE_HOME"] = path_to("knifehome")
+        end
+
+        it { is_expected.to eq "other\n" }
+      end
     end
 
     context "with an argument" do
@@ -88,14 +131,14 @@ describe "knife config use-profile", :workstation do
 
     context "with no credentials file" do
       let(:cmd_args) { %w{production} }
-      subject { knife_use_profile.stderr }
+      subject { knife_use.stderr }
       it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
 
     context "with an empty credentials file" do
       let(:cmd_args) { %w{production} }
       before { file(".chef/credentials", "") }
-      subject { knife_use_profile.stderr }
+      subject { knife_use.stderr }
       it { is_expected.to eq "FATAL: No profiles found, #{path_to(".chef/credentials")} does not exist or is empty\n" }
     end
 
@@ -107,7 +150,7 @@ describe "knife config use-profile", :workstation do
         client_key = "testkey.pem"
         chef_server_url = "https://example.com/organizations/testorg"
       EOH
-      subject { knife_use_profile }
+      subject { knife_use }
       it { expect { subject }.to raise_error ChefConfig::ConfigurationError, "Profile staging doesn't exist. Please add it to #{path_to(".chef/credentials")} and if it is profile with DNS name check that you are not missing single quotes around it as per docs https://docs.chef.io/workstation/knife_setup/#knife-profiles." }
     end
 

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -62,7 +62,7 @@ describe "Knife cookbook API integration with IPv6", :workstation, :not_supporte
       Dir.mktmpdir
     end
 
-    let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+    let(:chef_dir) { File.join(__dir__, "..", "..", "..", "bin") }
     let(:knife) { "ruby '#{chef_dir}/knife'" }
 
     let(:knife_config_flag) { "-c '#{path_to("config/knife.rb")}'" }

data/spec/integration/knife/node_create_spec.rb

@@ -34,7 +34,7 @@ describe "knife node create", :workstation do
 
     it "creates a new validator node" do
       knife("node create bah").should_succeed out
-      knife("node show bah").should_succeed /Node Name:   bah/
+      knife("node show bah").should_succeed(/Node Name:   bah/)
     end
 
     it "refuses to add an existing node" do

data/spec/integration/knife/node_environment_set_spec.rb

@@ -31,7 +31,7 @@ describe "knife node environment set", :workstation do
     end
 
     it "sets an environment on a node" do
-      knife("node environment set cons lisp").should_succeed /chef_environment:.*lisp/
+      knife("node environment set cons lisp").should_succeed(/chef_environment:.*lisp/)
       knife("node show cons -a chef_environment").should_succeed <<~EOM
         cons:
           chef_environment: lisp

data/spec/integration/knife/node_run_list_add_spec.rb

@@ -30,7 +30,7 @@ describe "knife node run list add", :workstation do
     end
 
     it "sets the run list" do
-      knife("node run list add cons recipe[foo]").should_succeed /run_list:\s*recipe\[foo\]\n/
+      knife("node run list add cons recipe[foo]").should_succeed(/run_list:\s*recipe\[foo\]\n/)
     end
   end
 
@@ -40,15 +40,15 @@ describe "knife node run list add", :workstation do
     end
 
     it "appends to the run list" do
-      knife("node run list add cons recipe[foo]").should_succeed /run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m
+      knife("node run list add cons recipe[foo]").should_succeed(/run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m)
     end
 
     it "adds to the run list before the specified item" do
-      knife("node run list add cons -b recipe[bar] recipe[foo]").should_succeed /run_list:\n\s*recipe\[foo\]\n\s*recipe\[bar\]\n/m
+      knife("node run list add cons -b recipe[bar] recipe[foo]").should_succeed(/run_list:\n\s*recipe\[foo\]\n\s*recipe\[bar\]\n/m)
     end
 
     it "adds to the run list after the specified item" do
-      knife("node run list add cons -a recipe[bar] recipe[foo]").should_succeed /run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m
+      knife("node run list add cons -a recipe[bar] recipe[foo]").should_succeed(/run_list:\n\s*recipe\[bar\]\n\s*recipe\[foo\]\n/m)
     end
   end
 end