diff options
author | Bryan McLellan <btm@chef.io> | 2020-04-05 14:17:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-05 14:17:41 -0400 |
commit | 0eb95716799d99aba03e359cbc59c6c908f1334b (patch) | |
tree | a0d4a4a1016388e624608b2d99071f3dfb78cb89 | |
parent | 4d7946cc72c26fa15917d796e4c53b3864e364ac (diff) | |
parent | 88b5d6dd2a0ce9dd0629af3c9c5ba9682a9c9f23 (diff) | |
download | chef-0eb95716799d99aba03e359cbc59c6c908f1334b.tar.gz |
Merge pull request #9601 from MsysTechnologiesllc/vasundhara/backport-to-chef-14
Backport windows_task PR #8420 and #9223
-rw-r--r-- | lib/chef/provider/windows_task.rb | 14 | ||||
-rw-r--r-- | lib/chef/resource/windows_task.rb | 4 | ||||
-rw-r--r-- | spec/functional/resource/windows_task_spec.rb | 51 | ||||
-rw-r--r-- | spec/unit/resource/windows_task_spec.rb | 4 |
4 files changed, 68 insertions, 5 deletions
diff --git a/lib/chef/provider/windows_task.rb b/lib/chef/provider/windows_task.rb index f57d7c25e3..4bfc769643 100644 --- a/lib/chef/provider/windows_task.rb +++ b/lib/chef/provider/windows_task.rb @@ -328,13 +328,14 @@ class Chef def task_needs_update?(task) flag = false if new_resource.frequency == :none - flag = (task.account_information != new_resource.user || + flag = (task.author != new_resource.user || task.application_name != new_resource.command || description_needs_update?(task) || task.parameters != new_resource.command_arguments.to_s || task.principals[:run_level] != run_level || task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries || - task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries) + task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries || + task.settings[:start_when_available] != new_resource.start_when_available) else current_task_trigger = task.trigger(0) new_task_trigger = trigger @@ -351,7 +352,7 @@ class Chef current_task_trigger[:type] != new_task_trigger[:type] || current_task_trigger[:random_minutes_interval].to_i != new_task_trigger[:random_minutes_interval].to_i || current_task_trigger[:minutes_interval].to_i != new_task_trigger[:minutes_interval].to_i || - task.account_information.to_s.casecmp(new_resource.user.to_s) != 0 || + task.author.to_s.casecmp(new_resource.user.to_s) != 0 || task.application_name != new_resource.command || description_needs_update?(task) || task.parameters != new_resource.command_arguments.to_s || @@ -360,7 +361,9 @@ class Chef task.principals[:run_level] != run_level || PRIORITY[task.priority] != new_resource.priority || task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries || - task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries + task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries || + task.settings[:start_when_available] != new_resource.start_when_available + if trigger_type == TaskScheduler::MONTHLYDATE flag = true if current_task_trigger[:run_on_last_day_of_month] != new_task_trigger[:run_on_last_day_of_month] end @@ -560,12 +563,13 @@ class Chef settings[:priority] = new_resource.priority settings[:disallow_start_if_on_batteries] = new_resource.disallow_start_if_on_batteries settings[:stop_if_going_on_batteries] = new_resource.stop_if_going_on_batteries + settings[:start_when_available] = new_resource.start_when_available settings end def principal_settings settings = {} - settings [:run_level] = run_level + settings[:run_level] = run_level settings[:logon_type] = logon_type settings end diff --git a/lib/chef/resource/windows_task.rb b/lib/chef/resource/windows_task.rb index 54920f2bac..652a22b14f 100644 --- a/lib/chef/resource/windows_task.rb +++ b/lib/chef/resource/windows_task.rb @@ -120,6 +120,10 @@ class Chef introduced: "14.7", description: "The task description." + property :start_when_available, [TrueClass, FalseClass], + introduced: "14.15", default: false, + description: "To start the task at any time after its scheduled time has passed." + attr_accessor :exists, :task, :command_arguments VALID_WEEK_DAYS = %w{ mon tue wed thu fri sat sun * }.freeze diff --git a/spec/functional/resource/windows_task_spec.rb b/spec/functional/resource/windows_task_spec.rb index b0c6998d77..b0ba1f9168 100644 --- a/spec/functional/resource/windows_task_spec.rb +++ b/spec/functional/resource/windows_task_spec.rb @@ -1283,6 +1283,57 @@ describe Chef::Resource::WindowsTask, :windows_only do expect(subject).not_to be_updated_by_last_action end end + + context "when start_when_available is passed" do + subject do + new_resource = Chef::Resource::WindowsTask.new(task_name, run_context) + new_resource.command task_name + new_resource.run_level :highest + new_resource.execution_time_limit = 259200 / 60 # converting "PT72H" into minutes and passing here since win32-taskscheduler accespts this + new_resource + end + + it "sets start_when_available to true" do + subject.frequency :minute + subject.start_when_available true + call_for_create_action + # loading current resource again to check new task is creted and it matches task parameters + current_resource = call_for_load_current_resource + expect(current_resource.exists).to eq(true) + expect(current_resource.task.settings[:start_when_available]).to eql(true) + end + + it "sets start_when_available to false" do + subject.frequency :minute + subject.start_when_available false + call_for_create_action + # loading current resource again to check new task is created and it matches task parameters + current_resource = call_for_load_current_resource + expect(current_resource.exists).to eq(true) + expect(current_resource.task.settings[:start_when_available]).to eql(false) + end + + it "sets the default if start_when_available is nil" do + subject.frequency :minute + subject.start_when_available nil + call_for_create_action + # loading current resource again to check new task is created and it matches task parameters + current_resource = call_for_load_current_resource + expect(current_resource.exists).to eq(true) + expect(current_resource.task.settings[:start_when_available]).to eql(false) + end + + it "does not converge the resource if it is already converged" do + subject.frequency :minute + subject.start_when_available true + subject.run_action(:create) + subject.frequency :minute + subject.start_when_available true + subject.disallow_start_if_on_batteries false + subject.run_action(:create) + expect(subject).not_to be_updated_by_last_action + end + end end context "task_name with parent folder" do diff --git a/spec/unit/resource/windows_task_spec.rb b/spec/unit/resource/windows_task_spec.rb index ac4b2b8c99..d08849d4be 100644 --- a/spec/unit/resource/windows_task_spec.rb +++ b/spec/unit/resource/windows_task_spec.rb @@ -61,6 +61,10 @@ describe Chef::Resource::WindowsTask, :windows_only do expect(resource.stop_if_going_on_batteries).to eql(false) end + it "sets the default value for start_when_available as false" do + expect(resource.start_when_available).to eql(false) + end + context "when frequency is not provided" do it "raises ArgumentError to provide frequency" do expect { resource.after_created }.to raise_error(ArgumentError, "Frequency needs to be provided. Valid frequencies are :minute, :hourly, :daily, :weekly, :monthly, :once, :on_logon, :onstart, :on_idle, :none." ) |