chef 12.18.31 → 13.0.118

data/spec/unit/win32/security_spec.rb

@@ -0,0 +1,66 @@
+#
+# Author:: Aliasgar Batterywala (aliasgar.batterywala@msystechnologies.com)
+# Copyright:: Copyright 2017, 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"
+if Chef::Platform.windows?
+  require "chef/win32/error"
+  require "chef/win32/security"
+  require "chef/win32/api/error"
+end
+
+describe "Chef::Win32::Security", :windows_only do
+  describe "self.get_named_security_info" do
+    context "when HR result is ERROR_SUCCESS" do
+      it "does not raise the exception" do
+        expect(Chef::ReservedNames::Win32::Security).to receive(:GetNamedSecurityInfoW).and_return(
+          Chef::ReservedNames::Win32::API::Error::ERROR_SUCCESS
+        )
+        expect { Chef::ReservedNames::Win32::Security.get_named_security_info "/temp_path" }.to_not raise_error
+      end
+    end
+
+    context "when HR result is not ERROR_SUCCESS and not ERROR_USER_NOT_FOUND" do
+      it "raises Win32APIError exception" do
+        expect(Chef::ReservedNames::Win32::Security).to receive(:GetNamedSecurityInfoW).and_return(
+          Chef::ReservedNames::Win32::API::Error::ERROR_INVALID_ACCESS
+        )
+        expect { Chef::ReservedNames::Win32::Security.get_named_security_info "/temp_path" }.to raise_error Chef::Exceptions::Win32APIError
+      end
+    end
+  end
+
+  describe "self.set_named_security_info" do
+    context "when HR result is ERROR_SUCCESS" do
+      it "does not raise the exception" do
+        expect(Chef::ReservedNames::Win32::Security).to receive(:SetNamedSecurityInfoW).and_return(
+          Chef::ReservedNames::Win32::API::Error::ERROR_SUCCESS
+        )
+        expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to_not raise_error
+      end
+    end
+
+    context "when HR result is not ERROR_SUCCESS but it is ERROR_USER_NOT_FOUND" do
+      it "raises UserIDNotFound exception" do
+        expect(Chef::ReservedNames::Win32::Security).to receive(:SetNamedSecurityInfoW).and_return(
+          Chef::ReservedNames::Win32::API::Error::ERROR_USER_NOT_FOUND
+        )
+        expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to raise_error Chef::Exceptions::Chef::Exceptions::UserIDNotFound
+      end
+    end
+  end
+end

data/tasks/bundle.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,7 +15,6 @@
 # limitations under the License.
 #
 
-require_relative "bundle_util"
 require_relative "../version_policy"
 require "fileutils"
 
@@ -23,75 +22,60 @@ desc "Tasks to work with the main Gemfile and Gemfile.<platform>"
 namespace :bundle do
   desc "Update Gemfile.lock and all Gemfile.<platform>.locks (or one or more gems via bundle:update gem1 gem2 ...)."
   task :update, [:args] do |t, rake_args|
-    extend BundleUtil
     args = rake_args[:args] || ""
-    with_bundle_unfrozen do
-      puts ""
-      puts "-------------------------------------------------------------------"
-      puts "Updating Gemfile.lock ..."
-      puts "-------------------------------------------------------------------"
-      bundle "update #{args}"
-      platforms.each do |platform|
-        bundle "update #{args}", platform: platform
-      end
+    Bundler.with_clean_env do
+      sh "bundle config --local frozen '0'"
+      sh "bundle update #{args}"
+      sh "bundle config --local frozen '1'"
     end
   end
 
   desc "Conservatively update Gemfile.lock and all Gemfile.<platform>.locks"
   task :install, [:args] do |t, rake_args|
-    extend BundleUtil
     args = rake_args[:args] || ""
-    with_bundle_unfrozen do
-      puts ""
-      puts "-------------------------------------------------------------------"
-      puts "Updating Gemfile.lock ..."
-      puts "-------------------------------------------------------------------"
-      bundle "install #{args}"
-      platforms.each do |platform|
-        bundle "lock", platform: platform
+    args = rake_args[:args] || ""
+    Bundler.with_clean_env do
+      sh "bundle config --local frozen '0'"
+      sh "bundle install #{args}"
+      sh "bundle config --local frozen '1'"
+    end
+  end
+
+  def parse_bundle_outdated(bundle_outdated_output)
+    result = []
+    bundle_outdated_output.each_line do |line|
+      if line =~ /^\s*\* (.+) \(newest ([^,]+), installed ([^,)])*/
+        gem_name, newest_version, installed_version = $1, $2, $3
+        result << [ line, gem_name ]
       end
     end
+    result
   end
 
   # Find out if we're using the latest gems we can (so we don't regress versions)
   desc "Check for gems that are not at the latest released version, and report if anything not in ACCEPTABLE_OUTDATED_GEMS (version_policy.rb) is out of date."
   task :outdated do
-    extend BundleUtil
-    puts ""
-    puts "-------------------------------------------------------------------"
-    puts "Checking for outdated gems ..."
-    puts "-------------------------------------------------------------------"
-    # TODO check for outdated windows gems too
-    with_bundle_unfrozen do
-      bundle_outdated = bundle("outdated", extract_output: true)
+    bundle_outdated = ""
+    Bundler.with_clean_env do
+      sh "bundle config --local frozen '0'"
+      bundle_outdated = `bundle outdated`
       puts bundle_outdated
