summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--.travis.yml13
-rw-r--r--CHANGELOG.md13
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--appveyor.yml20
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--distro/powershell/chef/chef.psm16
-rw-r--r--kitchen-tests/Berksfile.lock62
-rw-r--r--kitchen-tests/Gemfile15
-rw-r--r--kitchen-tests/Gemfile.lock403
-rw-r--r--lib/chef/deprecated.rb10
-rw-r--r--lib/chef/knife/core/ui.rb2
-rw-r--r--lib/chef/knife/edit.rb2
-rw-r--r--lib/chef/property.rb16
-rw-r--r--lib/chef/provider/apt_preference.rb2
-rw-r--r--lib/chef/provider/apt_repository.rb2
-rw-r--r--lib/chef/provider/apt_update.rb2
-rw-r--r--lib/chef/provider/package/smartos.rb4
-rw-r--r--lib/chef/resource/erl_call.rb5
-rw-r--r--lib/chef/resource/zypper_repository.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/integration/recipes/resource_action_spec.rb2
-rw-r--r--spec/unit/property_spec.rb26
-rw-r--r--tasks/dependencies.rb5
25 files changed, 87 insertions, 547 deletions
diff --git a/.gitignore b/.gitignore
index 3a32f47541..35aecf92cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,8 +39,10 @@ doc/
Vagrantfile
.vagrant/
-# Kitchen Tests Local Mode Data
+# Kitchen Tests lock files and chef data
kitchen-tests/nodes/*
+kitchen-tests/Gemfile.lock
+kitchen-tests/Berksfile.lock
# Temporary files present during spec runs
spec/data/test-dir
diff --git a/.travis.yml b/.travis.yml
index fd8f8d33f6..ab0411e4b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,7 +132,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -150,7 +149,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -168,7 +166,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -186,7 +183,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -204,7 +200,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -222,7 +217,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -240,7 +234,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -258,7 +251,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -276,7 +268,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -294,7 +285,6 @@ matrix:
before_install:
- gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
before_script:
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
- cd kitchen-tests
@@ -312,7 +302,6 @@ matrix:
# before_install:
# - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
# - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-# bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
# before_script:
# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
# - cd kitchen-tests
@@ -330,7 +319,6 @@ matrix:
# before_install:
# - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
# - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
-# bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
# before_script:
# - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
# - cd kitchen-tests
@@ -349,7 +337,6 @@ matrix:
- gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
- sudo apt-get update
- sudo apt-get -y install squid3 git curl
- bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
env:
- PROXY_TESTS_DIR=proxy_tests/files/default/scripts
- PROXY_TESTS_REPO=$PROXY_TESTS_DIR/repo
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f209c3b9e3..4df8b5f34d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,22 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.53 -->
-## [v13.6.53](https://github.com/chef/chef/tree/v13.6.53) (2017-12-21)
+<!-- latest_release 13.7.3 -->
+## [v13.7.3](https://github.com/chef/chef/tree/v13.7.3) (2018-01-03)
#### Merged Pull Requests
-- Escape single-quoted strings from the context in knife bootstrap [#6695](https://github.com/chef/chef/pull/6695) ([aespinosa](https://github.com/aespinosa))
+- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Don&#39;t check both platform_family / os in provides when platform_family will do [#6711](https://github.com/chef/chef/pull/6711) ([tas50](https://github.com/tas50)) <!-- 13.7.3 -->
+- Update the knife editor error message to point to the correct document [#6726](https://github.com/chef/chef/pull/6726) ([tas50](https://github.com/tas50)) <!-- 13.7.2 -->
+- Remove a useless regex in zypper_repository resource [#6710](https://github.com/chef/chef/pull/6710) ([tas50](https://github.com/tas50)) <!-- 13.7.1 -->
+- Deprecate erl_call resource [#6720](https://github.com/chef/chef/pull/6720) ([tas50](https://github.com/tas50)) <!-- 13.6.57 -->
+- Improve property warnings in resources [#6717](https://github.com/chef/chef/pull/6717) ([tas50](https://github.com/tas50)) <!-- 13.6.56 -->
+- Remove lock files and test github masters in Kitchen Tests [#6709](https://github.com/chef/chef/pull/6709) ([tas50](https://github.com/tas50)) <!-- 13.6.55 -->
+- [MSYS-692] Fix issue with PowerShell function buffer [#6664](https://github.com/chef/chef/pull/6664) ([TheLunaticScripter](https://github.com/TheLunaticScripter)) <!-- 13.6.54 -->
- Escape single-quoted strings from the context in knife bootstrap [#6695](https://github.com/chef/chef/pull/6695) ([aespinosa](https://github.com/aespinosa)) <!-- 13.6.53 -->
- Allow injecting tempfiles into Chef::HTTP [#6701](https://github.com/chef/chef/pull/6701) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.52 -->
- Modernize launchd resource [#6698](https://github.com/chef/chef/pull/6698) ([tas50](https://github.com/tas50)) <!-- 13.6.51 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e2ca2a965d..2a6e1d2f46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.53)
+ chef (13.7.3)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.53)
+ chef-config (= 13.7.3)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.53-universal-mingw32)
+ chef (13.7.3-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.53)
+ chef-config (= 13.7.3)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.53)
+ chef-config (13.7.3)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -265,7 +265,7 @@ GEM
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
- rspec-core (3.7.0)
+ rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
diff --git a/VERSION b/VERSION
index 9832b5d8ad..e32d1dd484 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.53 \ No newline at end of file
+13.7.3 \ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 959c8e616c..aa9fb93902 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,9 @@ os: Visual Studio 2015
platform:
- x64
+cache:
+- vendor/bundle
+
environment:
matrix:
- ruby_version: "24-x64"
@@ -26,19 +29,22 @@ install:
- echo %OMNIBUS_RUBYGEMS%
- ps: $env:OMNIBUS_BUNDLER=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
- echo %OMNIBUS_BUNDLER%
- - ruby --version
- gem --version
- gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS%
- - gem --version
- - bundler --version
- - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci
- appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
- set SSL_CERT_FILE=C:\cacert.pem
- - bundle env
-
-build_script:
+ - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci
+ - bundle config --local path vendor/bundle # use the cache we define above
- bundle install || bundle install || bundle install
+build: off
+
+before_test:
+ - ruby --version
+ - gem --version
+ - bundler --version
+ - bundle env
+
test_script:
- SET SPEC_OPTS=--format progress
- bundle exec rake spec
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 293d4a6c10..7f1c2e39ea 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.6.53"
+ VERSION = "13.7.3"
end
#
diff --git a/distro/powershell/chef/chef.psm1 b/distro/powershell/chef/chef.psm1
index 1a5e2cc5eb..05fee05e5e 100644
--- a/distro/powershell/chef/chef.psm1
+++ b/distro/powershell/chef/chef.psm1
@@ -236,7 +236,6 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) {
throw "Unable to create process [$ArgumentString]. Error code $reason."
}
- $sb = New-Object System.Text.StringBuilder
$buffer = New-Object byte[] 1024
# Initialize reference variables
@@ -270,7 +269,7 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) {
while ([Chef.Kernel32]::ReadFile($hReadOut, $buffer, $buffer.Length, [ref] $bytesRead, 0)) {
$output = [Text.Encoding]::UTF8.GetString($buffer, 0, $bytesRead)
if ($output) {
- [void]$sb.Append($output)
+ $output
}
if ($bytesRead -lt $buffer.Length) {
# Partial buffer indicating the end of stream, break out of ReadFile loop
@@ -307,9 +306,6 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) {
}
}
- # Return output obtained from child process stdout/stderr
- $sb.ToString()
-
# Cleanup handles
$success = [Chef.Kernel32]::CloseHandle($pi.hProcess)
if (-Not $success) {
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
deleted file mode 100644
index 815567bc1a..0000000000
--- a/kitchen-tests/Berksfile.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-DEPENDENCIES
- base
- path: cookbooks/base
-
-GRAPH
- apt (6.1.4)
- base (0.1.0)
- apt (>= 0.0.0)
- build-essential (>= 0.0.0)
- chef-apt-docker (>= 0.0.0)
- chef-client (>= 0.0.0)
- chef-yum-docker (>= 0.0.0)
- chef_hostname (>= 0.0.0)
- cron (>= 0.0.0)
- git (>= 0.0.0)
- logrotate (>= 0.0.0)
- multipackage (>= 0.0.0)
- nscd (>= 0.0.0)
- ntp (>= 0.0.0)
- openssh (>= 0.0.0)
- resolver (>= 0.0.0)
- selinux (>= 0.0.0)
- sudo (>= 0.0.0)
- ubuntu (>= 0.0.0)
- users (>= 0.0.0)
- build-essential (8.0.4)
- mingw (>= 1.1)
- seven_zip (>= 0.0.0)
- chef-apt-docker (2.0.4)
- chef-client (9.0.2)
- cron (>= 4.2.0)
- logrotate (>= 1.9.0)
- windows (>= 2.0.0)
- chef-yum-docker (3.1.0)
- chef_hostname (0.6.1)
- compat_resource (12.19.0)
- cron (5.0.1)
- git (8.0.0)
- build-essential (>= 0.0.0)
- homebrew (>= 0.0.0)
- homebrew (4.2.0)
- iptables (4.3.1)
- logrotate (2.2.0)
- mingw (2.0.1)
- seven_zip (>= 0.0.0)
- multipackage (4.0.0)
- compat_resource (>= 0.0.0)
- nscd (5.0.0)
- ntp (3.5.4)
- ohai (5.2.0)
- openssh (2.6.1)
- iptables (>= 1.0)
- resolver (2.0.1)
- selinux (2.1.0)
- seven_zip (2.0.2)
- windows (>= 1.2.2)
- sudo (4.0.0)
- ubuntu (2.0.1)
- apt (>= 0.0.0)
- users (5.3.0)
- windows (3.4.1)
- ohai (>= 4.0.0)
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index e41d2ff808..144363b4ae 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -1,13 +1,10 @@
source "https://rubygems.org"
-gem "chef-config", "< 13"
gem "rake" # required to build some native extensions
-gem "berkshelf"
-gem "kitchen-appbundle-updater"
+gem "chef", path: ".."
+gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
+gem "kitchen-appbundle-updater", git: "https://github.com/chef/kitchen-appbundle-updater", branch: "master"
gem "kitchen-dokken", "< 2.0" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
-gem "kitchen-ec2"
-gem "kitchen-inspec"
-gem "kitchen-vagrant"
-gem "ridley"
-gem "test-kitchen"
-gem "vagrant-wrapper"
+gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
+gem "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master"
+gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master"
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
deleted file mode 100644
index 3dfae20dd8..0000000000
--- a/kitchen-tests/Gemfile.lock
+++ /dev/null
@@ -1,403 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.5.2)
- public_suffix (>= 2.0.2, < 4.0)
- aws-sdk (2.10.94)
- aws-sdk-resources (= 2.10.94)
- aws-sdk-core (2.10.94)
- aws-sigv4 (~> 1.0)
- jmespath (~> 1.0)
- aws-sdk-resources (2.10.94)
- aws-sdk-core (= 2.10.94)
- aws-sigv4 (1.0.2)
- berkshelf (6.3.1)
- buff-config (~> 2.0)
- buff-extensions (~> 2.0)
- chef (>= 12.7.2)
- cleanroom (~> 1.0)
- concurrent-ruby (~> 1.0)
- faraday (~> 0.9)
- httpclient (~> 2.7)
- minitar (~> 0.5, >= 0.5.4)
- mixlib-archive (~> 0.4)
- mixlib-shellout (~> 2.0)
- octokit (~> 4.0)
- retryable (~> 2.0)
- ridley (~> 5.0)
- solve (~> 4.0)
- thor (~> 0.19, < 0.19.2)
- buff-config (2.0.0)
- buff-extensions (~> 2.0)
- varia_model (~> 0.6)
- buff-extensions (2.0.0)
- buff-ignore (1.2.0)
- buff-ruby_engine (1.0.0)
- buff-shell_out (1.1.0)
- buff-ruby_engine (~> 1.0)
- builder (3.2.3)
- celluloid (0.16.0)
- timers (~> 4.0.0)
- celluloid-io (0.16.2)
- celluloid (>= 0.16.0)
- nio4r (>= 1.1.0)
- chef (12.21.26)
- addressable
- bundler (>= 1.10)
- chef-config (= 12.21.26)
- chef-zero (>= 4.8, < 13)
- diff-lcs (~> 1.2, >= 1.2.4)
- erubis (~> 2.7)
- ffi-yajl (~> 2.2)
- highline (~> 1.6, >= 1.6.9)
- iniparse (~> 1.4)
- mixlib-archive (~> 0.4)
- mixlib-authentication (~> 1.4)
- mixlib-cli (~> 1.7)
- mixlib-log (~> 1.3)
- mixlib-shellout (~> 2.0)
- net-sftp (~> 2.1, >= 2.1.2)
- net-ssh (>= 2.9, < 5.0)
- net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (>= 8.6.0.alpha.1, < 13)
- plist (~> 3.2)
- proxifier (~> 1.0)
- rspec-core (~> 3.5)
- rspec-expectations (~> 3.5)
- rspec-mocks (~> 3.5)
- rspec_junit_formatter (~> 0.2.0)
- serverspec (~> 2.7)
- specinfra (~> 2.10)
- syslog-logger (~> 1.6)
- uuidtools (~> 2.1.5)
- chef (12.21.26-universal-mingw32)
- addressable
- bundler (>= 1.10)
- chef-config (= 12.21.26)
- chef-zero (>= 4.8, < 13)
- diff-lcs (~> 1.2, >= 1.2.4)
- erubis (~> 2.7)
- ffi (~> 1.9)
- ffi-yajl (~> 2.2)
- highline (~> 1.6, >= 1.6.9)
- iniparse (~> 1.4)
- mixlib-archive (~> 0.4)
- mixlib-authentication (~> 1.4)
- mixlib-cli (~> 1.7)
- mixlib-log (~> 1.3)
- mixlib-shellout (~> 2.0)
- net-sftp (~> 2.1, >= 2.1.2)
- net-ssh (>= 2.9, < 5.0)
- net-ssh-multi (~> 1.2, >= 1.2.1)
- ohai (>= 8.6.0.alpha.1, < 13)
- plist (~> 3.2)
- proxifier (~> 1.0)
- rspec-core (~> 3.5)
- rspec-expectations (~> 3.5)
- rspec-mocks (~> 3.5)
- rspec_junit_formatter (~> 0.2.0)
- serverspec (~> 2.7)
- specinfra (~> 2.10)
- syslog-logger (~> 1.6)
- uuidtools (~> 2.1.5)
- win32-api (~> 1.5.3)
- win32-dir (~> 0.5.0)
- win32-event (~> 0.6.1)
- win32-eventlog (= 0.6.3)
- win32-mmap (~> 0.4.1)
- win32-mutex (~> 0.4.2)
- win32-process (~> 0.8.2)
- win32-service (~> 0.8.7)
- windows-api (~> 0.4.4)
- wmi-lite (~> 1.0)
- chef-config (12.21.26)
- addressable
- fuzzyurl
- mixlib-config (~> 2.0)
- mixlib-shellout (~> 2.0)
- chef-zero (5.3.2)
- ffi-yajl (~> 2.2)
- hashie (>= 2.0, < 4.0)
- mixlib-log (~> 1.3)
- rack (~> 2.0)
- uuidtools (~> 2.1)
- cleanroom (1.0.0)
- coderay (1.1.2)
- concurrent-ruby (1.0.5)
- diff-lcs (1.3)
- docker-api (1.34.0)
- excon (>= 0.47.0)
- multi_json
- erubis (2.7.0)
- excon (0.59.0)
- faraday (0.13.1)
- multipart-post (>= 1.2, < 3)
- ffi (1.9.18)
- ffi (1.9.18-x86-mingw32)
- ffi-win32-extensions (1.0.3)
- ffi
- ffi-yajl (2.3.1)
- libyajl2 (~> 1.2)
- fuzzyurl (0.9.0)
- gssapi (1.2.0)
- ffi (>= 1.0.1)
- gyoku (1.3.1)
- builder (>= 2.1.2)
- hashie (3.5.6)
- highline (1.7.10)
- hitimes (1.2.6)
- hitimes (1.2.6-x86-mingw32)
- htmlentities (4.3.4)
- httpclient (2.8.3)
- iniparse (1.4.4)
- inspec (1.46.2)
- addressable (~> 2.4)
- faraday (>= 0.9.0)
- hashie (~> 3.4)
- htmlentities
- json (>= 1.8, < 3.0)
- method_source (~> 0.8)
- mixlib-log
- parallel (~> 1.9)
- parslet (~> 1.5)
- pry (~> 0)
- rainbow (~> 2)
- rspec (~> 3)
- rspec-its (~> 1.2)
- rubyzip (~> 1.1)
- semverse
- sslshake (~> 1.2)
- thor (~> 0.19)
- tomlrb (~> 1.2)
- train (~> 0.29, >= 0.29.2)
- ipaddress (0.8.3)
- jmespath (1.3.1)
- json (2.1.0)
- kitchen-appbundle-updater (0.2.0)
- kitchen-dokken (1.1.0)
- docker-api (~> 1.33)
- test-kitchen (~> 1.13)
- kitchen-ec2 (1.4.0)
- aws-sdk (~> 2)
- excon
- multi_json
- retryable (~> 2.0)
- test-kitchen (~> 1.4, >= 1.4.1)
- kitchen-inspec (0.20.0)
- hashie (~> 3.4)
- inspec (>= 0.34.0, < 2.0.0)
- test-kitchen (~> 1.6)
- kitchen-vagrant (1.2.1)
- test-kitchen (~> 1.4)
- libyajl2 (1.2.0)
- little-plugger (1.1.4)
- logging (2.2.2)
- little-plugger (~> 1.1)
- multi_json (~> 1.10)
- method_source (0.9.0)
- minitar (0.6.1)
- mixlib-archive (0.4.1)
- mixlib-log
- mixlib-authentication (1.4.2)
- mixlib-cli (1.7.0)
- mixlib-config (2.2.4)
- mixlib-install (3.8.0)
- mixlib-shellout
- mixlib-versioning
- thor
- mixlib-log (1.7.1)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
- win32-process (~> 0.8.2)
- wmi-lite (~> 1.0)
- mixlib-versioning (1.2.2)
- molinillo (0.6.4)
- multi_json (1.12.2)
- multipart-post (2.0.0)
- net-scp (1.2.1)
- net-ssh (>= 2.6.5)
- net-sftp (2.1.2)
- net-ssh (>= 2.6.5)
- net-ssh (4.2.0)
- net-ssh-gateway (1.3.0)
- net-ssh (>= 2.6.5)
- net-ssh-multi (1.2.1)
- net-ssh (>= 2.6.5)
- net-ssh-gateway (>= 1.2.0)
- net-telnet (0.1.1)
- nio4r (2.1.0)
- nori (2.6.0)
- octokit (4.7.0)
- sawyer (~> 0.8.0, >= 0.5.3)
- ohai (8.25.1)
- chef-config (>= 12.5.0.alpha.1, < 14)
- ffi (~> 1.9)
- ffi-yajl (~> 2.2)
- ipaddress
- mixlib-cli
- mixlib-config (~> 2.0)
- mixlib-log (>= 1.7.1, < 2.0)
- mixlib-shellout (~> 2.0)
- plist (~> 3.1)
- systemu (~> 2.6.4)
- wmi-lite (~> 1.0)
- parallel (1.12.0)
- parslet (1.8.1)
- plist (3.3.0)
- proxifier (1.0.3)
- pry (0.11.3)
- coderay (~> 1.1.0)
- method_source (~> 0.9.0)
- public_suffix (3.0.1)
- rack (2.0.3)
- rainbow (2.2.2)
- rake
- rake (12.3.0)
- retryable (2.0.4)
- ridley (5.1.1)
- addressable
- buff-config (~> 2.0)
- buff-extensions (~> 2.0)
- buff-ignore (~> 1.2)
- buff-shell_out (~> 1.0)
- celluloid (~> 0.16.0)
- celluloid-io (~> 0.16.1)
- chef-config (>= 12.5.0)
- erubis
- faraday (~> 0.9)
- hashie (>= 2.0.2, < 4.0.0)
- httpclient (~> 2.7)
- json (>= 1.7.7)
- mixlib-authentication (>= 1.3.0)
- retryable (~> 2.0)
- semverse (~> 2.0)
- varia_model (~> 0.6)
- rspec (3.7.0)
- rspec-core (~> 3.7.0)
- rspec-expectations (~> 3.7.0)
- rspec-mocks (~> 3.7.0)
- rspec-core (3.7.0)
- rspec-support (~> 3.7.0)
- rspec-expectations (3.7.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-its (1.2.0)
- rspec-core (>= 3.0.0)
- rspec-expectations (>= 3.0.0)
- rspec-mocks (3.7.0)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.7.0)
- rspec-support (3.7.0)
- rspec_junit_formatter (0.2.3)
- builder (< 4)
- rspec-core (>= 2, < 4, != 2.12.0)
- rubyntlm (0.6.2)
- rubyzip (1.2.1)
- safe_yaml (1.0.4)
- sawyer (0.8.1)
- addressable (>= 2.3.5, < 2.6)
- faraday (~> 0.8, < 1.0)
- semverse (2.0.0)
- serverspec (2.41.3)
- multi_json
- rspec (~> 3.0)
- rspec-its
- specinfra (~> 2.72)
- sfl (2.3)
- solve (4.0.0)
- molinillo (~> 0.6)
- semverse (>= 1.1, < 3.0)
- specinfra (2.72.1)
- net-scp
- net-ssh (>= 2.7, < 5.0)
- net-telnet
- sfl
- sslshake (1.2.0)
- syslog-logger (1.6.8)
- systemu (2.6.5)
- test-kitchen (1.19.2)
- mixlib-install (~> 3.6)
- mixlib-shellout (>= 1.2, < 3.0)
- net-scp (~> 1.1)
- net-ssh (>= 2.9, < 5.0)
- net-ssh-gateway (~> 1.2)
- safe_yaml (~> 1.0)
- thor (~> 0.19, < 0.19.2)
- winrm (~> 2.0)
- winrm-elevated (~> 1.0)
- winrm-fs (~> 1.1.0)
- thor (0.19.1)
- timers (4.0.4)
- hitimes
- tomlrb (1.2.6)
- train (0.29.2)
- docker-api (~> 1.26)
- json (>= 1.8, < 3.0)
- mixlib-shellout (~> 2.0)
- net-scp (~> 1.2)
- net-ssh (>= 2.9, < 5.0)
- winrm (~> 2.0)
- winrm-fs (~> 1.0)
- uuidtools (2.1.5)
- vagrant-wrapper (2.0.3)
- varia_model (0.6.0)
- buff-extensions (~> 2.0)
- hashie (>= 2.0.2, < 4.0.0)
- win32-api (1.5.3-universal-mingw32)
- win32-dir (0.5.1)
- ffi (>= 1.0.0)
- win32-event (0.6.3)
- win32-ipc (>= 0.6.0)
- win32-eventlog (0.6.3)
- ffi
- win32-ipc (0.7.0)
- ffi
- win32-mmap (0.4.2)
- ffi
- win32-mutex (0.4.3)
- win32-ipc (>= 0.6.0)
- win32-process (0.8.3)
- ffi (>= 1.0.0)
- win32-service (0.8.10)
- ffi
- ffi-win32-extensions
- windows-api (0.4.4)
- win32-api (>= 1.4.5)
- winrm (2.2.3)
- builder (>= 2.1.2)
- erubis (~> 2.7)
- gssapi (~> 1.2)
- gyoku (~> 1.0)
- httpclient (~> 2.2, >= 2.2.0.2)
- logging (>= 1.6.1, < 3.0)
- nori (~> 2.0)
- rubyntlm (~> 0.6.0, >= 0.6.1)
- winrm-elevated (1.1.0)
- winrm (~> 2.0)
- winrm-fs (~> 1.0)
- winrm-fs (1.1.1)
- erubis (~> 2.7)
- logging (>= 1.6.1, < 3.0)
- rubyzip (~> 1.1)
- winrm (~> 2.0)
- wmi-lite (1.0.0)
-
-PLATFORMS
- ruby
- x86-mingw32
-
-DEPENDENCIES
- berkshelf
- chef-config (< 13)
- kitchen-appbundle-updater
- kitchen-dokken (< 2.0)
- kitchen-ec2
- kitchen-inspec
- kitchen-vagrant
- rake
- ridley
- test-kitchen
- vagrant-wrapper
-
-BUNDLED WITH
- 1.16.0
diff --git a/lib/chef/deprecated.rb b/lib/chef/deprecated.rb
index 183f8e4c24..ac4440f6db 100644
--- a/lib/chef/deprecated.rb
+++ b/lib/chef/deprecated.rb
@@ -268,6 +268,16 @@ class Chef
end
end
+ class ErlResource < Base
+ def id
+ 22
+ end
+
+ def target
+ "erl_resource.html"
+ end
+ end
+
# id 3694 was deleted
class Generic < Base
diff --git a/lib/chef/knife/core/ui.rb b/lib/chef/knife/core/ui.rb
index 484c3ab3de..b2efbd8b8f 100644
--- a/lib/chef/knife/core/ui.rb
+++ b/lib/chef/knife/core/ui.rb
@@ -172,7 +172,7 @@ class Chef
tf.sync = true
tf.puts output
tf.close
- raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_using.html for details." unless system("#{config[:editor]} #{tf.path}")
+ raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup.html for details." unless system("#{config[:editor]} #{tf.path}")
output = IO.read(tf.path)
end
diff --git a/lib/chef/knife/edit.rb b/lib/chef/knife/edit.rb
index 46903e7420..4d7338f9f6 100644
--- a/lib/chef/knife/edit.rb
+++ b/lib/chef/knife/edit.rb
@@ -58,7 +58,7 @@ class Chef
# Let the user edit the temporary file
if !system("#{config[:editor]} #{file.path}")
- raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_using.html for details."
+ raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup.html for details."
end
result_text = IO.read(file.path)
diff --git a/lib/chef/property.rb b/lib/chef/property.rb
index a72e41a61e..9d0957dcdf 100644
--- a/lib/chef/property.rb
+++ b/lib/chef/property.rb
@@ -99,7 +99,7 @@ class Chef
if options.has_key?(:name_attribute)
# If we have both name_attribute and name_property and they differ, raise an error
if options.has_key?(:name_property)
- raise ArgumentError, "Cannot specify both name_property and name_attribute together on property #{self}."
+ raise ArgumentError, "name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property #{self}"
end
# replace name_property with name_attribute in place
options = Hash[options.map { |k, v| k == :name_attribute ? [ :name_property, v ] : [ k, v ] }]
@@ -107,7 +107,7 @@ class Chef
end
if options.has_key?(:default) && options.has_key?(:name_property)
- raise ArgumentError, "Cannot specify both default and name_property/name_attribute together on property #{self}"
+ raise ArgumentError, "A property cannot be both a name_property/name_attribute and have a default value. Use one or the other on property #{self}"
end
# Recursively freeze the default if it isn't a lazy value.
@@ -361,7 +361,7 @@ class Chef
end
if value.nil? && required?
- raise Chef::Exceptions::ValidationFailed, "#{name} is required"
+ raise Chef::Exceptions::ValidationFailed, "#{name} is a required property"
else
value
end
@@ -386,7 +386,7 @@ class Chef
value = set_value(resource, input_to_stored_value(resource, value))
if value.nil? && required?
- raise Chef::Exceptions::ValidationFailed, "#{name} is required"
+ raise Chef::Exceptions::ValidationFailed, "#{name} is a required property"
else
value
end
@@ -457,7 +457,7 @@ class Chef
# options.
#
# @param resource [Chef::Resource] The resource we're validating against
- # (to provide context for the validate).
+ # (to provide context for the validation).
# @param value The value to validate.
#
# @raise Chef::Exceptions::ValidationFailed If the value is invalid for
@@ -514,18 +514,18 @@ class Chef
# very confusing results.
if property_redefines_method?
resource_name = declared_in.respond_to?(:resource_name) ? declared_in.resource_name : declared_in
- raise ArgumentError, "Property `#{name}` of resource `#{resource_name}` overwrites an existing method."
+ raise ArgumentError, "Property `#{name}` of resource `#{resource_name}` overwrites an existing method. A different name should be used for this property."
end
# We prefer this form because the property name won't show up in the
# stack trace if you use `define_method`.
declared_in.class_eval <<-EOM, __FILE__, __LINE__ + 1
def #{name}(value=NOT_PASSED)
- raise "Property `#{name}` of `\#{self}` was incorrectly passed a block. Possible property-resource collision. To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
+ raise "Property `#{name}` of `\#{self}` was incorrectly passed a block. Possible property-resource collision. To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
self.class.properties[#{name.inspect}].call(self, value)
end
def #{name}=(value)
- raise "Property `#{name}` of `\#{self}` was incorrectly passed a block. Possible property-resource collision. To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
+ raise "Property `#{name}` of `\#{self}` was incorrectly passed a block. Possible property-resource collision. To call a resource named `#{name}` either rename the property or else use `declare_resource(:#{name}, ...)`" if block_given?
self.class.properties[#{name.inspect}].set(self, value)
end
EOM
diff --git a/lib/chef/provider/apt_preference.rb b/lib/chef/provider/apt_preference.rb
index ff4ea02ff0..59c6fc7f6d 100644
--- a/lib/chef/provider/apt_preference.rb
+++ b/lib/chef/provider/apt_preference.rb
@@ -24,7 +24,7 @@ require "chef/log"
class Chef
class Provider
class AptPreference < Chef::Provider
- provides :apt_preference, os: "linux", platform_family: "debian"
+ provides :apt_preference, platform_family: "debian"
APT_PREFERENCE_DIR = "/etc/apt/preferences.d".freeze
diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb
index 2d86a6fce4..c16f1e5767 100644
--- a/lib/chef/provider/apt_repository.rb
+++ b/lib/chef/provider/apt_repository.rb
@@ -27,7 +27,7 @@ class Chef
class AptRepository < Chef::Provider
include Chef::Mixin::ShellOut
- provides :apt_repository, os: "linux", platform_family: "debian"
+ provides :apt_repository, platform_family: "debian"
LIST_APT_KEYS = "apt-key list".freeze
LIST_APT_KEY_FINGERPRINTS = "apt-key adv --list-public-keys --with-fingerprint --with-colons".freeze
diff --git a/lib/chef/provider/apt_update.rb b/lib/chef/provider/apt_update.rb
index bfd9603e4e..9d794abcf0 100644
--- a/lib/chef/provider/apt_update.rb
+++ b/lib/chef/provider/apt_update.rb
@@ -23,7 +23,7 @@ require "chef/dsl/declare_resource"
class Chef
class Provider
class AptUpdate < Chef::Provider
- provides :apt_update, os: "linux", platform_family: "debian"
+ provides :apt_update, platform_family: "debian"
APT_CONF_DIR = "/etc/apt/apt.conf.d"
STAMP_DIR = "/var/lib/apt/periodic"
diff --git a/lib/chef/provider/package/smartos.rb b/lib/chef/provider/package/smartos.rb
index 8e4368f7c1..66d23554df 100644
--- a/lib/chef/provider/package/smartos.rb
+++ b/lib/chef/provider/package/smartos.rb
@@ -3,7 +3,7 @@
# Bryan McLellan (btm@loftninjas.org)
# Matthew Landauer (matthew@openaustralia.org)
# Ben Rockwood (benr@joyent.com)
-# Copyright:: Copyright 2009-2016, Bryan McLellan, Matthew Landauer
+# Copyright:: Copyright 2009-2018, Bryan McLellan, Matthew Landauer
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +30,7 @@ class Chef
attr_accessor :is_virtual_package
provides :package, platform: "smartos"
- provides :smartos_package, os: "solaris2", platform_family: "smartos"
+ provides :smartos_package, platform_family: "smartos"
def load_current_resource
Chef::Log.debug("#{new_resource} loading current resource")
diff --git a/lib/chef/resource/erl_call.rb b/lib/chef/resource/erl_call.rb
index 3e317676a5..6bc71e75e6 100644
--- a/lib/chef/resource/erl_call.rb
+++ b/lib/chef/resource/erl_call.rb
@@ -80,6 +80,11 @@ class Chef
)
end
+ # This resource is deprecated.
+ def after_created
+ Chef.deprecated(:erl_resource, "The #{resource_name} resource (#{source_line}) is deprecated and will be removed from Chef core in 14.0 (April 2018).")
+ end
+
end
end
end
diff --git a/lib/chef/resource/zypper_repository.rb b/lib/chef/resource/zypper_repository.rb
index c0ec111c25..72e0074b2a 100644
--- a/lib/chef/resource/zypper_repository.rb
+++ b/lib/chef/resource/zypper_repository.rb
@@ -43,7 +43,7 @@ class Chef
property :keeppackages, [true, false], default: false
property :mode, default: "0644"
property :refresh_cache, [true, false], default: true
- property :source, String, regex: /.*/
+ property :source, String
property :cookbook, String
property :gpgautoimportkeys, [true, false], default: true
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 5e51574d8d..759b647376 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.6.53")
+ VERSION = Chef::VersionString.new("13.7.3")
end
#
diff --git a/spec/integration/recipes/resource_action_spec.rb b/spec/integration/recipes/resource_action_spec.rb
index 53f25cb35b..f698a65771 100644
--- a/spec/integration/recipes/resource_action_spec.rb
+++ b/spec/integration/recipes/resource_action_spec.rb
@@ -509,7 +509,7 @@ module ResourceActionSpec
Chef::Config[:treat_deprecation_warnings_as_errors] = false
expect_converge do
has_property_named_template "hi"
- end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block. Possible property-resource collision. To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
+ end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block. Possible property-resource collision. To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
end
end
diff --git a/spec/unit/property_spec.rb b/spec/unit/property_spec.rb
index b8cf7f5d1b..996585ab98 100644
--- a/spec/unit/property_spec.rb
+++ b/spec/unit/property_spec.rb
@@ -93,7 +93,7 @@ describe "Chef::Resource.property" do
expect(resource.bare_property).to eq 20
end
it "can be set with =" do
- expect(resource.bare_property 10).to eq 10
+ expect(resource.bare_property = 10).to eq 10
expect(resource.bare_property).to eq 10
end
it "can be set to nil with =" do
@@ -1037,20 +1037,20 @@ describe "Chef::Resource.property" do
context "default ordering deprecation warnings" do
it "emits an error for property :x, default: 10, #{name}: true" do
- expect { resource_class.property :x, :default => 10, name.to_sym => true }.to raise_error Chef::Exceptions::ArgumentError,
- /Cannot specify both default and name_property\/name_attribute together on property x of resource chef_resource_property_spec_(\d+)/
+ expect { resource_class.property :x, :default => 10, name.to_sym => true }.to raise_error ArgumentError,
+ /A property cannot be both a name_property\/name_attribute and have a default value. Use one or the other on property x of resource chef_resource_property_spec_(\d+)/
end
it "emits an error for property :x, default: nil, #{name}: true" do
- expect { resource_class.property :x, :default => nil, name.to_sym => true }.to raise_error Chef::Exceptions::ArgumentError,
- /Cannot specify both default and name_property\/name_attribute together on property x of resource chef_resource_property_spec_(\d+)/
+ expect { resource_class.property :x, :default => nil, name.to_sym => true }.to raise_error ArgumentError,
+ /A property cannot be both a name_property\/name_attribute and have a default value. Use one or the other on property x of resource chef_resource_property_spec_(\d+)/
end
it "emits an error for property :x, #{name}: true, default: 10" do
- expect { resource_class.property :x, name.to_sym => true, :default => 10 }.to raise_error Chef::Exceptions::ArgumentError,
- /Cannot specify both default and name_property\/name_attribute together on property x of resource chef_resource_property_spec_(\d+)/
+ expect { resource_class.property :x, name.to_sym => true, :default => 10 }.to raise_error ArgumentError,
+ /A property cannot be both a name_property\/name_attribute and have a default value. Use one or the other on property x of resource chef_resource_property_spec_(\d+)/
end
it "emits an error for property :x, #{name}: true, default: nil" do
- expect { resource_class.property :x, name.to_sym => true, :default => nil }.to raise_error Chef::Exceptions::ArgumentError,
- /Cannot specify both default and name_property\/name_attribute together on property x of resource chef_resource_property_spec_(\d+)/
+ expect { resource_class.property :x, name.to_sym => true, :default => nil }.to raise_error ArgumentError,
+ /A property cannot be both a name_property\/name_attribute and have a default value. Use one or the other on property x of resource chef_resource_property_spec_(\d+)/
end
end
end
@@ -1058,13 +1058,13 @@ describe "Chef::Resource.property" do
it "raises an error if both name_property and name_attribute are specified" do
expect { resource_class.property :x, :name_property => false, :name_attribute => 1 }.to raise_error ArgumentError,
- /Cannot specify both name_property and name_attribute together on property x of resource chef_resource_property_spec_(\d+)./
+ /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
expect { resource_class.property :x, :name_property => false, :name_attribute => nil }.to raise_error ArgumentError,
- /Cannot specify both name_property and name_attribute together on property x of resource chef_resource_property_spec_(\d+)./
+ /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
expect { resource_class.property :x, :name_property => false, :name_attribute => false }.to raise_error ArgumentError,
- /Cannot specify both name_property and name_attribute together on property x of resource chef_resource_property_spec_(\d+)./
+ /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
expect { resource_class.property :x, :name_property => true, :name_attribute => true }.to raise_error ArgumentError,
- /Cannot specify both name_property and name_attribute together on property x of resource chef_resource_property_spec_(\d+)./
+ /name_attribute and name_property are functionally identical and both cannot be specified on a property at once. Use just one on property x of resource chef_resource_property_spec_(\d+)./
end
context "property_type" do
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index 1c4ec14911..1dba2b4190 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -39,8 +39,6 @@ namespace :dependencies do
dependencies:update_gemfile_lock
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
}
@@ -84,9 +82,6 @@ namespace :dependencies do
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"
end
View Lorry Controller Status