From ade944d8fe6c554a34c362a0a22ebf5e95e105c6 Mon Sep 17 00:00:00 2001 From: rishichawda Date: Mon, 8 Nov 2021 15:48:59 +0530 Subject: update specs Signed-off-by: rishichawda --- spec/functional/resource/macos_userdefaults_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spec/functional/resource/macos_userdefaults_spec.rb b/spec/functional/resource/macos_userdefaults_spec.rb index 2f79135c45..0ed7839ad0 100644 --- a/spec/functional/resource/macos_userdefaults_spec.rb +++ b/spec/functional/resource/macos_userdefaults_spec.rb @@ -116,4 +116,24 @@ describe Chef::Resource::MacosUserDefaults, :macos_only do resource.key "titlesize" expect { resource.run_action(:delete) }. to_not raise_error end + + context "resource can process FFI::Pointer type" do + it "for host property" do + resource.domain "/Library/Preferences/ManagedInstalls" + resource.key "TestDictionaryValues" + resource.value "User": "/Library/Managed Installs/way_fake.log" + resource.host :current + resource.run_action(:write) + expect { resource.run_action(:write) }. to_not raise_error + end + + it "for user property" do + resource.domain "/Library/Preferences/ManagedInstalls" + resource.key "TestDictionaryValues" + resource.value "User": "/Library/Managed Installs/way_fake.log" + resource.user :current + resource.run_action(:write) + expect { resource.run_action(:write) }. to_not raise_error + end + end end -- cgit v1.2.1 From 64f64ccc3fe4e4e30b8e6ba6dc9b46a6ae1c21d4 Mon Sep 17 00:00:00 2001 From: rishichawda Date: Mon, 8 Nov 2021 15:49:26 +0530 Subject: remove coerce, transform as needed Signed-off-by: rishichawda --- lib/chef/resource/macos_userdefaults.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/chef/resource/macos_userdefaults.rb b/lib/chef/resource/macos_userdefaults.rb index b0b9c32fe0..0ac35d90b1 100644 --- a/lib/chef/resource/macos_userdefaults.rb +++ b/lib/chef/resource/macos_userdefaults.rb @@ -18,6 +18,7 @@ require_relative "../resource" require "chef-utils/dist" unless defined?(ChefUtils::Dist) require "corefoundation" if RUBY_PLATFORM.match?(/darwin/) +require "ffi" unless defined?(FFI) autoload :Plist, "plist" class Chef @@ -81,8 +82,7 @@ class Chef property :host, [String, Symbol], description: "Set either :current, :all or a hostname to set the user default at the host level.", desired_state: false, - introduced: "16.3", - coerce: proc { |value| to_cf_host(value) } + introduced: "16.3" property :value, [Integer, Float, String, TrueClass, FalseClass, Hash, Array], description: "The value of the key. Note: With the `type` property set to `bool`, `String` forms of Boolean true/false values that Apple accepts in the defaults command will be coerced: 0/1, 'TRUE'/'FALSE,' 'true'/false', 'YES'/'NO', or 'yes'/'no'.", @@ -96,8 +96,7 @@ class Chef property :user, [String, Symbol], description: "The system user that the default will be applied to. Set :current for current user, :all for all users or pass a valid username", - desired_state: false, - coerce: proc { |value| to_cf_user(value) } + desired_state: false property :sudo, [TrueClass, FalseClass], description: "Set to true if the setting you wish to modify requires privileged access. This requires passwordless sudo for the `/usr/bin/defaults` command to be setup for the user running #{ChefUtils::Dist::Infra::PRODUCT}.", @@ -118,7 +117,7 @@ class Chef action :write, description: "Write the value to the specified domain/key." do converge_if_changed do Chef::Log.debug("Updating defaults value for #{new_resource.key} in #{new_resource.domain}") - CF::Preferences.set!(new_resource.key, new_resource.value, new_resource.domain, new_resource.user, new_resource.host) + CF::Preferences.set!(new_resource.key, new_resource.value, new_resource.domain, to_cf_user(new_resource.user), to_cf_host(new_resource.host)) end end @@ -128,12 +127,12 @@ class Chef converge_by("delete domain:#{new_resource.domain} key:#{new_resource.key}") do Chef::Log.debug("Removing defaults key: #{new_resource.key}") - CF::Preferences.set!(new_resource.key, nil, new_resource.domain, new_resource.user, new_resource.host) + CF::Preferences.set!(new_resource.key, nil, new_resource.domain, to_cf_user(new_resource.user), to_cf_host(new_resource.host)) end end def get_preference(new_resource) - CF::Preferences.get(new_resource.key, new_resource.domain, new_resource.user, new_resource.host) + CF::Preferences.get(new_resource.key, new_resource.domain, to_cf_user(new_resource.user), to_cf_host(new_resource.host)) end # Return valid hostname based on the input from host property -- cgit v1.2.1 From af0fd593ad2de7765334c5a778413224eb6f474a Mon Sep 17 00:00:00 2001 From: rishichawda Date: Thu, 11 Nov 2021 23:48:53 +0530 Subject: remove unused import Signed-off-by: rishichawda --- lib/chef/resource/macos_userdefaults.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/chef/resource/macos_userdefaults.rb b/lib/chef/resource/macos_userdefaults.rb index 0ac35d90b1..9daea38aa4 100644 --- a/lib/chef/resource/macos_userdefaults.rb +++ b/lib/chef/resource/macos_userdefaults.rb @@ -18,7 +18,6 @@ require_relative "../resource" require "chef-utils/dist" unless defined?(ChefUtils::Dist) require "corefoundation" if RUBY_PLATFORM.match?(/darwin/) -require "ffi" unless defined?(FFI) autoload :Plist, "plist" class Chef -- cgit v1.2.1 From be49c678f53f38717c397f3cdd5a5830bbe9dc6a Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Mon, 15 Nov 2021 20:40:49 +0000 Subject: Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 This pull request was triggered automatically via Expeditor when 3a1257b8c5934344bc854e604a882d7e7e5a8733 was merged. This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required. --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbac3bdeee..0e2121cecc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 2f92bd6c5a23845acc9a0991815a232c842c8ff8 + revision: 8b945f7083df2459718f023304116b8404a83a7d branch: main specs: - chefstyle (2.1.2) - rubocop (= 1.22.3) + chefstyle (2.1.3) + rubocop (= 1.23.0) GIT remote: https://github.com/chef/ohai.git @@ -142,7 +142,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.528.0) + aws-partitions (1.529.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) @@ -329,7 +329,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.3) - rubocop (1.22.3) + rubocop (1.23.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) -- cgit v1.2.1 From 1923a1048ac9842c05b3f35ab3879f2886ddaae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 14:28:50 +0000 Subject: Bump omnibus-software from `b6f2ff8` to `32876cd` in /omnibus Bumps [omnibus-software](https://github.com/chef/omnibus-software) from `b6f2ff8` to `32876cd`. - [Release notes](https://github.com/chef/omnibus-software/releases) - [Commits](https://github.com/chef/omnibus-software/compare/b6f2ff8e4dfb7d70f49c8a512fdaa3e352a6d5fc...32876cd385807cd29b7b33cee219ad028dcc6f5f) --- updated-dependencies: - dependency-name: omnibus-software dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- omnibus/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 0f4ee11c26..aaf22c7c2a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: b6f2ff8e4dfb7d70f49c8a512fdaa3e352a6d5fc + revision: 32876cd385807cd29b7b33cee219ad028dcc6f5f branch: main specs: omnibus-software (4.0.0) @@ -33,7 +33,7 @@ GEM artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.527.0) + aws-partitions (1.530.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) -- cgit v1.2.1 From aa4fc49bbce33b9a5f17faae24b74d36a427b483 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Wed, 27 Oct 2021 13:08:34 -0700 Subject: Implement compliance phase interval runs Copies the API from the audit cookbook including the same attributes Signed-off-by: Lamont Granquist --- lib/chef/compliance/default_attributes.rb | 12 ++++++- lib/chef/compliance/runner.rb | 48 +++++++++++++++++++++++-- spec/unit/compliance/runner_spec.rb | 60 +++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/lib/chef/compliance/default_attributes.rb b/lib/chef/compliance/default_attributes.rb index 3ecb1cd056..fc30716205 100644 --- a/lib/chef/compliance/default_attributes.rb +++ b/lib/chef/compliance/default_attributes.rb @@ -94,7 +94,17 @@ class Chef # Should the built-in compliance phase run. True and false force the behavior. Nil does magic based on if you have # profiles defined but do not have the audit cookbook enabled. - "compliance_phase" => false + "compliance_phase" => false, + + "interval" => { + # control how often inspec scans are run, if not on every node converge + # notes: false value will result in running inspec scan every converge + "enabled" => false, + + # controls how often inspec scans are run (in minutes) + # notes: only used if interval is enabled above + "time" => 1440, + } ) end end diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index ade35d4861..8aa4fe6140 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -71,7 +71,7 @@ class Chef logger.debug("#{self.class}##{__method__}: enabling Compliance Phase") - report + report_with_interval end def run_failed(_exception, _run_status) @@ -82,7 +82,7 @@ class Chef logger.debug("#{self.class}##{__method__}: enabling Compliance Phase") - report + report_with_interval end ### Below code adapted from audit cookbook's files/default/handler/audit_report.rb @@ -92,7 +92,6 @@ class Chef fail_if_not_present inspec_gem_source inspec_version - interval owner raise_if_unreachable }.freeze @@ -106,6 +105,18 @@ class Chef end end + def report_with_interval + interval = node["audit"]["interval"] + interval_enabled = node["audit"]["interval"]["enabled"] + interval_time = node["audit"]["interval"]["time"] + if check_interval_settings(interval, interval_enabled, interval_time) + create_timestamp_file if interval_enabled + report + else + logger.info "Skipping Chef Infra Compliance Phase due to interval settings" + end + end + def report(report = nil) logger.info "Starting Chef Infra Compliance Phase" report ||= generate_report @@ -362,6 +373,37 @@ class Chef def requested_reporters (Array(node["audit"]["reporter"]) + ["cli"]).uniq end + + def create_timestamp_file + timestamp = Time.now.utc + timestamp_file = File.new(report_timing_file, "w") + timestamp_file.puts(timestamp) + timestamp_file.close + end + + def report_timing_file + # Will create and return the complete folder path for the chef cache location and the passed in value + ::File.join(Chef::FileCache.create_cache_path("compliance"), "report_timing.json") + end + + def profile_overdue_to_run?(interval_seconds) + # Calculate when a report was last created so we delay the next report if necessary + return true unless ::File.exist?(report_timing_file) + + seconds_since_last_run = Time.now - ::File.mtime(report_timing_file) + seconds_since_last_run > interval_seconds + end + + def check_interval_settings(interval, interval_enabled, interval_time) + # handle intervals + interval_seconds = 0 # always run this by default, unless interval is defined + if !interval.nil? && interval_enabled + interval_seconds = interval_time * 60 # seconds in interval + Chef::Log.debug "Running Chef Infra Compliance Phase every #{interval_seconds} seconds" + end + # returns true if profile is overdue to run + profile_overdue_to_run?(interval_seconds) + end end end end diff --git a/spec/unit/compliance/runner_spec.rb b/spec/unit/compliance/runner_spec.rb index 602d675d4d..e8a08abfc1 100644 --- a/spec/unit/compliance/runner_spec.rb +++ b/spec/unit/compliance/runner_spec.rb @@ -1,4 +1,5 @@ require "spec_helper" +require "tmpdir" describe Chef::Compliance::Runner do let(:logger) { double(:logger).as_null_object } @@ -283,4 +284,63 @@ describe Chef::Compliance::Runner do expect(inputs["chef_node"]["chef_environment"]).to eq("_default") end end + + describe "interval running" do + let(:tempdir) { Dir.mktmpdir("chef-compliance-tests") } + + before do + allow(runner).to receive(:report_timing_file).and_return("#{tempdir}/report_timing.json") + end + + it "is disabled by default" do + expect(runner.node["audit"]["interval"]["enabled"]).to be false + end + + it "defaults to 24 hours / 1440 minutes" do + expect(runner.node["audit"]["interval"]["time"]).to be 1440 + end + + it "runs when the timing file does not exist" do + expect(runner).to receive(:report) + runner.report_with_interval + end + + it "runs when the timing file does not exist and intervals are enabled" do + node.normal["audit"]["interval"]["enabled"] = true + expect(runner).to receive(:report) + runner.report_with_interval + end + + it "runs when the timing file exists and has a recent timestamp" do + FileUtils.touch runner.report_timing_file + expect(runner).to receive(:report) + runner.report_with_interval + end + + it "does not runs when the timing file exists and has a recent timestamp and intervals are enabled" do + node.normal["audit"]["interval"]["enabled"] = true + FileUtils.touch runner.report_timing_file + expect(runner).not_to receive(:report) + runner.report_with_interval + end + + it "does not runs when the timing file exists and has a recent timestamp and intervals are enabled" do + node.normal["audit"]["interval"]["enabled"] = true + FileUtils.touch runner.report_timing_file + ten_minutes_ago = Time.now - 600 + File.utime ten_minutes_ago, ten_minutes_ago, runner.report_timing_file + expect(runner).not_to receive(:report) + runner.report_with_interval + end + + it "runs when the timing file exists and has a recent timestamp and intervals are enabled and the time is short" do + node.normal["audit"]["interval"]["enabled"] = true + node.normal["audit"]["interval"]["time"] = 9 + FileUtils.touch runner.report_timing_file + ten_minutes_ago = Time.now - 600 + File.utime ten_minutes_ago, ten_minutes_ago, runner.report_timing_file + expect(runner).to receive(:report) + runner.report_with_interval + end + end end -- cgit v1.2.1 From 195b541f9b0a3e5ead8881a4177ddc1d4bb4af43 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Wed, 27 Oct 2021 13:12:50 -0700 Subject: simplify interval running code Signed-off-by: Lamont Granquist --- lib/chef/compliance/runner.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index 8aa4fe6140..35dd11603e 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -107,10 +107,8 @@ class Chef def report_with_interval interval = node["audit"]["interval"] - interval_enabled = node["audit"]["interval"]["enabled"] - interval_time = node["audit"]["interval"]["time"] - if check_interval_settings(interval, interval_enabled, interval_time) - create_timestamp_file if interval_enabled + if check_interval_settings(interval) + create_timestamp_file if interval["enabled"] report else logger.info "Skipping Chef Infra Compliance Phase due to interval settings" @@ -375,10 +373,7 @@ class Chef end def create_timestamp_file - timestamp = Time.now.utc - timestamp_file = File.new(report_timing_file, "w") - timestamp_file.puts(timestamp) - timestamp_file.close + FileUtils.touch report_timing_file end def report_timing_file @@ -394,7 +389,9 @@ class Chef seconds_since_last_run > interval_seconds end - def check_interval_settings(interval, interval_enabled, interval_time) + def check_interval_settings(interval) + interval_enabled = interval["enabled"] + interval_time = interval["time"] # handle intervals interval_seconds = 0 # always run this by default, unless interval is defined if !interval.nil? && interval_enabled -- cgit v1.2.1 From b7f0ff9966ac7b913557643863fac76eaf7b661b Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Wed, 27 Oct 2021 16:55:38 -0700 Subject: Refactor intervals to expose remaining time Signed-off-by: Lamont Granquist --- lib/chef/compliance/runner.rb | 45 +++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index 35dd11603e..88882d3d63 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -106,12 +106,11 @@ class Chef end def report_with_interval - interval = node["audit"]["interval"] - if check_interval_settings(interval) - create_timestamp_file if interval["enabled"] + if interval_seconds_left <= 0 + create_timestamp_file if interval_enabled report else - logger.info "Skipping Chef Infra Compliance Phase due to interval settings" + logger.info "Skipping Chef Infra Compliance Phase due to interval settings (next run in #{interval_seconds_left} secs)" end end @@ -377,29 +376,33 @@ class Chef end def report_timing_file - # Will create and return the complete folder path for the chef cache location and the passed in value ::File.join(Chef::FileCache.create_cache_path("compliance"), "report_timing.json") end - def profile_overdue_to_run?(interval_seconds) - # Calculate when a report was last created so we delay the next report if necessary - return true unless ::File.exist?(report_timing_file) + def interval_time + @interval_time ||= node.read("audit", "interval", "time") + end - seconds_since_last_run = Time.now - ::File.mtime(report_timing_file) - seconds_since_last_run > interval_seconds + def interval_enabled + @interval_enabled ||= node.read("audit", "interval", "enabled") end - def check_interval_settings(interval) - interval_enabled = interval["enabled"] - interval_time = interval["time"] - # handle intervals - interval_seconds = 0 # always run this by default, unless interval is defined - if !interval.nil? && interval_enabled - interval_seconds = interval_time * 60 # seconds in interval - Chef::Log.debug "Running Chef Infra Compliance Phase every #{interval_seconds} seconds" - end - # returns true if profile is overdue to run - profile_overdue_to_run?(interval_seconds) + def interval_seconds + @interval_seconds ||= + if interval_enabled + Chef::Log.debug "Running Chef Infra Compliance Phase every #{interval_time * 60} seconds" + interval_time * 60 + else + Chef::Log.debug "Running Chef Infra Compliance Phase on every run" + 0 + end + end + + def interval_seconds_left + return 0 unless ::File.exist?(report_timing_file) + + seconds_since_last_run = Time.now - ::File.mtime(report_timing_file) + interval_seconds - seconds_since_last_run end end end -- cgit v1.2.1 From 02663dbd95b0190ec177ea6471e499d6abeee93e Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Thu, 28 Oct 2021 15:30:03 -0700 Subject: Turn seconds into minutes for slightly better human readability Signed-off-by: Lamont Granquist --- lib/chef/compliance/runner.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index 88882d3d63..d342e4c835 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -110,7 +110,7 @@ class Chef create_timestamp_file if interval_enabled report else - logger.info "Skipping Chef Infra Compliance Phase due to interval settings (next run in #{interval_seconds_left} secs)" + logger.info "Skipping Chef Infra Compliance Phase due to interval settings (next run in #{interval_seconds_left / 60.0} mins)" end end -- cgit v1.2.1 From 798b0a1264ad6fe15181023f3c55a48e71170673 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 16 Nov 2021 11:29:04 -0800 Subject: PR feedback Signed-off-by: Lamont Granquist --- lib/chef/compliance/runner.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index d342e4c835..f6d3e89b15 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -390,10 +390,10 @@ class Chef def interval_seconds @interval_seconds ||= if interval_enabled - Chef::Log.debug "Running Chef Infra Compliance Phase every #{interval_time * 60} seconds" + logger.debug "Running Chef Infra Compliance Phase every #{interval_time} minutes" interval_time * 60 else - Chef::Log.debug "Running Chef Infra Compliance Phase on every run" + logger.debug "Running Chef Infra Compliance Phase on every run" 0 end end -- cgit v1.2.1 From 9796acacb5d641cab71f26931b9558e138525f04 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 16 Nov 2021 20:09:06 +0000 Subject: Bump version to 17.8.3 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 24 ++++++++++++------------ VERSION | 2 +- chef-bin/lib/chef-bin/version.rb | 2 +- chef-config/lib/chef-config/version.rb | 2 +- chef-utils/lib/chef-utils/version.rb | 2 +- knife/lib/chef/knife/version.rb | 2 +- lib/chef/version.rb | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c75f2503ff..3be2831ba4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). - -## [v17.8.2](https://github.com/chef/chef/tree/v17.8.2) (2021-11-12) + +## [v17.8.3](https://github.com/chef/chef/tree/v17.8.3) (2021-11-16) #### Merged Pull Requests -- Fix zypper_package behavior when there is no candidate_version [#12279](https://github.com/chef/chef/pull/12279) ([lamont-granquist](https://github.com/lamont-granquist)) +- Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 [#12284](https://github.com/chef/chef/pull/12284) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) ### Changes not yet released to stable #### Merged Pull Requests +- Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 [#12284](https://github.com/chef/chef/pull/12284) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - Fix zypper_package behavior when there is no candidate_version [#12279](https://github.com/chef/chef/pull/12279) ([lamont-granquist](https://github.com/lamont-granquist)) - Bump omnibus-software from `9222241` to `b6f2ff8` in /omnibus [#12277](https://github.com/chef/chef/pull/12277) ([dependabot[bot]](https://github.com/dependabot[bot])) - pin omnibus builds to chef-16 [#12274](https://github.com/chef/chef/pull/12274) ([lamont-granquist](https://github.com/lamont-granquist)) diff --git a/Gemfile.lock b/Gemfile.lock index 0e2121cecc..bf383697cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.8.2) + chef (17.8.3) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.2) - chef-utils (= 17.8.2) + chef-config (= 17.8.3) + chef-utils (= 17.8.3) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,12 +66,12 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.8.2-universal-mingw32) + chef (17.8.3-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.2) - chef-utils (= 17.8.2) + chef-config (= 17.8.3) + chef-utils (= 17.8.3) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.8.2) - chef (= 17.8.2) + chef-bin (17.8.3) + chef (= 17.8.3) PATH remote: chef-config specs: - chef-config (17.8.2) + chef-config (17.8.3) addressable - chef-utils (= 17.8.2) + chef-utils (= 17.8.3) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -129,7 +129,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.8.2) + chef-utils (17.8.3) concurrent-ruby GEM @@ -142,7 +142,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.529.0) + aws-partitions (1.530.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) diff --git a/VERSION b/VERSION index 9797fc1c2a..91bf726216 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.2 \ No newline at end of file +17.8.3 \ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 94bb3ed1aa..a06ba02312 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.2".freeze + VERSION = "17.8.3".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index be5df8a758..149c91508c 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.2".freeze + VERSION = "17.8.3".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index eee9f16875..9b3a4c6da1 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.2" + VERSION = "17.8.3" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 47799d0112..39673019d4 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.8.2".freeze + VERSION = "17.8.3".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 7f0ebd16b9..76e9deacb5 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("17.8.2") + VERSION = Chef::VersionString.new("17.8.3") end # -- cgit v1.2.1 From 82075173b1134f0062a38657eaf670e3a50dd297 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 16 Nov 2021 20:13:18 +0000 Subject: Bump version to 17.8.4 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 22 +++++++++++----------- VERSION | 2 +- chef-bin/lib/chef-bin/version.rb | 2 +- chef-config/lib/chef-config/version.rb | 2 +- chef-utils/lib/chef-utils/version.rb | 2 +- knife/lib/chef/knife/version.rb | 2 +- lib/chef/version.rb | 2 +- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be2831ba4..c9531c7ab3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). - -## [v17.8.3](https://github.com/chef/chef/tree/v17.8.3) (2021-11-16) + +## [v17.8.4](https://github.com/chef/chef/tree/v17.8.4) (2021-11-16) #### Merged Pull Requests -- Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 [#12284](https://github.com/chef/chef/pull/12284) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) +- Bump omnibus-software from `b6f2ff8` to `32876cd` in /omnibus [#12287](https://github.com/chef/chef/pull/12287) ([dependabot[bot]](https://github.com/dependabot[bot])) ### Changes not yet released to stable #### Merged Pull Requests +- Bump omnibus-software from `b6f2ff8` to `32876cd` in /omnibus [#12287](https://github.com/chef/chef/pull/12287) ([dependabot[bot]](https://github.com/dependabot[bot])) - Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 [#12284](https://github.com/chef/chef/pull/12284) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - Fix zypper_package behavior when there is no candidate_version [#12279](https://github.com/chef/chef/pull/12279) ([lamont-granquist](https://github.com/lamont-granquist)) - Bump omnibus-software from `9222241` to `b6f2ff8` in /omnibus [#12277](https://github.com/chef/chef/pull/12277) ([dependabot[bot]](https://github.com/dependabot[bot])) diff --git a/Gemfile.lock b/Gemfile.lock index bf383697cb..44a1ffcb63 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.8.3) + chef (17.8.4) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.3) - chef-utils (= 17.8.3) + chef-config (= 17.8.4) + chef-utils (= 17.8.4) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,12 +66,12 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.8.3-universal-mingw32) + chef (17.8.4-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.3) - chef-utils (= 17.8.3) + chef-config (= 17.8.4) + chef-utils (= 17.8.4) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.8.3) - chef (= 17.8.3) + chef-bin (17.8.4) + chef (= 17.8.4) PATH remote: chef-config specs: - chef-config (17.8.3) + chef-config (17.8.4) addressable - chef-utils (= 17.8.3) + chef-utils (= 17.8.4) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -129,7 +129,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.8.3) + chef-utils (17.8.4) concurrent-ruby GEM diff --git a/VERSION b/VERSION index 91bf726216..09fb2cd1b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.3 \ No newline at end of file +17.8.4 \ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index a06ba02312..88deaf6267 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.3".freeze + VERSION = "17.8.4".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 149c91508c..f8ca9215db 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.3".freeze + VERSION = "17.8.4".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 9b3a4c6da1..ad9829f2db 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.3" + VERSION = "17.8.4" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 39673019d4..69aa42681a 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.8.3".freeze + VERSION = "17.8.4".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 76e9deacb5..33f52b1d97 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("17.8.3") + VERSION = Chef::VersionString.new("17.8.4") end # -- cgit v1.2.1 From c004ed06c393c7793b936ad6cba1afde96e08d66 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 16 Nov 2021 20:36:39 +0000 Subject: Bump version to 17.8.5 by Chef Expeditor Obvious fix; these changes are the result of automation not creative thinking. --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 24 ++++++++++++------------ VERSION | 2 +- chef-bin/lib/chef-bin/version.rb | 2 +- chef-config/lib/chef-config/version.rb | 2 +- chef-utils/lib/chef-utils/version.rb | 2 +- knife/lib/chef/knife/version.rb | 2 +- lib/chef/version.rb | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9531c7ab3..beeb7fecaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). - -## [v17.8.4](https://github.com/chef/chef/tree/v17.8.4) (2021-11-16) + +## [v17.8.5](https://github.com/chef/chef/tree/v17.8.5) (2021-11-16) #### Merged Pull Requests -- Bump omnibus-software from `b6f2ff8` to `32876cd` in /omnibus [#12287](https://github.com/chef/chef/pull/12287) ([dependabot[bot]](https://github.com/dependabot[bot])) +- fix invalid ffi type error after coerce in macos_userdefaults [#12234](https://github.com/chef/chef/pull/12234) ([rishichawda](https://github.com/rishichawda)) ### Changes not yet released to stable #### Merged Pull Requests +- fix invalid ffi type error after coerce in macos_userdefaults [#12234](https://github.com/chef/chef/pull/12234) ([rishichawda](https://github.com/rishichawda)) - Bump omnibus-software from `b6f2ff8` to `32876cd` in /omnibus [#12287](https://github.com/chef/chef/pull/12287) ([dependabot[bot]](https://github.com/dependabot[bot])) - Bump chef/chefstyle to 3a1257b8c5934344bc854e604a882d7e7e5a8733 [#12284](https://github.com/chef/chef/pull/12284) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) - Fix zypper_package behavior when there is no candidate_version [#12279](https://github.com/chef/chef/pull/12279) ([lamont-granquist](https://github.com/lamont-granquist)) diff --git a/Gemfile.lock b/Gemfile.lock index 44a1ffcb63..e04c55d4e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.8.4) + chef (17.8.5) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.4) - chef-utils (= 17.8.4) + chef-config (= 17.8.5) + chef-utils (= 17.8.5) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,12 +66,12 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.8.4-universal-mingw32) + chef (17.8.5-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.8.4) - chef-utils (= 17.8.4) + chef-config (= 17.8.5) + chef-utils (= 17.8.5) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.8.4) - chef (= 17.8.4) + chef-bin (17.8.5) + chef (= 17.8.5) PATH remote: chef-config specs: - chef-config (17.8.4) + chef-config (17.8.5) addressable - chef-utils (= 17.8.4) + chef-utils (= 17.8.5) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -129,7 +129,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.8.4) + chef-utils (17.8.5) concurrent-ruby GEM @@ -142,7 +142,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.530.0) + aws-partitions (1.531.0) aws-sdk-core (3.122.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) diff --git a/VERSION b/VERSION index 09fb2cd1b8..43162bb936 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.4 \ No newline at end of file +17.8.5 \ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 88deaf6267..96a17d7aa1 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.4".freeze + VERSION = "17.8.5".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f8ca9215db..ba7c8ac02b 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.4".freeze + VERSION = "17.8.5".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index ad9829f2db..a58b53174a 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.8.4" + VERSION = "17.8.5" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 69aa42681a..39afadebcb 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.8.4".freeze + VERSION = "17.8.5".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 33f52b1d97..932b3cdb95 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("17.8.4") + VERSION = Chef::VersionString.new("17.8.5") end # -- cgit v1.2.1