chef-dk 1.6.11 → 2.0.26

data/spec/unit/policyfile_lock_build_spec.rb

@@ -480,8 +480,8 @@ REVISION_STRING
       <<-REVISION_STRING
 name:custom_identifier
 run-list-item:recipe[foo]
-cookbook:foo;id:1.0.0
 cookbook:bar;id:0.1.0
+cookbook:foo;id:1.0.0
 default_attributes:{}
 override_attributes:{}
 REVISION_STRING
@@ -502,15 +502,6 @@ REVISION_STRING
 
         "cookbook_locks" => {
 
-          "foo" => {
-            "version" => "1.0.0",
-            "identifier" => "1.0.0",
-            "dotted_decimal_identifier" => "1.0.0",
-            "cache_key" => "foo-1.0.0",
-            "origin" => nil,
-            "source_options" => nil,
-          },
-
           "bar" => {
             "version" => "0.1.0",
             "identifier" => "0.1.0",
@@ -528,6 +519,16 @@ REVISION_STRING
             },
             "source_options" => nil,
           },
+
+          "foo" => {
+            "version" => "1.0.0",
+            "identifier" => "1.0.0",
+            "dotted_decimal_identifier" => "1.0.0",
+            "cache_key" => "foo-1.0.0",
+            "origin" => nil,
+            "source_options" => nil,
+          },
+
         },
 
         "default_attributes" => {},
@@ -603,10 +604,10 @@ name:basic_example
 run-list-item:recipe[foo]
 run-list-item:recipe[bar]
 run-list-item:recipe[baz::non_default]
-cookbook:foo;id:#{cookbook_foo_cksum}
 cookbook:bar;id:#{cookbook_bar_cksum}
 cookbook:baz;id:#{cookbook_baz_cksum}
 cookbook:dep_of_bar;id:#{cookbook_dep_of_bar_cksum}
+cookbook:foo;id:#{cookbook_foo_cksum}
 default_attributes:{}
 override_attributes:{}
 REVISION_STRING
@@ -627,15 +628,6 @@ REVISION_STRING
 
         "cookbook_locks" => {
 
-          "foo" => {
-            "version" => "1.0.0",
-            "identifier" => cookbook_foo_cksum,
-            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
-            "origin" => "https://community.chef.io/api/cookbooks/foo/1.0.0",
-            "cache_key" => "foo-1.0.0",
-            "source_options" => nil,
-          },
-
           "bar" => {
             "version" => "0.1.0",
             "identifier" => cookbook_bar_cksum,
@@ -673,6 +665,16 @@ REVISION_STRING
 
           },
 
+          "foo" => {
+            "version" => "1.0.0",
+            "identifier" => cookbook_foo_cksum,
+            "dotted_decimal_identifier" => cookbook_foo_cksum_dotted,
+            "origin" => "https://community.chef.io/api/cookbooks/foo/1.0.0",
+            "cache_key" => "foo-1.0.0",
+            "source_options" => nil,
+          },
+
+
         },
 
         "default_attributes" => {},
@@ -945,8 +947,8 @@ name:my-policyfile
 run-list-item:recipe[foo::default]
 run-list-item:recipe[bar::default]
 named-run-list:rl2;run-list-item:recipe[bar::default]
-cookbook:foo;id:#{cookbook_foo_cksum}
 cookbook:bar;id:#{cookbook_bar_cksum}
+cookbook:foo;id:#{cookbook_foo_cksum}
 default_attributes:#{canonicalized_default_attrs}
 override_attributes:#{canonicalized_override_attrs}
 REVISION_STRING

data/spec/unit/policyfile_lock_install_spec.rb

@@ -96,8 +96,8 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from a lockfile" do
       cookbook_lock = policyfile_lock.cookbook_locks["local-cookbook"]
       expect(cookbook_lock.name).to eq("local-cookbook")
       expect(cookbook_lock.version).to eq("2.3.4")
-      expect(cookbook_lock.identifier).to eq("fab501cfaf747901bd82c1bc706beae7dc3a350c")
-      expect(cookbook_lock.dotted_decimal_identifier).to eq("70567763561641081.489844270461035.258281553147148")
+      expect(cookbook_lock.identifier).to eq("1e9dfd1134735385b425c056cb5decef9081b92c")
+      expect(cookbook_lock.dotted_decimal_identifier).to eq("8617959542256467.37634246136220509.260513665759532")
       expect(cookbook_lock.source).to eq("local-cookbook")
       expect(cookbook_lock.source_options).to eq({ path: "local-cookbook" })
       expect(cookbook_lock.cookbook_location_spec.version_constraint).to eq(Semverse::Constraint.new("= 2.3.4"))

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -199,7 +199,7 @@ E
       it "updates the content identifier" do
         old_id = lock_generator.lock_data_for("local-cookbook").identifier
         expect(cookbook_lock_data.identifier).to_not eq(old_id)
