knife 18.2.7 → 18.3.0

data/spec/unit/knife/client_edit_spec.rb

@@ -1,53 +1,53 @@
-#
-# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright 2011-2016, Thomas Bishop
-# 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 "knife_spec_helper"
-require "chef/api_client_v1"
-
-describe Chef::Knife::ClientEdit do
-  before(:each) do
-    @knife = Chef::Knife::ClientEdit.new
-    @knife.name_args = [ "adam" ]
-    @knife.config[:disable_editing] = true
-  end
-
-  describe "run" do
-    let(:data) do
-      {
-        "name" => "adam",
-        "validator" => false,
-        "admin" => false,
-        "chef_type" => "client",
-        "create_key" => true,
-      }
-    end
-
-    it "should edit the client" do
-      allow(Chef::ApiClientV1).to receive(:load).with("adam").and_return(data)
-      expect(@knife).to receive(:edit_hash).with(data).and_return(data)
-      @knife.run
-    end
-
-    it "should print usage and exit when a client name is not provided" do
-      @knife.name_args = []
-      expect(@knife).to receive(:show_usage)
-      expect(@knife.ui).to receive(:fatal)
-      expect { @knife.run }.to raise_error(SystemExit)
-    end
-  end
-end
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright 2011-2016, Thomas Bishop
+# 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 "knife_spec_helper"
+require "chef/api_client_v1"
+
+describe Chef::Knife::ClientEdit do
+  before(:each) do
+    @knife = Chef::Knife::ClientEdit.new
+    @knife.name_args = [ "adam" ]
+    @knife.config[:disable_editing] = true
+  end
+
+  describe "run" do
+    let(:data) do
+      {
+        "name" => "adam",
+        "validator" => false,
+        "admin" => false,
+        "chef_type" => "client",
+        "create_key" => true,
+      }
+    end
+
+    it "should edit the client" do
+      allow(Chef::ApiClientV1).to receive(:load).with("adam").and_return(data)
+      expect(@knife).to receive(:edit_hash).with(data).and_return(data)
+      @knife.run
+    end
+
+    it "should print usage and exit when a client name is not provided" do
+      @knife.name_args = []
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal)
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+  end
+end

data/spec/unit/knife/client_list_spec.rb

@@ -1,34 +1,34 @@
-#
-# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright 2011-2016, Thomas Bishop
-# 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 "knife_spec_helper"
-
-describe Chef::Knife::ClientList do
-  before(:each) do
-    @knife = Chef::Knife::ClientList.new
-    @knife.name_args = [ "adam" ]
-  end
-
-  describe "run" do
-    it "should list the clients" do
-      expect(Chef::ApiClientV1).to receive(:list)
-      expect(@knife).to receive(:format_list_for_display)
-      @knife.run
-    end
-  end
-end
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright 2011-2016, Thomas Bishop
+# 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 "knife_spec_helper"
+
+describe Chef::Knife::ClientList do
+  before(:each) do
+    @knife = Chef::Knife::ClientList.new
+    @knife.name_args = [ "adam" ]
+  end
+
+  describe "run" do
+    it "should list the clients" do
+      expect(Chef::ApiClientV1).to receive(:list)
+      expect(@knife).to receive(:format_list_for_display)
+      @knife.run
+    end
+  end
+end

data/spec/unit/knife/client_reregister_spec.rb

