chef 15.3.14 → 15.4.45

data/spec/spec_helper.rb

@@ -141,6 +141,8 @@ RSpec.configure do |config|
   config.filter_run_excluding skip_appveyor: true if ENV["APPVEYOR"]
   config.filter_run_excluding appveyor_only: true unless ENV["APPVEYOR"]
 
+  config.filter_run_excluding skip_buildkite: true if ENV["BUILDKITE"]
+
   config.filter_run_excluding windows_only: true unless windows?
   config.filter_run_excluding not_supported_on_windows: true if windows?
   config.filter_run_excluding not_supported_on_macos: true if mac_osx?

data/spec/unit/formatters/doc_spec.rb

@@ -76,6 +76,24 @@ describe Chef::Formatters::Base do
     expect(formatter.pretty_elapsed_time).to include("10 hours 10 minutes 10 seconds")
   end
 
+  it "shows nothing if total is nil" do
+    res = Chef::Resource::RemoteFile.new("canteloupe")
+    formatter.resource_update_progress(res, 35, nil, 10)
+    expect(out.string).to eq("")
+  end
+
+  it "shows nothing if total is 0" do
+    res = Chef::Resource::RemoteFile.new("canteloupe")
+    formatter.resource_update_progress(res, 35, 0, 10)
+    expect(out.string).to eq("")
+  end
+
+  it "shows nothing if current and total are 0" do
+    res = Chef::Resource::RemoteFile.new("canteloupe")
+    formatter.resource_update_progress(res, 0, 0, 10)
+    expect(out.string).to eq("")
+  end
+
   it "shows the percentage completion of an action" do
     res = Chef::Resource::RemoteFile.new("canteloupe")
     formatter.resource_update_progress(res, 35, 50, 10)

data/spec/unit/knife/bootstrap_spec.rb

@@ -1839,6 +1839,20 @@ describe Chef::Knife::Bootstrap do
         e
       end
 
+      let(:expected_error_password_prompt) do
+        e = Train::ClientError.new
+        reason = :no_ssh_password_or_key_available
+        allow(e).to receive(:reason).and_return(reason)
+        e
+      end
+
+      let(:expected_error_password_prompt_winrm) do
+        e = RuntimeError.new
+        message = "password is a required option"
+        allow(e).to receive(:message).and_return(message)
+        e
+      end
+
       context "and password auth was used" do
         before do
           allow(connection).to receive(:password_auth?).and_return true
@@ -1854,19 +1868,41 @@ describe Chef::Knife::Bootstrap do
         before do
           allow(connection).to receive(:password_auth?).and_return false
           allow(connection).to receive(:user).and_return "testuser"
+          allow(knife).to receive(:connection_protocol).and_return connection_protocol
         end
 
-        it "warns, prompts for password, then reconnects with a password-enabled configuration using the new password" do
-          question_mock = double("question")
-          expect(knife).to receive(:do_connect).and_raise(expected_error)
-          expect(knife.ui).to receive(:warn).with(/Failed to auth.*/)
-          expect(knife.ui).to receive(:ask).and_yield(question_mock).and_return("newpassword")
-          # Ensure that we set echo off to prevent showing password on the screen
-          expect(question_mock).to receive(:echo=).with false
-          expect(knife).to receive(:do_connect) do |opts|
-            expect(opts[:password]).to eq "newpassword"
+        context "when using ssh" do
+          let(:connection_protocol) { "ssh" }
+
+          it "warns, prompts for password, then reconnects with a password-enabled configuration using the new password" do
+            question_mock = double("question")
+            expect(knife).to receive(:do_connect).and_raise(expected_error_password_prompt)
+            expect(knife.ui).to receive(:warn).with(/Failed to auth.*/)
+            expect(knife.ui).to receive(:ask).and_yield(question_mock).and_return("newpassword")
+            # Ensure that we set echo off to prevent showing password on the screen
+            expect(question_mock).to receive(:echo=).with false
+            expect(knife).to receive(:do_connect) do |opts|
+              expect(opts[:password]).to eq "newpassword"
+            end
+            knife.connect!
+          end
+        end
+
+        context "when using winrm" do
+          let(:connection_protocol) { "winrm" }
+
+          it "warns, prompts for password, then reconnects with a password-enabled configuration using the new password for" do
+            question_mock = double("question")
+            expect(knife).to receive(:do_connect).and_raise(expected_error_password_prompt_winrm)
+            expect(knife.ui).to receive(:warn).with(/Failed to auth.*/)
+            expect(knife.ui).to receive(:ask).and_yield(question_mock).and_return("newpassword")
+            # Ensure that we set echo off to prevent showing password on the screen
+            expect(question_mock).to receive(:echo=).with false
+            expect(knife).to receive(:do_connect) do |opts|
+              expect(opts[:password]).to eq "newpassword"
+            end
+            knife.connect!
           end
