knife 18.0.185 → 18.1.0

data/lib/chef/knife/org_user_add.rb

@@ -1,62 +1,62 @@
-#
-# Author:: Marc Paradise (<marc@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 OrgUserAdd < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org user add ORG_NAME USER_NAME"
-      attr_accessor :org_name, :username
-
-      option :admin,
-        long: "--admin",
-        short: "-a",
-        description: "Add user to admin group"
-
-      deps do
-        require "chef/org"
-      end
-
-      def run
-        @org_name, @username = @name_args
-
-        if !org_name || !username
-          ui.fatal "You must specify an ORG_NAME and USER_NAME"
-          show_usage
-          exit 1
-        end
-
-        org = Chef::Org.new(@org_name)
-        begin
-          org.associate_user(@username)
-        rescue Net::HTTPClientException => e
-          if e.response.code == "409"
-            ui.msg "User #{username} already associated with organization #{org_name}"
-          else
-            raise e
-          end
-        end
-        if config[:admin]
-          org.add_user_to_group("admins", @username)
-          org.add_user_to_group("billing-admins", @username)
-          ui.msg "User #{username} is added to admins and billing-admins group"
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Marc Paradise (<marc@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 OrgUserAdd < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org user add ORG_NAME USER_NAME"
+      attr_accessor :org_name, :username
+
+      option :admin,
+        long: "--admin",
+        short: "-a",
+        description: "Add user to admin group"
+
+      deps do
+        require "chef/org"
+      end
+
+      def run
+        @org_name, @username = @name_args
+
+        if !org_name || !username
+          ui.fatal "You must specify an ORG_NAME and USER_NAME"
+          show_usage
+          exit 1
+        end
+
+        org = Chef::Org.new(@org_name)
+        begin
+          org.associate_user(@username)
+        rescue Net::HTTPClientException => e
+          if e.response.code == "409"
+            ui.msg "User #{username} already associated with organization #{org_name}"
+          else
+            raise e
+          end
+        end
+        if config[:admin]
+          org.add_user_to_group("admins", @username)
+          org.add_user_to_group("billing-admins", @username)
+          ui.msg "User #{username} is added to admins and billing-admins group"
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/org_user_remove.rb

@@ -1,103 +1,103 @@
-#
-# Author:: Marc Paradise (<marc@getchef.com>)
-# 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 OrgUserRemove < Knife
-      category "CHEF ORGANIZATION MANAGEMENT"
-      banner "knife org user remove ORG_NAME USER_NAME"
-      attr_accessor :org_name, :username
-
-      option :force_remove_from_admins,
-        long: "--force",
-        short: "-f",
-        description: "Force removal of user from the organization's admins and billing-admins group."
-
-      deps do
-        require "chef/org" unless defined?(Chef::Org)
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-      end
-
-      def run
-        @org_name, @username = @name_args
-
-        if !org_name || !username
-          ui.fatal "You must specify an ORG_NAME and USER_NAME"
-          show_usage
-          exit 1
-        end
-
-        org = Chef::Org.new(@org_name)
-
-        if config[:force_remove_from_admins]
-          if org.actor_delete_would_leave_admins_empty?
-            failure_error_message(org_name, username)
-            ui.msg <<~EOF
-              You ran with --force which force removes the user from the admins and billing-admins groups.
-              However, removing #{username} from the admins group would leave it empty, which breaks the org.
-              Please add another user to org #{org_name} admins group and try again.
-            EOF
-            exit 1
-          end
-          remove_user_from_admin_group(org, org_name, username, "admins")
-          remove_user_from_admin_group(org, org_name, username, "billing-admins")
-        end
-
-        begin
-          org.dissociate_user(@username)
-        rescue Net::HTTPClientException => e
-          if e.response.code == "404"
-            ui.msg "User #{username} is not associated with organization #{org_name}"
-            exit 1
-          elsif e.response.code == "403"
-            body = Chef::JSONCompat.from_json(e.response.body)
-            if body.key?("error") && body["error"] == "Please remove #{username} from this organization's admins group before removing him or her from the organization."
-              failure_error_message(org_name, username)
-              ui.msg <<~EOF
-                User #{username} is in the organization's admin group. Removing users from an organization without removing them from the admins group is not allowed.
-                Re-run this command with --force to remove this user from the admins prior to removing it from the organization.
-              EOF
-              exit 1
-            else
-              raise e
-            end
-          else
-            raise e
-          end
-        end
-      end
-
-      def failure_error_message(org_name, username)
-        ui.error "Error removing user #{username} from organization #{org_name}."
-      end
-
-      def remove_user_from_admin_group(org, org_name, username, admin_group_string)
-        org.remove_user_from_group(admin_group_string, username)
-      rescue Net::HTTPClientException => e
-        if e.response.code == "404"
-          ui.warn <<~EOF
-            User #{username} is not in the #{admin_group_string} group for organization #{org_name}.
-            You probably don't need to pass --force.
-          EOF
-        else
-          raise e
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Marc Paradise (<marc@getchef.com>)
+# 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 OrgUserRemove < Knife
+      category "CHEF ORGANIZATION MANAGEMENT"
+      banner "knife org user remove ORG_NAME USER_NAME"
+      attr_accessor :org_name, :username
+
+      option :force_remove_from_admins,
+        long: "--force",
+        short: "-f",
+        description: "Force removal of user from the organization's admins and billing-admins group."
+
+      deps do
+        require "chef/org" unless defined?(Chef::Org)
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+      end
+
+      def run
+        @org_name, @username = @name_args
+
+        if !org_name || !username
+          ui.fatal "You must specify an ORG_NAME and USER_NAME"
+          show_usage
+          exit 1
+        end
+
+        org = Chef::Org.new(@org_name)
+
+        if config[:force_remove_from_admins]
+          if org.actor_delete_would_leave_admins_empty?
+            failure_error_message(org_name, username)
+            ui.msg <<~EOF
+              You ran with --force which force removes the user from the admins and billing-admins groups.
+              However, removing #{username} from the admins group would leave it empty, which breaks the org.
+              Please add another user to org #{org_name} admins group and try again.
+            EOF
+            exit 1
+          end
+          remove_user_from_admin_group(org, org_name, username, "admins")
+          remove_user_from_admin_group(org, org_name, username, "billing-admins")
+        end
+
+        begin
+          org.dissociate_user(@username)
+        rescue Net::HTTPClientException => e
+          if e.response.code == "404"
+            ui.msg "User #{username} is not associated with organization #{org_name}"
+            exit 1
+          elsif e.response.code == "403"
+            body = Chef::JSONCompat.from_json(e.response.body)
+            if body.key?("error") && body["error"] == "Please remove #{username} from this organization's admins group before removing him or her from the organization."
+              failure_error_message(org_name, username)
+              ui.msg <<~EOF
+                User #{username} is in the organization's admin group. Removing users from an organization without removing them from the admins group is not allowed.
+                Re-run this command with --force to remove this user from the admins prior to removing it from the organization.
+              EOF
+              exit 1
+            else
+              raise e
+            end
+          else
+            raise e
+          end
+        end
+      end
+
+      def failure_error_message(org_name, username)
+        ui.error "Error removing user #{username} from organization #{org_name}."
+      end
+
+      def remove_user_from_admin_group(org, org_name, username, admin_group_string)
+        org.remove_user_from_group(admin_group_string, username)
+      rescue Net::HTTPClientException => e
+        if e.response.code == "404"
+          ui.warn <<~EOF
+            User #{username} is not in the #{admin_group_string} group for organization #{org_name}.
+            You probably don't need to pass --force.
+          EOF
+        else
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/raw.rb

@@ -1,123 +1,123 @@
-#
-# 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 Raw < Chef::Knife
-      banner "knife raw REQUEST_PATH (options)"
-
-      deps do
-        require "chef/json_compat" unless defined?(Chef::JSONCompat)
-        require "chef/config" unless defined?(Chef::Config)
-        require "chef/http" unless defined?(Chef::HTTP)
-        require "chef/http/authenticator" unless defined?(Chef::HTTP::Authenticator)
-        require "chef/http/cookie_manager" unless defined?(Chef::HTTP::CookieManager)
-        require "chef/http/decompressor" unless defined?(Chef::HTTP::Decompressor)
-        require "chef/http/json_output" unless defined?(Chef::HTTP::JSONOutput)
-      end
-
-      option :method,
-        long: "--method METHOD",
-        short: "-m METHOD",
-        default: "GET",
-        description: "Request method (GET, POST, PUT or DELETE). Default: GET."
-
-      option :pretty,
-        long: "--[no-]pretty",
-        boolean: true,
-        default: true,
-        description: "Pretty-print JSON output. Default: true."
-
-      option :input,
-        long: "--input FILE",
-        short: "-i FILE",
-        description: "Name of file to use for PUT or POST."
-
-      option :proxy_auth,
-        long: "--proxy-auth",
-        boolean: true,
-        default: false,
-        description: "Use webui proxy authentication. Client key must be the webui key."
-
-      # We need a custom HTTP client class here because we don't want to even
-      # try to decode the body, in case we get back corrupted JSON or whatnot.
-      class RawInputServerAPI < Chef::HTTP
-        def initialize(options = {})
-          # If making a change here, also update Chef::ServerAPI.
-          options[:client_name] ||= Chef::Config[:node_name]
-          options[:raw_key] ||= Chef::Config[:client_key_contents]
-          options[:signing_key_filename] ||= Chef::Config[:client_key] unless options[:raw_key]
-          options[:ssh_agent_signing] ||= Chef::Config[:ssh_agent_signing]
-          super(Chef::Config[:chef_server_url], options)
-        end
-        use Chef::HTTP::JSONOutput
-        use Chef::HTTP::CookieManager
-        use Chef::HTTP::Decompressor
-        use Chef::HTTP::Authenticator
-        use Chef::HTTP::RemoteRequestID
-      end
-
-      def run
-        if name_args.length == 0
-          show_usage
-          ui.fatal("You must provide the path you want to hit on the server")
-          exit(1)
-        elsif name_args.length > 1
-          show_usage
-          ui.fatal("You must specify only a single path")
-          exit(1)
-        end
-
-        path = name_args[0]
-        data = false
-        if config[:input]
-          data = IO.read(config[:input])
-        end
-        begin
-          method = config[:method].to_sym
-
-          headers = { "Content-Type" => "application/json" }
-
-          if config[:proxy_auth]
-            headers["x-ops-request-source"] = "web"
-          end
-
-          if config[:pretty]
-            chef_rest = RawInputServerAPI.new
-            result = chef_rest.request(method, name_args[0], headers, data)
-            unless result.is_a?(String)
-              result = Chef::JSONCompat.to_json_pretty(result)
-            end
-          else
-            chef_rest = RawInputServerAPI.new(raw_output: true)
-            result = chef_rest.request(method, name_args[0], headers, data)
-          end
-          output result
-        rescue Timeout::Error => e
-          ui.error "Server timeout"
-          exit 1
-        rescue Net::HTTPClientException => e
-          ui.error "Server responded with error #{e.response.code} \"#{e.response.message}\""
-          ui.error "Error Body: #{e.response.body}" if e.response.body && e.response.body != ""
-          exit 1
-        end
-      end
-
-    end # class Raw
-  end
-end
+#
+# 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 Raw < Chef::Knife
+      banner "knife raw REQUEST_PATH (options)"
+
+      deps do
+        require "chef/json_compat" unless defined?(Chef::JSONCompat)
+        require "chef/config" unless defined?(Chef::Config)
+        require "chef/http" unless defined?(Chef::HTTP)
+        require "chef/http/authenticator" unless defined?(Chef::HTTP::Authenticator)
+        require "chef/http/cookie_manager" unless defined?(Chef::HTTP::CookieManager)
+        require "chef/http/decompressor" unless defined?(Chef::HTTP::Decompressor)
+        require "chef/http/json_output" unless defined?(Chef::HTTP::JSONOutput)
+      end
+
+      option :method,
+        long: "--method METHOD",
+        short: "-m METHOD",
+        default: "GET",
+        description: "Request method (GET, POST, PUT or DELETE). Default: GET."
+
+      option :pretty,
+        long: "--[no-]pretty",
+        boolean: true,
+        default: true,
+        description: "Pretty-print JSON output. Default: true."
+
+      option :input,
+        long: "--input FILE",
+        short: "-i FILE",
+        description: "Name of file to use for PUT or POST."
+
+      option :proxy_auth,
+        long: "--proxy-auth",
+        boolean: true,
+        default: false,
+        description: "Use webui proxy authentication. Client key must be the webui key."
+
+      # We need a custom HTTP client class here because we don't want to even
+      # try to decode the body, in case we get back corrupted JSON or whatnot.
+      class RawInputServerAPI < Chef::HTTP
+        def initialize(options = {})
+          # If making a change here, also update Chef::ServerAPI.
+          options[:client_name] ||= Chef::Config[:node_name]
+          options[:raw_key] ||= Chef::Config[:client_key_contents]
+          options[:signing_key_filename] ||= Chef::Config[:client_key] unless options[:raw_key]
+          options[:ssh_agent_signing] ||= Chef::Config[:ssh_agent_signing]
+          super(Chef::Config[:chef_server_url], options)
+        end
+        use Chef::HTTP::JSONOutput
+        use Chef::HTTP::CookieManager
+        use Chef::HTTP::Decompressor
+        use Chef::HTTP::Authenticator
+        use Chef::HTTP::RemoteRequestID
+      end
+
+      def run
+        if name_args.length == 0
+          show_usage
+          ui.fatal("You must provide the path you want to hit on the server")
+          exit(1)
+        elsif name_args.length > 1
+          show_usage
+          ui.fatal("You must specify only a single path")
+          exit(1)
+        end
+
+        path = name_args[0]
+        data = false
+        if config[:input]
+          data = IO.read(config[:input])
+        end
+        begin
+          method = config[:method].to_sym
+
+          headers = { "Content-Type" => "application/json" }
+
+          if config[:proxy_auth]
+            headers["x-ops-request-source"] = "web"
+          end
+
+          if config[:pretty]
+            chef_rest = RawInputServerAPI.new
+            result = chef_rest.request(method, name_args[0], headers, data)
+            unless result.is_a?(String)
+              result = Chef::JSONCompat.to_json_pretty(result)
+            end
+          else
+            chef_rest = RawInputServerAPI.new(raw_output: true)
+            result = chef_rest.request(method, name_args[0], headers, data)
+          end
+          output result
+        rescue Timeout::Error => e
+          ui.error "Server timeout"
+          exit 1
+        rescue Net::HTTPClientException => e
+          ui.error "Server responded with error #{e.response.code} \"#{e.response.message}\""
+          ui.error "Error Body: #{e.response.body}" if e.response.body && e.response.body != ""
+          exit 1
+        end
+      end
+
+    end # class Raw
+  end
+end

data/lib/chef/knife/recipe_list.rb

@@ -1,32 +1,32 @@
-#
-# Author:: Daniel DeLeo (<dan@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::Knife::RecipeList < Chef::Knife
-
-  banner "knife recipe list [PATTERN]"
-
-  def run
-    recipes = rest.get("cookbooks/_recipes")
-    if pattern = @name_args.first
-      recipes = recipes.grep(Regexp.new(pattern))
-    end
-    output(recipes)
-  end
-
-end
+#
+# Author:: Daniel DeLeo (<dan@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::Knife::RecipeList < Chef::Knife
+
+  banner "knife recipe list [PATTERN]"
+
+  def run
+    recipes = rest.get("cookbooks/_recipes")
+    if pattern = @name_args.first
+      recipes = recipes.grep(Regexp.new(pattern))
+    end
+    output(recipes)
+  end
+
+end