refactor of rundeck agent to use token auth

lib/noah/agent.rb

@@ -55,6 +55,8 @@ module Noah
         begin
           #self.instance_variable_get("@#{a}").send(:notify, e, m, @@watchers)
           x.notify(e, m, @@watchers.clone)
+          x.errback {|e| self.set_deferred_status(:fail, "Error in #{x.class.to_s}: #{e}")}
+          x.callback {|m| self.set_deferred_status(:success); iter.next}
           iter.next
         rescue Exception => e
           @logger.error("#{agent.to_s} invocation failed with #{e.message}")

lib/noah/agents/base_agent.rb

@@ -22,7 +22,7 @@ module Noah::Agents
           work!(ep, message)
           iter.next
         end
-        logger.info("Dispatched message to #{worklist.size} #{self.class.to_s} endpoints")
+          logger.info("Dispatched message to #{worklist.size} #{self.class.to_s} endpoints")
       else
         logger.info("No work to do")
       end

lib/noah/agents/http_agent.rb

@@ -14,7 +14,7 @@ module Noah::Agents
           logger.info("Message posted to #{ep} successfully")
         }
         http.errback {
-          logger.error("Something went wrong with #{ep}")
+          logger.debug("Error posting to #{ep}: #{http.response}.")
         }
     end
 

lib/noah/agents/rundeck_agent.rb

 require File.join(File.dirname(__FILE__), 'base_agent')
-require 'em-http/middleware/cookie_jar'
-require 'uri'
+require 'nokogiri'
 
 module Noah::Agents
   class RunDeckAgent < Base
@@ -8,31 +7,60 @@ module Noah::Agents
     PREFIX = "rundeck://"
     NAME = self.class.to_s
     DEFAULT_CONCURRENCY = 50
+    SUPPORTED_PATHS = ["refresh", "run"]
 
     def work!(ep, message)
         logger.info("Sending message to (#{ep})")
-        uri = URI.parse(ep)
-        credentials = {:j_username => uri.user, :j_password => uri.password}
-        EM::HttpRequest.use EM::Middleware::CookieJar
-        conn = EM::HttpRequest.new("http://#{uri.host}:#{uri.port}/j_security_check")
-        http = conn.post :body => credentials
+        rd = rundeck_parser(ep)
+        req = EM::HttpRequest.new(rd[:url], :connection_timeout => 2, :inactivity_timeout => 2)
+        http = req.send(:"#{rd[:http_method]}", :head => {"X-RunDeck-Auth-Token" => "#{rd[:token]}"})
         http.callback {
-          logger.info("Logged in to RunDeck. Calling path")
-          conn2 = EM::HttpRequest.new("http://#{uri.host}:#{uri.port}#{uri.path}?#{uri.query}")
-          exec = conn2.get
-          exec.callback {
-            logger.info("Successfully called #{ep}")
-            logger.info("Response from RunDeck:")
-            logger.info("#{exec.response}")
-          }
-          exec.errback {
-            logger.error("Something went wrong with #{ep}")
-          }
+          logger.info("Message posted to #{ep}")
+          rd_resp = rundeck_response(http.response)
+          http.fail("#{rd_resp[:message]}") if rd_resp[:status] == "error"
         }
         http.errback {
-          logger.error("Something went wrong with #{ep}")
+          logger.error("Something went wrong with #{ep}: #{http.response}")
         }
     end
 
+    private
+    def rundeck_parser(endpoint)
+      rd = {}
+      logger.debug("Parsing endpoint: #{endpoint}")
+      begin
+        rduri = URI.parse(endpoint)
+      rescue URI::InvalidURIError
+        logger.error("Invalid callback destination")
+      end
+
+      rduri.user.nil? ? self.fail("Missing API Token") : rd[:token]=rduri.user
+      # valid paths are:
+      # "/refresh/<project_name>"
+      # or
+      # "/run/<job_id>"
+      rduri.path.split("/").size < 3 ? logger.error("Path must contain job number") : action=rduri.path.split("/")[1]
+      case action
+        when "run"
+          realpath = "api/1/job/#{rduri.path.split("/")[2]}/run"
+          rd[:http_method] = "get"
+        when "refresh"
+          realpath = "api/2/project/#{rduri.path.split("/")[2]}/resources/refresh"
+          rd[:http_method] = "post"
+        else
+          logger.error("I only handle jobs and refreshes for now. Sorry!")
+        end
+      rd[:url] = "http://#{rduri.host}:#{rduri.port}/#{realpath}"
+      logger.debug("Returning to work with params: #{rd.to_s}")
+      rd
+    end
+
+    def rundeck_response(response)
+      xml = Nokogiri::XML.parse(response)
+      keys = xml.xpath("//result").collect(&:keys).first
+      keys.member?("error") ? status="error" : status="success"
+      message = xml.xpath("//result").collect(&:text)
+      {:status => status, :message => message}
+    end
   end
 end

lib/noah/models/watchers.rb

@@ -5,6 +5,8 @@ module Noah
     attribute :pattern
     attribute :endpoint
     attribute :name
+    counter :failures
+
 
     index :pattern
     index :endpoint