knife 18.2.7 → 18.3.0

data/lib/chef/knife/node_policy_set.rb

@@ -1,79 +1,79 @@
-#
-# Author:: Piyush Awasthi (<piyush.awasthi@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 NodePolicySet < Knife
-
-      deps do
-        require "chef/node" unless defined?(Chef::Node)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife node policy set NODE POLICY_GROUP POLICY_NAME (options)"
-
-      def run
-        validate_node!
-        validate_options!
-        node = Chef::Node.load(@name_args[0])
-        set_policy(node)
-        if node.save
-          ui.info "Successfully set the policy on node #{node.name}"
-        else
-          ui.info "Error in updating node #{node.name}"
-        end
-      end
-
-      private
-
-      # Set policy name and group to node
-      def set_policy(node)
-        policy_group, policy_name = @name_args[1..]
-        node.policy_name  = policy_name
-        node.policy_group = policy_group
-      end
-
-      # Validate policy name and policy group
-      def validate_options!
-        if incomplete_policyfile_options?
-          ui.error("Policy group and name must be specified together")
-          exit 1
-        end
-        true
-      end
-
-      # Validate node pass in CLI
-      def validate_node!
-        if @name_args[0].nil?
-          ui.error("You must specify a node name")
-          show_usage
-          exit 1
-        end
-      end
-
-      # True if one of policy_name or policy_group was given, but not both
-      def incomplete_policyfile_options?
-        policy_group, policy_name = @name_args[1..]
-        (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2)
-      end
-
-    end
-  end
-end
+#
+# Author:: Piyush Awasthi (<piyush.awasthi@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 NodePolicySet < Knife
+
+      deps do
+        require "chef/node" unless defined?(Chef::Node)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife node policy set NODE POLICY_GROUP POLICY_NAME (options)"
+
+      def run
+        validate_node!
+        validate_options!
+        node = Chef::Node.load(@name_args[0])
+        set_policy(node)
+        if node.save
+          ui.info "Successfully set the policy on node #{node.name}"
+        else
+          ui.info "Error in updating node #{node.name}"
+        end
+      end
+
+      private
+
+      # Set policy name and group to node
+      def set_policy(node)
+        policy_group, policy_name = @name_args[1..]
+        node.policy_name  = policy_name
+        node.policy_group = policy_group
+      end
+
+      # Validate policy name and policy group
+      def validate_options!
+        if incomplete_policyfile_options?
+          ui.error("Policy group and name must be specified together")
+          exit 1
+        end
+        true
+      end
+
+      # Validate node pass in CLI
+      def validate_node!
+        if @name_args[0].nil?
+          ui.error("You must specify a node name")
+          show_usage
+          exit 1
+        end
+      end
+
+      # True if one of policy_name or policy_group was given, but not both
+      def incomplete_policyfile_options?
+        policy_group, policy_name = @name_args[1..]
+        (policy_group.nil? || policy_name.nil? || @name_args[1..-1].size > 2)
+      end
+
+    end
+  end
+end

data/lib/chef/knife/node_run_list_add.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 NodeRunListAdd < Knife
-
-      deps do
-        require "chef/node" unless defined?(Chef::Node)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife node run_list add [NODE] [ENTRY [ENTRY]] (options)"
-
-      option :after,
-        short: "-a ITEM",
-        long: "--after ITEM",
-        description: "Place the ENTRY in the run list after ITEM."
-
-      option :before,
-        short: "-b ITEM",
-        long: "--before ITEM",
-        description: "Place the ENTRY in the run list before ITEM."
-
-      def run
-        node = Chef::Node.load(@name_args[0])
-        if @name_args.size > 2
-          # Check for nested lists and create a single plain one
-          entries = @name_args[1..].map do |entry|
-            entry.split(",").map(&:strip)
-          end.flatten
-        else
-          # Convert to array and remove the extra spaces
-          entries = @name_args[1].split(",").map(&:strip)
-        end
-
-        if config[:after] && config[:before]
-          ui.fatal("You cannot specify both --before and --after!")
-          exit 1
-        end
-
-        if config[:after]
-          add_to_run_list_after(node, entries, config[:after])
-        elsif config[:before]
-          add_to_run_list_before(node, entries, config[:before])
-        else
-          add_to_run_list_after(node, entries)
-        end
-
-        node.save
-
-        config[:run_list] = true
-
-        output(format_for_display(node))
-      end
-
-      private
-
-      def add_to_run_list_after(node, entries, after = nil)
-        if after
-          nlist = []
-          node.run_list.each do |entry|
-            nlist << entry
-            if entry == after
-              entries.each { |e| nlist << e }
-            end
-          end
-          node.run_list.reset!(nlist)
-        else
-          entries.each { |e| node.run_list << e }
-        end
-      end
-
-      def add_to_run_list_before(node, entries, before)
-        nlist = []
-        node.run_list.each do |entry|
-          if entry == before
-            entries.each { |e| nlist << e }
-          end
-          nlist << entry
-        end
-        node.run_list.reset!(nlist)
-      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 NodeRunListAdd < Knife
+
+      deps do
+        require "chef/node" unless defined?(Chef::Node)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife node run_list add [NODE] [ENTRY [ENTRY]] (options)"
+
+      option :after,
+        short: "-a ITEM",
+        long: "--after ITEM",
+        description: "Place the ENTRY in the run list after ITEM."
+
+      option :before,
+        short: "-b ITEM",
+        long: "--before ITEM",
+        description: "Place the ENTRY in the run list before ITEM."
+
+      def run
+        node = Chef::Node.load(@name_args[0])
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..].map do |entry|
+            entry.split(",").map(&:strip)
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(",").map(&:strip)
+        end
+
+        if config[:after] && config[:before]
+          ui.fatal("You cannot specify both --before and --after!")
+          exit 1
+        end
+
+        if config[:after]
+          add_to_run_list_after(node, entries, config[:after])
+        elsif config[:before]
+          add_to_run_list_before(node, entries, config[:before])
+        else
+          add_to_run_list_after(node, entries)
+        end
+
+        node.save
+
+        config[:run_list] = true
+
+        output(format_for_display(node))
+      end
+
+      private
+
+      def add_to_run_list_after(node, entries, after = nil)
+        if after
+          nlist = []
+          node.run_list.each do |entry|
+            nlist << entry
+            if entry == after
+              entries.each { |e| nlist << e }
+            end
+          end
+          node.run_list.reset!(nlist)
+        else
+          entries.each { |e| node.run_list << e }
+        end
+      end
+
+      def add_to_run_list_before(node, entries, before)
+        nlist = []
+        node.run_list.each do |entry|
+          if entry == before
+            entries.each { |e| nlist << e }
+          end
+          nlist << entry
+        end
+        node.run_list.reset!(nlist)
+      end
+
+    end
+  end
+end

data/lib/chef/knife/node_run_list_remove.rb

@@ -1,67 +1,67 @@
-#
-# 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 NodeRunListRemove < Knife
-
-      deps do
-        require "chef/node" unless defined?(Chef::Node)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife node run_list remove [NODE] [ENTRY [ENTRY]] (options)"
-
-      def run
-        node = Chef::Node.load(@name_args[0])
-
-        if @name_args.size > 2
-          # Check for nested lists and create a single plain one
-          entries = @name_args[1..].map do |entry|
-            entry.split(",").map(&:strip)
-          end.flatten
-        else
-          # Convert to array and remove the extra spaces
-          entries = @name_args[1].split(",").map(&:strip)
-        end
-
-        # iterate over the list of things to remove,
-        # warning if one of them was not found
-        entries.each do |e|
-          if node.run_list.find { |rli| e == rli.to_s }
-            node.run_list.remove(e)
-          else
-            ui.warn "#{e} is not in the run list"
-            unless /^(recipe|role)\[/.match?(e)
-              ui.warn "(did you forget recipe[] or role[] around it?)"
-            end
-          end
-        end
-
-        node.save
-
-        config[:run_list] = true
-
-        output(format_for_display(node))
-      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 NodeRunListRemove < Knife
+
+      deps do
+        require "chef/node" unless defined?(Chef::Node)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife node run_list remove [NODE] [ENTRY [ENTRY]] (options)"
+
+      def run
+        node = Chef::Node.load(@name_args[0])
+
+        if @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..].map do |entry|
+            entry.split(",").map(&:strip)
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(",").map(&:strip)
+        end
+
+        # iterate over the list of things to remove,
+        # warning if one of them was not found
+        entries.each do |e|
+          if node.run_list.find { |rli| e == rli.to_s }
+            node.run_list.remove(e)
+          else
+            ui.warn "#{e} is not in the run list"
+            unless /^(recipe|role)\[/.match?(e)
+              ui.warn "(did you forget recipe[] or role[] around it?)"
+            end
+          end
+        end
+
+        node.save
+
+        config[:run_list] = true
+
+        output(format_for_display(node))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/node_run_list_set.rb

@@ -1,66 +1,66 @@
-#
-# Author:: Mike Fiedler (<miketheman@gmail.com>)
-# Copyright:: Copyright 2013-2016, Mike Fiedler
-# 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 NodeRunListSet < Knife
-
-      deps do
-        require "chef/node" unless defined?(Chef::Node)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife node run_list set NODE ENTRIES (options)"
-
-      def run
-        if @name_args.size < 2
-          ui.fatal "You must supply both a node name and a run list."
-          show_usage
-          exit 1
-        elsif @name_args.size > 2
-          # Check for nested lists and create a single plain one
-          entries = @name_args[1..].map do |entry|
-            entry.split(",").map(&:strip)
-          end.flatten
-        else
-          # Convert to array and remove the extra spaces
-          entries = @name_args[1].split(",").map(&:strip)
-        end
-        node = Chef::Node.load(@name_args[0])
-
-        set_run_list(node, entries)
-
-        node.save
-
-        config[:run_list] = true
-
-        output(format_for_display(node))
-      end
-
-      # Clears out any existing run_list_items and sets them to the
-      # specified entries
-      def set_run_list(node, entries)
-        node.run_list.run_list_items.clear
-        entries.each { |e| node.run_list << e }
-      end
-
-    end
-  end
-end
+#
+# Author:: Mike Fiedler (<miketheman@gmail.com>)
+# Copyright:: Copyright 2013-2016, Mike Fiedler
+# 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 NodeRunListSet < Knife
+
+      deps do
+        require "chef/node" unless defined?(Chef::Node)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife node run_list set NODE ENTRIES (options)"
+
+      def run
+        if @name_args.size < 2
+          ui.fatal "You must supply both a node name and a run list."
+          show_usage
+          exit 1
+        elsif @name_args.size > 2
+          # Check for nested lists and create a single plain one
+          entries = @name_args[1..].map do |entry|
+            entry.split(",").map(&:strip)
+          end.flatten
+        else
+          # Convert to array and remove the extra spaces
+          entries = @name_args[1].split(",").map(&:strip)
+        end
+        node = Chef::Node.load(@name_args[0])
+
+        set_run_list(node, entries)
+
+        node.save
+
+        config[:run_list] = true
+
+        output(format_for_display(node))
+      end
+
+      # Clears out any existing run_list_items and sets them to the
+      # specified entries
+      def set_run_list(node, entries)
+        node.run_list.run_list_items.clear
+        entries.each { |e| node.run_list << e }
+      end
+
+    end
+  end
+end