From 1165e24e574f2bbbf37403680b0f407b5750981a Mon Sep 17 00:00:00 2001 From: tyler-ball Date: Thu, 9 May 2019 12:07:28 -0600 Subject: CHEF_LICENSE environment variables should be quoted Some shells interpret the '-' character in 'accept-no-persist' Signed-off-by: tyler-ball --- .travis.yml | 2 +- RELEASE_NOTES.md | 4 ++-- appveyor.yml | 2 +- kitchen-tests/cookbooks/rspec/templates/run-chef-rspec | 2 +- spec/unit/knife/core/windows_bootstrap_context_spec.rb | 6 ------ 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87fcd57a6d..24b24082d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ branches: env: global: - FORCE_FFI_YAJL=ext - - CHEF_LICENSE=accept-no-persist + - CHEF_LICENSE="accept-no-persist" matrix: include: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 76607e5ca2..62267652fe 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -12,8 +12,8 @@ Chef Infra Client requires a EULA to be accepted by users before it can run. Use `chef-client --chef-license accept` `chef-client --chef-license accept-no-persist` -`CHEF_LICENSE=accept chef-client` -`CHEF_LICENSE=accept-no-persist chef-client` +`CHEF_LICENSE="accept" chef-client` +`CHEF_LICENSE="accept-no-persist" chef-client` Finally, if users run `chef-client` without any of these options, they will receive an interactive prompt asking for license acceptance. If the license is accepted, a marker file will be written to the filesystem (unless diff --git a/appveyor.yml b/appveyor.yml index 6ab90e3c2d..649181b224 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,7 @@ install: - bundle config --local path vendor/bundle # use the cache we define above - bundle install || bundle install || bundle install - SET SPEC_OPTS=--format progress - - SET CHEF_LICENSE=accept-no-persist + - SET CHEF_LICENSE="accept-no-persist" build: off diff --git a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec b/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec index 4a1eb54b48..4063c571e4 100644 --- a/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec +++ b/kitchen-tests/cookbooks/rspec/templates/run-chef-rspec @@ -8,5 +8,5 @@ export PATH=/opt/chef/embedded/bin:$PATH cd /opt/chef/embedded/apps/chef /opt/chef/embedded/bin/bundle install -export CHEF_LICENSE=accept-no-persist +export CHEF_LICENSE="accept-no-persist" /opt/chef/embedded/bin/bundle exec /opt/chef/embedded/bin/rspec --format progress diff --git a/spec/unit/knife/core/windows_bootstrap_context_spec.rb b/spec/unit/knife/core/windows_bootstrap_context_spec.rb index 639a7bf73a..a662b1c203 100644 --- a/spec/unit/knife/core/windows_bootstrap_context_spec.rb +++ b/spec/unit/knife/core/windows_bootstrap_context_spec.rb @@ -230,8 +230,6 @@ describe Chef::Knife::Core::WindowsBootstrapContext do let(:bootstrap) { Chef::Knife::Bootstrap.new(["--bootstrap-install-command", "chef-client"]) } before do bootstrap.config[:bootstrap_install_command] = "chef-client" - @old_env = ENV["CHEF_LICENSE"] - ENV["CHEF_LICENSE"] = "accept" end it "sets the bootstrap_install_command option under Chef::Config::Knife object" do @@ -241,7 +239,6 @@ describe Chef::Knife::Core::WindowsBootstrapContext do after do bootstrap.config.delete(:bootstrap_install_command) Chef::Config[:knife].delete(:bootstrap_install_command) - ENV["CHEF_LICENSE"] = @old_env end end @@ -258,8 +255,6 @@ describe Chef::Knife::Core::WindowsBootstrapContext do let(:bootstrap) { Chef::Knife::Bootstrap.new(["--bootstrap-install-command", "chef-client"]) } before do bootstrap.config[:bootstrap_install_command] = "chef-client" - @old_env = ENV["CHEF_LICENSE"] - ENV["CHEF_LICENSE"] = "accept" end it "sets the bootstrap_install_command option under Chef::Config::Knife object" do @@ -269,7 +264,6 @@ describe Chef::Knife::Core::WindowsBootstrapContext do after do bootstrap.config.delete(:bootstrap_install_command) Chef::Config[:knife].delete(:bootstrap_install_command) - ENV["CHEF_LICENSE"] = @old_env end end -- cgit v1.2.1