Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enabled unified mode: CHEF-33 deprecation warning #822

Merged
merged 20 commits into from
Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:
command: |
echo "Using $RUBY_VERSION"
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
rvm get stable
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand All @@ -38,7 +39,8 @@ jobs:
command: |
echo "Using $RUBY_VERSION"
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
rvm get stable
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand Down Expand Up @@ -71,7 +73,8 @@ jobs:
command: |
echo "Using $RUBY_VERSION"
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
rvm get stable
# Update RVM. Using this path instead of https://get.rvm.io because the later uses the letsencrypt cert that breaks openssl 1.0
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable
rvm install $RUBY_VERSION
echo . $(rvm $RUBY_VERSION do rvm env --path) >> $BASH_ENV
- run:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changes
=======

# Unreleased

* [FEATURE] Enabled unified mode on compatible platforms since it will be the default on Chef 18. See [CHEF-33](https://docs.chef.io/deprecations_unified_mode/) deprecation.
* [FEATURE] Added support for Chef 18+.

# 4.11.1 / 2021-08-24

* [BUGFIX] Support cookbook renaming [#810][] [@lchayoun][]
Expand Down
1 change: 1 addition & 0 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ platforms:
14
16.5
17
18
)

test_platforms.product(chef_versions).each do |platform_version, chef_version|
Expand Down
6 changes: 6 additions & 0 deletions resources/integration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
# The datadog_resource must be used on a system where the datadog-agent has
# already been setup.

# enable unified mode on specific Chef versions.
# See CHEF-33 Deprecation warning:
# https://docs.chef.io/deprecations_unified_mode/

unified_mode true if respond_to?(:unified_mode)

default_action :install

property :property_name, String, name_property: true
Expand Down
6 changes: 6 additions & 0 deletions resources/monitor.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Configure a service via its yaml file

# enable unified mode on specific Chef versions.
# See CHEF-33 Deprecation warning:
# https://docs.chef.io/deprecations_unified_mode/

unified_mode true if respond_to?(:unified_mode)

require 'yaml' # Our erb templates need this

default_action :add
Expand Down