-        expect(cookbook_lock_data.identifier).to eq("d71622904ed89b1e0066bb4ae823b2a7b49a615a")
+        expect(cookbook_lock_data.identifier).to eq("5a2b09f9d5e6e8a1a2d811c41d58ed200599adbe")
       end
 
       it "has an updated version and identifier" do
@@ -267,7 +267,7 @@ E
         old_id = lock_generator.lock_data_for("local-cookbook").identifier
 
         expect(cookbook_lock_data.identifier).to_not eq(old_id)
-        expect(cookbook_lock_data.identifier).to eq("08a96e3afbd1eaa1183a2dde8687ca29dbddc94b")
+        expect(cookbook_lock_data.identifier).to eq("0f62422f744d173c35a3e74f1a8c76c8b92908c2")
       end
 
       it "has an updated identifier but not an updated version" do
@@ -305,7 +305,7 @@ E
         old_id = lock_generator.lock_data_for("local-cookbook").identifier
 
         expect(cookbook_lock_data.identifier).to_not eq(old_id)
-        expect(cookbook_lock_data.identifier).to eq("da6a1c0f8791df713b7ff8c27285fbe7923901cc")
+        expect(cookbook_lock_data.identifier).to eq("af5e1252307bdf99b878ca5ede3c40e24ee9e45a")
       end
 
       it "has an updated identifier but not an updated version" do

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -106,7 +106,7 @@ describe ChefDK::PolicyfileServices::ExportRepo do
 
       let(:local_cookbook_path) { File.join(fixtures_path, "local_path_cookbooks/local-cookbook") }
 
-      let(:revision_id) { "60e5ad638dce219d8f87d589463ec4a9884007ba5e2adbb4c0a7021d67204f1a" }
+      let(:revision_id) { "7da81d2c7bb97f904637f97e7f8b487fa4bb1ed682edea7087743dec84c254ec" }
 
       let(:lockfile_content) do
         <<-E
