foreman_salt 1.1.1 → 2.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -34,12 +34,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/foreman_salt/api/v2/base_controller.rb
 - app/controllers/foreman_salt/api/v2/jobs_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_autosign_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_environments_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_keys_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_minions_controller.rb
+- app/controllers/foreman_salt/api/v2/salt_states_controller.rb
 - app/controllers/foreman_salt/application_controller.rb
 - app/controllers/foreman_salt/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb
-- app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb
 - app/controllers/foreman_salt/concerns/unattended_controller_extensions.rb
+- app/controllers/foreman_salt/minions_controller.rb
 - app/controllers/foreman_salt/salt_autosign_controller.rb
 - app/controllers/foreman_salt/salt_environments_controller.rb
 - app/controllers/foreman_salt/salt_keys_controller.rb
@@ -55,14 +61,38 @@ files:
 - app/models/foreman_salt/fact_name.rb
 - app/models/foreman_salt/salt_environment.rb
 - app/models/foreman_salt/salt_module.rb
+- app/models/setting/salt.rb
 - app/overrides/foreman/salt_modules/_host_tab.html.erb
 - app/overrides/foreman/salt_modules/_host_tab_pane.html.erb
 - app/overrides/salt_environment_selector.rb
 - app/overrides/salt_modules_selector.rb
 - app/overrides/salt_proxy_selector.rb
 - app/services/foreman_salt/fact_importer.rb
+- app/services/foreman_salt/fact_parser.rb
 - app/services/foreman_salt/report_importer.rb
 - app/services/foreman_salt/smart_proxies/salt_keys.rb
+- app/views/foreman_salt/api/v2/salt_autosign/base.json.rabl
+- app/views/foreman_salt/api/v2/salt_autosign/create.json.rabl
+- app/views/foreman_salt/api/v2/salt_autosign/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_autosign/main.json.rabl
+- app/views/foreman_salt/api/v2/salt_environments/base.json.rabl
+- app/views/foreman_salt/api/v2/salt_environments/create.json.rabl
+- app/views/foreman_salt/api/v2/salt_environments/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_environments/main.json.rabl
+- app/views/foreman_salt/api/v2/salt_environments/show.json.rabl
+- app/views/foreman_salt/api/v2/salt_keys/base.json.rabl
+- app/views/foreman_salt/api/v2/salt_keys/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_keys/main.json.rabl
+- app/views/foreman_salt/api/v2/salt_keys/update.json.rabl
+- app/views/foreman_salt/api/v2/salt_minions/base.json.rabl
+- app/views/foreman_salt/api/v2/salt_minions/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_minions/main.json.rabl
+- app/views/foreman_salt/api/v2/salt_minions/show.json.rabl
+- app/views/foreman_salt/api/v2/salt_states/base.json.rabl
+- app/views/foreman_salt/api/v2/salt_states/create.json.rabl
+- app/views/foreman_salt/api/v2/salt_states/index.json.rabl
+- app/views/foreman_salt/api/v2/salt_states/main.json.rabl
+- app/views/foreman_salt/api/v2/salt_states/show.json.rabl
 - app/views/foreman_salt/salt_autosign/_form.html.erb
 - app/views/foreman_salt/salt_autosign/index.html.erb
 - app/views/foreman_salt/salt_autosign/new.html.erb
@@ -80,13 +110,18 @@ files:
 - db/migrate/20140817210214_create_salt_modules.rb
 - db/migrate/20140829210214_add_salt_modules_to_hostgroups.rb
 - db/migrate/20140920232200_create_salt_environments.rb
+- db/migrate/20150220122707_fix_incorrect_report_metrics.rb
 - db/seeds.d/75-salt-seeds.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
 - lib/foreman_salt/version.rb
 - lib/tasks/foreman_salt_tasks.rake
 - test/factories/foreman_salt_factories.rb
-- test/functional/hosts_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/minions_controller_test.rb
 - test/integration/salt_autosign_test.rb
 - test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
@@ -139,4 +174,8 @@ test_files:
 - test/unit/report_importer_test.rb
 - test/test_plugin_helper.rb
 - test/factories/foreman_salt_factories.rb
-- test/functional/hosts_controller_test.rb
+- test/functional/minions_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb

data/app/controllers/foreman_salt/concerns/smart_proxy_auth_extensions.rb

@@ -1,24 +0,0 @@
-module ForemanSalt
-  module Concerns
-    module SmartProxyAuthExtensions
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :require_puppetmaster_or_login, :salt
-        case self.controller_path
-          when 'hosts'
-            add_puppetmaster_filters [::HostsController::PUPPETMASTER_ACTIONS, :salt_external_node].flatten
-        end
-      end
-
-      def require_puppetmaster_or_login_with_salt
-        if auth_smart_proxy(::SmartProxy.with_features('Salt'), ::Setting[:require_ssl_puppetmasters])
-          set_admin_user
-          true
-        else
-          require_puppetmaster_or_login_without_salt
-        end
-      end
-    end
-  end
-end

data/test/functional/hosts_controller_test.rb

@@ -1,16 +0,0 @@
-require 'test_plugin_helper'
-
-class HostsControllerTest < ActionController::TestCase
-  test 'salt smart proxy should get salt external node' do
-    User.current = nil
-    Setting[:restrict_registered_puppetmasters] = true
-    Setting[:require_ssl_puppetmasters] = false
-
-    proxy = FactoryGirl.create :smart_proxy, :with_salt_feature
-    Resolv.any_instance.stubs(:getnames).returns([proxy.to_s])
-
-    host = FactoryGirl.create :host
-    get :salt_external_node, {:name => host.name, :format => 'yml'}
-    assert_response :success
-  end
-end