chef-dk 3.13.1 → 4.0.60

data/lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/Berksfile.erb

@@ -2,6 +2,6 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-group :delivery do
+group :workflow do
   cookbook 'test', path: './test/fixtures/cookbooks/test'
 end

data/lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb

@@ -3,7 +3,7 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= license %>'
 version '0.1.0'
-chef_version '>= 13.0'
+chef_version '>= 14.0'
 <% if build_cookbook_parent_is_cookbook -%>
 
 depends 'delivery-truck'

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -19,7 +19,7 @@ provisioner:
   ## product_name and product_version specifies a specific Chef product and version to install.
   ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
   #  product_name: chef
-  #  product_version: 14
+  #  product_version: 15
 
 verifier:
   name: inspec

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -15,7 +15,7 @@ provisioner:
   ## product_name and product_version specifies a specific Chef product and version to install.
   ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
   #  product_name: chef
-  #  product_version: 14
+  #  product_version: 15
 
 verifier:
   name: inspec

data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb

@@ -5,7 +5,7 @@ license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 long_description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
-chef_version '>= 13.0'
+chef_version '>= 14.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
 # tracked.  A `View Issues` link will be displayed on this cookbook's page when

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.13.1".freeze
+  VERSION = "4.0.60".freeze
 end

data/spec/shared/fixture_cookbook_checksums.rb

@@ -27,7 +27,7 @@ RSpec.shared_context "fixture cookbooks checksums" do
     decimal_integers.join(".")
   end
 
-  let(:cookbook_foo_cksum) { "467dc855408ce8b74f991c5dc2fd72a6aa369b60" }
+  let(:cookbook_foo_cksum) { "f24326bbf81d67fcab6a5615c75092d1c6da81cc" }
 
   let(:cookbook_foo_cksum_dotted) { id_to_dotted(cookbook_foo_cksum) }
 

data/spec/spec_helper.rb

@@ -48,8 +48,4 @@ RSpec.configure do |c|
     mocks.verify_partial_doubles = true
   end
 
-  # better diffs when expects fail
-  c.expect_with :rspec do |r|
-    r.max_formatted_output_length = 400
-  end
 end

data/spec/unit/command/base_spec.rb

@@ -42,6 +42,7 @@ describe ChefDK::Command::Base do
   let(:stderr_io) { StringIO.new }
   let(:stdout_io) { StringIO.new }
   let(:command_instance) { TestCommand.new() }
+  let(:enforce_license) { false }
 
   def stdout
     stdout_io.string
@@ -57,7 +58,7 @@ describe ChefDK::Command::Base do
   end
 
   def run_command(options)
-    command_instance.run_with_default_options(options)
+    command_instance.run_with_default_options(enforce_license, options)
   end
 
   it "should print the banner for -h" do
@@ -95,6 +96,26 @@ describe ChefDK::Command::Base do
     expect(stdout).to eq("thanks for passing me true\n")
   end
 
+  describe "when enforce_license is true" do
+    let(:enforce_license) { true }
+
+    it "calls the license acceptance library" do
+      expect(LicenseAcceptance::Acceptor).to receive(:check_and_persist!).with("chef-dk", ChefDK::VERSION.to_s)
+      run_command([])
+      expect(stdout).to eq("thanks for passing me \n")
+    end
+  end
+
+  describe "when enforce_license is false" do
+    let(:enforce_license) { false }
+
+    it "does not call the license acceptance library" do
+      expect(LicenseAcceptance::Acceptor).to_not receive(:check_and_persist!)
+      run_command([])
+      expect(stdout).to eq("thanks for passing me \n")
+    end
+  end
+
   describe "when given invalid options" do
 
     it "prints the help banner and exits gracefully" do
@@ -105,6 +126,7 @@ describe ChefDK::Command::Base do
       expected = <<~E
         use me please
             -a, --arg ARG                    An option with a required argument
+                --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
             -h, --help                       Show this message
             -u, --user                       If the user exists
             -v, --version                    Show chef version
@@ -125,6 +147,7 @@ describe ChefDK::Command::Base do
       expected = <<~E
         use me please
             -a, --arg ARG                    An option with a required argument
+                --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
             -h, --help                       Show this message
             -u, --user                       If the user exists
             -v, --version                    Show chef version

data/spec/unit/command/env_spec.rb