@@ -1,62 +1,62 @@
-#
-# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright 2011-2016, Thomas Bishop
-# 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 "knife_spec_helper"
-
-describe Chef::Knife::ClientReregister do
-  before(:each) do
-    @knife = Chef::Knife::ClientReregister.new
-    @knife.name_args = [ "adam" ]
-    @client_mock = double("client_mock", private_key: "foo_key")
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-  end
-
-  context "when no client name is given on the command line" do
-    before do
-      @knife.name_args = []
-    end
-
-    it "should print usage and exit when a client name is not provided" do
-      expect(@knife).to receive(:show_usage)
-      expect(@knife.ui).to receive(:fatal)
-      expect { @knife.run }.to raise_error(SystemExit)
-    end
-  end
-
-  context "when not configured for file output" do
-    it "reregisters the client and prints the key" do
-      expect(Chef::ApiClientV1).to receive(:reregister).with("adam").and_return(@client_mock)
-      @knife.run
-      expect(@stdout.string).to match( /foo_key/ )
-    end
-  end
-
-  context "when configured for file output" do
-    it "should write the private key to a file" do
-      expect(Chef::ApiClientV1).to receive(:reregister).with("adam").and_return(@client_mock)
-
-      @knife.config[:file] = "/tmp/monkeypants"
-      filehandle = StringIO.new
-      expect(File).to receive(:open).with("/tmp/monkeypants", "w").and_yield(filehandle)
-      @knife.run
-      expect(filehandle.string).to eq("foo_key")
-    end
-  end
-
-end
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright 2011-2016, Thomas Bishop
+# 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 "knife_spec_helper"
+
+describe Chef::Knife::ClientReregister do
+  before(:each) do
+    @knife = Chef::Knife::ClientReregister.new
+    @knife.name_args = [ "adam" ]
+    @client_mock = double("client_mock", private_key: "foo_key")
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+  end
+
+  context "when no client name is given on the command line" do
+    before do
+      @knife.name_args = []
+    end
+
+    it "should print usage and exit when a client name is not provided" do
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal)
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+  end
+
+  context "when not configured for file output" do
+    it "reregisters the client and prints the key" do
+      expect(Chef::ApiClientV1).to receive(:reregister).with("adam").and_return(@client_mock)
+      @knife.run
+      expect(@stdout.string).to match( /foo_key/ )
+    end
+  end
+
+  context "when configured for file output" do
+    it "should write the private key to a file" do
+      expect(Chef::ApiClientV1).to receive(:reregister).with("adam").and_return(@client_mock)
+
+      @knife.config[:file] = "/tmp/monkeypants"
+      filehandle = StringIO.new
+      expect(File).to receive(:open).with("/tmp/monkeypants", "w").and_yield(filehandle)
+      @knife.run
+      expect(filehandle.string).to eq("foo_key")
+    end
+  end
+
+end

data/spec/unit/knife/client_show_spec.rb

@@ -1,52 +1,52 @@
-#
-# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright 2011-2016, Thomas Bishop
-# 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 "knife_spec_helper"
-
-describe Chef::Knife::ClientShow do
-  before(:each) do
-    @knife = Chef::Knife::ClientShow.new
-    @knife.name_args = [ "adam" ]
-    @client_mock = double("client_mock")
-  end
-
-  describe "run" do
-    it "should list the client" do
-      expect(Chef::ApiClientV1).to receive(:load).with("adam").and_return(@client_mock)
-      expect(@knife).to receive(:format_for_display).with(@client_mock)
-      @knife.run
-    end
-
-    it "should pretty print json" do
-      @knife.config[:format] = "json"
-      @stdout = StringIO.new
-      allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-      fake_client_contents = { "foo" => "bar", "baz" => "qux" }
-      expect(Chef::ApiClientV1).to receive(:load).with("adam").and_return(fake_client_contents)
-      @knife.run
-      expect(@stdout.string).to eql("{\n  \"foo\": \"bar\",\n  \"baz\": \"qux\"\n}\n")
-    end
-
-    it "should print usage and exit when a client name is not provided" do
-      @knife.name_args = []
-      expect(@knife).to receive(:show_usage)
-      expect(@knife.ui).to receive(:fatal)
-      expect { @knife.run }.to raise_error(SystemExit)
-    end
-  end
-end
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright 2011-2016, Thomas Bishop
+# 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 "knife_spec_helper"
+
+describe Chef::Knife::ClientShow do
+  before(:each) do
+    @knife = Chef::Knife::ClientShow.new
+    @knife.name_args = [ "adam" ]
+    @client_mock = double("client_mock")
+  end
+
+  describe "run" do
+    it "should list the client" do
+      expect(Chef::ApiClientV1).to receive(:load).with("adam").and_return(@client_mock)
+      expect(@knife).to receive(:format_for_display).with(@client_mock)
+      @knife.run
+    end
+
+    it "should pretty print json" do
+      @knife.config[:format] = "json"
+      @stdout = StringIO.new
+      allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+      fake_client_contents = { "foo" => "bar", "baz" => "qux" }
+      expect(Chef::ApiClientV1).to receive(:load).with("adam").and_return(fake_client_contents)
+      @knife.run
+      expect(@stdout.string).to eql("{\n  \"foo\": \"bar\",\n  \"baz\": \"qux\"\n}\n")
+    end
+
+    it "should print usage and exit when a client name is not provided" do
+      @knife.name_args = []
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal)
+      expect { @knife.run }.to raise_error(SystemExit)
+    end
+  end
+end

data/spec/unit/knife/configure_client_spec.rb

