knife 18.2.7 → 18.3.0

data/lib/chef/knife/client_bulk_delete.rb

@@ -1,104 +1,104 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class ClientBulkDelete < Knife
-
-      deps do
-        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
-      end
-
-      option :delete_validators,
-        short: "-D",
-        long: "--delete-validators",
-        description: "Force deletion of clients if they're validators."
-
-      banner "knife client bulk delete REGEX (options)"
-
-      def run
-        if name_args.length < 1
-          ui.fatal("You must supply a regular expression to match the results against")
-          exit 42
-        end
-        all_clients = Chef::ApiClientV1.list(true)
-
-        matcher = /#{name_args[0]}/
-        clients_to_delete = {}
-        validators_to_delete = {}
-        all_clients.each do |name, client|
-          next unless name&.match?(matcher)
-
-          if client.validator
-            validators_to_delete[client.name] = client
-          else
-            clients_to_delete[client.name] = client
-          end
-        end
-
-        if clients_to_delete.empty? && validators_to_delete.empty?
-          ui.info "No clients match the expression /#{name_args[0]}/"
-          exit 0
-        end
-
-        check_and_delete_validators(validators_to_delete)
-        check_and_delete_clients(clients_to_delete)
-      end
-
-      def check_and_delete_validators(validators)
-        unless validators.empty?
-          unless config[:delete_validators]
-            ui.msg("The following clients are validators and will not be deleted:")
-            print_clients(validators)
-            ui.msg("You must specify --delete-validators to delete the validator clients")
-          else
-            ui.msg("The following validators will be deleted:")
-            print_clients(validators)
-            if ui.confirm_without_exit("Are you sure you want to delete these validators")
-              destroy_clients(validators)
-            end
-          end
-        end
-      end
-
-      def check_and_delete_clients(clients)
-        unless clients.empty?
-          ui.msg("The following clients will be deleted:")
-          print_clients(clients)
-          ui.confirm("Are you sure you want to delete these clients")
-          destroy_clients(clients)
-        end
-      end
-
-      def destroy_clients(clients)
-        clients.sort.each do |name, client|
-          client.destroy
-          ui.msg("Deleted client #{name}")
-        end
-      end
-
-      def print_clients(clients)
-        ui.msg("")
-        ui.msg(ui.list(clients.keys.sort, :columns_down))
-        ui.msg("")
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class ClientBulkDelete < Knife
+
+      deps do
+        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
+      end
+
+      option :delete_validators,
+        short: "-D",
+        long: "--delete-validators",
+        description: "Force deletion of clients if they're validators."
+
+      banner "knife client bulk delete REGEX (options)"
+
+      def run
+        if name_args.length < 1
+          ui.fatal("You must supply a regular expression to match the results against")
+          exit 42
+        end
+        all_clients = Chef::ApiClientV1.list(true)
+
+        matcher = /#{name_args[0]}/
+        clients_to_delete = {}
+        validators_to_delete = {}
+        all_clients.each do |name, client|
+          next unless name&.match?(matcher)
+
+          if client.validator
+            validators_to_delete[client.name] = client
+          else
+            clients_to_delete[client.name] = client
+          end
+        end
+
+        if clients_to_delete.empty? && validators_to_delete.empty?
+          ui.info "No clients match the expression /#{name_args[0]}/"
+          exit 0
+        end
+
+        check_and_delete_validators(validators_to_delete)
+        check_and_delete_clients(clients_to_delete)
+      end
+
+      def check_and_delete_validators(validators)
+        unless validators.empty?
+          unless config[:delete_validators]
+            ui.msg("The following clients are validators and will not be deleted:")
+            print_clients(validators)
+            ui.msg("You must specify --delete-validators to delete the validator clients")
+          else
+            ui.msg("The following validators will be deleted:")
+            print_clients(validators)
+            if ui.confirm_without_exit("Are you sure you want to delete these validators")
+              destroy_clients(validators)
+            end
+          end
+        end
+      end
+
+      def check_and_delete_clients(clients)
+        unless clients.empty?
+          ui.msg("The following clients will be deleted:")
+          print_clients(clients)
+          ui.confirm("Are you sure you want to delete these clients")
+          destroy_clients(clients)
+        end
+      end
+
+      def destroy_clients(clients)
+        clients.sort.each do |name, client|
+          client.destroy
+          ui.msg("Deleted client #{name}")
+        end
+      end
+
+      def print_clients(clients)
+        ui.msg("")
+        ui.msg(ui.list(clients.keys.sort, :columns_down))
+        ui.msg("")
+      end
+    end
+  end
+end