@@ -36,7 +36,7 @@ describe ChefDK::Command::Env do
   end
 
   def run_command
-    command_instance.run_with_default_options(command_options)
+    command_instance.run_with_default_options(false, command_options)
   end
 
   it "has a usage banner" do

data/spec/unit/command/exec_spec.rb

@@ -24,7 +24,7 @@ describe ChefDK::Command::Exec do
   let(:command_options) { [] }
 
   def run_command
-    command_instance.run_with_default_options(command_options)
+    command_instance.run_with_default_options(false, command_options)
   end
 
   it "has a usage banner" do

data/spec/unit/command/generator_commands/build_cookbook_spec.rb

@@ -25,7 +25,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   include_context("setup_git_committer_config")
 
-  let(:argv) { %w{delivery_project} }
+  let(:argv) { %w{workflow_project} }
 
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
@@ -67,7 +67,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   let(:expected_cookbook_files) do
     expected_cookbook_file_relpaths.map do |relpath|
-      File.join(Dir["#{tempdir}"], "delivery_project", ".delivery", "build_cookbook", relpath)
+      File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", relpath)
     end
   end
 
@@ -110,9 +110,9 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
   context "when given the name of the delivery project" do
 
-    let(:argv) { %w{delivery_project} }
+    let(:argv) { %w{workflow_project} }
 
-    let(:project_dir) { File.join(tempdir, "delivery_project") }
+    let(:project_dir) { File.join(tempdir, "workflow_project") }
 
     before do
       reset_tempdir
@@ -122,7 +122,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
     it "configures the generator context" do
       cookbook_generator.read_and_validate_params
       cookbook_generator.setup_context
-      expect(generator_context.delivery_project_dir).to eq(File.join(Dir.pwd, "delivery_project"))
+      expect(generator_context.workflow_project_dir).to eq(File.join(Dir.pwd, "workflow_project"))
     end
 
     it "creates a build cookbook" do
@@ -130,7 +130,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
         allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
         expect(cookbook_generator.run).to eq(0)
       end
-      generated_files = Dir.glob("#{tempdir}/delivery_project/**/*", File::FNM_DOTMATCH)
+      generated_files = Dir.glob("#{tempdir}/workflow_project/**/*", File::FNM_DOTMATCH)
       expected_cookbook_files.each do |expected_file|
         expect(generated_files).to include(expected_file)
       end
@@ -162,7 +162,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
           end
         end
 
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "kitchen.yml") }
+        let(:file) { File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", "kitchen.yml") }
 
         it "creates a kitchen.yml with the expected content" do
           expect(IO.read(file)).to eq(expected_kitchen_yml_content)
@@ -173,7 +173,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
 
     context "when the delivery project is a cookbook" do
 
-      let(:parent_metadata_rb) { File.join(tempdir, "delivery_project", "metadata.rb") }
+      let(:parent_metadata_rb) { File.join(tempdir, "workflow_project", "metadata.rb") }
 
       before do
         FileUtils.touch(parent_metadata_rb)
@@ -188,7 +188,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       end
 
       describe "metadata.rb" do
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "metadata.rb") }
+        let(:file) { File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", "metadata.rb") }
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
@@ -198,7 +198,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
               maintainer_email 'you@example.com'
               license 'all_rights'
               version '0.1.0'
-              chef_version '>= 13.0'
+              chef_version '>= 14.0'
 
               depends 'delivery-truck'
             METADATA
@@ -228,7 +228,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
             syntax.rb
             unit.rb
           }.each do |phase_recipe|
-            recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
+            recipe_file = File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
             phase = File.basename(phase_recipe, ".rb")
             expected_content = %Q{include_recipe 'delivery-truck::#{phase}'}
             expect(IO.read(recipe_file)).to include(expected_content)
@@ -248,7 +248,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
       end
 
       describe "metadata.rb" do
-        let(:file) { File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "metadata.rb") }
+        let(:file) { File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", "metadata.rb") }
 
         include_examples "a generated file", :cookbook_name do
           let(:line) do
@@ -285,7 +285,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
             syntax.rb
             unit.rb
           }.each do |phase_recipe|
