smart_proxy_salt 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77c8f6c3ad50715f41fb5606a65ddd3cb6f06bd1
-  data.tar.gz: 61153e01b2c2043c19b22f33a651932c6c8fb8b9
+  metadata.gz: 3351c2de7272f0dbb7b148909a51ad602199427d
+  data.tar.gz: 64aa21a514991c9b241451210c1972df71a61ee5
 SHA512:
-  metadata.gz: de0c1674f1e3742a185e3f1f4bb9574e8c2c498cc3fa1278914c1e0617517cfe19a63774f4c53d3b567650bbc959816ee312a7a7e6dee3cd42785d071de1c13f
-  data.tar.gz: f85fb6810cbb2c47846f167875880825b788f9cf7cd430358c1d58becdaae63b4b2b9f8884428104a5626288d15e761d415019a2bb24b2f0acedbffca49a5fb6
+  metadata.gz: 70501217d2996bb1a95dc6845396a0cf8df049c3642626eb219d3d84f1cc058b15558aeac6acacdd3b722a89d7ae2e99b3db06e5baf71537061959a049ea1f2b
+  data.tar.gz: 4ce92e47305d9ea121449067c6945fcbeb92a94378b9ba259d8709d4e6fe9d7f7563289c318fa0363fa20d5b1ceeefed7577d35a33d18507d0d329794289191c

data/lib/smart_proxy_salt/api_request.rb

@@ -0,0 +1,45 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'uri'
+
+module Proxy::Salt
+  class ApiError < RuntimeError; end
+
+  class ApiRequest
+    attr_reader :url, :username, :password, :auth
+
+    def initialize
+      @url = Proxy::Salt::Plugin.settings.api_url
+      @auth = Proxy::Salt::Plugin.settings.api_auth
+      @username = Proxy::Salt::Plugin.settings.api_username
+      @password = Proxy::Salt::Plugin.settings.api_password
+
+      begin
+        URI.parse(url)
+      rescue URI::InvalidURIError => e
+        raise ConfigurationError.new("Invalid Salt api_url setting: #{e}")
+      end
+    end
+
+    def post(path, options = {})
+      uri              = URI.parse(url)
+      http             = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl     = uri.scheme == 'https'
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      path = [uri.path, path].join('/') unless uri.path.empty?
+
+      request = Net::HTTP::Post.new(URI.join(uri.to_s, path).path)
+      request.add_field('Accept', 'application/json')
+      request.set_form_data(options.merge(:username => username, :password => password, :eauth => auth))
+
+      response = http.request(request)
+
+      if response.is_a? Net::HTTPOK
+        JSON.load(response.body)
+      else
+        raise ApiError.new("Failed to query Salt API (#{response.code}): #{response.body}")
+      end
+    end
+  end
+end

data/lib/smart_proxy_salt/{salt_main.rb → cli.rb}

@@ -1,34 +1,8 @@
-module Proxy::Salt
+module Proxy::Salt::CLI
   extend ::Proxy::Log
   extend ::Proxy::Util
 
   class << self
-
-    # Move these to a util thingy later
-    def shell_command(cmd, wait = true)
-      begin
-        c = popen(cmd)
-        unless wait
-          Process.detach(c.pid)
-          return 0
-        end
-        Process.wait(c.pid)
-	logger.info("Result: #{c.read}")
-      rescue Exception => e
-        logger.error("Exception '#{e}' when executing '#{cmd}'")
-        return false
-      end
-      logger.warn("Non-null exit code when executing '#{cmd}'") if $?.exitstatus != 0
-      $?.exitstatus == 0
-    end
-
-    def popen(cmd)
-      # 1.8.7 note: this assumes that cli options are space-separated
-      cmd = cmd.join(' ') unless RUBY_VERSION > '1.8.7'
-      logger.debug("about to execute: #{cmd}")
-      IO.popen(cmd)
-    end
-
     def autosign_file
       Proxy::Salt::Plugin.settings.autosign_file
     end
@@ -136,6 +110,32 @@ module Proxy::Salt
 
     end
 
+    private
+
+    def shell_command(cmd, wait = true)
+      begin
+        c = popen(cmd)
+        unless wait
+          Process.detach(c.pid)
+          return 0
+        end
+        Process.wait(c.pid)
+        logger.info("Result: #{c.read}")
+      rescue Exception => e
+        logger.error("Exception '#{e}' when executing '#{cmd}'")
+        return false
+      end
+      logger.warn("Non-null exit code when executing '#{cmd}'") if $?.exitstatus != 0
+      $?.exitstatus == 0
+    end
+
+    def popen(cmd)
+      # 1.8.7 note: this assumes that cli options are space-separated
+      cmd = cmd.join(' ') unless RUBY_VERSION > '1.8.7'
+      logger.debug("about to execute: #{cmd}")
+      IO.popen(cmd)
+    end
+
     def find_salt_binaries
       @salt_key = which('salt-key')
       unless File.exists?("#{@salt_key}")