@@ -119,8 +119,8 @@ describe ChefDK::PolicyfileServices::ExportRepo do
   "cookbook_locks": {
     "local-cookbook": {
       "version": "2.3.4",
-      "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+      "identifier": "1e9dfd1134735385b425c056cb5decef9081b92c",
+      "dotted_decimal_identifier": "42704157235437826.6970356709321892.63549625984142",
       "source": "#{local_cookbook_path}",
       "cache_key": null,
       "scm_info": null,
@@ -168,7 +168,7 @@ E
         context "when the given 'export_dir' is a directory" do
 
           it "sets the archive file location to $policy_name-$revision.tgz" do
-            expected = File.join(export_dir, "install-example-60e5ad638dce219d8f87d589463ec4a9884007ba5e2adbb4c0a7021d67204f1a.tgz")
+            expected = File.join(export_dir, "install-example-7da81d2c7bb97f904637f97e7f8b487fa4bb1ed682edea7087743dec84c254ec.tgz")
             expect(export_service.archive_file_location).to eq(expected)
           end
 
@@ -215,7 +215,7 @@ E
             expected << Pathname.new("metadata.json")
           end
 
-          let(:cookbook_with_version) { "local-cookbook-fab501cfaf747901bd82c1bc706beae7dc3a350c" }
+          let(:cookbook_with_version) { "local-cookbook-1e9dfd1134735385b425c056cb5decef9081b92c" }
 
           let(:exported_cookbook_root) { Pathname.new(File.join(export_dir, "cookbook_artifacts", cookbook_with_version)) }
 
@@ -422,7 +422,7 @@ CONFIG
           let(:archive) { true }
 
           let(:expected_archive_path) do
-            File.join(export_dir, "install-example-60e5ad638dce219d8f87d589463ec4a9884007ba5e2adbb4c0a7021d67204f1a.tgz")
+            File.join(export_dir, "install-example-7da81d2c7bb97f904637f97e7f8b487fa4bb1ed682edea7087743dec84c254ec.tgz")
           end
 
           it "exports the repo as a tgz archive" do

data/spec/unit/policyfile_services/install_spec.rb

@@ -128,7 +128,7 @@ E
 
       it "prints the lockfile's revision id" do
         install_service.run
-        expect(ui.output).to include("Policy revision id: 60e5ad638dce219d8f87d589463ec4a9884007ba5e2adbb4c0a7021d67204f1a")
+        expect(ui.output).to include("Policy revision id: 7da81d2c7bb97f904637f97e7f8b487fa4bb1ed682edea7087743dec84c254ec")
       end
 
     end

data/spec/unit/policyfile_services/update_spec.rb

@@ -0,0 +1,143 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# 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 'spec_helper'
+require "chef-dk/policyfile_services/install"
+require "chef-dk/policyfile/cookbook_sources"
+
+
+describe ChefDK::PolicyfileServices::Install do
+
+  include ChefDK::Helpers
+
+  let(:working_dir) do
+    path = File.join(tempdir, "policyfile_services_test_working_dir")
+    Dir.mkdir(path)
+    path
+  end
+
+  let(:policyfile_rb_explicit_name) { nil }
+
+  let(:policyfile_rb_name) { policyfile_rb_explicit_name || "Policyfile.rb" }
+
+  let(:policyfile_rb_path) { File.join(working_dir, policyfile_rb_name) }
+
+  let(:policyfile_lock_name) { "Policyfile.lock.json" }
+
+  let(:policyfile_lock_path) { File.join(working_dir, policyfile_lock_name) }
+
+  let(:ui) { TestHelpers::TestUI.new }
+
+  let(:install_service) { described_class.new(policyfile: policyfile_rb_name, ui: ui, root_dir: working_dir, overwrite: true) }
+
+  let(:storage_config) do
+    ChefDK::Policyfile::StorageConfig.new( cache_path: nil, relative_paths_root: local_cookbooks_root )
+  end
+
+  let(:policyfile_content) do
+    <<-EOH
+default_source :community
+name 'install-example'
+
+run_list 'top-level'
+
+cookbook 'top-level'
+cookbook 'top-level-bis'
+cookbook 'b', '>= 1.2.3'
+EOH
+  end
+
+  def cookbook_lock(name, version)
+    {
+      "version" => version,
+      "identifier" => Digest::SHA256.new.hexdigest(version),
+      "dotted_decimal_identifier" => "55385045718000942.66835911167097593.12604218968062",
+      "cache_key" => "#{name}-#{version}-supermarket.chef.io",
+      "origin" => "https://supermarket.chef.io:443/api/v1/cookbooks/#{name}/versions/#{version}/download",
+      "source_options" => {
+        "artifactserver" => "https://supermarket.chef.io:443/api/v1/cookbooks/#{name}/versions/#{version}/download",
+        "version" => version
+      }
+    }
+  end
+
+  let(:policyfile_lock_content) do
+    {
+      "revision_id" => "b33cb73a52bee7254eb53138ee44",
+      "name" => "install-example",
+      "run_list" => [ "recipe[top-level::default]" ],
+      "cookbook_locks" => {
+        "top-level" => cookbook_lock("top-level", "1.2.0"),
+        "a" => cookbook_lock("a", "2.1.0"),
+        "b" => cookbook_lock("b", "1.2.3"),
+        "top-level-bis" => cookbook_lock("top-level-bis", "1.0.0")
+      },
+      "default_attributes" => {},
+      "override_attributes" => {},
+      "solution_dependencies" => {
+        "Policyfile" => [
+          [ "top-level", "= 1.2.0" ],
+          [ "a", "= 2.1.0" ],
+          [ "b", "= 1.2.3" ],
+          [ "top-level-bis", "= 1.0.0" ],
+        ],
+        "dependencies" => {
+          "top-level (1.2.0)" => [ [ "a", "~> 2.1" ], [ "b", "~> 1.0" ] ],
+          "a (2.1.0)" => [],
+          "b (1.2.3)" => [],
+          "top-level-bis (1.0.0)" => []
+        }
+      }
+    }.to_json
+  end
+
+
+  context "when given one cookbook to update" do
+    before(:each) do
+      # stub access to Policyfile.rb and Policyfile.lock.json
+      expect(File).to receive(:exist?).at_least(:once).with(policyfile_rb_path).and_return(true)
+      expect(File).to receive(:exist?).at_least(:once).with(policyfile_lock_path).and_return(true)
+
+      expect(IO).to receive(:read).with(policyfile_rb_path).and_return(policyfile_content)
+      expect(IO).to receive(:read).with(policyfile_lock_path).and_return(policyfile_lock_content)
+
+
+      # lock generation is a no-op. Its behavior is already tested
+      # elsewhere. We only check constraints changes
+      expect(install_service).to receive(:generate_lock_and_install)
+
+      expect { install_service.run(["top-level"]) }.not_to raise_error
+    end
+    it "allows update on cookbook to update" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level"].version_constraint.to_s).to eq(">= 0.0.0")
+    end
+
+    it "does not update unrelated cookbooks" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["top-level-bis"].version_constraint.to_s).to eq("= 1.0.0")
+    end
+
+    it "allows update on dependencies" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["a"]).to be_nil
+    end
+
+    it "preserves existing constraints from Policyfile" do
+      expect(install_service.policyfile_compiler.dsl.cookbook_location_specs["b"].version_constraint.to_s).to eq(">= 1.2.3")
+    end
+
+  end
+
+end