-            recipe_file = File.join(tempdir, "delivery_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
+            recipe_file = File.join(tempdir, "workflow_project", ".delivery", "build_cookbook", "recipes", phase_recipe)
             expect(IO.read(recipe_file)).to_not include("include_recipe")
           end
         end
@@ -360,7 +360,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
   end
 
   context "when given a path including the .delivery directory" do
-    let(:argv) { [ File.join(tempdir, "delivery_project", ".delivery", "build_cookbook") ] }
+    let(:argv) { [ File.join(tempdir, "workflow_project", ".delivery", "build_cookbook") ] }
 
     before do
       reset_tempdir
@@ -369,7 +369,7 @@ describe ChefDK::Command::GeneratorCommands::BuildCookbook do
     it "correctly sets the delivery project dir to the parent of the .delivery dir" do
       cookbook_generator.read_and_validate_params
       cookbook_generator.setup_context
-      expect(generator_context.delivery_project_dir).to eq(File.join(tempdir, "delivery_project"))
+      expect(generator_context.workflow_project_dir).to eq(File.join(tempdir, "workflow_project"))
     end
 
   end

data/spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb

@@ -36,9 +36,7 @@ describe ChefDK::ChefResource::GeneratorDesc do
 
   let(:stderr) { StringIO.new }
 
-  let(:null_formatter) do
-    Chef::Formatters.new(:null, stdout, stderr)
-  end
+  let(:null_formatter) { Chef::Formatters.new(:null, stdout, stderr) }
 
   let(:events) do
     Chef::EventDispatch::Dispatcher.new.tap do |d|
@@ -48,15 +46,13 @@ describe ChefDK::ChefResource::GeneratorDesc do
 
   let(:cookbook_collection) { Chef::CookbookCollection.new }
 
-  let(:run_context) do
-    Chef::RunContext.new(node, cookbook_collection, events)
-  end
+  let(:run_context) { Chef::RunContext.new(node, cookbook_collection, events) }
 
   let(:message) { "this part of the cookbook does a thing" }
 
-  let(:resource) do
-    described_class.new(message, run_context)
-  end
+  let(:resource) { described_class.new(message, run_context) }
+
+  let(:provider) { resource.provider_for_action(:write) }
 
   describe "resource" do
 
@@ -72,26 +68,10 @@ describe ChefDK::ChefResource::GeneratorDesc do
       expect(resource.identity).to eq(message)
     end
 
-  end
-
-  describe "provider" do
-
-    let(:provider) do
-      ChefDK::ChefProvider::GeneratorDesc.new(resource, run_context)
-    end
-
-    it "supports why run" do
-      expect(provider.whyrun_supported?).to be(true)
-    end
-
-    it "does nothing for load current resource" do
-      expect(provider.load_current_resource).to be(true)
-    end
-
     it "writes the message to the formatter" do
       provider.action_write
       expect(stdout.string).to include(message)
     end
-  end
 
+  end
 end

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -36,7 +36,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       test
       test/integration
       test/integration/default/default_test.rb
-      Berksfile
+      Policyfile.rb
       chefignore
       LICENSE
       metadata.rb
@@ -54,7 +54,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
 
   let(:expected_cookbook_files) do
     expected_cookbook_file_relpaths.map do |relpath|
-      File.join(Dir["#{tempdir}"], "new_cookbook", relpath)
+      File.join(tempdir, "new_cookbook", relpath)
     end
   end
 
@@ -163,155 +163,239 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       end
     end
 
-    context "by default configure for delivery" do
+    context "when passed workflow option" do
 
-      let(:dot_delivery) { File.join(tempdir, "new_cookbook", ".delivery") }
+      context "generates a workflow (delivery) cookbook" do
 
-      before do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
-        end
-      end
+        let(:argv) { %w{new_cookbook --workflow} }
 
-      describe ".delivery/project.toml" do
+        let(:dot_delivery) { File.join(tempdir, "new_cookbook", ".delivery") }
 
-        let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "project.toml") }
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+        end
 