-      outdated_gems = parse_bundle_outdated(bundle_outdated).map { |line, gem_name| gem_name }
-      # Weed out the acceptable ones
-      outdated_gems = outdated_gems.reject { |gem_name| ACCEPTABLE_OUTDATED_GEMS.include?(gem_name) }
-      if outdated_gems.empty?
-        puts ""
-        puts "SUCCESS!"
-      else
-        raise "ERROR: outdated gems: #{outdated_gems.join(", ")}. Either fix them or add them to ACCEPTABLE_OUTDATED_GEMS in #{__FILE__}."
-      end
+      sh "bundle config --local frozen '1'"
+    end
+    outdated_gems = parse_bundle_outdated(bundle_outdated).map { |line, gem_name| gem_name }
+    outdated_gems = outdated_gems.reject { |gem_name| ACCEPTABLE_OUTDATED_GEMS.include?(gem_name) }
+    unless outdated_gems.empty?
+      raise "ERROR: outdated gems: #{outdated_gems.join(", ")}. Either fix them or add them to ACCEPTABLE_OUTDATED_GEMS in #{__FILE__}."
     end
   end
 end
 
-desc "Run bundle with arbitrary args against the given platform; e.g. rake bundle[show]. No platform to run against the main bundle; bundle[show,windows] to run the windows one; bundle[show,*] to run against all non-default platforms."
-task :bundle, [:args, :platform] do |t, rake_args|
-  extend BundleUtil
+desc "Run bundle with arbitrary args"
+task :bundle, [:args] do |t, rake_args|
   args = rake_args[:args] || ""
-  platform = rake_args[:platform]
-  with_bundle_unfrozen do
-    if platform == "*"
-      platforms.each do |platform|
-        bundle args, platform: platform
-      end
-    elsif platform
-      bundle args, platform: platform
-    else
-      bundle args
-    end
+  Bundler.with_clean_env do
+    sh "bundle config --local frozen '0'"
+    sh "bundle #{args}"
+    sh "bundle config --local frozen '1'"
   end
 end

data/tasks/changelog.rb

@@ -22,7 +22,7 @@ begin
       config.add_issues_wo_labels = false
       config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
       config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-      config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
+      config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion,Meta: Exclude From Changelog".split(",")
       config.header = "This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)."
     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,81 +15,81 @@
 # limitations under the License.
 #
 
-require_relative "bundle_util"
 require_relative "bundle"
 require_relative "../version_policy"
 
 desc "Tasks to update and check dependencies"
 namespace :dependencies do
-  # Update all dependencies to the latest constraint-matching version
+
+  # 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. dependencies:update to update as little as possible."
-  task :update => %w{
+  task :update do |t, rake_args|
+    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|
+    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. dependencies:update to update as little as possible (CI-only)."
+  task :update_ci => %w{
                     dependencies:update_gemfile_lock
                     dependencies:update_omnibus_overrides
                     dependencies:update_omnibus_gemfile_lock
                     dependencies:update_acceptance_gemfile_lock
                     dependencies:update_kitchen_tests_gemfile_lock
                     dependencies:update_kitchen_tests_berksfile_lock
+                    dependencies:update_audit_tests_berksfile_lock
                   }
 
-  desc "Update Gemfile.lock and all Gemfile.<platform>.locks."
-  task :update_gemfile_lock do |t, rake_args|
-    Rake::Task["bundle:update"].invoke
+  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
+          sh "bundle config --local frozen '0'"
+          sh "bundle lock --update --add-platform ruby"
+          sh "bundle lock --update --add-platform x86-mingw32"
+          sh "bundle config --local frozen '1'"
+        end
+      end
+    end
   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_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
 
-  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 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
     end
   end
 
-  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
-  gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{
-    kitchen-tests
-  }
-  berksfile_lock_task :update_kitchen_tests_berksfile_lock, dirs: %w{
-    kitchen-tests
-    kitchen-tests/cookbooks/audit_test
-  }
+  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"
+  bundle_update_locked_multiplatform_task :update_kitchen_tests_gemfile_lock, "kitchen-tests"
+
+  berks_update_task :update_kitchen_tests_berksfile_lock, "kitchen-tests"
+  berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test"
 
   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|
@@ -130,6 +130,8 @@ namespace :dependencies do
     end
   end
 end
+
 desc "Update all dependencies and check for outdated gems."
-task :dependencies => [ "dependencies:update", "bundle:outdated" ]
-task :update => [ "dependencies:update", "bundle:outdated"]
+task :dependencies_ci => [ "dependencies:update_ci", "bundle:outdated" ]
+task :dependencies => [ "dependencies:update" ]
+task :update => [ "dependencies:update" ]

data/tasks/version.rb

@@ -0,0 +1,41 @@
+#
+# Copyright:: Copyright 2017 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.
+#
+
+task :ci_version_bump do
+  begin
+    require "rake"
+
+    Rake::Task["version:bump_patch"].invoke
+    Rake::Task["version:update"].invoke
+
+    # We want to log errors that occur in the following tasks, but we don't
+    # want them to stop an otherwise valid version bump from progressing.
+    begin
+      Rake::Task["changelog:update"].invoke
+    rescue Exception => e
+      puts "There was an error updating the CHANGELOG"
+      puts e
+    end
+
+    begin
+      Rake::Task["update_dockerfile"].invoke
+    rescue Exception => e
+      puts "There was an error updating the Dockerfile"
+      puts e
+    end
+  end
+end