motherbrain 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa9b41a671b085f2e3c08057bd1f2e3db7a61f2
-  data.tar.gz: eadec4b2bc486a6b52eedf09d9c630608c4927db
+  metadata.gz: acc003650c5db20ee4a4198443bfc04339a538e9
+  data.tar.gz: ec7dbd88bac26101aa0029882106b775352025f2
 SHA512:
-  metadata.gz: 52cadf2941cdd996c6f5f869cdafc0758a1d20f910e28d5e66fb0d1e23410b9d72d07b045b3ba3656edc737605470a675b9e0f2028f8e3235a2e8120377e6e62
-  data.tar.gz: 035faec4ac2787b08b3491d49506caa3ac06a740c7ac37a1a8b8eb72122021051ff1c143c786a9a8863ba4ac44987aaef80b09346c87ace569933922559a9032
+  metadata.gz: c55553d715c7e67ac0a8627f3bffec8ce9ae47577c1601aa32242f75dade46acbb1d8614840df5ce8fddba26a028c91d91921fc88e0856aa5d98336e4811a0d6
+  data.tar.gz: 3f7d389d0ddcf5e067c417ada1412ff825710a3219bf83283808ff62bdf48ccf130ff0a5d8d6d97470b3a53e9c03eb1f0d8f9fffe17f8b606ce2bcc5ec233389

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.0
+
+* [#711](https://github.com/RiotGames/motherbrain/pull/711) Implement a new command for upgrading a node or environment's Omnibus Chef installation
+* [#708](https://github.com/RiotGames/motherbrain/pull/708) Fix a bug when node filtering would reduce the nodes to 0
+
 # 1.2.1
 
 * [#705](https://github.com/RiotGames/motherbrain/pull/705) Make connector_for_os public and ensure it is used for environment upgrades

data/lib/mb/api/v1/chef_endpoint.rb

@@ -0,0 +1,48 @@
+module MotherBrain::API
+  class V1
+    class ChefEndpoint < MB::API::Endpoint
+      helpers MB::API::Helpers
+
+      rescue_from MB::OmnibusUpgradeError do |ex|
+        rack_response(ex.to_json, 400, "Content-type" => "application/json")
+      end
+
+      namespace 'chef' do
+
+        desc "Remove Chef from node and purge it's data from the Chef server"
+        params do
+          requires :hostname, type: String, desc: "the hostname of the node to purge"
+          optional :skip_chef, type: Boolean, desc: "Skip removing the Chef installation from the node"
+        end
+        post 'purge' do
+          node_querier.async_purge(params[:hostname], params.slice(:skip_chef).freeze)
+        end
+
+        desc "Upgrades the provided node and an environment of node's Omnibus Chef installation"
+        params do
+          requires :version, type: String, desc: "the version of omnibus to upgrade to"
+          optional :environment_id, type: String, desc: "an environment to upgrade"
+          optional :host, type: String, desc: "a host to upgrade"
+          optional :prerelease, type: Boolean, desc: "boolean to use a prerelease version of Chef"
+          optional :direct_url, type: String, desc: "a direct URL to a Omnibus binary file"
+        end
+        post 'upgrade' do
+          nodes = nil
+          host = params[:host]
+          environment_id = params[:environment_id]
+
+          raise MB::OmnibusUpgradeError.new("Need to provide one of :environment_id or :host") if host.nil? && environment_id.nil?
+          raise MB::OmnibusUpgradeError.new("Both :environment_id and :host were provided") if !host.nil? && !environment_id.nil?
+
+          if host
+            node_object = Ridley::NodeObject.new(host, automatic: { fqdn: host })
+            nodes = [node_object]
+          elsif environment_id
+            nodes = environment_manager.nodes_for_environment(params[:environment_id])
+          end
+          node_querier.async_upgrade_omnibus(params[:version], nodes, params.slice(:prerelease, :direct_url).freeze)
+        end
+      end
+    end
+  end
+end

data/lib/mb/api/v1.rb

@@ -6,6 +6,7 @@ module MotherBrain::API
     require_relative 'v1/environments_endpoint'
     require_relative 'v1/jobs_endpoint'
     require_relative 'v1/plugins_endpoint'
+    require_relative 'v1/chef_endpoint'
 
     version 'v1', using: :header, vendor: 'motherbrain'
     format :json
@@ -41,6 +42,7 @@ module MotherBrain::API
     mount V1::JobsEndpoint
     mount V1::EnvironmentsEndpoint
     mount V1::PluginsEndpoint
+    mount V1::ChefEndpoint
     add_swagger_documentation
 
     if MB.testing?

data/lib/mb/cli_gateway.rb

@@ -234,7 +234,8 @@ module MotherBrain
       "template",
       "purge",
       "disable",
-      "enable"
+      "enable",
+      "upgrade_omnibus"
     ].freeze
 
     CREATE_ENVIRONMENT_TASKS = [
@@ -334,6 +335,34 @@ module MotherBrain
       CliClient.new(job).display
     end
 
+    method_option :host,
+      type: :string,
+      desc: "A hostname for the node to be upgraded"
+    method_option :prerelease,
+      type: :boolean,
+      desc: "Boolean to install a prerelease version of Chef",
+      default: false
+    method_option :direct_url,
+      type: :string,
+      desc: "A URL pointing directly to a Chef package to install"
+    desc "upgrade_omnibus VERSION", "Upgrades the Omnibus Chef installation on a Chef Environment of nodes to a specified VERSION."
+    def upgrade_omnibus(version)
+      nodes = nil
+      if options["host"]
+        host = options["host"]
+        node_object = Ridley::NodeObject.new(host, automatic: { fqdn: host })
+        nodes = [node_object]
+      elsif options["environment"]
+        nodes = environment_manager.nodes_for_environment(options["environment"])
+      end
+      if nodes.nil?
+        ui.error "Error - you need to either define a host (--host) or an environment (-e) to operate on."
+      else
+        job = node_querier.async_upgrade_omnibus(version, nodes, options.to_hash.symbolize_keys)
+        CliClient.new(job).display
+      end
+    end
+
     method_option :force,
       type: :boolean,
       desc: "Perform HOST enable even if the environment is locked",

data/lib/mb/command_runner.rb

@@ -124,10 +124,10 @@ module MotherBrain
         group.nodes(environment)
       end.uniq
 
-      return unless nodes.any?
-
       nodes = MB::NodeFilter.filter(node_filter, nodes) if node_filter
 
+      return unless nodes.any?
+
       if options[:any]
         nodes = nodes.sample(options[:any])
       end

data/lib/mb/errors.rb

@@ -690,4 +690,9 @@ module MotherBrain
       "#{@name} is disabled."
     end
   end
+
+  class OmnibusUpgradeError < MBError
+    exit_code(25)
+    error_code(3029)
+  end
 end

data/lib/mb/node_querier.rb

@@ -279,6 +279,26 @@ module MotherBrain
       job.ticket
     end
 
+    # Asynchronously upgrade the Omnibus installation of Chef on the given nodes
+    # to a specific version.
+    #
+    # @param [String] version
+    #   the version of Chef to upgrade to
+    # @param [Array<Ridley::NodeObject>] nodes
+    #   the node(s) to upgrade omnibus on
+    #
+    # @option options [Boolean] :prerelease
+    #   whether or not to use a prerelease version of Chef
+    # @option options [String] :direct_url
+    #   a URL pointing directly to a Chef package to install
+    #
+    # @return [Mb::JobTicket]
+    def async_upgrade_omnibus(version, nodes, options = {})
+      job = Job.new(:upgrade_omnibus)
+      async(:upgrade_omnibus, job, version, nodes, options)
+      job.ticket
+    end
+
     # Asynchronously disable a node to stop services @host and prevent
     # chef-client from being run on @host until @host is reenabled
     #
@@ -353,6 +373,43 @@ module MotherBrain
       job.terminate if job && job.alive?
     end
 
+    # Upgrades the Omnibus installation of Chef on a specific node(s) to
+    # a specific version.
+    #
+    # @param [MB::Job] job
+    # @param [String] version
+    #   the version of Chef to upgrade to
+    # @param [Array<Ridley::NodeObject>] nodes
+    #   the node(s) to upgrade omnibus on
+    #
+    # @option options [Boolean] :prerelease
+    #   whether or not to use a prerelease version of Chef
+    # @option options [String] :direct_url
+    #   a URL pointing directly to a Chef package to install
+    #
+    # @return [MB::Job]
+    def upgrade_omnibus(job, version, nodes, options = {})
+      futures = Array.new
+      options = options.merge(chef_version: version)
+
+      hostnames = nodes.collect(&:public_hostname)
+      job.report_running("Upgrading Omnibus Chef installation on #{hostnames}")
+
+      hostnames.each do |hostname|
+        futures << chef_connection.node.future(:update_omnibus, hostname, options)
+      end
+
+      begin
+        safe_remote { futures.map(&:value) }
+      rescue RemoteCommandError => e
+        job.report_failure
+      end
+
+      job.report_success
+    ensure
+      job.terminate if job && job.alive?
+    end
+
     # Remove explicit service state on @host and remove disabled entry
     # from run list to allow chef-client to run on @host
     #

data/lib/mb/version.rb

@@ -1,3 +1,3 @@
 module MotherBrain
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/motherbrain.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh'
   s.add_dependency 'net-sftp'
   s.add_dependency 'solve', '~> 1.1'
-  s.add_dependency 'ridley-connectors', '~> 2.1'
+  s.add_dependency 'ridley-connectors', '~> 2.2'
   s.add_dependency 'thor', '~> 0.18.0'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'multi_json'

data/spec/unit/mb/api/v1/chef_endpoint_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe MB::API::V1::ChefEndpoint do
+  include Rack::Test::Methods
+
+  before(:all) { MB::RestGateway.start(port: 26101) }
+  after(:all) { MB::RestGateway.stop }
+  let(:app) { MB::RestGateway.instance.app }
+  let(:job) { MB::Job.new(:test) }
+
+  describe "POST /chef/purge" do
+    let(:hostname) { "foo.bar.com" }
+
+    it "returns 201" do
+      node_querier.should_receive(:async_purge).with(hostname, anything()).and_return(job.ticket)
+      json_post "/chef/purge",
+        MultiJson.dump(hostname: hostname)
+      last_response.status.should == 201
+    end
+  end
+
+  describe "POST /chef/upgrade" do
+    let(:version) { "1.2.3" }
+    let(:environment_id) { "rpsec_test" }
+    let(:host) { "1.1.1.1" }
+
+    context "when neither environment_id nor host are provided" do
+      it "returns a 400" do
+        json_post "/chef/upgrade",
+          MultiJson.dump(version: version)
+
+        last_response.status.should == 400
+      end
+    end
+
+    context "when both environment_id and host are provided" do
+      it "returns a 400" do
+        json_post "/chef/upgrade",
+          MultiJson.dump(version: version, environment_id: environment_id, host: host)
+
+        last_response.status.should == 400
+      end
+    end
+
+    context "when host is provided" do
+      let(:node_object) { Ridley::NodeObject.new(host, automatic: { fqdn: host }) }
+
+      it "returns 201" do
+        node_querier.should_receive(:async_upgrade_omnibus).with(version, [node_object], anything()).and_return(job.ticket)
+
+        json_post "/chef/upgrade",
+          MultiJson.dump(version: version, host: host)
+
+        last_response.status.should == 201
+      end
+    end
+    
+    context "when environment_id is provided" do
+      let(:nodes) { ["node1", "node2", "node3"] }
+
+      before do
+        environment_manager.stub(:nodes_for_environment).and_return(nodes)
+      end
+
+      it "returns 201" do
+        node_querier.should_receive(:async_upgrade_omnibus).with(version, nodes, anything()).and_return(job.ticket)
+
+        json_post "/chef/upgrade",
+          MultiJson.dump(version: version, environment_id: environment_id)
+
+        last_response.status.should == 201
+      end
+    end
+  end
+end

data/spec/unit/mb/command_runner_spec.rb

@@ -7,7 +7,7 @@ describe MB::CommandRunner do
     described_class.new(job, environment, scope, command_block, node_filter)
   }
 
-  let(:scope) { MB::Plugin.new(double(valid?: true)) }
+  let(:scope) { MB::Plugin.new(double(valid?: true, name: 'cookbook')) }
 
   let(:action_1) { double('action_1', name: "action 1", run: nil) }
   let(:action_2) { double('action_2', name: "action 2", run: nil) }
@@ -39,6 +39,7 @@ describe MB::CommandRunner do
     MB::CommandRunner::CleanRoom.stub_chain(:new, :actions).and_return(actions)
 
     scope.stub(:group!).with("master_group").and_return(master_group)
+    scope.stub(:group!).with("slave_group").and_return(slave_group)
   end
 
   describe "#on" do
@@ -126,6 +127,20 @@ describe MB::CommandRunner do
       end
     end
 
+    context "when a group's nodes are filtered to 0" do
+      let(:node_filter)   { "c.riotgames.com" }
+      let(:command_block) {
+        proc {
+          on("master_group") {}
+          on("slave_group")  {}
+        }
+      }
+
+      it "skips groups that have all their nodes filtered out" do
+        command_runner
+      end
+    end
+
     context "with max_concurrent: 1" do
       let(:command_block) {
         proc {

data/spec/unit/mb/node_querier_spec.rb

@@ -374,6 +374,58 @@ describe MB::NodeQuerier do
     end
   end
 
+  describe "#async_upgrade_omnibus" do
+    let(:host) { "192.168.1.1" }
+    let(:nodes) { [Ridley::NodeObject.new(host, automatic: { fqdn: host })] }
+    let(:version) { "11.12.4" }
+    let(:options) { Hash.new }
+
+    it "creates a Job and delegates to #upgrade_omnibus" do
+      ticket = double('ticket')
+      job    = double('job', ticket: ticket)
+      MB::Job.should_receive(:new).and_return(job)
+      subject.should_receive(:upgrade_omnibus).with(job, version, nodes, options)
+
+      subject.async_upgrade_omnibus(version, nodes, options)
+    end
+
+    it "returns a JobTicket" do
+      expect(subject.async_purge(host, options)).to be_a(MB::JobRecord)
+    end
+  end
+
+  describe "#upgrade_omnibus" do
+    let(:host) { "192.168.1.1" }
+    let(:nodes) { [Ridley::NodeObject.new(host, automatic: { fqdn: host })] }
+    let(:version) { "11.12.4" }
+    let(:options) do
+      {
+        chef_version: version
+      }
+    end
+    let(:job) { MB::Job.new(:upgrade_omnibus) }
+    let(:future_stub) { double(Celluloid::Future, value: nil) }
+
+    before do
+      subject.chef_connection.
+        stub_chain(:node, :future).
+        with(:update_omnibus, host, options).
+        and_return(future_stub)
+    end
+
+    context "when there are no errors" do
+      it "reports success" do
+        job.should_receive(:report_success)
+        subject.upgrade_omnibus(job, version, nodes, options)
+      end
+    end
+
+    it "terminates the job" do
+      subject.upgrade_omnibus(job, version, nodes, options)
+      expect(job).to_not be_alive
+    end
+  end
+
   describe "#async_disable" do
     let(:host) { "192.168.1.1" }
     let(:options) { Hash.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motherbrain
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -149,14 +149,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -388,6 +388,7 @@ files:
 - lib/mb/api/endpoint.rb
 - lib/mb/api/helpers.rb
 - lib/mb/api/v1.rb
+- lib/mb/api/v1/chef_endpoint.rb
 - lib/mb/api/v1/config_endpoint.rb
 - lib/mb/api/v1/environments_endpoint.rb
 - lib/mb/api/v1/jobs_endpoint.rb
@@ -517,6 +518,7 @@ files:
 - spec/support/spec_helpers.rb
 - spec/unit/mb/api/application_spec.rb
 - spec/unit/mb/api/helpers_spec.rb
+- spec/unit/mb/api/v1/chef_endpoint_spec.rb
 - spec/unit/mb/api/v1/config_endpoint_spec.rb
 - spec/unit/mb/api/v1/environments_endpoint_spec.rb
 - spec/unit/mb/api/v1/jobs_endpoint_spec.rb
@@ -666,6 +668,7 @@ test_files:
 - spec/support/spec_helpers.rb
 - spec/unit/mb/api/application_spec.rb
 - spec/unit/mb/api/helpers_spec.rb
+- spec/unit/mb/api/v1/chef_endpoint_spec.rb
 - spec/unit/mb/api/v1/config_endpoint_spec.rb
 - spec/unit/mb/api/v1/environments_endpoint_spec.rb
 - spec/unit/mb/api/v1/jobs_endpoint_spec.rb