-        let(:expected_content) do
-          <<~PROJECT_DOT_TOML
-            # Delivery for Local Phases Execution
-            #
-            # This file allows you to execute test phases locally on a workstation or
-            # in a CI pipeline. The delivery-cli will read this file and execute the
-            # command(s) that are configured for each phase. You can customize them
-            # by just modifying the phase key on this file.
-            #
-            # By default these phases are configured for Cookbook Workflow only
-            #
+        describe ".delivery/project.toml" do
+
+          let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "project.toml") }
+
+          let(:expected_content) do
+            <<~PROJECT_DOT_TOML
+              # Delivery for Local Phases Execution
+              #
+              # This file allows you to execute test phases locally on a workstation or
+              # in a CI pipeline. The delivery-cli will read this file and execute the
+              # command(s) that are configured for each phase. You can customize them
+              # by just modifying the phase key on this file.
+              #
+              # By default these phases are configured for Cookbook Workflow only
+              #
+
+              [local_phases]
+              unit = "chef exec rspec spec/"
+              lint = "chef exec cookstyle"
+              # Foodcritic includes rules only appropriate for community cookbooks
+              # uploaded to Supermarket. We turn off any rules tagged "supermarket"
+              # by default. If you plan to share this cookbook you should remove
+              # '-t ~supermarket' below to enable supermarket rules.
+              syntax = "chef exec foodcritic . -t ~supermarket"
+              provision = "chef exec kitchen create"
+              deploy = "chef exec kitchen converge"
+              smoke = "chef exec kitchen verify"
+              # The functional phase is optional, you can define it by uncommenting
+              # the line below and running the command: `delivery local functional`
+              # functional = ""
+              cleanup = "chef exec kitchen destroy"
+
+              # Remote project.toml file
+              #
+              # Instead of the local phases above, you may specify a remote URI location for
+              # the `project.toml` file. This is useful for teams that wish to centrally
+              # manage the behavior of the `delivery local` command across many different
+              # projects.
+              #
+              # remote_file = "https://url/project.toml"
+            PROJECT_DOT_TOML
+          end
+
+          it "exists with default config for Cookbook Workflow" do
+            expect(IO.read(file)).to eq(expected_content)
+          end
 
-            [local_phases]
-            unit = "chef exec rspec spec/"
-            lint = "chef exec cookstyle"
-            # Foodcritic includes rules only appropriate for community cookbooks
-            # uploaded to Supermarket. We turn off any rules tagged "supermarket"
-            # by default. If you plan to share this cookbook you should remove
-            # '-t ~supermarket' below to enable supermarket rules.
-            syntax = "chef exec foodcritic . -t ~supermarket"
-            provision = "chef exec kitchen create"
-            deploy = "chef exec kitchen converge"
-            smoke = "chef exec kitchen verify"
-            # The functional phase is optional, you can define it by uncommenting
-            # the line below and running the command: `delivery local functional`
-            # functional = ""
-            cleanup = "chef exec kitchen destroy"
-
-            # Remote project.toml file
-            #
-            # Instead of the local phases above, you may specify a remote URI location for
-            # the `project.toml` file. This is useful for teams that wish to centrally
-            # manage the behavior of the `delivery local` command across many different
-            # projects.
-            #
-            # remote_file = "https://url/project.toml"
-          PROJECT_DOT_TOML
         end
 
-        it "exists with default config for Cookbook Workflow" do
-          expect(IO.read(file)).to eq(expected_content)
+        describe ".delivery/config.json" do
+
+          let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "config.json") }
+
+          let(:expected_content) do
+            <<~CONFIG_DOT_JSON
+              {
+                "version": "2",
+                "build_cookbook": {
+                  "name": "build_cookbook",
+                  "path": ".delivery/build_cookbook"
+                },
+                "delivery-truck": {
+                  "lint": {
+                    "enable_cookstyle": true
+                  }
+                },
+                "skip_phases": [],
+                "job_dispatch": {
+                  "version": "v2"
+                },
+                "dependencies": []
+              }
+            CONFIG_DOT_JSON
+          end
+
+          it "configures delivery to use a local build cookbook" do
+            expect(IO.read(file)).to eq(expected_content)
+          end
+
         end
 
-      end
+        describe "build cookbook recipes" do
 
-      describe ".delivery/config.json" do
+          let(:file) do
+            File.join(dot_delivery, "build_cookbook", "recipes", "publish.rb")
+          end
 
-        let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "config.json") }
+          let(:expected_content) do
+            <<~CONFIG_DOT_JSON
+              #
+              # Cookbook:: build_cookbook
+              # Recipe:: publish
+              #
+              # Copyright:: 2019, The Authors, All Rights Reserved.
 
