knife 18.2.7 → 18.3.0

data/lib/chef/knife/key_edit_base.rb

@@ -1,55 +1,55 @@
-#
-# Author:: Tyler Cloke (<tyler@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.
-#
-
-class Chef
-  class Knife
-    # Extendable module that class_eval's common options into UserKeyEdit and ClientKeyEdit
-    #
-    # @author Tyler Cloke
-    module KeyEditBase
-      def self.included(includer)
-        includer.class_eval do
-          option :public_key,
-            short: "-p FILENAME",
-            long: "--public-key FILENAME",
-            description: "Replace the public_key field from a file on disk. If not passed, the public_key field will not change."
-
-          option :create_key,
-            short: "-c",
-            long: "--create-key",
-            description: "Replace the public_key field with a key generated by the server. The private key will be returned."
-
-          option :file,
-            short: "-f FILE",
-            long: "--file FILE",
-            description: "Write the private key to a file, if you requested the server to create one via --create-key."
-
-          option :key_name,
-            short: "-k NAME",
-            long: "--key-name NAME",
-            description: "The new name for your key. Pass if you wish to update the name field of your key."
-
-          option :expiration_date,
-            short: "-e DATE",
-            long: "--expiration-date DATE",
-            description: "Updates the expiration_date field of your key if passed. Pass in ISO 8601 formatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z or infinity. UTC timezone assumed."
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Tyler Cloke (<tyler@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.
+#
+
+class Chef
+  class Knife
+    # Extendable module that class_eval's common options into UserKeyEdit and ClientKeyEdit
+    #
+    # @author Tyler Cloke
+    module KeyEditBase
+      def self.included(includer)
+        includer.class_eval do
+          option :public_key,
+            short: "-p FILENAME",
+            long: "--public-key FILENAME",
+            description: "Replace the public_key field from a file on disk. If not passed, the public_key field will not change."
+
+          option :create_key,
+            short: "-c",
+            long: "--create-key",
+            description: "Replace the public_key field with a key generated by the server. The private key will be returned."
+
+          option :file,
+            short: "-f FILE",
+            long: "--file FILE",
+            description: "Write the private key to a file, if you requested the server to create one via --create-key."
+
+          option :key_name,
+            short: "-k NAME",
+            long: "--key-name NAME",
+            description: "The new name for your key. Pass if you wish to update the name field of your key."
+
+          option :expiration_date,
+            short: "-e DATE",
+            long: "--expiration-date DATE",
+            description: "Updates the expiration_date field of your key if passed. Pass in ISO 8601 formatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z or infinity. UTC timezone assumed."
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/key_list.rb

@@ -1,90 +1,90 @@
-#
-# Author:: Tyler Cloke (<tyler@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 "chef/key" unless defined?(Chef::Key)
-require "chef/json_compat" unless defined?(Chef::JSONCompat)
-require "chef/exceptions" unless defined?(Chef::Exceptions)
-
-class Chef
-  class Knife
-    # Service class for UserKeyList and ClientKeyList, used to list keys.
-    # Implements common functionality of knife [user | org client] key list.
-    #
-    # @author Tyler Cloke
-    #
-    # @attr_accessor [Hash] cli input, see UserKeyList and ClientKeyList for what could populate it
-    class KeyList
-
-      attr_accessor :config
-
-      def initialize(actor, list_method, ui, config)
-        @actor = actor
-        @list_method = list_method
-        @ui = ui
-        @config = config
-      end
-
-      def expired_and_non_expired_msg
-        <<~EOS
-          You cannot pass both --only-expired and --only-non-expired.
-          Please pass one or none.
-        EOS
-      end
-
-      def display_info(string)
-        @ui.output(string)
-      end
-
-      def colorize(string)
-        @ui.color(string, :cyan)
-      end
-
-      def run
-        if @config[:only_expired] && @config[:only_non_expired]
-          raise Chef::Exceptions::KeyCommandInputError, expired_and_non_expired_msg
-        end
-
-        # call proper list function
-        keys = Chef::Key.send(@list_method, @actor)
-        if @config[:with_details]
-          max_length = 0
-          keys.each do |key|
-            key["name"] = key["name"] + ":"
-            max_length = key["name"].length if key["name"].length > max_length
-          end
-          keys.each do |key|
-            next if !key["expired"] && @config[:only_expired]
-            next if key["expired"] && @config[:only_non_expired]
-
-            display = "#{colorize(key["name"].ljust(max_length))} #{key["uri"]}"
-            display = "#{display} (expired)" if key["expired"]
-            display_info(display)
-          end
-        else
-          keys.each do |key|
-            next if !key["expired"] && @config[:only_expired]
-            next if key["expired"] && @config[:only_non_expired]
-
-            display_info(key["name"])
-          end
-        end
-      end
-
-    end
-  end
-end
+#
+# Author:: Tyler Cloke (<tyler@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 "chef/key" unless defined?(Chef::Key)
+require "chef/json_compat" unless defined?(Chef::JSONCompat)
+require "chef/exceptions" unless defined?(Chef::Exceptions)
+
+class Chef
+  class Knife
+    # Service class for UserKeyList and ClientKeyList, used to list keys.
+    # Implements common functionality of knife [user | org client] key list.
+    #
+    # @author Tyler Cloke
+    #
+    # @attr_accessor [Hash] cli input, see UserKeyList and ClientKeyList for what could populate it
+    class KeyList
+
+      attr_accessor :config
+
+      def initialize(actor, list_method, ui, config)
+        @actor = actor
+        @list_method = list_method
+        @ui = ui
+        @config = config
+      end
+
+      def expired_and_non_expired_msg
+        <<~EOS
+          You cannot pass both --only-expired and --only-non-expired.
+          Please pass one or none.
+        EOS
+      end
+
+      def display_info(string)
+        @ui.output(string)
+      end
+
+      def colorize(string)
+        @ui.color(string, :cyan)
+      end
+
+      def run
+        if @config[:only_expired] && @config[:only_non_expired]
+          raise Chef::Exceptions::KeyCommandInputError, expired_and_non_expired_msg
+        end
+
+        # call proper list function
+        keys = Chef::Key.send(@list_method, @actor)
+        if @config[:with_details]
+          max_length = 0
+          keys.each do |key|
+            key["name"] = key["name"] + ":"
+            max_length = key["name"].length if key["name"].length > max_length
+          end
+          keys.each do |key|
+            next if !key["expired"] && @config[:only_expired]
+            next if key["expired"] && @config[:only_non_expired]
+
+            display = "#{colorize(key["name"].ljust(max_length))} #{key["uri"]}"
+            display = "#{display} (expired)" if key["expired"]
+            display_info(display)
+          end
+        else
+          keys.each do |key|
+            next if !key["expired"] && @config[:only_expired]
+            next if key["expired"] && @config[:only_non_expired]
+
+            display_info(key["name"])
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/key_list_base.rb

@@ -1,45 +1,45 @@
-#
-# Author:: Tyler Cloke (<tyler@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.
-#
-
-class Chef
-  class Knife
-    # Extendable module that class_eval's common options into UserKeyList and ClientKeyList
-    #
-    # @author Tyler Cloke
-    module KeyListBase
-      def self.included(includer)
-        includer.class_eval do
-          option :with_details,
-            short: "-w",
-            long: "--with-details",
-            description: "Show corresponding URIs and whether the key has expired or not."
-
-          option :only_expired,
-            short: "-e",
-            long: "--only-expired",
-            description: "Only show expired keys."
-
-          option :only_non_expired,
-            short: "-n",
-            long: "--only-non-expired",
-            description: "Only show non-expired keys."
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Tyler Cloke (<tyler@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.
+#
+
+class Chef
+  class Knife
+    # Extendable module that class_eval's common options into UserKeyList and ClientKeyList
+    #
+    # @author Tyler Cloke
+    module KeyListBase
+      def self.included(includer)
+        includer.class_eval do
+          option :with_details,
+            short: "-w",
+            long: "--with-details",
+            description: "Show corresponding URIs and whether the key has expired or not."
+
+          option :only_expired,
+            short: "-e",
+            long: "--only-expired",
+            description: "Only show expired keys."
+
+          option :only_non_expired,
+            short: "-n",
+            long: "--only-non-expired",
+            description: "Only show non-expired keys."
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/key_show.rb

@@ -1,53 +1,53 @@
-#
-# Author:: Tyler Cloke (<tyler@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 "chef/key" unless defined?(Chef::Key)
-require "chef/json_compat" unless defined?(Chef::JSONCompat)
-require "chef/exceptions" unless defined?(Chef::Exceptions)
-
-class Chef
-  class Knife
-    # Service class for UserKeyShow and ClientKeyShow, used to show keys.
-    # Implements common functionality of knife [user | org client] key show.
-    #
-    # @author Tyler Cloke
-    #
-    # @attr_accessor [Hash] cli input, see UserKeyShow and ClientKeyShow for what could populate it
-    class KeyShow
-
-      attr_accessor :config
-
-      def initialize(name, actor, load_method, ui)
-        @name = name
-        @actor = actor
-        @load_method = load_method
-        @ui = ui
-      end
-
-      def display_output(key)
-        @ui.output(@ui.format_for_display(key))
-      end
-
-      def run
-        key = Chef::Key.send(@load_method, @actor, @name)
-        key.public_key(key.public_key.strip)
-        display_output(key)
-      end
-    end
-  end
-end
+#
+# Author:: Tyler Cloke (<tyler@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 "chef/key" unless defined?(Chef::Key)
+require "chef/json_compat" unless defined?(Chef::JSONCompat)
+require "chef/exceptions" unless defined?(Chef::Exceptions)
+
+class Chef
+  class Knife
+    # Service class for UserKeyShow and ClientKeyShow, used to show keys.
+    # Implements common functionality of knife [user | org client] key show.
+    #
+    # @author Tyler Cloke
+    #
+    # @attr_accessor [Hash] cli input, see UserKeyShow and ClientKeyShow for what could populate it
+    class KeyShow
+
+      attr_accessor :config
+
+      def initialize(name, actor, load_method, ui)
+        @name = name
+        @actor = actor
+        @load_method = load_method
+        @ui = ui
+      end
+
+      def display_output(key)
+        @ui.output(@ui.format_for_display(key))
+      end
+
+      def run
+        key = Chef::Key.send(@load_method, @actor, @name)
+        key.public_key(key.public_key.strip)
+        display_output(key)
+      end
+    end
+  end
+end