chef 14.3.37 → 14.4.56

data/lib/chef/knife/client_reregister.rb

@@ -24,7 +24,6 @@ class Chef
 
       deps do
         require "chef/api_client_v1"
-        require "chef/json_compat"
       end
 
       banner "knife client reregister CLIENT (options)"

data/lib/chef/knife/client_show.rb

@@ -26,7 +26,6 @@ class Chef
 
       deps do
         require "chef/api_client_v1"
-        require "chef/json_compat"
       end
 
       banner "knife client show CLIENT (options)"

data/lib/chef/knife/config_get.rb

@@ -27,13 +27,13 @@ class Chef
       option :all,
              short: "-a",
              long: "--all",
-             description: "Include options that are not set in the configuration",
+             description: "Include options that are not set in the configuration.",
              default: false
 
       option :raw,
               short: "-r",
               long: "--raw",
-              description: "Display a each value with no formatting",
+              description: "Display a each value with no formatting.",
               default: false
 
       def run

data/lib/chef/knife/config_get_profile.rb

@@ -0,0 +1,37 @@
+#
+# Copyright:: Copyright (c) 2018, Noah Kantrowitz
+# 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/knife"
+
+class Chef
+  class Knife
+    class ConfigGetProfile < Knife
+      banner "knife config get-profile"
+
+      # Disable normal config loading since this shouldn't fail if the profile
+      # doesn't exist of the config is otherwise corrupted.
+      def configure_chef
+        apply_computed_config
+      end
+
+      def run
+        ui.msg(self.class.config_loader.credentials_profile(config[:profile]))
+      end
+
+    end
+  end
+end

data/lib/chef/knife/config_list_profiles.rb