-        let(:expected_content) do
-          <<~CONFIG_DOT_JSON
-            {
-              "version": "2",
-              "build_cookbook": {
-                "name": "build_cookbook",
-                "path": ".delivery/build_cookbook"
-              },
-              "delivery-truck": {
-                "lint": {
-                  "enable_cookstyle": true
-                }
-              },
-              "skip_phases": [],
-              "job_dispatch": {
-                "version": "v2"
-              },
-              "dependencies": []
-            }
-          CONFIG_DOT_JSON
-        end
+              include_recipe 'delivery-truck::publish'
+            CONFIG_DOT_JSON
+          end
+
+          it "delegates functionality to delivery-truck" do
+            expect(IO.read(file)).to include(expected_content)
+          end
 
-        it "configures delivery to use a local build cookbook" do
-          expect(IO.read(file)).to eq(expected_content)
         end
 
-      end
+        describe "build cookbook Berksfile" do
 
-      describe "build cookbook recipes" do
+          let(:file) do
+            File.join(dot_delivery, "build_cookbook", "Berksfile")
+          end
 
-        let(:file) do
-          File.join(dot_delivery, "build_cookbook", "recipes", "publish.rb")
-        end
+          let(:expected_content) do
+            <<~CONFIG_DOT_JSON
+              source 'https://supermarket.chef.io'
 
-        let(:expected_content) do
-          <<~CONFIG_DOT_JSON
-            #
-            # Cookbook:: build_cookbook
-            # Recipe:: publish
-            #
-            # Copyright:: 2020, The Authors, All Rights Reserved.
+              metadata
+
+              group :workflow do
+                cookbook 'test', path: './test/fixtures/cookbooks/test'
+              end
+            CONFIG_DOT_JSON
+          end
+
+          it "sets the sources for delivery library cookbooks to github" do
+            expect(IO.read(file)).to include(expected_content)
+          end
 
-            include_recipe 'delivery-truck::publish'
-          CONFIG_DOT_JSON
         end
+      end
 
-        it "delegates functionality to delivery-truck" do
-          expect(IO.read(file)).to include(expected_content)
+      context "when no delivery CLI configuration is present" do
+
+        let(:argv) { %w{new_cookbook --workflow} }
+
+        it "detects no delivery config" do
+          Dir.chdir(tempdir) do
+            expect(cookbook_generator.have_delivery_config?).to be(false)
+          end
         end
 
-      end
+        it "emits concise output" do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+
+          expected = <<~OUTPUT
+            Generating cookbook new_cookbook
+            - Ensuring correct cookbook content
+            - Committing cookbook files to git
+            - Ensuring delivery CLI configuration
+            - Ensuring correct Workflow (Delivery) build cookbook content
+            - Adding delivery configuration to feature branch
+            - Adding build cookbook to feature branch
+            - Merging delivery content feature branch to master
+
+            #{non_delivery_breadcrumb}
+          OUTPUT
 
-      describe "build cookbook Berksfile" do
+          actual = stdout_io.string
 
-        let(:file) do
-          File.join(dot_delivery, "build_cookbook", "Berksfile")
+          # the formatter will add escape sequences to turn off any colors
+          actual.gsub!("\e[0m", "")
+          expect(actual).to eq(expected)
         end
+      end
 
-        let(:expected_content) do
-          <<~CONFIG_DOT_JSON
-            source 'https://supermarket.chef.io'
+      context "when a delivery CLI config is present" do
 
-            metadata
+        # Setup a situation like this:
+        # there is a dir for the delivery organization with the
+        # `.delivery/cli.toml` in it. Inside that is another dir (maybe IRL this
+        # would be "cookbooks"), then we create the cookbook inside that.
 
-            group :delivery do
-              cookbook 'test', path: './test/fixtures/cookbooks/test'
-            end
-          CONFIG_DOT_JSON
+        let(:argv) { %w{new_cookbook --workflow} }
+
+        let(:tempdir_subdir) { File.join(tempdir, "subdirectory") }
+
+        let(:dot_delivery_dir) { File.join(tempdir, ".delivery") }
+
+        let(:dot_delivery_cli_toml) { File.join(dot_delivery_dir, "cli.toml") }
+
+        before do
+          Dir.mkdir(tempdir_subdir)
+          Dir.mkdir(dot_delivery_dir)
+          FileUtils.touch(dot_delivery_cli_toml)
         end
 
