chef-dk 4.5.0 → 4.11.0

data/Rakefile

@@ -58,20 +58,4 @@ namespace :style do
   rescue LoadError => e
     puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
   end
-
-  begin
-    require "foodcritic"
-
-    desc "Run Chef Cookbook (Foodcritic) style checks"
-    FoodCritic::Rake::LintTask.new(:foodcritic) do |t|
-      t.options = {
-        fail_tags: ["any"],
-        tags: ["~FC071", "~supermarket", "~FC031"],
-        cookbook_paths: ["lib/chef-dk/skeletons/code_generator"],
-        progress: true,
-      }
-    end
-  rescue LoadError => e
-    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
-  end
 end

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

@@ -118,43 +118,6 @@ module ChefDK
         c.smoke_test { run_in_tmpdir("kitchen init --create-gemfile") }
       end
 
-      add_component "tk-policyfile-provisioner" do |c|
-
-        c.gem_base_dir = "chef-dk"
-
-        c.smoke_test do
-          tmpdir do |cwd|
-            File.open(File.join(cwd, "kitchen.yml"), "w+") do |f|
-              f.print(<<~KITCHEN_YML)
-                ---
-                driver:
-                  name: dummy
-                  network:
-                    - ["forwarded_port", {guest: 80, host: 8080}]
-
-                provisioner:
-                  name: policyfile_zero
-                  require_chef_omnibus: 12.3.0
-
-                platforms:
-                  - name: ubuntu-14.04
-
-                suites:
-                  - name: default
-                    run_list:
-                      - recipe[aar::default]
-                    attributes:
-
-              KITCHEN_YML
-            end
-
-            sh("kitchen list", cwd: cwd)
-
-          end
-        end
-
-      end
-
       add_component "chef-client" do |c|
         c.gem_base_dir = "chef"
         c.unit_test do
@@ -185,20 +148,16 @@ module ChefDK
         end
       end
 
-      add_component "chef-apply" do |c|
-        c.gem_base_dir = "chef-apply"
-      #   c.unit_test do
-      #     bundle_install_mutex.synchronize { sh("#{embedded_bin("bundle")} install") }
-      #     sh("#{embedded_bin("bundle")} exec rspec")
-      #   end
-        c.smoke_test { sh("#{bin("chef-run")} -v") }
-      end
-
       add_component "foodcritic" do |c|
         c.gem_base_dir = "foodcritic"
         c.smoke_test { sh("#{embedded_bin("foodcritic --list")}") } # foodcritic -v exits with 2 so use --list which exits 0
       end
 
+      add_component "cookstyle" do |c|
+        c.gem_base_dir = "cookstyle"
+        c.smoke_test { sh("#{embedded_bin("cookstyle -v")}") }
+      end
+
       add_component "chefspec" do |c|
         c.gem_base_dir = "chefspec"
         c.unit_test do
@@ -417,8 +376,8 @@ module ChefDK
       end
 
       # We try and use some chef-sugar code to make sure it loads correctly
-      add_component "chef-sugar-ng" do |c|
-        c.gem_base_dir = "chef-sugar-ng"
+      add_component "chef-sugar" do |c|
+        c.gem_base_dir = "chef-sugar"
         c.smoke_test do
           tmpdir do |cwd|
             with_file(File.join(cwd, "foo.rb")) do |f|

data/lib/chef-dk/policyfile/uploader.rb

@@ -79,7 +79,7 @@ module ChefDK
 
       def data_bag_create
         http_client.post("data", { "name" => COMPAT_MODE_DATA_BAG_NAME })
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "409"
       end
 
@@ -214,7 +214,7 @@ module ChefDK
 
       def upload_lockfile_as_data_bag_item(policy_id, data_item)
         http_client.put("data/#{COMPAT_MODE_DATA_BAG_NAME}/#{policy_id}", data_item)
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise e unless e.response.code == "404"
 
         http_client.post("data/#{COMPAT_MODE_DATA_BAG_NAME}", data_item)

data/lib/chef-dk/policyfile_services/rm_policy.rb

@@ -134,7 +134,7 @@ module ChefDK
       def fetch_policy_revision_data
         @policy_revision_data = http_client.get("/policies/#{policy_name}")
         @policy_exists = true
-      rescue Net::HTTPServerException => e
+      rescue Net::HTTPClientException => e
         raise unless e.response.code == "404"
 
         @policy_exists = false

data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/README.md

@@ -129,7 +129,7 @@ delivery review
 
 ## FAQ
 