data/tasks/announce.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
+# Copyright:: Copyright (c) 2016 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@ class ReleaseAnnouncement
 
   def initialize(version, date, type)
     @version = version
+    @maj_minor = version.split(".")[0..1].join(".")
     @date = Date.parse(date) unless date.nil?
     @release_notes = release_notes_from_file
     @type = type
@@ -40,7 +41,7 @@ class ReleaseAnnouncement
   end
 
   def release_notes_from_file
-    File.read("RELEASE_NOTES.md").match(/^# ChefDK #{@version} Release Notes\n\n(.*)/m)[1]
+    File.read("RELEASE_NOTES.md").match(/^# ChefDK #{@maj_minor} Release Notes\n\n(.*)/m)[1]
   end
 end
 

data/tasks/dependencies.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,151 +15,75 @@
 # limitations under the License.
 #
 
-require_relative "bundle_util"
-require_relative "bundle"
-require_relative "../version_policy"
-require_relative "helpers"
-
 desc "Tasks to update and check dependencies"
 namespace :dependencies do
 
   # Running update_ci on your local system wont' work. The best way to update
   # dependencies locally is by running the dependency update script.
-  desc "Update all dependencies."
+  desc "Update all dependencies. dependencies:update to update as little as possible."
   task :update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
     system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
   end
 
   desc "Force update (when adding new gems to Gemfiles)"
   task :force_update do |t, rake_args|
+    # FIXME: probably broken, and needs less indirection
     FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
     system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
   end
 
   # Update all dependencies to the latest constraint-matching version
-  desc "Update all dependencies. (CI Only)"
+  desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)."
   task :update_ci => %w{
-                    dependencies:update_stable_channel_gems
                     dependencies:update_gemfile_lock
-                    dependencies:update_omnibus_overrides
                     dependencies:update_omnibus_gemfile_lock
                     dependencies:update_acceptance_gemfile_lock
                   }
 
-  desc "Update Gemfile.lock and all Gemfile.<platform>.locks."
-  task :update_gemfile_lock do |t, rake_args|
-    Rake::Task["bundle:update"].invoke
-  end
-
-  def gemfile_lock_task(task_name, dirs: [], other_platforms: true, leave_frozen: true)
-    dirs.each do |dir|
-      desc "Update #{dir}/Gemfile.lock."
-      task task_name do |t, rake_args|
-        extend BundleUtil
-        puts ""
-        puts "-------------------------------------------------------------------"
-        puts "Updating #{dir}/Gemfile.lock ..."
-        puts "-------------------------------------------------------------------"
-        with_bundle_unfrozen(cwd: dir, leave_frozen: leave_frozen) do
-          bundle "install", cwd: dir, delete_gemfile_lock: true
-          if other_platforms
-            # Include all other supported platforms into the lockfile as well
-            platforms.each do |platform|
-              bundle "lock", cwd: dir, platform: platform
-            end
-          end
+  def bundle_update_locked_multiplatform_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          rm_f "#{dir}/Gemfile.lock"
+          sh "bundle lock --update --add-platform ruby"
+          sh "bundle lock --update --add-platform x64-mingw32"
+          sh "bundle lock --update --add-platform x86-mingw32"
         end
       end
     end
   end
 
-  def berksfile_lock_task(task_name, dirs: [])
-    dirs.each do |dir|
-      desc "Update #{dir}/Berksfile.lock."
-      task task_name do |t, rake_args|
-        extend BundleUtil
-        puts ""
-        puts "-------------------------------------------------------------------"
-        puts "Updating #{dir}/Berksfile.lock ..."
-        puts "-------------------------------------------------------------------"
-        if File.exist?("#{project_root}/#{dir}/Berksfile.lock")
-          File.delete("#{project_root}/#{dir}/Berksfile.lock")
-        end
-        Dir.chdir("#{project_root}/#{dir}") do
-          Bundler.with_clean_env do
-            sh "bundle exec berks install"
-          end
+  def bundle_update_task(task_name, dir)
+    desc "Update #{dir}/Gemfile.lock."
+    task task_name do
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          sh "bundle update"
         end
       end
     end
   end
 
-  include RakeDependenciesTaskHelpers
-
-  gemfile_lock_task :update_omnibus_gemfile_lock, dirs: %w{omnibus}
-  gemfile_lock_task :update_acceptance_gemfile_lock, dirs: %w{acceptance},
-                                                     other_platforms: false, leave_frozen: false
-
-  desc "Update gems to the versions specified by the stable channel."
-  task :update_stable_channel_gems do |t, rake_args|
-    extend BundleUtil
-    puts ""
-    puts "-------------------------------------------------------------------"
-    puts "Updating Gemfile ..."
-    puts "-------------------------------------------------------------------"
-
-    # Modify the gemfile to pin to stable chef
-    gemfile_path = File.join(project_root, "Gemfile")
-    gemfile = IO.read(gemfile_path)
-    update_gemfile_from_stable(gemfile, "chef", "chef", "v")
-    update_gemfile_from_stable(gemfile, "push-jobs-client", "opscode-pushy-client")
-
-    if gemfile != IO.read(gemfile_path)
-      puts "Writing modified #{gemfile_path} ..."
-      IO.write(gemfile_path, gemfile)
-    end
-  end
-
-  desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}."
-  task :update_omnibus_overrides do |t, rake_args|
-    puts ""
-    puts "-------------------------------------------------------------------"
-    puts "Updating omnibus_overrides.rb ..."
-    puts "-------------------------------------------------------------------"
-
-    # Generate the new overrides file
-    overrides = "# DO NOT EDIT. Generated by \"rake dependencies\". Edit version_policy.rb instead.\n"
-
-    # Replace the bundler and rubygems versions
-    OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.each do |override_name, gem_name|
-      # Get the latest bundler version
-      puts "Running gem list -r #{gem_name} ..."
-      gem_list = `gem list -r #{gem_name}`
-      unless gem_list =~ /^#{gem_name}\s*\(([^)]*)\)$/
-        raise "gem list -r #{gem_name} failed with output:\n#{gem_list}"
+  def berks_update_task(task_name, dir)
+    desc "Update #{dir}/Berksfile.lock."
+    task task_name do
+      FileUtils.rm_f("#{dir}/Berksfile.lock")
+      Dir.chdir(dir) do
+        Bundler.with_clean_env do
+          sh "bundle exec berks install"
+        end
       end
