chef 12.19.36 → 14.14.25

data/lib/chef/knife/user_create.rb

@@ -28,35 +28,34 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       option :file,
-        :short => "-f FILE",
-        :long  => "--file FILE",
-        :description => "Write the private key to a file if the server generated one."
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file if the server generated one."
 
       option :user_key,
-        :long => "--user-key FILENAME",
-        :description => "Set the initial default key for the user from a file on disk (cannot pass with --prevent-keygen)."
+        long: "--user-key FILENAME",
+        description: "Set the initial default key for the user from a file on disk (cannot pass with --prevent-keygen)."
 
       option :prevent_keygen,
-        :short => "-k",
-        :long  => "--prevent-keygen",
-        :description => "API V1 (Chef Server 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
-        :boolean => true
+        short: "-k",
+        long: "--prevent-keygen",
+        description: "API V1 (Chef Server 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
+        boolean: true
 
       option :admin,
-        :short => "-a",
-        :long  => "--admin",
-        :description => "DEPRECATED: Open Source Chef 11 only. Create the user as an admin.",
-        :boolean => true
+        short: "-a",
+        long: "--admin",
+        description: "DEPRECATED: Open Source Chef 11 only. Create the user as an admin.",
+        boolean: true
 
       option :user_password,
-        :short => "-p PASSWORD",
-        :long => "--password PASSWORD",
-        :description => "DEPRECATED: Open Source Chef 11 only. Password for newly created user.",
-        :default => ""
+        short: "-p PASSWORD",
+        long: "--password PASSWORD",
+        description: "DEPRECATED: Open Source Chef 11 only. Password for newly created user.",
+        default: ""
 
       banner "knife user create USERNAME DISPLAY_NAME FIRST_NAME LAST_NAME EMAIL PASSWORD (options)"
 
@@ -69,15 +68,17 @@ class Chef
       end
 
       def osc_11_warning
-        <<-EOF
-IF YOU ARE USING CHEF SERVER 12+, PLEASE FOLLOW THE INSTRUCTIONS UNDER knife user create --help.
-You only passed a single argument to knife user create.
-For backwards compatibility, when only a single argument is passed,
-knife user create assumes you want Open Source 11 Server user creation.
-knife user create for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user create.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
+        <<~EOF
+          IF YOU ARE USING CHEF SERVER 12+, PLEASE FOLLOW THE INSTRUCTIONS UNDER knife user create --help.
+          You only passed a single argument to knife user create.
+          For backwards compatibility, when only a single argument is passed,
+          knife user create assumes you want Open Source 11 Server user creation.
+          knife user create for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user create.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/user_delete.rb

@@ -24,19 +24,20 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       banner "knife user delete USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user delete for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user delete.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user delete for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user delete.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/user_edit.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Danna (<steve@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,19 +24,20 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       banner "knife user edit USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user edit for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife oc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user edit.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user edit for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife oc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user edit.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 
@@ -56,7 +57,7 @@ EOF
           exit 1
         end
 
-        original_user = Chef::UserV1.load(@user_name).to_hash
+        original_user = Chef::UserV1.load(@user_name).to_h
         # DEPRECATION NOTE
         # Remove this if statement and corrosponding code post OSC 11 support.
         #

data/lib/chef/knife/user_key_create.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_create"
 require "chef/knife/key_create_base"
 
 class Chef

data/lib/chef/knife/user_key_delete.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_delete"
 
 class Chef
   class Knife

data/lib/chef/knife/user_key_edit.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_edit"
 require "chef/knife/key_edit_base"
 
 class Chef

data/lib/chef/knife/user_key_list.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_list"
 require "chef/knife/key_list_base"
 
 class Chef

data/lib/chef/knife/user_key_show.rb

@@ -17,6 +17,7 @@
 #
 
 require "chef/knife"
+require "chef/knife/key_show"
 
 class Chef
   class Knife

data/lib/chef/knife/user_list.rb

@@ -26,15 +26,14 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       banner "knife user list (options)"
 
       option :with_uri,
-        :short => "-w",
-        :long => "--with-uri",
-        :description => "Show corresponding URIs"
+        short: "-w",
+        long: "--with-uri",
+        description: "Show corresponding URIs."
 
       def run
         output(format_list_for_display(Chef::UserV1.list))

data/lib/chef/knife/user_reregister.rb

@@ -24,19 +24,20 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       banner "knife user reregister USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user reregister for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user reregister.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user reregister for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user reregister.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 
@@ -48,9 +49,9 @@ EOF
       end
 
       option :file,
-        :short => "-f FILE",
-        :long  => "--file FILE",
-        :description => "Write the private key to a file"
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file"
 
       def run
         @user_name = @name_args[0]
@@ -73,7 +74,7 @@ EOF
           run_osc_11_user_reregister
         else # EC / CS 12 case
           user.reregister
-          Chef::Log.debug("Updated user data: #{user.inspect}")
+          Chef::Log.trace("Updated user data: #{user.inspect}")
           key = user.private_key
           if config[:file]
             File.open(config[:file], "w") do |f|

