chef-dk 3.13.1 → 4.0.60

data/bin/chef

@@ -22,4 +22,4 @@ Kernel.trap(:INT) { print("\n"); exit 1 }
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 require "chef-dk/cli"
 
-ChefDK::CLI.new(ARGV.clone).run
+ChefDK::CLI.new(ARGV.clone).run(enforce_license: true)

data/chef-dk.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.5"
 
   gem.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -43,13 +43,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.6"
-  gem.add_dependency "chef", "~> 14.0"
+  gem.add_dependency "chef", "~> 15.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   gem.add_dependency "diff-lcs", "~> 1.0"
   gem.add_dependency "paint", "~> 1.0"
-  gem.add_dependency "chef-provisioning", "~> 2.0"
+  gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
 
   %w{rspec-core rspec-expectations rspec-mocks}.each do |dev_gem|
     gem.add_development_dependency dev_gem, "~> 3.0"

data/lib/chef-dk/builtin_commands.rb

@@ -37,12 +37,10 @@ ChefDK.commands do |c|
 
   c.builtin "push-archive", :PushArchive, desc: "Push a policy archive to a policy group on the server"
 
-  c.builtin "show-policy", :ShowPolicy, desc: "Show policyfile objects on your Chef Server"
+  c.builtin "show-policy", :ShowPolicy, desc: "Show policyfile objects on your Chef Infra Server"
 
   c.builtin "diff", :Diff, desc: "Generate an itemized diff of two Policyfile lock documents"
 
-  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook"
-
   c.builtin "export", :Export, desc: "Export a policy lock as a Chef Zero code repo"
 
   c.builtin "clean-policy-revisions", :CleanPolicyRevisions, desc: "Delete unused policy revisions on the server"

data/lib/chef-dk/cli.rb

@@ -57,7 +57,7 @@ module ChefDK
       super() # mixlib-cli #initialize doesn't allow arguments
     end
 
-    def run
+    def run(enforce_license: false)
       sanity_check!
 
       subcommand_name, *subcommand_params = argv
@@ -70,7 +70,7 @@ module ChefDK
         handle_options
       elsif have_command?(subcommand_name)
         subcommand = instantiate_subcommand(subcommand_name)
-        exit_code = subcommand.run_with_default_options(subcommand_params)
+        exit_code = subcommand.run_with_default_options(enforce_license, subcommand_params)
         exit normalized_exit_code(exit_code)
       else
         err "Unknown command `#{subcommand_name}'."
@@ -181,7 +181,6 @@ module ChefDK
     def sanity_check!
       # When installed outside of omnibus, trust the user to configure their PATH
       return true unless omnibus_install?
-
       paths = env[path_key].split(File::PATH_SEPARATOR)
       paths.map! { |p| drive_upcase(Chef::Util::PathHelper.cleanpath(p)) }
       embed_index = paths.index(drive_upcase(Chef::Util::PathHelper.cleanpath(omnibus_embedded_bin_dir)))

data/lib/chef-dk/command/base.rb

@@ -19,12 +19,15 @@ require "mixlib/cli"
 require "chef-dk/helpers"
 require "chef-dk/version"
 require "chef/exceptions"
+require "license_acceptance/acceptor"
+require "license_acceptance/cli_flags/mixlib_cli"
 
 module ChefDK
   module Command
     class Base
       include Mixlib::CLI
       include ChefDK::Helpers
+      include LicenseAcceptance::CLIFlags::MixlibCLI
 
       option :help,
         short: "-h",
@@ -47,7 +50,7 @@ module ChefDK
       # In order to control this behavior, make sure the default options are
       # handled here.
       #
-      def run_with_default_options(params = [ ])
+      def run_with_default_options(enforce_license, params = [ ])
         if needs_help?(params)
           msg(opt_parser.to_s)
           0
@@ -55,6 +58,7 @@ module ChefDK
           msg("Chef Development Kit Version: #{ChefDK::VERSION}")
           0
         else
+          check_license_acceptance if enforce_license
           run(params)
         end
       rescue Chef::Exceptions::ConfigurationError => e
@@ -74,6 +78,10 @@ module ChefDK
         params.include?("-v") || params.include?("--version")
       end
 