-### Why don't I just run rspec and foodcritic/rubocop on my local system?
+### Why don't I just run rspec and cookstyle/chefspec on my local system?
 
 An objection to the Test Kitchen approach is that it is much faster to run the unit, lint, and syntax commands for the project on the local system. That is totally true, and also totally valid. Do that for the really fast feedback loop. However, the dance we do with Test Kitchen brings a much higher degree of confidence in the changes we're making, that everything will run on the build nodes in Chef Workflow. We strongly encourage this approach before actually pushing the changes to Workflow.
 

data/lib/chef-dk/skeletons/code_generator/recipes/build_cookbook.rb

@@ -11,13 +11,13 @@ directory dot_delivery_dir
 
 cookbook_file config_json do
   source 'delivery-config.json'
-  not_if { File.exist?(config_json) }
+  not_if { ::File.exist?(config_json) }
 end
 
 # Adding the delivery local-mode config
 cookbook_file project_toml do
   source 'delivery-project.toml'
-  not_if { File.exist?(project_toml) }
+  not_if { ::File.exist?(project_toml) }
 end
 
 generator_desc('Ensuring correct Workflow (Delivery) build cookbook content')

data/lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb

@@ -129,7 +129,7 @@ unless context.enable_workflow
   # Adding the delivery local-mode config
   cookbook_file "#{cookbook_dir}/.delivery/project.toml" do
     source 'delivery-project.toml'
-    not_if { File.exist?("#{cookbook_dir}/.delivery/project.toml") }
+    not_if { ::File.exist?("#{cookbook_dir}/.delivery/project.toml") }
   end
 end
 

data/lib/chef-dk/skeletons/code_generator/recipes/repo.rb

@@ -60,7 +60,7 @@ if context.have_git
     execute('initialize-git') do
       command('git init .')
       cwd repo_dir
-      not_if { File.exist?("#{repo_dir}/.gitignore") }
+      not_if { ::File.exist?("#{repo_dir}/.gitignore") }
     end
   end
   template "#{repo_dir}/.gitignore" do

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "4.5.0".freeze
+  VERSION = "4.11.0".freeze
 end

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

@@ -271,7 +271,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
               # Cookbook:: build_cookbook
               # Recipe:: publish
               #
-              # Copyright:: 2019, The Authors, All Rights Reserved.
+              # Copyright:: 2020, The Authors, All Rights Reserved.
 
               include_recipe 'delivery-truck::publish'
             CONFIG_DOT_JSON

data/spec/unit/command/verify_spec.rb

@@ -38,12 +38,12 @@ describe ChefDK::Command::Verify do
   let(:default_components) do
     [
       "berkshelf",
-      "chef-apply",
       "chef-client",
       "chef-dk",
-      "chef-sugar-ng",
+      "chef-sugar",
       "chef-vault",
       "chefspec",
+      "cookstyle",
       "delivery-cli",
       "fauxhai",
       "foodcritic",
@@ -55,7 +55,6 @@ describe ChefDK::Command::Verify do
       "opscode-pushy-client",
       "package installation",
       "test-kitchen",
-      "tk-policyfile-provisioner",
     ]
   end
 

data/spec/unit/policyfile/uploader_spec.rb

@@ -319,14 +319,14 @@ describe ChefDK::Policyfile::Uploader do
 
       it "does not error when the 'policyfiles' data bag exists" do
         response = double("Net::HTTP response", code: "409")
-        error = Net::HTTPServerException.new("conflict", response)
+        error = Net::HTTPClientException .new("conflict", response)
         expect(http_client).to receive(:post).with("data", { "name" => "policyfiles" }).and_raise(error)
         expect { uploader.data_bag_create }.to_not raise_error
       end
 
       it "uploads the policyfile as a data bag item" do
         response = double("Net::HTTP response", code: "404")
-        error = Net::HTTPServerException.new("Not Found", response)
+        error = Net::HTTPClientException .new("Not Found", response)
         expect(http_client).to receive(:put)
           .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
           .and_raise(error)

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -211,6 +211,8 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
           end
 
           it "deletes what it can, then raises an error" do
+            # Ruby 2.6 deprecated HTTPServerException but the errors are still initialized using it, so
+            # this will continue to print that out until they remove HTTPServerException
             expected_message = <<~ERROR
               Failed to delete some policy revisions:
               - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -64,7 +64,7 @@ describe ChefDK::ServiceExceptionInspectors::HTTP do
   end
 
   let(:exception) do
-    Net::HTTPServerException.new(message, response).tap { |e| e.chef_rest_request = request }
+    Net::HTTPClientException .new(message, response).tap { |e| e.chef_rest_request = request }
   end
 
   subject(:inspector) { described_class.new(exception) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.11.0
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli