knife 18.2.7 → 18.3.0

data/lib/chef/knife/node_show.rb

@@ -1,63 +1,63 @@
-#
-# 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_relative "core/node_presenter"
-require_relative "core/formatting_options"
-require "chef-utils/dist" unless defined?(ChefUtils::Dist)
-
-class Chef
-  class Knife
-    class NodeShow < Knife
-
-      include Knife::Core::FormattingOptions
-      include Knife::Core::MultiAttributeReturnOption
-
-      deps do
-        require "chef/node" unless defined?(Chef::Node)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      banner "knife node show NODE (options)"
-
-      option :run_list,
-        short: "-r",
-        long: "--run-list",
-        description: "Show only the run list."
-
-      option :environment,
-        short: "-E",
-        long: "--environment",
-        description: "Show only the #{ChefUtils::Dist::Infra::PRODUCT} environment."
-
-      def run
-        ui.use_presenter Knife::Core::NodePresenter
-        @node_name = @name_args[0]
-
-        if @node_name.nil?
-          show_usage
-          ui.fatal("You must specify a node name")
-          exit 1
-        end
-
-        node = Chef::Node.load(@node_name)
-        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"
+require_relative "core/node_presenter"
+require_relative "core/formatting_options"
+require "chef-utils/dist" unless defined?(ChefUtils::Dist)
+
+class Chef
+  class Knife
+    class NodeShow < Knife
+
+      include Knife::Core::FormattingOptions
+      include Knife::Core::MultiAttributeReturnOption
+
+      deps do
+        require "chef/node" unless defined?(Chef::Node)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      banner "knife node show NODE (options)"
+
+      option :run_list,
+        short: "-r",
+        long: "--run-list",
+        description: "Show only the run list."
+
+      option :environment,
+        short: "-E",
+        long: "--environment",
+        description: "Show only the #{ChefUtils::Dist::Infra::PRODUCT} environment."
+
+      def run
+        ui.use_presenter Knife::Core::NodePresenter
+        @node_name = @name_args[0]
+
+        if @node_name.nil?
+          show_usage
+          ui.fatal("You must specify a node name")
+          exit 1
+        end
+
+        node = Chef::Node.load(@node_name)
+        output(format_for_display(node))
+      end
+    end
+  end
+end

data/lib/chef/knife/null.rb

@@ -1,12 +1,12 @@
-class Chef
-  class Knife
-    class Null < Chef::Knife
-      banner "knife null"
-
-      # setting the category to deprecated keeps it out of help
-      category "deprecated"
-
-      def run; end
-    end
-  end
-end
+class Chef
+  class Knife
+    class Null < Chef::Knife
+      banner "knife null"
+
+      # setting the category to deprecated keeps it out of help
+      category "deprecated"
+
+      def run; end
+    end
+  end
+end

data/lib/chef/knife/org_create.rb