@@ -0,0 +1,121 @@
+#
+# Copyright:: Copyright (c) 2018, Noah Kantrowitz
+# 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/knife"
+require "chef/workstation_config_loader"
+
+class Chef
+  class Knife
+    class ConfigListProfiles < Knife
+      banner "knife config list-profiles"
+
+      option :ignore_knife_rb,
+             short: "-i",
+             long: "--ignore-knife-rb",
+             description: "Ignore the current knife.rb configuration.",
+             default: false
+
+      def run
+        credentials_data = self.class.config_loader.parse_credentials_file
+        if credentials_data.nil? || credentials_data.empty?
+          # Should this just show the ambient knife.rb config as "default" instead?
+          ui.fatal("No profiles found, #{self.class.config_loader.credentials_file_path} does not exist or is empty")
+          exit 1
+        end
+
+        current_profile = self.class.config_loader.credentials_profile(config[:profile])
+        profiles = credentials_data.keys.map do |profile|
+          if config[:ignore_knife_rb]
+            # Don't do any fancy loading nonsense, just the raw data.
+            profile_data = credentials_data[profile]
+            {
+              profile: profile,
+              active: profile == current_profile,
+              client_name: profile_data["client_name"] || profile_data["node_name"],
+              client_key: profile_data["client_key"],
+              server_url: profile_data["chef_server_url"],
+            }
+          else
+            # Fancy loading nonsense so we get what the actual config would be.
+            # Note that this modifies the global config, after this, all bets are
+            # off as to whats in the config.
+            Chef::Config.reset
+            wcl = Chef::WorkstationConfigLoader.new(nil, Chef::Log, profile: profile)
+            wcl.load
+            {
+              profile: profile,
+              active: profile == current_profile,
+              client_name: Chef::Config[:node_name],
+              client_key: Chef::Config[:client_key],
+              server_url: Chef::Config[:chef_server_url],
+            }
+          end
+        end
+
+        # Try to reset the config.
+        unless config[:ignore_knife_rb]
+          Chef::Config.reset
+          Chef::WorkstationConfigLoader.new(config[:config_file], Chef::Log, profile: config[:profile]).load
+          apply_computed_config
+        end
+
+        if ui.interchange?
+          # Machine-readable output.
+          ui.output(profiles)
+        else
+          # Table output.
+          ui.output(render_table(profiles))
+        end
+      end
+
+      private
+
+      def render_table(profiles, padding: 2)
+        # Replace the home dir in the client key path with ~.
+        profiles.each do |profile|
+          profile[:client_key] = profile[:client_key].to_s.gsub(/^#{Regexp.escape(Dir.home)}/, "~") if profile[:client_key]
+        end
+        # Render the data to a 2D array that will be used for the table.
+        table_data = [["", "Profile", "Client", "Key", "Server"]] + profiles.map do |profile|
+          [profile[:active] ? "*" : ""] + profile.values_at(:profile, :client_name, :client_key, :server_url).map(&:to_s)
+        end
+        # Compute column widths.
+        column_widths = Array.new(table_data.first.length) do |i|
+          table_data.map { |row| row[i].length + padding }.max
+        end
+        # Special case, the first col gets no padding (because indicator) and last
+        # get no padding because last.
+        column_widths[0] -= padding
+        column_widths[-1] -= padding
+        # Build the format string for each row.
+        format_string = column_widths.map { |w| "%-#{w}.#{w}s" }.join("")
+        format_string << "\n"
+        # Print the header row and a separator.
+        table = ui.color(format_string % table_data.first, :green)
+        table << "-" * column_widths.sum
+        table << "\n"
+        # Print the rest of the table.
+        table_data.drop(1).each do |row|
+          table << format_string % row
+        end
+        # Trim the last newline because ui.output adds one.
+        table.chomp!
+      end
+
+    end
+  end
+end

data/lib/chef/knife/config_use_profile.rb

@@ -0,0 +1,50 @@
+#
+# Copyright:: Copyright (c) 2018, Noah Kantrowitz
+# 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 "fileutils"
+
+require "chef/knife"
+
+class Chef
+  class Knife
+    class ConfigUseProfile < Knife
+      banner "knife config use-profile PROFILE"
+
+      # Disable normal config loading since this shouldn't fail if the profile
+      # doesn't exist of the config is otherwise corrupted.
+      def configure_chef
+        apply_computed_config
+      end
+
+      def run
+        context_file = ChefConfig::PathHelper.home(".chef", "context").freeze
+        profile = @name_args[0]&.strip
+        if profile && !profile.empty?
+          # Ensure the .chef/ folder exists.
+          FileUtils.mkdir_p(File.dirname(context_file))
+          IO.write(context_file, "#{profile}\n")
+          ui.msg("Set default profile to #{profile}")
+        else
+          show_usage
+          ui.fatal("You must specify a profile")
+          exit 1
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/knife/configure.rb

@@ -36,29 +36,29 @@ class Chef
       option :repository,
         short: "-r REPO",
         long: "--repository REPO",
-        description: "The path to the chef-repo"
+        description: "The path to the chef-repo."
 
       option :initial,
         short: "-i",
         long: "--initial",
         boolean: true,
-        description: "Use to create a API client, typically an administrator client on a freshly-installed server"
+        description: "Use to create a API client, typically an administrator client on a freshly-installed server."
 
       option :admin_client_name,
         long: "--admin-client-name NAME",
-        description: "The name of the client, typically the name of the admin client"
+        description: "The name of the client, typically the name of the admin client."
 
       option :admin_client_key,
         long: "--admin-client-key PATH",
-        description: "The path to the private key used by the client, typically a file named admin.pem"
+        description: "The path to the private key used by the client, typically a file named admin.pem."
 
       option :validation_client_name,
         long: "--validation-client-name NAME",
-        description: "The name of the validation client, typically a client named chef-validator"
+        description: "The name of the validation client, typically a client named chef-validator."
 
       option :validation_key,
         long: "--validation-key PATH",
-        description: "The path to the validation key used by the client, typically a file named validation.pem"
+        description: "The path to the validation key used by the client, typically a file named validation.pem."
 
       def configure_chef
         # We are just faking out the system so that you can do this without a key specified

data/lib/chef/knife/cookbook_bulk_delete.rb

@@ -28,7 +28,7 @@ class Chef
         require "chef/cookbook_version"
       end
 
-      option :purge, short: "-p", long: "--purge", boolean: true, description: "Permanently remove files from backing data store"
+      option :purge, short: "-p", long: "--purge", boolean: true, description: "Permanently remove files from backing data store."
 
       banner "knife cookbook bulk delete REGEX (options)"
 

data/lib/chef/knife/cookbook_delete.rb

@@ -28,9 +28,9 @@ class Chef
         require "chef/cookbook_version"
       end
 
-      option :all, short: "-a", long: "--all", boolean: true, description: "delete all versions"
+      option :all, short: "-a", long: "--all", boolean: true, description: "Delete all versions of the cookbook."
 
-      option :purge, short: "-p", long: "--purge", boolean: true, description: "Permanently remove files from backing data store"
+      option :purge, short: "-p", long: "--purge", boolean: true, description: "Permanently remove files from backing data store."
 
       banner "knife cookbook delete COOKBOOK VERSION (options)"
 
@@ -45,7 +45,7 @@ class Chef
           delete_without_explicit_version
         elsif @cookbook_name.nil?
           show_usage
-          ui.fatal("You must provide the name of the cookbook to delete")
+          ui.fatal("You must provide the name of the cookbook to delete.")
           exit(1)
         end
       end
@@ -90,7 +90,7 @@ class Chef
         end.flatten
       rescue Net::HTTPServerException => e
         if e.to_s =~ /^404/
-          ui.error("Cannot find a cookbook named #{@cookbook_name} to delete")
+          ui.error("Cannot find a cookbook named #{@cookbook_name} to delete.")
           nil
         else
           raise

data/lib/chef/knife/cookbook_site_download.rb

@@ -17,106 +17,18 @@
 #
 
 require "chef/knife"
+require "chef/knife/supermarket_download"
 
 class Chef
   class Knife
-    class CookbookSiteDownload < Knife
+    class CookbookSiteDownload < Knife::SupermarketDownload
 
-      deps do
-        require "fileutils"
-      end
+      # Handle the subclassing (knife doesn't do this :()
+      dependency_loaders.concat(superclass.dependency_loaders)
+      options.merge!(superclass.options)
 
       banner "knife cookbook site download COOKBOOK [VERSION] (options)"
       category "cookbook site"
-
-      option :file,
-        short: "-f FILE",
-        long: "--file FILE",
-        description: "The filename to write to"
-
-      option :force,
-        long: "--force",
-        description: "Force download deprecated version"
-
-      option :supermarket_site,
-        short: "-m SUPERMARKET_SITE",
-        long: "--supermarket-site SUPERMARKET_SITE",
-        description: "Supermarket Site",
-        default: "https://supermarket.chef.io",
-        proc: Proc.new { |supermarket| Chef::Config[:knife][:supermarket_site] = supermarket }
-
-      def run
-        if current_cookbook_deprecated?
-          message = "DEPRECATION: This cookbook has been deprecated. "
-          replacement = replacement_cookbook
-          if !replacement.to_s.strip.empty?
-            message << "It has been replaced by #{replacement}."
-          else
-            message << "No replacement has been defined."
-          end
-          ui.warn message
-
-          unless config[:force]
-            ui.warn "Use --force to force download deprecated cookbook."
-            return
-          end
-        end
-
-        download_cookbook
-      end
-
-      def version
-        @version = desired_cookbook_data["version"]
-      end
-
-      private
-
-      def cookbooks_api_url
-        "#{config[:supermarket_site]}/api/v1/cookbooks"
-      end
-
-      def current_cookbook_data
-        @current_cookbook_data ||= begin
-                                     noauth_rest.get "#{cookbooks_api_url}/#{@name_args[0]}"
-                                   end
-      end
-
-      def current_cookbook_deprecated?
-        current_cookbook_data["deprecated"] == true
-      end
-
-      def desired_cookbook_data
-        @desired_cookbook_data ||= begin
-                                     uri = if @name_args.length == 1
-                                             current_cookbook_data["latest_version"]
-                                           else
-                                             specific_cookbook_version_url
-                                           end
-
-                                     noauth_rest.get uri
-                                   end
-      end
-
-      def download_cookbook
-        ui.info "Downloading #{@name_args[0]} from Supermarket at version #{version} to #{download_location}"
-        tf = noauth_rest.streaming_request(desired_cookbook_data["file"])
-
-        ::FileUtils.cp tf.path, download_location
-        ui.info "Cookbook saved: #{download_location}"
-      end
-
-      def download_location
-        config[:file] ||= File.join Dir.pwd, "#{@name_args[0]}-#{version}.tar.gz"
-        config[:file]
-      end
-
-      def replacement_cookbook
-        File.basename(current_cookbook_data["replacement"] || "")
-      end
-
-      def specific_cookbook_version_url
-        "#{cookbooks_api_url}/#{@name_args[0]}/versions/#{@name_args[1].tr('.', '_')}"
-      end
     end
   end
 end