data/lib/chef/knife/client_create.rb

@@ -1,140 +1,140 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# 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_relative "../knife"
-require "chef-utils/dist" unless defined?(ChefUtils::Dist)
-
-class Chef
-  class Knife
-    class ClientCreate < Knife
-
-      deps do
-        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
-      end
-
-      option :file,
-        short: "-f FILE",
-        long: "--file FILE",
-        description: "Write the private key to a file if the #{ChefUtils::Dist::Server::PRODUCT} generated one."
-
-      option :validator,
-        long: "--validator",
-        description: "Create the client as a validator.",
-        boolean: true
-
-      option :public_key,
-        short: "-p FILE",
-        long: "--public-key",
-        description: "Set the initial default key for the client from a file on disk (cannot pass with --prevent-keygen)."
-
-      option :prevent_keygen,
-        short: "-k",
-        long: "--prevent-keygen",
-        description: "Prevent #{ChefUtils::Dist::Server::PRODUCT} from generating a default key pair for you. Cannot be passed with --public-key.",
-        boolean: true
-
-      banner "knife client create CLIENTNAME (options)"
-
-      def client
-        @client_field ||= Chef::ApiClientV1.new
-      end
-
-      def file
-        config[:file]
-      end
-
-      def create_client(client)
-        # should not be using save :( bad behavior
-        Chef::ApiClientV1.from_hash(client).save
-      end
-
-      def run
-        test_mandatory_field(@name_args[0], "client name")
-        client.name @name_args[0]
-
-        if config[:public_key] && config[:prevent_keygen]
-          show_usage
-          ui.fatal("You cannot pass --public-key and --prevent-keygen")
-          exit 1
-        end
-
-        if !config[:prevent_keygen] && !config[:public_key]
-          client.create_key(true)
-        end
-
-        if config[:validator]
-          client.validator(true)
-        end
-
-        if config[:public_key]
-          client.public_key File.read(File.expand_path(config[:public_key]))
-        end
-
-        file_is_writable!
-
-        output = edit_hash(client)
-        final_client = create_client(output)
-        ui.info("Created #{final_client}")
-
-        # output private_key if one
-        if final_client.private_key
-          if config[:file]
-            File.open(config[:file], "w") do |f|
-              f.print(final_client.private_key)
-            end
-          else
-            puts final_client.private_key
-          end
-        end
-      end
-
-      #
-      # This method is used to verify that the file and it's containing
-      # directory are writable.  This ensures that you don't create the client
-      # and then lose the private key because you weren't able to write it to
-      # disk.
-      #
-      # @return [void]
-      #
-      def file_is_writable!
-        return unless file
-
-        dir = File.dirname(File.expand_path(file))
-        unless File.exist?(dir)
-          ui.fatal "Directory #{dir} does not exist. Please create and retry."
-          exit 1
-        end
-
-        unless File.directory?(dir)
-          ui.fatal "#{dir} exists, but is not a directory. Please update your file path (--file #{file}) or re-create #{dir} as a directory."
-          exit 1
-        end
-
-        unless File.writable?(dir)
-          ui.fatal "Directory #{dir} is not writable. Please check the permissions."
-          exit 1
-        end
-
-        if File.exist?(file) && !File.writable?(file)
-          ui.fatal "File #{file} is not writable. Please check the permissions."
-          exit 1
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# 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_relative "../knife"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
+
+class Chef
+  class Knife
+    class ClientCreate < Knife
+
+      deps do
+        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
+      end
+
+      option :file,
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file if the #{ChefUtils::Dist::Server::PRODUCT} generated one."
+
+      option :validator,
+        long: "--validator",
+        description: "Create the client as a validator.",
+        boolean: true
+
+      option :public_key,
+        short: "-p FILE",
+        long: "--public-key",
+        description: "Set the initial default key for the client from a file on disk (cannot pass with --prevent-keygen)."
+
+      option :prevent_keygen,
+        short: "-k",
+        long: "--prevent-keygen",
+        description: "Prevent #{ChefUtils::Dist::Server::PRODUCT} from generating a default key pair for you. Cannot be passed with --public-key.",
+        boolean: true
+
+      banner "knife client create CLIENTNAME (options)"
+
+      def client
+        @client_field ||= Chef::ApiClientV1.new
+      end
+
+      def file
+        config[:file]
+      end
+
+      def create_client(client)
+        # should not be using save :( bad behavior
+        Chef::ApiClientV1.from_hash(client).save
+      end
+
+      def run
+        test_mandatory_field(@name_args[0], "client name")
+        client.name @name_args[0]
+
+        if config[:public_key] && config[:prevent_keygen]
+          show_usage
+          ui.fatal("You cannot pass --public-key and --prevent-keygen")
+          exit 1
+        end
+
+        if !config[:prevent_keygen] && !config[:public_key]
+          client.create_key(true)
+        end
+
+        if config[:validator]
+          client.validator(true)
+        end
+
+        if config[:public_key]
+          client.public_key File.read(File.expand_path(config[:public_key]))
+        end
+
+        file_is_writable!
+
+        output = edit_hash(client)
+        final_client = create_client(output)
+        ui.info("Created #{final_client}")
+
+        # output private_key if one
+        if final_client.private_key
+          if config[:file]
+            File.open(config[:file], "w") do |f|
+              f.print(final_client.private_key)
+            end
+          else
+            puts final_client.private_key
+          end
+        end
+      end
+
+      #
+      # This method is used to verify that the file and it's containing
+      # directory are writable.  This ensures that you don't create the client
+      # and then lose the private key because you weren't able to write it to
+      # disk.
+      #
+      # @return [void]
+      #
+      def file_is_writable!
+        return unless file
+
+        dir = File.dirname(File.expand_path(file))
+        unless File.exist?(dir)
+          ui.fatal "Directory #{dir} does not exist. Please create and retry."
+          exit 1
+        end
+
+        unless File.directory?(dir)
+          ui.fatal "#{dir} exists, but is not a directory. Please update your file path (--file #{file}) or re-create #{dir} as a directory."
+          exit 1
+        end
+
+        unless File.writable?(dir)
+          ui.fatal "Directory #{dir} is not writable. Please check the permissions."
+          exit 1
+        end
+
+        if File.exist?(file) && !File.writable?(file)
+          ui.fatal "File #{file} is not writable. Please check the permissions."
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/client_delete.rb

