Update the omnibus_updater chef recipe

Author: nlalonde

chef/cookbooks/omnibus_updater/.gitignore

@@ -1,5 +1,7 @@
-.bundle
-.cache
-.kitchen
+.*
+!.gitignore
+!.kitchen.yml
 bin
 Gemfile.lock
+Cheffile.lock
+tmp*

chef/cookbooks/omnibus_updater/.kitchen.yml

@@ -0,0 +1,28 @@
+---
+driver_plugin: vagrant
+platforms:
+- name: ubuntu-12.04
+  driver_config:
+    box: opscode-ubuntu-12.04
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box
+- name: ubuntu-10.04
+  driver_config:
+    box: opscode-ubuntu-10.04
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-10.04.box
+- name: centos-6.4
+  driver_config:
+    box: opscode-centos-6.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-6.3.box
+- name: centos-5.8
+  driver_config:
+    box: opscode-centos-5.8
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-centos-5.8.box
+suites:
+- name: default
+  run_list:
+  - recipe[omnibus_updater_test::default]
+  - recipe[minitest-handler]
+- name: upgrade
+  run_list:
+  - recipe[omnibus_updater_test::version_upgrade]
+  - recipe[minitest-handler]

chef/cookbooks/omnibus_updater/CHANGELOG.md

@@ -1,3 +1,17 @@
+v0.2.4
+======
+* Only download omnibus package if version difference detected (#20 #22 #23)
+* Provide attribute for always downloading package even if version matches
+
+v0.2.3
+======
+* Use chef internals for interactions with omnitruck to provide proper proxy support (#19)
+
+v0.2.0
+======
+* Use omnitruck client for url generation for package fetching
+* Use `prerelease` in favor of `allow_release_clients`
+
 v0.1.2
 ======
 * Fix regression on debian package path construction (thanks [ashmere](https://github.com/ashmere))

chef/cookbooks/omnibus_updater/Cheffile

@@ -0,0 +1,4 @@
+site 'http://community.opscode.com/api/v1'
+
+cookbook 'omnibus_updater', path: './'
+cookbook 'omnibus_updater_test', path: './test/kitchen/cookbooks/omnibus_updater_test'

chef/cookbooks/omnibus_updater/Gemfile

@@ -1,3 +1,3 @@
 source :rubygems
 
-gem 'test-kitchen'
+gem 'vagabond'

chef/cookbooks/omnibus_updater/README.md

@@ -14,13 +14,13 @@ be installed on the node:
 
 `knife node run_list add recipe[omnibus_updater]`
 
-In your role you'll likely want to set the version (it defaults
-to the 0.10.10 version of Chef):
+In your role you'll likely want to set the version. It defaults
+to nothing, and will install the latest..
 
 ```
 override_attributes(
   :omnibus_updater => {
-    :version => '10.16.2'
+    :version => '11.4.0'
   }
 )
 ```
@@ -35,37 +35,30 @@ override_attributes(
   }
 )
 ```
----
-
-If you are using a Chef version earlier than 10.12.0 you may want
-to take a look at the chef_gem cookbook to ensure gems are going
-where expected.
-
----
-
-The default recipe will install the omnibus package based
-on system information but you can override that by using
-the `install_via` attribute which accepts: deb, rpm or script.
 
 Features
 ========
 
-Auto version expansion
-----------------------
+Latest Version
+--------------
 
-Versions for the omnibus installer are defined as: x.y.z-n If the `:version` attribute only provides
-x.y.z the `n` value will be automatically filled in with the latest available version.
+Force installation of the latest version regardless of value stored in version
+attribute by setting the `force_latest` attribute.
 
-Auto version searching
-----------------------
+Chef Killing
+------------
 
-Using the `:version_search` attribute, the latest stable version of the omnibus installer will
-be installed automatically as they become available.
+By default the omnibus updater will kill the chef instance by raising and exception.
+You can turn this off using the `kill_chef_on_upgrade` attribute. It is not
+recommended to turn this off. Internal chef libraries may change, move, or no
+longer exist. The currently running instance can encounter unexpected states because
+of this. To prevent this, the updater will attempt to kill the Chef instance so
+that it can be restarted in a normal state.
 
-Release clients
----------------
+Prerelease
+--------
 
-Release clients can be installed via the auto-installation using `:allow_release_clients` attribute.
+Prereleases can be installed via the auto-installation using `prerelease` attribute.
 
 Disable
 -------
@@ -79,4 +72,4 @@ Infos
 
 * Repo: https://github.com/hw-cookbooks/omnibus_updater
 * IRC: Freenode @ #heavywater
-
+* Cookbook: http://ckbk.it/omnibus_updater

chef/cookbooks/omnibus_updater/attributes/default.rb

@@ -1,8 +1,9 @@
-default[:omnibus_updater][:version] = '10.18.2'
-default[:omnibus_updater][:version_search] = false
-default[:omnibus_updater][:base_uri] = 'http://opscode-omnibus-packages.s3.amazonaws.com'
+default[:omnibus_updater][:version] = nil
+default[:omnibus_updater][:force_latest] = false
 default[:omnibus_updater][:cache_dir] = '/opt'
 default[:omnibus_updater][:cache_omnibus_installer] = false
 default[:omnibus_updater][:remove_chef_system_gem] = false
-default[:omnibus_updater][:allow_release_clients] = false
+default[:omnibus_updater][:prerelease] = false
 default[:omnibus_updater][:disabled] = false
+default[:omnibus_updater][:kill_chef_on_upgrade] = true
+default[:omnibus_updater][:always_download] = false

chef/cookbooks/omnibus_updater/libraries/omnitrucker.rb

@@ -0,0 +1,64 @@
+module OmnibusTrucker
+  class << self
+    URL_MAP = {
+      :p => :platform, :pv => :platform_version, :m => :machine,
+      :v => :version, :prerelease => :prerelease,
+      :nightlies => :nightlies
+    }
+
+    def build_url(*opts)
+      args = node = nil
+      opts.each do |o|
+        if(o.kind_of?(Hash))
+          args = o
+        elsif(o.kind_of?(Chef::Node))
+          node = o
+        else
+          raise ArgumentError.new "Provided argument is not allowed: #{o.class}"
+        end
+      end
+      args ||= {}
+      if(node)
+        args = collect_attributes(node).merge(args)
+      end
+      url = args[:url] || "http://www.opscode.com/chef/download#{'-server' if args[:server]}"
+      u_args = URL_MAP.map do |u_k, a_k|
+        "#{u_k}=#{args[a_k]}" unless args[a_k].nil?
+      end.compact
+      "#{url}?#{u_args.join('&')}"
+    end
+
+    def collect_attributes(node, args={})
+      set = Hash[*(
+          [:platform_family, :platform, :platform_version].map do |k|
+            [k, args[k] || node[k]]
+          end.flatten.compact
+      )]
+      unless(@attrs)
+        if(set[:platform_family] == 'rhel')
+          @attrs = {:platform => 'el', :platform_version => set[:platform_version].to_i}
+        else
+          @attrs = {:platform => set[:platform], :platform_version => set[:platform_version]}
+        end
+        @attrs[:machine] = args[:machine] || node[:kernel][:machine]
+      end
+      @attrs
+    end
+
+    def url(url_or_node, node = nil)
+      if(url_or_node.is_a?(Chef::Node))
+        url = build_url(url_or_node)
+        node = url_or_node
+      else
+        url = url_or_node
+        raise "Node instance is required for Omnitruck.url!" unless node
+      end
+      request = Chef::REST::RESTRequest.new(:head, URI.parse(url), nil)
+      result = request.call
+      if(result.kind_of?(Net::HTTPRedirection))
+        result['location']
+      end
+    end
+
+  end
+end

chef/cookbooks/omnibus_updater/metadata.json

@@ -1,7 +1,8 @@
+name             "omnibus_updater"
 maintainer       "Chris Roberts"
 maintainer_email "[email protected]"
 license          "Apache 2.0"
 description      "Chef omnibus package updater and installer"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.2"
+version          "0.2.4"
 

chef/cookbooks/omnibus_updater/metadata.rb

@@ -1,25 +1,10 @@
-if node[:omnibus_updater][:disabled]
+if(node[:omnibus_updater][:disabled])
   Chef::Log.warn 'Omnibus updater disabled via `disabled` attribute'
-elsif node[:omnibus_updater][:install_via]
-  case node[:omnibus_updater][:install_via]
-  when 'deb'
-    include_recipe 'omnibus_updater::deb_package'
-  when 'rpm'
-    include_recipe 'omnibus_updater::rpm_package'
-  when 'script'
-    include_recipe 'omnibus_updater::script'
-  else
-    raise "Unknown omnibus update method requested: #{node[:omnibus_updater][:install_via]}"
-  end
 else
-  case node.platform_family
-  when 'debian'
-    include_recipe 'omnibus_updater::deb_package'
-  when 'fedora', 'rhel'
-    include_recipe 'omnibus_updater::rpm_package'
-  else
-    include_recipe 'omnibus_updater::script'
-  end
+  include_recipe 'omnibus_updater::downloader'
+  include_recipe 'omnibus_updater::installer'
 end
 
-include_recipe 'omnibus_updater::remove_chef_system_gem' if node[:omnibus_updater][:remove_chef_system_gem]
+if(node[:omnibus_updater][:remove_chef_system_gem])
+  include_recipe 'omnibus_updater::remove_chef_system_gem'
+end

chef/cookbooks/omnibus_updater/recipes/deb_downloader.rb

@@ -0,0 +1,36 @@
+# NOTE: This recipe is here for others that just want the
+# package, not the actual installation (lxc for example)
+
+if(node[:omnibus_updater][:direct_url])
+  remote_path = node[:omnibus_updater][:direct_url]
+else
+  version = node[:omnibus_updater][:version] || ''
+  remote_path = OmnibusTrucker.url(
+    OmnibusTrucker.build_url(node,
+      :version => node[:omnibus_updater][:force_latest] ? nil : version.sub(/\-.+$/, ''),
+      :prerelease => node[:omnibus_updater][:preview]
+    ), node
+  )
+end
+
+if(remote_path)
+  node.set[:omnibus_updater][:full_url] = remote_path
+  Chef::Log.info "Omnibus Updater remote path: #{remote_path}"
+
+  remote_file "omnibus_remote[#{File.basename(remote_path)}]" do
+    path File.join(node[:omnibus_updater][:cache_dir], File.basename(remote_path))
+    source remote_path
+    backup false
+    action :create_if_missing
+    only_if do
+      unless(version = node[:omnibus_updater][:version])
+        version = node[:omnibus_updater][:full_url].scan(%r{chef_(\d+\.\d+.\d+)}).flatten.first
+      end
+      node[:omnibus_updater][:always_download] || Chef::VERSION != version.to_s.sub(/\-.+$/, '')
+    end
+  end
+else
+  Chef::Log.warn 'Failed to retrieve omnibus download URL'
+end
+
+include_recipe 'omnibus_updater::old_package_cleaner'