+      def check_license_acceptance
+        LicenseAcceptance::Acceptor.check_and_persist!("chef-dk", ChefDK::VERSION.to_s)
+      end
+
     end
   end
 end

data/lib/chef-dk/command/clean_policy_cookbooks.rb

@@ -28,8 +28,8 @@ module ChefDK
       banner(<<~BANNER)
         Usage: chef clean-policy-cookbooks [options]
 
-        `chef clean-policy-cookbooks` deletes unused Policyfile cookbooks. Cookbooks
-        are considered unused when they are not referenced by any Policyfile revision
+        `chef clean-policy-cookbooks` deletes unused policyfile cookbooks. Cookbooks
+        are considered unused when they are not referenced by any policyfile revision
         on the server. Note that cookbooks which are referenced by "orphaned" policy
         revisions are not removed, so you may wish to run `chef clean-policy-revisions`
         to remove orphaned policies before running this command.
@@ -70,7 +70,6 @@ module ChefDK
 
       def run(params)
         return 1 unless apply_params!(params)
-
         clean_policy_cookbooks_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-dk/command/clean_policy_revisions.rb

@@ -28,9 +28,9 @@ module ChefDK
       banner(<<~BANNER)
         Usage: chef clean-policy-revisions [options]
 
-        `chef clean-policy-revisions` deletes orphaned Policyfile revisions from the Chef
-        Server. Orphaned Policyfile revisions are not associated to any group, and
-        therefore not in active use by any nodes. To list orphaned Policyfile revisions
+        `chef clean-policy-revisions` deletes orphaned policyfile revisions from the Chef
+        Server. Orphaned policyfile revisions are not associated to any group, and
+        therefore not in active use by any nodes. To list orphaned policyfile revisions
         before deleting them, use `chef show-policy --orphans`.
 
         See our detailed README for more information:
@@ -67,7 +67,6 @@ module ChefDK
 
       def run(params)
         return 1 unless apply_params!(params)
-
         clean_policies_service.run
         0
       rescue PolicyfileServiceError => e

data/lib/chef-dk/command/delete_policy.rb

@@ -29,7 +29,7 @@ module ChefDK
         Usage: chef delete-policy POLICY_NAME [options]
 
         `chef delete-policy POLICY_NAME` deletes all revisions of the policy
-        `POLICY_NAME` on the configured Chef Server. All policy revisions will be
+        `POLICY_NAME` on the configured Chef Infra Server. All policy revisions will be
         backed up locally, allowing you to undo this operation via the `chef undelete`
         command.
 

data/lib/chef-dk/command/delete_policy_group.rb

@@ -29,7 +29,7 @@ module ChefDK
         Usage: chef delete-policy-group POLICY_GROUP [options]
 
         `chef delete-policy-group POLICY_GROUP` deletes the policy group POLICY_GROUP on
-        the configured Chef Server. Policy Revisions associated to the policy group are
+        the configured Chef Infra Server. Policy Revisions associated to the policy group are
         not deleted. The state of the policy group will be backed up locally, allowing
         you to undo this operation via the `chef undelete` command.
 
@@ -67,7 +67,6 @@ module ChefDK
 
       def run(params)
         return 1 unless apply_params!(params)
-
         rm_policy_group_service.run
         ui.msg("This operation can be reversed by running `chef undelete --last`.")
         0

data/lib/chef-dk/command/describe_cookbook.rb

@@ -62,7 +62,6 @@ module ChefDK
       def run(params = [])
         return 1 unless apply_params!(params)
         return 1 unless check_cookbook_path
-
         IdDumper.new(ui, cookbook_path).run
       end
 
@@ -72,9 +71,11 @@ module ChefDK
           return false
         end
 
-        md_path = File.join(cookbook_path, "metadata.rb")
-        unless File.exist?(md_path)
-          ui.err("Given cookbook path '#{cookbook_path}' does not appear to be a cookbook, it does not contain a metadata.rb")
+        mdrb_path = File.join(cookbook_path, "metadata.rb")
+        mdjson_path = File.join(cookbook_path, "metadata.json")
+
+        unless File.exist?(mdrb_path) || File.exist?(mdjson_path)
+          ui.err("Given cookbook path '#{cookbook_path}' does not appear to be a cookbook, it does not contain a metadata.rb or metadata.json")
           return false
         end
         true