@@ -1,62 +1,62 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# 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_relative "../knife"
-
-class Chef
-  class Knife
-    class ClientDelete < Knife
-
-      deps do
-        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
-      end
-
-      option :delete_validators,
-        short: "-D",
-        long: "--delete-validators",
-        description: "Force deletion of client if it's a validator."
-
-      banner "knife client delete [CLIENT [CLIENT]] (options)"
-
-      def run
-        if @name_args.length == 0
-          show_usage
-          ui.fatal("You must specify at least one client name")
-          exit 1
-        end
-
-        @name_args.each do |client_name|
-          delete_client(client_name)
-        end
-      end
-
-      def delete_client(client_name)
-        delete_object(Chef::ApiClientV1, client_name, "client") do
-          object = Chef::ApiClientV1.load(client_name)
-          if object.validator
-            unless config[:delete_validators]
-              ui.fatal("You must specify --delete-validators to delete the validator client #{client_name}")
-              exit 2
-            end
-          end
-          object.destroy
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# 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_relative "../knife"
+
+class Chef
+  class Knife
+    class ClientDelete < Knife
+
+      deps do
+        require "chef/api_client_v1" unless defined?(Chef::ApiClientV1)
+      end
+
+      option :delete_validators,
+        short: "-D",
+        long: "--delete-validators",
+        description: "Force deletion of client if it's a validator."
+
+      banner "knife client delete [CLIENT [CLIENT]] (options)"
+
+      def run
+        if @name_args.length == 0
+          show_usage
+          ui.fatal("You must specify at least one client name")
+          exit 1
+        end
+
+        @name_args.each do |client_name|
+          delete_client(client_name)
+        end
+      end
+
+      def delete_client(client_name)
+        delete_object(Chef::ApiClientV1, client_name, "client") do
+          object = Chef::ApiClientV1.load(client_name)
+          if object.validator
+            unless config[:delete_validators]
+              ui.fatal("You must specify --delete-validators to delete the validator client #{client_name}")
+              exit 2
+            end
+          end
+          object.destroy
+        end
+      end
+    end
+  end
+end