-        it "sets the sources for delivery library cookbooks to github" do
-          expect(IO.read(file)).to include(expected_content)
+        it "detects the delivery config" do
+          Dir.chdir(tempdir_subdir) do
+            expect(cookbook_generator.have_delivery_config?).to be(true)
+          end
         end
 
-      end
-    end
+        it "emits concise output" do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
 
-    context "when passed delivery option" do
+          expected = <<~OUTPUT
+            Generating cookbook new_cookbook
+            - Ensuring correct cookbook content
+            - Committing cookbook files to git
+            - Ensuring delivery CLI configuration
+            - Ensuring correct Workflow (Delivery) build cookbook content
+            - Adding delivery configuration to feature branch
+            - Adding build cookbook to feature branch
+            - Merging delivery content feature branch to master
 
-      let(:argv) { %w{new_cookbook --delivery} }
+            Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
+          OUTPUT
 
-      it "still works with no action" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
+          actual = stdout_io.string
+
+          # the formatter will add escape sequences to turn off any colors
+          actual.gsub!("\e[0m", "")
+          expect(actual).to eq(expected)
         end
       end
     end
@@ -343,93 +427,6 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       end
     end
 
-    context "when no delivery CLI configuration is present" do
-
-      it "detects no delivery config" do
-        Dir.chdir(tempdir) do
-          expect(cookbook_generator.have_delivery_config?).to be(false)
-        end
-      end
-
-      it "emits concise output" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
-        end
-
-        expected = <<~OUTPUT
-          Generating cookbook new_cookbook
-          - Ensuring correct cookbook content
-          - Committing cookbook files to git
-          - Ensuring delivery configuration
-          - Ensuring correct delivery build cookbook content
-          - Adding delivery configuration to feature branch
-          - Adding build cookbook to feature branch
-          - Merging delivery content feature branch to master
-
-          #{non_delivery_breadcrumb}
-        OUTPUT
-
-        actual = stdout_io.string
-
-        # the formatter will add escape sequences to turn off any colors
-        actual.gsub!("\e[0m", "")
-        expect(actual).to eq(expected)
-      end
-    end
-
-    context "when a delivery CLI config is present" do
-
-      # Setup a situation like this:
-      # there is a dir for the delivery organization with the
-      # `.delivery/cli.toml` in it. Inside that is another dir (maybe IRL this
-      # would be "cookbooks"), then we create the cookbook inside that.
-
-      let(:tempdir_subdir) { File.join(tempdir, "subdirectory") }
-
-      let(:dot_delivery_dir) { File.join(tempdir, ".delivery") }
-
-      let(:dot_delivery_cli_toml) { File.join(dot_delivery_dir, "cli.toml") }
-
-      before do
-        Dir.mkdir(tempdir_subdir)
-        Dir.mkdir(dot_delivery_dir)
-        FileUtils.touch(dot_delivery_cli_toml)
-      end
-
-      it "detects the delivery config" do
-        Dir.chdir(tempdir_subdir) do
-          expect(cookbook_generator.have_delivery_config?).to be(true)
-        end
-      end
-
-      it "emits concise output" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
-        end
-
-        expected = <<~OUTPUT
-          Generating cookbook new_cookbook
-          - Ensuring correct cookbook content
-          - Committing cookbook files to git
-          - Ensuring delivery configuration
-          - Ensuring correct delivery build cookbook content
-          - Adding delivery configuration to feature branch
-          - Adding build cookbook to feature branch
-          - Merging delivery content feature branch to master
-
-          Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
-        OUTPUT
-
-        actual = stdout_io.string
-
-        # the formatter will add escape sequences to turn off any colors
-        actual.gsub!("\e[0m", "")
-        expect(actual).to eq(expected)
-      end
-    end
-
     shared_examples_for "a generated file" do |context_var|
       before do
         Dir.chdir(tempdir) do
@@ -578,7 +575,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
               ## product_name and product_version specifies a specific Chef product and version to install.
               ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
               #  product_name: chef
-              #  product_version: 14
+              #  product_version: 15
 
             verifier:
               name: inspec
@@ -665,7 +662,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
               ## product_name and product_version specifies a specific Chef product and version to install.
               ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
               #  product_name: chef
-              #  product_version: 14
+              #  product_version: 15
 
             verifier:
               name: inspec