@@ -159,6 +159,5 @@ module Proxy::Salt
       logger.debug "Found sudo at #{@sudo}"
       @sudo = "#{@sudo}"
     end
-
   end
 end

data/lib/smart_proxy_salt/rest.rb

@@ -0,0 +1,31 @@
+require 'json'
+require 'smart_proxy_salt/api_request'
+
+module Proxy::Salt::Rest
+  extend ::Proxy::Log
+  extend ::Proxy::Util
+
+  class << self
+    def environments_list
+      Proxy::Salt::ApiRequest.new.post('/run', :fun => 'fileserver.envs', :client => 'runner')['return'][0].to_s
+    end
+
+    def states_list(environment)
+      states = []
+      files = Proxy::Salt::ApiRequest.new.post('/run', :fun => 'fileserver.file_list',
+                                   :saltenv => environment,
+                                   :client => 'runner')['return'][0]
+
+      files.each do |file|
+        if file =~ /\.sls\Z/ && file != "top.sls"
+          states << file.gsub('.sls', '')
+                        .gsub('/init', '')
+                        .chomp('/')
+                        .gsub('/', '.')
+        end
+      end
+
+      states.to_s
+    end
+  end
+end

data/lib/smart_proxy_salt/salt.rb

@@ -1,13 +1,32 @@
+require 'smart_proxy_salt/cli'
+require 'smart_proxy_salt/rest'
+
 module Proxy::Salt
   class NotFound < RuntimeError; end
 
   class Plugin < ::Proxy::Plugin
     plugin 'salt', Proxy::Salt::VERSION
 
-    default_settings :autosign_file => '/etc/salt/autosign.conf'
-    default_settings :salt_command_user  => 'root'
+    default_settings :autosign_file      => '/etc/salt/autosign.conf',
+                     :salt_command_user  => 'root',
+                     :use_api            => false
 
     http_rackup_path File.expand_path('salt_http_config.ru', File.expand_path('../', __FILE__))
     https_rackup_path File.expand_path('salt_http_config.ru', File.expand_path('../', __FILE__))
   end
+
+  class << self
+    def method_missing(m, *args, &block)
+      # Use API, if it supports it, otherwise fallback to the CLI
+      if Proxy::Salt::Plugin.settings.use_api && Proxy::Salt::Rest.respond_to?(m)
+        Proxy::Salt::Rest.send(m, *args, &block)
+      elsif Proxy::Salt::CLI.respond_to?(m)
+        Proxy::Salt::CLI.send(m, *args, &block)
+      elsif !Proxy::Salt::Plugin.settings.use_api && Proxy::Salt::Rest.respond_to?(m)
+        raise NotImplementedError, 'You must enable the Salt API to use this feature.'
+      else
+        super
+      end
+    end
+  end
 end

data/lib/smart_proxy_salt/salt_api.rb

@@ -1,6 +1,5 @@
 require 'sinatra'
 require 'smart_proxy_salt/salt'
-require 'smart_proxy_salt/salt_main'
 
 module Proxy::Salt
   class Api < ::Sinatra::Base
@@ -37,6 +36,26 @@ module Proxy::Salt
       end
     end
 
+    get '/environments' do
+      content_type :json
+      begin
+        Proxy::Salt::environments_list
+      rescue => e
+        log_halt 406, "Failed to list environments: #{e}"
+      end
+    end
+
+    get '/environments/:environment' do
+      content_type :json
+      begin
+        Proxy::Salt::states_list params[:environment]
+      rescue Proxy::Salt::NotFound => e
+        log_halt 404, "#{e}"
+      rescue => e
+        log_halt 406, "Failed to list states for #{params[:host]}: #{e}"
+      end
+    end
+
     post '/highstate/:host' do
       content_type :json
       begin
@@ -82,6 +101,5 @@ module Proxy::Salt
         log_halt 406, "Failed to list keys: #{e}"
       end
     end
-
   end
 end

data/lib/smart_proxy_salt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Salt
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

data/settings.d/salt.yml.example

@@ -2,3 +2,10 @@
 :enabled: true
 :autosign_file: /etc/salt/autosign.conf
 :salt_command_user: root
+# Some features require using the Salt API - such as listing
+# environments and retrieving state info
+:use_api: false
+:api_url: https://localhost:8080
+:api_auth: pam
+:api_username: saltuser
+:api_password: password

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies: []
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
@@ -27,10 +27,12 @@ files:
 - cron/smart_proxy_salt
 - etc/foreman.yaml.example
 - lib/smart_proxy_salt.rb
+- lib/smart_proxy_salt/api_request.rb
+- lib/smart_proxy_salt/cli.rb
+- lib/smart_proxy_salt/rest.rb
 - lib/smart_proxy_salt/salt.rb
 - lib/smart_proxy_salt/salt_api.rb
 - lib/smart_proxy_salt/salt_http_config.ru
-- lib/smart_proxy_salt/salt_main.rb
 - lib/smart_proxy_salt/version.rb
 - sbin/upload-salt-reports
 - settings.d/salt.yml.example