-
-      # Emit it
-      puts "Latest version of #{gem_name} is #{$1}"
-      overrides << "override #{override_name.inspect}, version: #{$1.inspect}\n"
-    end
-
-    # Add explicit overrides
-    OMNIBUS_OVERRIDES.each do |override_name, version|
-      overrides << "override #{override_name.inspect}, version: #{version.inspect}\n"
-    end
-
-    # Write the file out (if changed)
-    overrides_path = File.expand_path("../../omnibus_overrides.rb", __FILE__)
-    if overrides != IO.read(overrides_path)
-      puts "Overrides changed!"
-      puts `git diff #{overrides_path}`
-      puts "Writing modified #{overrides_path} ..."
-      IO.write(overrides_path, overrides)
     end
   end
+
+  bundle_update_locked_multiplatform_task :update_gemfile_lock, "."
+  bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus"
+  bundle_update_task :update_acceptance_gemfile_lock, "acceptance"
 end
+
 desc "Update all dependencies and check for outdated gems."
-task :dependencies_ci => [ "dependencies:update_ci", "bundle:outdated" ]
+task :dependencies_ci => [ "dependencies:update_ci" ]
 task :dependencies => [ "dependencies:update" ]
-task :update => [ "dependencies:update", "bundle:outdated" ]
+task :update => [ "dependencies:update" ]