diff options
author | Thom May <thom@may.lt> | 2016-01-27 09:36:46 +0000 |
---|---|---|
committer | Thom May <thom@may.lt> | 2016-01-27 09:36:46 +0000 |
commit | b7e7f425b27d011d358b17c5f7ba61473dbb3308 (patch) | |
tree | 94db9524bfe2366091785199732ac58952d7eed5 /lib/chef | |
parent | c958ec94037a4014685e0229cc47af12944b4a97 (diff) | |
parent | 3bf45a67e60d1081d4288bb01d0f2fc944ed8ca7 (diff) | |
download | chef-b7e7f425b27d011d358b17c5f7ba61473dbb3308.tar.gz |
Merge pull request #4422 from chef/tm/apt_update
Add an apt_update resource
Diffstat (limited to 'lib/chef')
-rw-r--r-- | lib/chef/provider/apt_update.rb | 78 | ||||
-rw-r--r-- | lib/chef/providers.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/apt_update.rb | 33 | ||||
-rw-r--r-- | lib/chef/resources.rb | 1 |
4 files changed, 113 insertions, 0 deletions
diff --git a/lib/chef/provider/apt_update.rb b/lib/chef/provider/apt_update.rb new file mode 100644 index 0000000000..00c3ad16bb --- /dev/null +++ b/lib/chef/provider/apt_update.rb @@ -0,0 +1,78 @@ +# +# Author:: Thom May (<thom@chef.io>) +# Copyright:: Copyright (c) 2016 Chef Software, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require "chef/resource" +require "chef/dsl/declare_resource" + +class Chef + class Provider + class AptUpdate < Chef::Provider + include Chef::DSL::DeclareResource + + provides :apt_update, os: "linux" + + APT_CONF_DIR = "/etc/apt/apt.conf.d" + STAMP_DIR = "/var/lib/apt/periodic" + + def whyrun_supported? + true + end + + def load_current_resource + end + + def action_periodic + if !apt_up_to_date? + converge_by "update new lists of packages" do + do_update + end + end + end + + def action_update + converge_by "force update new lists of packages" do + do_update + end + end + + private + # Determines whether we need to run `apt-get update` + # + # @return [Boolean] + def apt_up_to_date? + ::File.exist?("#{STAMP_DIR}/update-success-stamp") && + ::File.mtime("#{STAMP_DIR}/update-success-stamp") > Time.now - new_resource.frequency + end + + def do_update + [STAMP_DIR, APT_CONF_DIR].each do |d| + build_resource(:directory, d, caller[0]) do + recursive true + end.run_action(:create) + end + + build_resource(:file, "#{APT_CONF_DIR}/15update-stamp", caller[0]) do + content "APT::Update::Post-Invoke-Success {\"touch #{STAMP_DIR}/update-success-stamp 2>/dev/null || true\";};" + end.run_action(:create_if_missing) + + shell_out!("apt-get -q update") + end + + end + end +end diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb index b024be5b62..935933d326 100644 --- a/lib/chef/providers.rb +++ b/lib/chef/providers.rb @@ -16,6 +16,7 @@ # limitations under the License. # +require "chef/provider/apt_update" require "chef/provider/batch" require "chef/provider/breakpoint" require "chef/provider/cookbook_file" diff --git a/lib/chef/resource/apt_update.rb b/lib/chef/resource/apt_update.rb new file mode 100644 index 0000000000..df2033b063 --- /dev/null +++ b/lib/chef/resource/apt_update.rb @@ -0,0 +1,33 @@ +# +# Author:: Thom May (<thom@chef.io>) +# Copyright:: Copyright (c) 2016 Chef Software, Inc. +# License:: Apache License, Version 2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +require "chef/resource" + +class Chef + class Resource + class AptUpdate < Chef::Resource + resource_name :apt_update + provides :apt_update, os: "linux" + + property :frequency, Integer, default: 86_400 + + default_action :periodic + allowed_actions :update, :periodic + end + end +end diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb index dc1b195d25..647db5fc00 100644 --- a/lib/chef/resources.rb +++ b/lib/chef/resources.rb @@ -17,6 +17,7 @@ # require "chef/resource/apt_package" +require "chef/resource/apt_update" require "chef/resource/bash" require "chef/resource/batch" require "chef/resource/breakpoint" |