summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md11
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock52
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--chef.gemspec2
-rw-r--r--lib/chef/encrypted_data_bag_item/assertions.rb2
-rw-r--r--lib/chef/knife/ssh.rb2
-rw-r--r--lib/chef/provider/git.rb10
-rw-r--r--lib/chef/resource/template.rb4
-rw-r--r--lib/chef/resource_collection/resource_set.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock16
-rw-r--r--spec/functional/resource/dsc_script_spec.rb2
-rw-r--r--spec/unit/knife/core/node_editor_spec.rb2
-rw-r--r--spec/unit/provider/systemd_unit_spec.rb2
18 files changed, 65 insertions, 56 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 190b6a98dc..b01092721b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,20 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.7.68 -->
-## [v16.7.68](https://github.com/chef/chef/tree/v16.7.68) (2020-12-03)
+<!-- latest_release unreleased -->
+## Unreleased
#### Merged Pull Requests
-- only test dsc_script on 64 bit and document that it will fail on 32 bit clients [#10708](https://github.com/chef/chef/pull/10708) ([mwrock](https://github.com/mwrock))
+- only run systemd unit tests on linux [#10718](https://github.com/chef/chef/pull/10718) ([mwrock](https://github.com/mwrock))
<!-- latest_release -->
<!-- release_rollup since=16.7.61 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- only run systemd unit tests on linux [#10718](https://github.com/chef/chef/pull/10718) ([mwrock](https://github.com/mwrock)) <!-- 16.8.3 -->
+- Update Train to 3.4.1 [#10716](https://github.com/chef/chef/pull/10716) ([tas50](https://github.com/tas50)) <!-- 16.8.3 -->
+- Update license-acceptance gem to 2.1.13 [#10714](https://github.com/chef/chef/pull/10714) ([tas50](https://github.com/tas50)) <!-- 16.8.2 -->
+- only run dsc_script functional tests on 64 bit ruby [#10710](https://github.com/chef/chef/pull/10710) ([mwrock](https://github.com/mwrock)) <!-- 16.8.1 -->
+- Switch back to chefstyle from github [#10709](https://github.com/chef/chef/pull/10709) ([tas50](https://github.com/tas50)) <!-- 16.8.0 -->
- only test dsc_script on 64 bit and document that it will fail on 32 bit clients [#10708](https://github.com/chef/chef/pull/10708) ([mwrock](https://github.com/mwrock)) <!-- 16.7.68 -->
- Add new Compliance Phase replicating the functionality previously in the audit cookbook [#10547](https://github.com/chef/chef/pull/10547) ([phiggins](https://github.com/phiggins)) <!-- 16.7.67 -->
- Allow remote_file consider certificates stored under /etc/chef/trusted_certs [#10704](https://github.com/chef/chef/pull/10704) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 16.7.66 -->
diff --git a/Gemfile b/Gemfile
index f92dc7be14..30d573a2b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,9 +57,7 @@ end
group(:chefstyle) do
# for testing new chefstyle rules
- # disabled until we resolve the conflict in regexp_parser deps between rubocop and inspec
- # gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
- gem "chefstyle", "= 1.5.2"
+ gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
end
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index c8e7bd2d2a..12d28236fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,17 @@
GIT
+ remote: https://github.com/chef/chefstyle.git
+ revision: 4beb76511e5e3e414bb88942c75f107eb56a9aa1
+ branch: master
+ specs:
+ chefstyle (1.5.7)
+ rubocop (= 1.5.2)
+
+GIT
remote: https://github.com/chef/ohai.git
- revision: 876839a6324a635f15db4118366c938bdd3d675b
+ revision: 3ef9243c91c67a529bff67dc6a30e356c80b9d2b
branch: master
specs:
- ohai (16.8.0)
+ ohai (16.8.1)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -20,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.7.68)
+ chef (16.8.3)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.68)
- chef-utils (= 16.7.68)
+ chef-config (= 16.8.3)
+ chef-utils (= 16.8.3)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -57,12 +65,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.7.68-universal-mingw32)
+ chef (16.8.3-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.7.68)
- chef-utils (= 16.7.68)
+ chef-config (= 16.8.3)
+ chef-utils (= 16.8.3)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -109,15 +117,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.7.68)
- chef (= 16.7.68)
+ chef-bin (16.8.3)
+ chef (= 16.8.3)
PATH
remote: chef-config
specs:
- chef-config (16.7.68)
+ chef-config (16.8.3)
addressable
- chef-utils (= 16.7.68)
+ chef-utils (= 16.8.3)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -126,7 +134,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.7.68)
+ chef-utils (16.8.3)
GEM
remote: https://rubygems.org/
@@ -158,8 +166,6 @@ GEM
cheffish (16.0.12)
chef-zero (>= 14.0)
net-ssh
- chefstyle (1.5.2)
- rubocop (= 1.3.1)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crack (0.4.4)
@@ -188,7 +194,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hana (1.3.6)
+ hana (1.3.7)
hashdiff (1.0.1)
hashie (3.6.0)
highline (2.0.3)
@@ -228,9 +234,9 @@ GEM
regexp_parser (~> 1.5)
uri_template (~> 0.7)
libyajl2 (1.2.0)
- license-acceptance (2.1.2)
+ license-acceptance (2.1.13)
pastel (~> 0.7)
- tomlrb (~> 1.2)
+ tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
little-plugger (1.1.4)
@@ -307,13 +313,13 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.0)
- rubocop (1.3.1)
+ rubocop (1.5.2)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 1.8)
+ regexp_parser (>= 1.8, < 3.0)
rexml
- rubocop-ast (>= 1.1.1)
+ rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.3.0)
@@ -334,7 +340,7 @@ GEM
syslog-logger (1.6.8)
thor (1.0.1)
tomlrb (1.2.9)
- train-core (3.3.27)
+ train-core (3.4.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
@@ -428,7 +434,7 @@ DEPENDENCIES
chef-utils!
chef-vault
cheffish (>= 14)
- chefstyle (= 1.5.2)
+ chefstyle!
fauxhai-ng
inspec-core-bin (~> 4.23)
ohai!
diff --git a/VERSION b/VERSION
index e8d663113e..954ad849b5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.68 \ No newline at end of file
+16.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 61ef5c77e1..b102011924 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 = "16.7.68".freeze
+ VERSION = "16.8.3".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 73ae49ba5f..d282df4938 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 = "16.7.68".freeze
+ VERSION = "16.8.3".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 57f97f63b7..e286c5d435 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 = "16.7.68"
+ VERSION = "16.8.3"
end
diff --git a/chef.gemspec b/chef.gemspec
index 9379e74fa7..876ee3f513 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "ffi", ">= 1.9.25"
s.add_dependency "ffi-yajl", "~> 2.2"
- s.add_dependency "net-ssh", ">= 4.2", "< 7"
+ s.add_dependency "net-ssh", ">= 5.1", "< 7"
s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
diff --git a/lib/chef/encrypted_data_bag_item/assertions.rb b/lib/chef/encrypted_data_bag_item/assertions.rb
index 02baad2a2d..13ed0de050 100644
--- a/lib/chef/encrypted_data_bag_item/assertions.rb
+++ b/lib/chef/encrypted_data_bag_item/assertions.rb
@@ -30,7 +30,7 @@ class Chef::EncryptedDataBagItem
unless format_version.is_a?(Integer) && format_version >= Chef::Config[:data_bag_decrypt_minimum_version]
raise UnacceptableEncryptedDataBagItemFormat,
"The encrypted data bag item has format version `#{format_version}', " +
- "but the config setting 'data_bag_decrypt_minimum_version' requires version `#{Chef::Config[:data_bag_decrypt_minimum_version]}'"
+ "but the config setting 'data_bag_decrypt_minimum_version' requires version `#{Chef::Config[:data_bag_decrypt_minimum_version]}'"
end
end
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index a586bf37c2..8b254c13aa 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -289,7 +289,7 @@ class Chef
opts[:port] = port unless port.nil?
opts[:logger] = Chef::Log.with_child(subsystem: "net/ssh") if Chef::Log.level == :trace
unless config[:host_key_verify]
- opts[:verify_host_key] = false
+ opts[:verify_host_key] = :never
opts[:user_known_hosts_file] = "/dev/null"
end
if ssh_config[:keepalive]
diff --git a/lib/chef/provider/git.rb b/lib/chef/provider/git.rb
index f1c8380307..c0f6f01c59 100644
--- a/lib/chef/provider/git.rb
+++ b/lib/chef/provider/git.rb
@@ -68,9 +68,9 @@ class Chef
a.assertion { !(new_resource.revision =~ %r{^origin/}) }
a.failure_message Chef::Exceptions::InvalidRemoteGitReference,
"Deploying remote branches is not supported. " +
- "Specify the remote branch as a local branch for " +
- "the git repository you're deploying from " +
- "(ie: '#{new_resource.revision.gsub("origin/", "")}' rather than '#{new_resource.revision}')."
+ "Specify the remote branch as a local branch for " +
+ "the git repository you're deploying from " +
+ "(ie: '#{new_resource.revision.gsub("origin/", "")}' rather than '#{new_resource.revision}')."
end
requirements.assert(:all_actions) do |a|
@@ -80,8 +80,8 @@ class Chef
a.assertion { !target_revision.nil? }
a.failure_message Chef::Exceptions::UnresolvableGitReference,
"Unable to parse SHA reference for '#{new_resource.revision}' in repository '#{new_resource.repository}'. " +
- "Verify your (case-sensitive) repository URL and revision.\n" +
- "`git ls-remote '#{new_resource.repository}' '#{rev_search_pattern}'` output: #{@resolved_reference}"
+ "Verify your (case-sensitive) repository URL and revision.\n" +
+ "`git ls-remote '#{new_resource.repository}' '#{rev_search_pattern}'` output: #{@resolved_reference}"
end
end
diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb
index 88fde45a25..e3f266740d 100644
--- a/lib/chef/resource/template.rb
+++ b/lib/chef/resource/template.rb
@@ -169,8 +169,8 @@ class Chef
elsif module_name.nil?
raise Exceptions::ValidationFailed,
"#helpers requires either a module name or inline module code as a block.\n" +
- "e.g.: helpers do; helper_code; end;\n" +
- "OR: helpers(MyHelpersModule)"
+ "e.g.: helpers do; helper_code; end;\n" +
+ "OR: helpers(MyHelpersModule)"
else
raise Exceptions::ValidationFailed,
"Argument to #helpers must be a module. You gave #{module_name.inspect} (#{module_name.class})"
diff --git a/lib/chef/resource_collection/resource_set.rb b/lib/chef/resource_collection/resource_set.rb
index db298afb63..26521010bd 100644
--- a/lib/chef/resource_collection/resource_set.rb
+++ b/lib/chef/resource_collection/resource_set.rb
@@ -131,7 +131,7 @@ class Chef
else
raise Chef::Exceptions::InvalidResourceSpecification,
"The object `#{query_object.inspect}' is not valid for resource collection lookup. " +
- "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
+ "Use a String like `resource_type[resource_name]' or a Chef::Resource object"
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 2ed9051e3d..855ba0f470 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("16.7.68")
+ VERSION = Chef::VersionString.new("16.8.3")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 82adf554b5..0e3652218c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 01f76620796c00bea448f0355bb177647b3a64a2
+ revision: 3f948d5a56ef3a5af1e617af30443fabf63c6f0a
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,8 +32,8 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.401.0)
- aws-sdk-core (3.109.3)
+ aws-partitions (1.403.0)
+ aws-sdk-core (3.110.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
@@ -199,12 +199,12 @@ GEM
kitchen-vagrant (1.7.2)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
- license-acceptance (2.1.2)
+ license-acceptance (2.1.13)
pastel (~> 0.7)
- tomlrb (~> 1.2)
+ tomlrb (>= 1.2, < 3.0)
tty-box (~> 0.6)
tty-prompt (~> 0.20)
- license_scout (1.2.3)
+ license_scout (1.2.7)
ffi-yajl (~> 2.2)
mixlib-shellout (>= 2.2, < 4.0)
toml-rb (>= 1, < 3)
@@ -296,7 +296,7 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (2.7.2)
+ test-kitchen (2.8.0)
bcrypt_pbkdf (~> 1.0)
ed25519 (~> 1.2)
license-acceptance (>= 1.0.11, < 3.0)
@@ -313,7 +313,7 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.3.27)
+ train-core (3.4.1)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
diff --git a/spec/functional/resource/dsc_script_spec.rb b/spec/functional/resource/dsc_script_spec.rb
index d0baeae7a9..b22599266b 100644
--- a/spec/functional/resource/dsc_script_spec.rb
+++ b/spec/functional/resource/dsc_script_spec.rb
@@ -21,7 +21,7 @@ require "chef/mixin/powershell_exec"
require "chef/mixin/windows_architecture_helper"
require "support/shared/integration/integration_helper"
-describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :windows64_only do
+describe Chef::Resource::DscScript, :windows_powershell_dsc_only, :ruby64_only do
include Chef::Mixin::WindowsArchitectureHelper
include Chef::Mixin::PowershellExec
before(:all) do
diff --git a/spec/unit/knife/core/node_editor_spec.rb b/spec/unit/knife/core/node_editor_spec.rb
index 4eac07c313..d8e5c86d2c 100644
--- a/spec/unit/knife/core/node_editor_spec.rb
+++ b/spec/unit/knife/core/node_editor_spec.rb
@@ -74,7 +74,7 @@ describe Chef::Knife::NodeEditor do
expect(ui).to have_received(:warn)
.with "Changing the name of a node results in a new node being " +
- "created, test_node will not be modified or removed."
+ "created, test_node will not be modified or removed."
expect(ui).to have_received(:confirm)
.with("Proceed with creation of new node")
diff --git a/spec/unit/provider/systemd_unit_spec.rb b/spec/unit/provider/systemd_unit_spec.rb
index e1170b4fc5..d31d5f0919 100644
--- a/spec/unit/provider/systemd_unit_spec.rb
+++ b/spec/unit/provider/systemd_unit_spec.rb
@@ -18,7 +18,7 @@
require "spec_helper"
-describe Chef::Provider::SystemdUnit do
+describe Chef::Provider::SystemdUnit, :linux_only do
let(:node) { Chef::Node.new }
let(:events) { Chef::EventDispatch::Dispatcher.new }
View Lorry Controller Status