@@ -1,70 +1,70 @@
-#
-# Author:: Steven Danna (<steve@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
-    class OrgCreate < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org create ORG_SHORT_NAME ORG_FULL_NAME (options)"
-
-      option :filename,
-        long: "--filename FILENAME",
-        short: "-f FILENAME",
-        description: "Write validator private key to FILENAME rather than STDOUT"
-
-      option :association_user,
-        long: "--association_user USERNAME",
-        short: "-a USERNAME",
-        description: "Invite USERNAME to the new organization after creation"
-
-      attr_accessor :org_name, :org_full_name
-
-      deps do
-        require "chef/org" unless defined?(Chef::Org)
-      end
-
-      def run
-        @org_name, @org_full_name = @name_args
-
-        if !org_name || !org_full_name
-          ui.fatal "You must specify an ORG_NAME and an ORG_FULL_NAME"
-          show_usage
-          exit 1
-        end
-
-        org = Chef::Org.from_hash({ "name" => org_name,
-                                    "full_name" => org_full_name }).create
-        if config[:filename]
-          File.open(config[:filename], "w") do |f|
-            f.print(org.private_key)
-          end
-        else
-          ui.msg org.private_key
-        end
-
-        if config[:association_user]
-          org.associate_user(config[:association_user])
-          org.add_user_to_group("admins", config[:association_user])
-          org.add_user_to_group("billing-admins", config[:association_user])
-        end
-
-        ui.info("Created #{org_name}")
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna (<steve@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
+    class OrgCreate < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org create ORG_SHORT_NAME ORG_FULL_NAME (options)"
+
+      option :filename,
+        long: "--filename FILENAME",
+        short: "-f FILENAME",
+        description: "Write validator private key to FILENAME rather than STDOUT"
+
+      option :association_user,
+        long: "--association_user USERNAME",
+        short: "-a USERNAME",
+        description: "Invite USERNAME to the new organization after creation"
+
+      attr_accessor :org_name, :org_full_name
+
+      deps do
+        require "chef/org" unless defined?(Chef::Org)
+      end
+
+      def run
+        @org_name, @org_full_name = @name_args
+
+        if !org_name || !org_full_name
+          ui.fatal "You must specify an ORG_NAME and an ORG_FULL_NAME"
+          show_usage
+          exit 1
+        end
+
+        org = Chef::Org.from_hash({ "name" => org_name,
+                                    "full_name" => org_full_name }).create
+        if config[:filename]
+          File.open(config[:filename], "w") do |f|
+            f.print(org.private_key)
+          end
+        else
+          ui.msg org.private_key
+        end
+
+        if config[:association_user]
+          org.associate_user(config[:association_user])
+          org.add_user_to_group("admins", config[:association_user])
+          org.add_user_to_group("billing-admins", config[:association_user])
+        end
+
+        ui.info("Created #{org_name}")
+      end
+    end
+  end
+end

data/lib/chef/knife/org_delete.rb

@@ -1,32 +1,32 @@
-#
-# Author:: Steven Danna (<steve@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
-    class OrgDelete < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org delete ORG_NAME"
-
-      def run
-        org_name = @name_args[0]
-        ui.confirm "Do you want to delete the organization #{org_name}"
-        ui.output root_rest.delete("organizations/#{org_name}")
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna (<steve@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
+    class OrgDelete < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org delete ORG_NAME"
+
+      def run
+        org_name = @name_args[0]
+        ui.confirm "Do you want to delete the organization #{org_name}"
+        ui.output root_rest.delete("organizations/#{org_name}")
+      end
+    end
+  end
+end

data/lib/chef/knife/org_edit.rb

@@ -1,48 +1,48 @@
-#
-# Author:: Steven Danna (<steve@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
-    class OrgEdit < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org edit ORG"
-
-      def run
-        org_name = @name_args[0]
-
-        if org_name.nil?
-          show_usage
-          ui.fatal("You must specify an organization name")
-          exit 1
-        end
-
-        original_org = root_rest.get("organizations/#{org_name}")
-        edited_org = edit_hash(original_org)
-
-        if original_org == edited_org
-          ui.msg("Organization unchanged, not saving.")
-          exit
-        end
-
-        ui.msg edited_org
-        root_rest.put("organizations/#{org_name}", edited_org)
-        ui.msg("Saved #{org_name}.")
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna (<steve@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
+    class OrgEdit < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org edit ORG"
+
+      def run
+        org_name = @name_args[0]
+
+        if org_name.nil?
+          show_usage
+          ui.fatal("You must specify an organization name")
+          exit 1
+        end
+
+        original_org = root_rest.get("organizations/#{org_name}")
+        edited_org = edit_hash(original_org)
+
+        if original_org == edited_org
+          ui.msg("Organization unchanged, not saving.")
+          exit
+        end
+
+        ui.msg edited_org
+        root_rest.put("organizations/#{org_name}", edited_org)
+        ui.msg("Saved #{org_name}.")
+      end
+    end
+  end
+end

data/lib/chef/knife/org_list.rb

@@ -1,44 +1,44 @@
-#
-# Author:: Steven Danna (<steve@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
-    class OrgList < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org list"
-
-      option :with_uri,
-        long: "--with-uri",
-        short: "-w",
-        description: "Show corresponding URIs"
-
-      option :all_orgs,
-        long: "--all-orgs",
-        short: "-a",
-        description: "Show auto-generated hidden orgs in output"
-
-      def run
-        results = root_rest.get("organizations")
-        unless config[:all_orgs]
-          results = results.select { |k, v| !(k.length == 20 && k =~ /^[a-z]+$/) }
-        end
-        ui.output(ui.format_list_for_display(results))
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna (<steve@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
+    class OrgList < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org list"
+
+      option :with_uri,
+        long: "--with-uri",
+        short: "-w",
+        description: "Show corresponding URIs"
+
+      option :all_orgs,
+        long: "--all-orgs",
+        short: "-a",
+        description: "Show auto-generated hidden orgs in output"
+
+      def run
+        results = root_rest.get("organizations")
+        unless config[:all_orgs]
+          results = results.select { |k, v| !(k.length == 20 && k =~ /^[a-z]+$/) }
+        end
+        ui.output(ui.format_list_for_display(results))
+      end
+    end
+  end
+end

data/lib/chef/knife/org_show.rb

@@ -1,31 +1,31 @@
-#
-# Author:: Steven Danna (<steve@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
-    class OrgShow < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org show ORGNAME"
-
-      def run
-        org_name = @name_args[0]
-        ui.output root_rest.get("organizations/#{org_name}")
-      end
-    end
-  end
-end
+#
+# Author:: Steven Danna (<steve@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
+    class OrgShow < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org show ORGNAME"
+
+      def run
+        org_name = @name_args[0]
+        ui.output root_rest.get("organizations/#{org_name}")
+      end
+    end
+  end
+end