-          knife.connect!
         end
       end
     end

data/spec/unit/knife/supermarket_list_spec.rb

@@ -0,0 +1,70 @@
+#
+# Author:: Vivek Singh (<vivek.singh@msystechnologies.com>)
+# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/knife/supermarket_list"
+require "spec_helper"
+
+describe Chef::Knife::SupermarketList do
+  let(:knife) { described_class.new }
+  let(:noauth_rest) { double("no auth rest") }
+  let(:stdout) { StringIO.new }
+  let(:cookbooks_data) {
+    [
+    { "cookbook_name" => "1password", "cookbook_maintainer" => "jtimberman", "cookbook_description" => "Installs 1password", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/1password" },
+    { "cookbook_name" => "301", "cookbook_maintainer" => "markhuge", "cookbook_description" => "Installs/Configures 301", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/301" },
+    { "cookbook_name" => "3cx", "cookbook_maintainer" => "obay", "cookbook_description" => "Installs/Configures 3cx", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/3cx" },
+    { "cookbook_name" => "7dtd", "cookbook_maintainer" => "gregf", "cookbook_description" => "Installs/Configures the 7 Days To Die server", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7dtd" },
+    { "cookbook_name" => "7-zip", "cookbook_maintainer" => "sneal", "cookbook_description" => "Installs/Configures the 7-zip file archiver", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/7-zip" },
+  ]
+  }
+
+  let(:response_text) {
+    {
+      "start" => 0,
+      "total" => 5,
+      "items" => cookbooks_data,
+    }
+  }
+
+  describe "run" do
+    before do
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife).to receive(:noauth_rest).and_return(noauth_rest)
+      expect(noauth_rest).to receive(:get).and_return(response_text)
+      knife.configure_chef
+    end
+
+    it "should display all supermarket cookbooks" do
+      knife.run
+      cookbooks_data.each do |item|
+        expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+      end
+    end
+
+    describe "with -w or --with-uri" do
+      it "should display the cookbook uris" do
+        knife.config[:with_uri] = true
+        knife.run
+        cookbooks_data.each do |item|
+          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+          expect(stdout.string).to match /#{item["cookbook"]}\s/
+        end
+      end
+    end
+  end
+end

data/spec/unit/knife/supermarket_search_spec.rb

@@ -0,0 +1,85 @@
+#
+# Author:: Vivek Singh (<vivek.singh@msystechnologies.com>)
+# Copyright:: Copyright 2018-2019, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/knife/supermarket_search"
+require "spec_helper"
+
+describe Chef::Knife::SupermarketSearch do
+  let(:knife) { described_class.new }
+  let(:noauth_rest) { double("no auth rest") }
+  let(:stdout) { StringIO.new }
+  let(:cookbooks_data) {
+    [
+    { "cookbook_name" => "mysql", "cookbook_maintainer" => "sous-chefs", "cookbook_description" => "Provides mysql_service, mysql_config, and mysql_client resources", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/mysql" },
+    { "cookbook_name" => "mw_mysql", "cookbook_maintainer" => "car", "cookbook_description" => "Installs/Configures mw_mysql", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/mw_mysql" },
+    { "cookbook_name" => "L7-mysql", "cookbook_maintainer" => "szelcsanyi", "cookbook_description" => "Installs/Configures MySQL server", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/l7-mysql" },
+    { "cookbook_name" => "mysql-sys", "cookbook_maintainer" => "ovaistariq", "cookbook_description" => "Installs the mysql-sys tool. Description of the tool is available here https://github.com/MarkLeith/mysql-sys", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/mysql-sys" },
+    { "cookbook_name" => "cg_mysql", "cookbook_maintainer" => "phai", "cookbook_description" => "Installs/Configures mysql with master and slave", "cookbook" => "https://supermarket.chef.io/api/v1/cookbooks/cg_mysql" },
+  ]
+  }
+
+  let(:response_text) {
+    {
+      "start" => 0,
+      "total" => 5,
+      "items" => cookbooks_data,
+    }
+  }
+
+  let(:empty_response_text) {
+    {
+      "start" => 0,
+      "total" => 0,
+      "items" => [],
+    }
+  }
+
+  describe "run" do
+    before do
+      allow(knife.ui).to receive(:stdout).and_return(stdout)
+      allow(knife).to receive(:noauth_rest).and_return(noauth_rest)
+      knife.configure_chef
+    end
+
+    context "when name_args is present" do
+      before do
+        expect(noauth_rest).to receive(:get).and_return(response_text)
+      end
+
+      it "should display cookbooks with given name value" do
+        knife.name_args = ["mysql"]
+        knife.run
+        cookbooks_data.each do |item|
+          expect(stdout.string).to match /#{item["cookbook_name"]}\s/
+        end
+      end
+    end
+
+    context "when name_args is empty string" do
+      before do
+        expect(noauth_rest).to receive(:get).and_return(empty_response_text)
+      end
+
+      it "display nothing with name arg empty string" do
+        knife.name_args = [""]
+        knife.run
+        expect(stdout.string).to eq("\n")
+      end
+    end
+  end
+end

data/spec/unit/node/attribute_spec.rb

@@ -1297,4 +1297,26 @@ describe Chef::Node::Attribute do
       expect(@attributes["foo"]).to be nil
     end
   end
+
+  describe "to_json" do
+    it "should convert to a valid json string" do
+      json = @attributes["hot"].to_json
+      expect { JSON.parse(json) }.not_to raise_error
+    end
+
+    it "should convert to a json based on current state" do
+      expect(@attributes["hot"].to_json).to eq("{\"day\":\"sunday\"}")
+    end
+  end
+
+  describe "to_yaml" do
+    it "should convert to a valid yaml format" do
+      json = @attributes["hot"].to_yaml
+      expect { YAML.parse(json) }.not_to raise_error
+    end
+
+    it "should convert to a yaml based on current state" do
+      expect(@attributes["hot"].to_yaml).to eq("---\nday: sunday\n")
+    end
+  end
 end

data/spec/unit/node/immutable_collections_spec.rb

@@ -19,6 +19,64 @@
 require "spec_helper"
 require "chef/node/immutable_collections"
 
+shared_examples_for "ImmutableMash module" do |param|
+  let(:copy) { @immutable_mash.send(param) }
+
+  it "converts an immutable mash to a new mutable hash" do
+    expect(copy).to be_is_a(Hash)
+  end
+
+  it "converts an immutable nested mash to a new mutable hash" do
+    expect(copy["top_level_4"]["level2"]).to be_is_a(Hash)
+  end
+
+  it "converts an immutable nested array to a new mutable array" do
+    expect(copy["top_level_2"]).to be_instance_of(Array)
+  end
+
+  it "should create a mash with the same content" do
+    expect(copy).to eq(@immutable_mash)
+  end
+
+  it "should allow mutation" do
+    expect { copy["m"] = "m" }.not_to raise_error
+  end
+end
+
+shared_examples_for "ImmutableArray module" do |param|
+  let(:copy) { @immutable_nested_array.send(param) }
+
+  it "converts an immutable array to a new mutable array" do
+    expect(copy).to be_instance_of(Array)
+  end
+
+  it "converts an immutable nested array to a new mutable array" do
+    expect(copy[1]).to be_instance_of(Array)
+  end
+
+  it "converts an immutable nested mash to a new mutable hash" do
+    expect(copy[2]).to be_is_a(Hash)
+  end
+
+  it "should create an array with the same content" do
+    expect(copy).to eq(@immutable_nested_array)
+  end
+
+  it "should allow mutation" do
+    expect { copy << "m" }.not_to raise_error
+  end
+end
+
+shared_examples_for "Immutable#to_yaml" do
+  it "converts an immutable array to a new valid YAML mutable string" do
+    expect { YAML.parse(copy) }.not_to raise_error
+  end
+
+  it "should create a YAML string with content" do
+    expect(copy).to eq(parsed_yaml)
+  end
+end
+
 describe Chef::Node::ImmutableMash do
   before do
     @data_in = { "top" => { "second_level" => "some value" },
@@ -67,82 +125,17 @@ describe Chef::Node::ImmutableMash do
     expect(@mash["test2"]).to eql("bar")
   end
 
-  describe "to_hash" do
-    before do
-      @copy = @immutable_mash.to_hash
-    end
-
-    it "converts an immutable mash to a new mutable hash" do
-      expect(@copy).to be_instance_of(Hash)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy["top_level_4"]["level2"]).to be_instance_of(Hash)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy["top_level_2"]).to be_instance_of(Array)
-    end
-
-    it "should create a mash with the same content" do
-      expect(@copy).to eq(@immutable_mash)
-    end
-
-    it "should allow mutation" do
-      expect { @copy["m"] = "m" }.not_to raise_error
+  %w{to_h to_hash dup}.each do |immutable_meth|
+    describe "#{immutable_meth}" do
+      include_examples "ImmutableMash module", description
     end
   end
 
-  describe "dup" do
-    before do
-      @copy = @immutable_mash.dup
-    end
-
-    it "converts an immutable mash to a new mutable hash" do
-      expect(@copy).to be_instance_of(Mash)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy["top_level_4"]["level2"]).to be_instance_of(Mash)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy["top_level_2"]).to be_instance_of(Array)
-    end
-
-    it "should create a mash with the same content" do
-      expect(@copy).to eq(@immutable_mash)
-    end
+  describe "to_yaml" do
+    let(:copy) { @immutable_mash.to_yaml }
+    let(:parsed_yaml) { "---\ntop:\n  second_level: some value\ntop_level_2:\n- array\n- of\n- values\ntop_level_3:\n- hash_array: 1\n  hash_array_b: 2\ntop_level_4:\n  level2:\n    key: value\n" }
 
-    it "should allow mutation" do
-      expect { @copy["m"] = "m" }.not_to raise_error
-    end
-  end
-
-  describe "to_h" do
-    before do
-      @copy = @immutable_mash.to_h
-    end
-
-    it "converts an immutable mash to a new mutable hash" do
-      expect(@copy).to be_instance_of(Hash)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy["top_level_4"]["level2"]).to be_instance_of(Hash)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy["top_level_2"]).to be_instance_of(Array)
-    end
-
-    it "should create a mash with the same content" do
-      expect(@copy).to eq(@immutable_mash)
-    end
-
-    it "should allow mutation" do
-      expect { @copy["m"] = "m" }.not_to raise_error
-    end
+    include_examples "Immutable#to_yaml"
   end
 
   %i{
@@ -240,82 +233,17 @@ describe Chef::Node::ImmutableArray do
     expect(mutable[0]).to eq(:value)
   end
 
-  describe "to_a" do
-    before do
-      @copy = @immutable_nested_array.to_a
-    end
-
-    it "converts an immutable array to a new mutable array" do
-      expect(@copy).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy[1]).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy[2]).to be_instance_of(Hash)
-    end
-
-    it "should create an array with the same content" do
-      expect(@copy).to eq(@immutable_nested_array)
-    end
-
-    it "should allow mutation" do
-      expect { @copy << "m" }.not_to raise_error
+  %w{to_a to_array dup}.each do |immutable_meth|
+    describe "#{immutable_meth}" do
+      include_examples "ImmutableArray module", description
     end
   end
 
-  describe "dup" do
-    before do
-      @copy = @immutable_nested_array.dup
-    end
-
-    it "converts an immutable array to a new mutable array" do
-      expect(@copy).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy[1]).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy[2]).to be_instance_of(Mash)
-    end
-
-    it "should create an array with the same content" do
-      expect(@copy).to eq(@immutable_nested_array)
-    end
-
-    it "should allow mutation" do
-      expect { @copy << "m" }.not_to raise_error
-    end
-  end
+  describe "to_yaml" do
+    let(:copy) { @immutable_nested_array.to_yaml }
+    let(:parsed_yaml) { "---\n- level1\n- - foo\n  - bar\n  - baz\n  - 1\n  - 2\n  - 3\n  - \n  - true\n  - false\n  - - el\n    - 0\n    - \n- m: m\n" }
 
-  describe "to_array" do
-    before do
-      @copy = @immutable_nested_array.to_array
-    end
-
-    it "converts an immutable array to a new mutable array" do
-      expect(@copy).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested array to a new mutable array" do
-      expect(@copy[1]).to be_instance_of(Array)
-    end
-
-    it "converts an immutable nested mash to a new mutable hash" do
-      expect(@copy[2]).to be_instance_of(Hash)
-    end
-
-    it "should create an array with the same content" do
-      expect(@copy).to eq(@immutable_nested_array)
-    end
-
-    it "should allow mutation" do
-      expect { @copy << "m" }.not_to raise_error
-    end
+    include_examples "Immutable#to_yaml"
   end
 
   describe "#[]" do