knife 18.2.7 → 18.3.0

data/spec/integration/client_bulk_delete_spec.rb

@@ -1,131 +1,131 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife client bulk delete", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some clients" do
-    before do
-      client "concat", {}
-      client "cons", {}
-      client "car", {}
-      client "cdr", {}
-      client "cat", {}
-    end
-
-    it "deletes all matching clients" do
-      knife("client bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
-        The following clients will be deleted:
-
-        car  cat
-
-        Are you sure you want to delete these clients? (Y/N) Deleted client car
-        Deleted client cat
-      EOM
-
-      knife("client list").should_succeed <<~EOM
-        cdr
-        chef-validator
-        chef-webui
-        concat
-        cons
-      EOM
-    end
-
-    it "deletes all matching clients when unanchored" do
-      knife("client bulk delete ca.*", input: "Y").should_succeed <<~EOM
-        The following clients will be deleted:
-
-        car     cat     concat
-
-        Are you sure you want to delete these clients? (Y/N) Deleted client car
-        Deleted client cat
-        Deleted client concat
-      EOM
-
-      knife("client list").should_succeed <<~EOM
-        cdr
-        chef-validator
-        chef-webui
-        cons
-      EOM
-    end
-  end
-
-  when_the_chef_server "has a validator client" do
-    before do
-      client "cons", {}
-      client "car", {}
-      client "car-validator", { validator: true }
-      client "cdr", {}
-      client "cat", {}
-    end
-
-    it "refuses to delete a validator normally" do
-      knife("client bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
-        The following clients are validators and will not be deleted:
-
-        car-validator
-
-        You must specify --delete-validators to delete the validator clients
-        The following clients will be deleted:
-
-        car  cat
-
-        Are you sure you want to delete these clients? (Y/N) Deleted client car
-        Deleted client cat
-      EOM
-
-      knife("client list").should_succeed <<~EOM
-        car-validator
-        cdr
-        chef-validator
-        chef-webui
-        cons
-      EOM
-    end
-
-    it "deletes a validator when told to" do
-      knife("client bulk delete ^ca.* -D", input: "Y\nY").should_succeed <<~EOM
-        The following validators will be deleted:
-
-        car-validator
-
-        Are you sure you want to delete these validators? (Y/N) Deleted client car-validator
-        The following clients will be deleted:
-
-        car  cat
-
-        Are you sure you want to delete these clients? (Y/N) Deleted client car
-        Deleted client cat
-      EOM
-
-      knife("client list").should_succeed <<~EOM
-        cdr
-        chef-validator
-        chef-webui
-        cons
-      EOM
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife client bulk delete", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some clients" do
+    before do
+      client "concat", {}
+      client "cons", {}
+      client "car", {}
+      client "cdr", {}
+      client "cat", {}
+    end
+
+    it "deletes all matching clients" do
+      knife("client bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
+        The following clients will be deleted:
+
+        car  cat
+
+        Are you sure you want to delete these clients? (Y/N) Deleted client car
+        Deleted client cat
+      EOM
+
+      knife("client list").should_succeed <<~EOM
+        cdr
+        chef-validator
+        chef-webui
+        concat
+        cons
+      EOM
+    end
+
+    it "deletes all matching clients when unanchored" do
+      knife("client bulk delete ca.*", input: "Y").should_succeed <<~EOM
+        The following clients will be deleted:
+
+        car     cat     concat
+
+        Are you sure you want to delete these clients? (Y/N) Deleted client car
+        Deleted client cat
+        Deleted client concat
+      EOM
+
+      knife("client list").should_succeed <<~EOM
+        cdr
+        chef-validator
+        chef-webui
+        cons
+      EOM
+    end
+  end
+
+  when_the_chef_server "has a validator client" do
+    before do
+      client "cons", {}
+      client "car", {}
+      client "car-validator", { validator: true }
+      client "cdr", {}
+      client "cat", {}
+    end
+
+    it "refuses to delete a validator normally" do
+      knife("client bulk delete ^ca.*", input: "Y").should_succeed <<~EOM
+        The following clients are validators and will not be deleted:
+
+        car-validator
+
+        You must specify --delete-validators to delete the validator clients
+        The following clients will be deleted:
+
+        car  cat
+
+        Are you sure you want to delete these clients? (Y/N) Deleted client car
+        Deleted client cat
+      EOM
+
+      knife("client list").should_succeed <<~EOM
+        car-validator
+        cdr
+        chef-validator
+        chef-webui
+        cons
+      EOM
+    end
+
+    it "deletes a validator when told to" do
+      knife("client bulk delete ^ca.* -D", input: "Y\nY").should_succeed <<~EOM
+        The following validators will be deleted:
+
+        car-validator
+
+        Are you sure you want to delete these validators? (Y/N) Deleted client car-validator
+        The following clients will be deleted:
+
+        car  cat
+
+        Are you sure you want to delete these clients? (Y/N) Deleted client car
+        Deleted client cat
+      EOM
+
+      knife("client list").should_succeed <<~EOM
+        cdr
+        chef-validator
+        chef-webui
+        cons
+      EOM
+    end
+  end
+end

data/spec/integration/client_create_spec.rb

@@ -1,70 +1,70 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-require "openssl"
-
-describe "knife client create", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  let(:out) { "Created client[bah]\n" }
-
-  when_the_chef_server "is empty" do
-    it "creates a new client" do
-      knife("client create -k bah").should_succeed stderr: out
-    end
-
-    it "creates a new validator client" do
-      knife("client create -k --validator bah").should_succeed stderr: out
-      knife("client show bah").should_succeed <<~EOM
-        admin:     false
-        chef_type: client
-        name:      bah
-        validator: true
-      EOM
-    end
-
-    it "refuses to add an existing client" do
-      pending "Knife client create must not blindly overwrite an existing client"
-      knife("client create -k bah").should_succeed stderr: out
-      expect { knife("client create -k bah") }.to raise_error(Net::HTTPClientException)
-    end
-
-    it "saves the private key to a file" do
-      Dir.mktmpdir do |tgt|
-        knife("client create -f #{tgt}/bah.pem bah").should_succeed stderr: out
-        expect(File).to exist("#{tgt}/bah.pem")
-      end
-    end
-
-    it "reads the public key from a file" do
-      Dir.mktmpdir do |tgt|
-        key = OpenSSL::PKey::RSA.generate(1024)
-        File.open("#{tgt}/public.pem", "w") { |pub| pub.write(key.public_key.to_pem) }
-        knife("client create -p #{tgt}/public.pem bah").should_succeed stderr: out
-      end
-    end
-
-    it "refuses to run if conflicting options are passed" do
-      knife("client create -p public.pem --prevent-keygen blah").should_fail stderr: "FATAL: You cannot pass --public-key and --prevent-keygen\n", stdout: /^USAGE.*/
-    end
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+require "openssl"
+
+describe "knife client create", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  let(:out) { "Created client[bah]\n" }
+
+  when_the_chef_server "is empty" do
+    it "creates a new client" do
+      knife("client create -k bah").should_succeed stderr: out
+    end
+
+    it "creates a new validator client" do
+      knife("client create -k --validator bah").should_succeed stderr: out
+      knife("client show bah").should_succeed <<~EOM
+        admin:     false
+        chef_type: client
+        name:      bah
+        validator: true
+      EOM
+    end
+
+    it "refuses to add an existing client" do
+      pending "Knife client create must not blindly overwrite an existing client"
+      knife("client create -k bah").should_succeed stderr: out
+      expect { knife("client create -k bah") }.to raise_error(Net::HTTPClientException)
+    end
+
+    it "saves the private key to a file" do
+      Dir.mktmpdir do |tgt|
+        knife("client create -f #{tgt}/bah.pem bah").should_succeed stderr: out
+        expect(File).to exist("#{tgt}/bah.pem")
+      end
+    end
+
+    it "reads the public key from a file" do
+      Dir.mktmpdir do |tgt|
+        key = OpenSSL::PKey::RSA.generate(1024)
+        File.open("#{tgt}/public.pem", "w") { |pub| pub.write(key.public_key.to_pem) }
+        knife("client create -p #{tgt}/public.pem bah").should_succeed stderr: out
+      end
+    end
+
+    it "refuses to run if conflicting options are passed" do
+      knife("client create -p public.pem --prevent-keygen blah").should_fail stderr: "FATAL: You cannot pass --public-key and --prevent-keygen\n", stdout: /^USAGE.*/
+    end
+  end
+end

data/spec/integration/client_delete_spec.rb

@@ -1,64 +1,64 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-
-describe "knife client delete", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  when_the_chef_server "has some clients" do
-    before do
-      client "cons", {}
-      client "car", {}
-      client "car-validator", { validator: true }
-      client "cdr", {}
-      client "cat", {}
-    end
-
-    it "deletes a client" do
-      knife("client delete car", input: "Y").should_succeed <<~EOM
-        Do you really want to delete car? (Y/N) Deleted client[car]
-      EOM
-
-      knife("client list").should_succeed <<~EOM
-        car-validator
-        cat
-        cdr
-        chef-validator
-        chef-webui
-        cons
-      EOM
-    end
-
-    it "refuses to delete a validator normally" do
-      knife("client delete car-validator", input: "Y").should_fail exit_code: 2, stdout: "Do you really want to delete car-validator? (Y/N) ", stderr: <<~EOM
-        FATAL: You must specify --delete-validators to delete the validator client car-validator
-      EOM
-    end
-
-    it "deletes a validator correctly" do
-      knife("client delete car-validator -D", input: "Y").should_succeed <<~EOM
-        Do you really want to delete car-validator? (Y/N) Deleted client[car-validator]
-      EOM
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+
+describe "knife client delete", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  when_the_chef_server "has some clients" do
+    before do
+      client "cons", {}
+      client "car", {}
+      client "car-validator", { validator: true }
+      client "cdr", {}
+      client "cat", {}
+    end
+
+    it "deletes a client" do
+      knife("client delete car", input: "Y").should_succeed <<~EOM
+        Do you really want to delete car? (Y/N) Deleted client[car]
+      EOM
+
+      knife("client list").should_succeed <<~EOM
+        car-validator
+        cat
+        cdr
+        chef-validator
+        chef-webui
+        cons
+      EOM
+    end
+
+    it "refuses to delete a validator normally" do
+      knife("client delete car-validator", input: "Y").should_fail exit_code: 2, stdout: "Do you really want to delete car-validator? (Y/N) ", stderr: <<~EOM
+        FATAL: You must specify --delete-validators to delete the validator client car-validator
+      EOM
+    end
+
+    it "deletes a validator correctly" do
+      knife("client delete car-validator -D", input: "Y").should_succeed <<~EOM
+        Do you really want to delete car-validator? (Y/N) Deleted client[car-validator]
+      EOM
+    end
+
+  end
+end

data/spec/integration/client_key_create_spec.rb

@@ -1,66 +1,66 @@
-#
-# Copyright:: Copyright (c) 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 "knife_spec_helper"
-require "support/shared/integration/integration_helper"
-require "support/shared/context/config"
-require "openssl"
-
-describe "knife client key create", :workstation do
-  include IntegrationSupport
-  include KnifeSupport
-
-  include_context "default config options"
-
-  let(:out) { "Created key: new" }
-
-  when_the_chef_server "has a client" do
-    before do
-      client "bah", {}
-    end
-
-    it "creates a new client key" do
-      knife("client key create -k new bah").should_succeed stderr: /^#{out}/, stdout: /.*BEGIN RSA PRIVATE KEY/
-    end
-
-    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}/)
-    end
-
-    it "refuses to add an already existing key" do
-      knife("client key create -k new bah")
-      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPClientException)
-    end
-
-    it "saves the private key to a file" do
-      Dir.mktmpdir do |tgt|
-        knife("client key create -f #{tgt}/bah.pem -k new bah").should_succeed stderr: /^#{out}/
-        expect(File).to exist("#{tgt}/bah.pem")
-      end
-    end
-
-    it "reads the public key from a file" do
-      Dir.mktmpdir do |tgt|
-        key = OpenSSL::PKey::RSA.generate(1024)
-        File.open("#{tgt}/public.pem", "w") { |pub| pub.write(key.public_key.to_pem) }
-        knife("client key create -p #{tgt}/public.pem -k new bah").should_succeed stderr: /^#{out}/
-      end
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 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 "knife_spec_helper"
+require "support/shared/integration/integration_helper"
+require "support/shared/context/config"
+require "openssl"
+
+describe "knife client key create", :workstation do
+  include IntegrationSupport
+  include KnifeSupport
+
+  include_context "default config options"
+
+  let(:out) { "Created key: new" }
+
+  when_the_chef_server "has a client" do
+    before do
+      client "bah", {}
+    end
+
+    it "creates a new client key" do
+      knife("client key create -k new bah").should_succeed stderr: /^#{out}/, stdout: /.*BEGIN RSA PRIVATE KEY/
+    end
+
+    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}/)
+    end
+
+    it "refuses to add an already existing key" do
+      knife("client key create -k new bah")
+      expect { knife("client key create -k new bah") }.to raise_error(Net::HTTPClientException)
+    end
+
+    it "saves the private key to a file" do
+      Dir.mktmpdir do |tgt|
+        knife("client key create -f #{tgt}/bah.pem -k new bah").should_succeed stderr: /^#{out}/
+        expect(File).to exist("#{tgt}/bah.pem")
+      end
+    end
+
+    it "reads the public key from a file" do
+      Dir.mktmpdir do |tgt|
+        key = OpenSSL::PKey::RSA.generate(1024)
+        File.open("#{tgt}/public.pem", "w") { |pub| pub.write(key.public_key.to_pem) }
+        knife("client key create -p #{tgt}/public.pem -k new bah").should_succeed stderr: /^#{out}/
+      end
+    end
+
+  end
+end