data/lib/chef-dk/command/diff.rb

@@ -57,7 +57,7 @@ module ChefDK
 
         When no git-specific flag is given, `chef diff` either compares the
         current lockfile revision on disk to one on the server or compares two
-        lockfiles on the server. Lockfiles on the Chef Server are specified by
+        lockfiles on the server. Lockfiles on the Chef Infra Server are specified by
         Policy Group. Examples:
 
         * `chef diff staging`: compares the current lock with the one currently
@@ -72,28 +72,28 @@ module ChefDK
       option :git,
         short:       "-g GIT_REF",
         long:        "--git GIT_REF",
-        description: "Compare local lock against GIT_REF, or between two git commits."
+        description: "Compare local lock against GIT_REF, or between two git commits"
 
       option :head,
         long:        "--head",
-        description: "Compare local lock against last git commit.",
+        description: "Compare local lock against last git commit",
         boolean:     true
 
       option :pager,
         long:        "--[no-]pager",
-        description: "Enable/disable paged diff ouput (default: enabled).",
+        description: "Enable/disable paged diff ouput (default: enabled)",
         default:     true,
         boolean:     true
 
       option :config_file,
         short:       "-c CONFIG_FILE",
         long:        "--config CONFIG_FILE",
-        description: "Path to configuration file."
+        description: "Path to configuration file"
 
       option :debug,
         short:       "-D",
         long:        "--debug",
-        description: "Enable stacktraces and other debug output.",
+        description: "Enable stacktraces and other debug output",
         default:     false
 
       attr_accessor :ui
@@ -124,7 +124,6 @@ module ChefDK
 
       def run(params = [])
         return 1 unless apply_params!(params)
-
         print_diff
         0
       rescue PolicyfileServiceError => e
@@ -153,7 +152,7 @@ module ChefDK
         end
       end
 