data/lib/chef/knife/user_show.rb

@@ -26,19 +26,20 @@ class Chef
 
       deps do
         require "chef/user_v1"
-        require "chef/json_compat"
       end
 
       banner "knife user show USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user show for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user show.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user show for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user show.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/xargs.rb

@@ -1,74 +1,90 @@
+#
+# 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/chef_fs/knife"
 
 class Chef
   class Knife
     class Xargs < Chef::ChefFS::Knife
-      banner "knife xargs [COMMAND]"
+      banner "knife xargs [COMMAND] (options)"
 
       category "path-based"
 
       deps do
         require "chef/chef_fs/file_system"
-        require "chef/chef_fs/file_system/not_found_error"
+        require "chef/chef_fs/file_system/exceptions"
       end
 
       # TODO modify to remote-only / local-only pattern (more like delete)
       option :local,
-        :long => "--local",
-        :boolean => true,
-        :description => "Xargs local files instead of remote"
+        long: "--local",
+        boolean: true,
+        description: "Xargs local files instead of remote"
 
       option :patterns,
-        :long => "--pattern [PATTERN]",
-        :short => "-p [PATTERN]",
-        :description => "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
-        :arg_arity => [1, -1]
+        long: "--pattern [PATTERN]",
+        short: "-p [PATTERN]",
+        description: "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
+        arg_arity: [1, -1]
 
       option :diff,
-        :long => "--[no-]diff",
-        :default => true,
-        :boolean => true,
-        :description => "Whether to show a diff when files change (default: true)"
+        long: "--[no-]diff",
+        default: true,
+        boolean: true,
+        description: "Whether to show a diff when files change (default: true)."
 
       option :dry_run,
-        :long => "--dry-run",
-        :boolean => true,
-        :description => "Prevents changes from actually being uploaded to the server."
+        long: "--dry-run",
+        boolean: true,
+        description: "Prevents changes from actually being uploaded to the server."
 
       option :force,
-        :long => "--[no-]force",
-        :boolean => true,
-        :default => false,
-        :description => "Force upload of files even if they are not changed (quicker and harmless, but doesn't print out what it changed)"
+        long: "--[no-]force",
+        boolean: true,
+        default: false,
+        description: "Force upload of files even if they are not changed (quicker and harmless, but doesn't print out what it changed)."
 
       option :replace_first,
-        :long => "--replace-first REPLACESTR",
-        :short => "-J REPLACESTR",
-        :description => "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
+        long: "--replace-first REPLACESTR",
+        short: "-J REPLACESTR",
+        description: "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
 
       option :replace_all,
-        :long => "--replace REPLACESTR",
-        :short => "-I REPLACESTR",
-        :description => "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
+        long: "--replace REPLACESTR",
+        short: "-I REPLACESTR",
+        description: "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
 
       option :max_arguments_per_command,
-        :long => "--max-args MAXARGS",
-        :short => "-n MAXARGS",
-        :description => "Maximum number of arguments per command line."
+        long: "--max-args MAXARGS",
+        short: "-n MAXARGS",
+        description: "Maximum number of arguments per command line."
 
       option :max_command_line,
-        :long => "--max-chars LENGTH",
-        :short => "-s LENGTH",
-        :description => "Maximum size of command line, in characters"
+        long: "--max-chars LENGTH",
+        short: "-s LENGTH",
+        description: "Maximum size of command line, in characters."
 
       option :verbose_commands,
-        :short => "-t",
-        :description => "Print command to be run on the command line"
+        short: "-t",
+        description: "Print command to be run on the command line."
 
       option :null_separator,
-        :short => "-0",
-        :boolean => true,
-        :description => "Use the NULL character (\0) as a separator, instead of whitespace"
+        short: "-0",
+        boolean: true,
+        description: "Use the NULL character (\0) as a separator, instead of whitespace."
 
       def run
         error = false
@@ -159,7 +175,7 @@ class Chef
           # Create the temporary files
           files.each do |file|
             tempfile = Tempfile.new(file.name)
-            tempfiles[tempfile] = { :file => file }
+            tempfiles[tempfile] = { file: file }
           end
         rescue
           destroy_tempfiles(files)
@@ -181,7 +197,7 @@ class Chef
 
       def destroy_tempfiles(tempfiles)
         # Unlink the files now that we're done with them
-        tempfiles.keys.each { |tempfile| tempfile.close! }
+        tempfiles.each_key { |tempfile| tempfile.close! }
       end
 
       def xargs_files(command, tempfiles)

data/lib/chef/local_mode.rb

@@ -73,6 +73,7 @@ class Chef
         @chef_zero_server = ChefZero::Server.new(server_options)
 
         if Chef::Config[:listen]
+          Chef.deprecated(:local_listen, "Starting local-mode server in deprecated socket mode")
           @chef_zero_server.start_background
         else
           @chef_zero_server.start_socketless