@@ -1,81 +1,81 @@
-#
-# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
-# Copyright:: Copyright 2011-2016, Thomas Bishop
-# 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 "knife_spec_helper"
-
-describe Chef::Knife::ConfigureClient do
-  before do
-    @knife = Chef::Knife::ConfigureClient.new
-    Chef::Config[:chef_server_url] = "https://chef.example.com"
-    Chef::Config[:validation_client_name] = "chef-validator"
-    Chef::Config[:validation_key] = "/etc/chef/validation.pem"
-
-    @stderr = StringIO.new
-    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
-  end
-
-  describe "run" do
-    it "should print usage and exit when a directory is not provided" do
-      expect(@knife).to receive(:show_usage)
-      expect(@knife.ui).to receive(:fatal).with(/must provide the directory/)
-      expect do
-        @knife.run
-      end.to raise_error SystemExit
-    end
-
-    describe "when specifing a directory" do
-      before do
-        @knife.name_args = ["/home/bob/.chef"]
-        @client_file = StringIO.new
-        @validation_file = StringIO.new
-        expect(File).to receive(:open).with("/home/bob/.chef/client.rb", "w")
-          .and_yield(@client_file)
-        expect(File).to receive(:open).with("/home/bob/.chef/validation.pem", "w")
-          .and_yield(@validation_file)
-        expect(IO).to receive(:read).and_return("foo_bar_baz")
-      end
-
-      it "should recursively create the directory" do
-        expect(FileUtils).to receive(:mkdir_p).with("/home/bob/.chef")
-        @knife.run
-      end
-
-      it "should write out the config file" do
-        allow(FileUtils).to receive(:mkdir_p)
-        @knife.run
-        expect(@client_file.string).to match %r{chef_server_url\s+'https\://chef\.example\.com'}
-        expect(@client_file.string).to match(/validation_client_name\s+'chef-validator'/)
-      end
-
-      it "should write out the validation.pem file" do
-        allow(FileUtils).to receive(:mkdir_p)
-        @knife.run
-        expect(@validation_file.string).to match(/foo_bar_baz/)
-      end
-
-      it "should print information on what is being configured" do
-        allow(FileUtils).to receive(:mkdir_p)
-        @knife.run
-        expect(@stderr.string).to match(/creating client configuration/i)
-        expect(@stderr.string).to match(/writing client\.rb/i)
-        expect(@stderr.string).to match(/writing validation\.pem/i)
-      end
-    end
-  end
-
-end
+#
+# Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
+# Copyright:: Copyright 2011-2016, Thomas Bishop
+# 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 "knife_spec_helper"
+
+describe Chef::Knife::ConfigureClient do
+  before do
+    @knife = Chef::Knife::ConfigureClient.new
+    Chef::Config[:chef_server_url] = "https://chef.example.com"
+    Chef::Config[:validation_client_name] = "chef-validator"
+    Chef::Config[:validation_key] = "/etc/chef/validation.pem"
+
+    @stderr = StringIO.new
+    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
+  end
+
+  describe "run" do
+    it "should print usage and exit when a directory is not provided" do
+      expect(@knife).to receive(:show_usage)
+      expect(@knife.ui).to receive(:fatal).with(/must provide the directory/)
+      expect do
+        @knife.run
+      end.to raise_error SystemExit
+    end
+
+    describe "when specifing a directory" do
+      before do
+        @knife.name_args = ["/home/bob/.chef"]
+        @client_file = StringIO.new
+        @validation_file = StringIO.new
+        expect(File).to receive(:open).with("/home/bob/.chef/client.rb", "w")
+          .and_yield(@client_file)
+        expect(File).to receive(:open).with("/home/bob/.chef/validation.pem", "w")
+          .and_yield(@validation_file)
+        expect(IO).to receive(:read).and_return("foo_bar_baz")
+      end
+
+      it "should recursively create the directory" do
+        expect(FileUtils).to receive(:mkdir_p).with("/home/bob/.chef")
+        @knife.run
+      end
+
+      it "should write out the config file" do
+        allow(FileUtils).to receive(:mkdir_p)
+        @knife.run
+        expect(@client_file.string).to match %r{chef_server_url\s+'https\://chef\.example\.com'}
+        expect(@client_file.string).to match(/validation_client_name\s+'chef-validator'/)
+      end
+
+      it "should write out the validation.pem file" do
+        allow(FileUtils).to receive(:mkdir_p)
+        @knife.run
+        expect(@validation_file.string).to match(/foo_bar_baz/)
+      end
+
+      it "should print information on what is being configured" do
+        allow(FileUtils).to receive(:mkdir_p)
+        @knife.run
+        expect(@stderr.string).to match(/creating client configuration/i)
+        expect(@stderr.string).to match(/writing client\.rb/i)
+        expect(@stderr.string).to match(/writing validation\.pem/i)
+      end
+    end
+  end
+
+end