-      def differ(ui = self.ui)
+      def differ(ui = self.ui())
         Policyfile::Differ.new(old_name: old_base.name,
                                old_lock: old_lock,
                                new_name: new_base.name,
@@ -290,7 +289,6 @@ module ChefDK
       def policy_group_comparison?(args)
         return false if args.empty?
         return true if args.size > 1
-
         !(args.first =~ /\.rb\Z/)
       end
 

data/lib/chef-dk/command/export.rb

@@ -83,7 +83,6 @@ module ChefDK
 
       def run(params = [])
         return 1 unless apply_params!(params)
-
         export_service.run
         ui.msg("Exported policy '#{export_service.policyfile_lock.name}' to #{export_target}")
         unless archive?

data/lib/chef-dk/command/generate.rb

@@ -20,7 +20,6 @@ require "chef-dk/command/generator_commands"
 require "chef-dk/command/generator_commands/base"
 require "chef-dk/command/generator_commands/cookbook_code_file"
 require "chef-dk/command/generator_commands/cookbook"
-require "chef-dk/command/generator_commands/app"
 require "chef-dk/command/generator_commands/attribute"
 require "chef-dk/command/generator_commands/cookbook_file"
 require "chef-dk/command/generator_commands/helpers"
@@ -46,19 +45,17 @@ module ChefDK
         generators << GeneratorCommand.new(name, class_name, description)
       end
 
-      generator(:app, :App, "Generate an application repo - DEPRECATED")
       generator(:cookbook, :Cookbook, "Generate a single cookbook")
       generator(:recipe, :Recipe, "Generate a new recipe")
       generator(:attribute, :Attribute, "Generate an attributes file")
       generator(:template, :Template, "Generate a file template")
       generator(:file, :CookbookFile, "Generate a cookbook file")
       generator(:helpers, :Helpers, "Generate a cookbook helper file in libraries")
-      generator(:lwrp, :Resource, "Generate a lightweight resource provider (LWRP) - DEPRECATED")
       generator(:resource, :Resource, "Generate a custom resource")
       generator(:repo, :Repo, "Generate a Chef code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
       generator(:generator, :GeneratorGenerator, "Copy ChefDK's generator cookbook so you can customize it")
-      generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with Workflow")
+      generator(:'build-cookbook', :BuildCookbook, "Generate a build cookbook for use with Chef Workflow (Delivery)")
 
       def self.banner_headline
         <<~E
@@ -86,7 +83,6 @@ module ChefDK
 
       def run(params)
         if ( generator_spec = generator_for(params[0]) )
-          puts "WARNING: The command 'chef generator #{params[0]}' is deprecated and will be removed from the next major release of Chef DK / Workstation (April 2019)\n\n" if %w{lwrp app}.include?(params[0])
           params.shift
           generator = GeneratorCommands.build(generator_spec.class_name, params)
           generator.run
@@ -114,7 +110,6 @@ module ChefDK
       # we delegate the request to the specified generator.
       def needs_help?(params)
         return false if have_generator?(params[0])
-
         super
       end
 

data/lib/chef-dk/command/generator_commands/build_cookbook.rb

@@ -59,9 +59,9 @@ module ChefDK
 
         def setup_context
           super
-          Generator.add_attr_to_context(:delivery_project_dir, delivery_project_dir)
+          Generator.add_attr_to_context(:workflow_project_dir, workflow_project_dir)
 
-          Generator.add_attr_to_context(:delivery_project_git_initialized, delivery_project_git_initialized?)
+          Generator.add_attr_to_context(:workflow_project_git_initialized, workflow_project_git_initialized?)
           Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, build_cookbook_parent_is_cookbook?)
 
           Generator.add_attr_to_context(:pipeline, pipeline)
@@ -76,13 +76,13 @@ module ChefDK
         end
 
         def build_cookbook_parent_is_cookbook?
-          metadata_json_path = File.join(delivery_project_dir, "metadata.json")
-          metadata_rb_path = File.join(delivery_project_dir, "metadata.rb")
+          metadata_json_path = File.join(workflow_project_dir, "metadata.json")
+          metadata_rb_path = File.join(workflow_project_dir, "metadata.rb")
 
           File.exist?(metadata_json_path) || File.exist?(metadata_rb_path)
         end
 
-        def delivery_project_dir
+        def workflow_project_dir
           project_dir = File.expand_path(cookbook_name_or_path, Dir.pwd)
           # Detect if we were invoked with arguments like
           #
@@ -103,8 +103,8 @@ module ChefDK
           project_dir
         end
 
-        def delivery_project_git_initialized?
-          File.exist?(File.join(delivery_project_dir, ".git"))
+        def workflow_project_git_initialized?
+          File.exist?(File.join(workflow_project_dir, ".git"))
         end
 
         def read_and_validate_params

data/lib/chef-dk/command/generator_commands/chef_exts/generator_desc_resource.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2019 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
 #
 
 require "chef/resource"
-require "chef/provider"
 
 module ChefDK
   module ChefResource
@@ -28,58 +27,14 @@ module ChefDK
     # As the name implies, it is used to describe the steps that the generator
     # takes to create a cookbook.
     class GeneratorDesc < Chef::Resource
+      resource_name :generator_desc
 
-      resource_name(:generator_desc)
-
-      identity_attr(:message)
-
-      default_action(:write)
-
-      def initialize(name, run_context = nil)
-        super
-        @message = name
-      end
-
-      def message(arg = nil)
-        set_or_return(
-          :message,
-          arg,
-          kind_of: String
-        )
-      end
-
-    end
-  end
-
-  module ChefProvider
-
-    # Chef log provider, allows logging to chef's logs from recipes
-    class GeneratorDesc < Chef::Provider
-
-      provides :generator_desc
-
-      def whyrun_supported?
-        true
-      end
-
-      # No concept of a 'current' resource for logs, this is a no-op
-      #
-      # === Return
-      # true:: Always return true
-      def load_current_resource
-        true
-      end
+      property :message, String, name_property: true
 
       # Write the log to Chef's log
-      #
-      # === Return
-      # true:: Always return true
-      def action_write
+      action :write do
         run_context.events.subscribers.first.puts_line("- #{new_resource.message}")
-        new_resource.updated_by_last_action(true)
       end
-
     end
-
   end
 end