foreman_omaha 0.0.3 → 1.0.0

data/db/migrate/20160812083100_add_omaha_fields_to_reports.foreman_omaha.rb

@@ -1,4 +1,4 @@
-class AddOmahaFieldsToReports < ActiveRecord::Migration
+class AddOmahaFieldsToReports < ActiveRecord::Migration[4.2]
   def change
     add_column :reports, :omaha_version, :string
   end

data/db/migrate/20171101204100_create_omaha_facets.foreman_omaha.rb

@@ -0,0 +1,22 @@
+class CreateOmahaFacets < ActiveRecord::Migration[4.2]
+  def change
+    create_table :omaha_groups do |t|
+      t.string :name, limit: 255, null: false, index: true
+      t.string :uuid, limit: 36, null: false, index: true
+
+      t.timestamps null: false
+    end
+
+    create_table :omaha_facets do |t|
+      t.references :host, null: false, foreign_key: true, index: true, unique: true
+      t.column :last_report, :datetime
+      t.string :version, limit: 255, index: true
+      t.string :machineid, limit: 32, index: true
+      t.integer :status, default: 1, index: true
+      t.string :oem, limit: 255, index: true
+      t.references :omaha_group, index: true, foreign_key: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/seeds.d/200_omaha_groups.rb

@@ -0,0 +1,6 @@
+default_groups = %w[Alpha Beta Stable]
+
+default_groups.each do |group|
+  g = ForemanOmaha::OmahaGroup.where(:uuid => group.downcase, :name => group).first_or_create
+  raise "Unable to create built in Omaha group: #{format_errors g}" if g.nil? || g.errors.any?
+end

data/lib/foreman_omaha/engine.rb

@@ -1,3 +1,5 @@
+require 'jquery-matchheight-rails'
+
 module ForemanOmaha
   class Engine < ::Rails::Engine
     engine_name 'foreman_omaha'
@@ -16,7 +18,7 @@ module ForemanOmaha
 
     initializer 'foreman_omaha.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_omaha do
-        requires_foreman '>= 1.12'
+        requires_foreman '>= 1.17'
 
         apipie_documented_controllers ["#{ForemanOmaha::Engine.root}/app/controllers/api/v2/*.rb"]
 
@@ -24,12 +26,25 @@ module ForemanOmaha
 
         # Add permissions
         security_block :foreman_omaha do
-          permission :view_omaha_reports, :omaha_reports => [:index, :show, :auto_complete_search],
-                                          :'api/v2/omaha_reports' => [:index, :show, :last]
-          permission :destroy_omaha_reports, :omaha_reports => [:destroy],
-                                             :'api/v2/omaha_reports' => [:destroy]
-          permission :upload_omaha_reports, :omaha_reports => [:create],
-                                            :'api/v2/omaha_reports' => [:create]
+          permission :view_omaha_reports, {
+            :omaha_reports => [:index, :show, :auto_complete_search],
+            :'api/v2/omaha_reports' => [:index, :show, :last]
+          }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+          permission :destroy_omaha_reports, {
+            :omaha_reports => [:destroy],
+            :'api/v2/omaha_reports' => [:destroy]
+          }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+          permission :upload_omaha_reports, {
+            :omaha_reports => [:create],
+            :'api/v2/omaha_reports' => [:create]
+          }, :resource_type => 'ForemanOmaha::OmahaReport'
+
+          permission :view_omaha_groups, {
+            :omaha_groups => [:index, :auto_complete_search, :show],
+            :'api/v2/omaha_groups' => [:index, :show]
+          }, :resource_type => 'ForemanOmaha::OmahaGroup'
         end
 
         role 'Omaha reports viewer',
@@ -40,14 +55,49 @@ module ForemanOmaha
         # add menu entry
         menu :top_menu, :omaha_reports,
              :url_hash => { controller: :omaha_reports, action: :index },
-             :caption => N_('Omaha reports'),
+             :caption => N_('Omaha Reports'),
              :parent => :monitor_menu,
-             after: :reports
-      end
+             :after => :reports
 
-      if respond_to?(:add_controller_action_scope)
-        add_controller_action_scope(HostsController, :index) { |base_scope| base_scope.includes(:last_omaha_report_object) }
+        menu :top_menu, :omaha_hosts,
+             :url_hash => { :controller => :omaha_hosts, :action => :index },
+             :caption => N_('Omaha Hosts'),
+             :parent => :hosts_menu,
+             :after => :hosts
+
+        divider :top_menu, :caption => N_('Omaha'), :parent => :configure_menu, :last => true
+
+        menu :top_menu, :omaha_groups,
+             :url_hash => { :controller => :omaha_groups, :action => :index },
+             :caption => N_('Omaha Groups'),
+             :parent => :configure_menu,
+             :last => :true
+
+        # Omaha Facet
+        register_facet(ForemanOmaha::OmahaFacet, :omaha_facet) do
+          api_view :list => 'foreman_omaha/api/v2/omaha_facets/base_with_root', :single => 'foreman_omaha/api/v2/omaha_facets/show'
+        end
+
+        # extend host show page
+        extend_page('hosts/show') do |context|
+          context.add_pagelet :main_tabs,
+                              :name => N_('Omaha'),
+                              :partial => 'hosts/omaha_tab',
+                              :onlyif => proc { |host| host.omaha_facet }
+        end
+
+        add_controller_action_scope(HostsController, :index) { |base_scope| base_scope.includes(:omaha_facet) }
+
+        # add renderer extensions
+        allowed_template_helpers :transpile_container_linux_config
+        extend_template_helpers ForemanOmaha::RendererMethods
       end
+
+      # Extend built in permissions
+      Foreman::AccessControl.permission(:view_hosts).actions.concat [
+        'omaha_hosts/index',
+        'omaha_hosts/auto_complete_search'
+      ]
     end
 
     # Include concerns in this config.to_prepare block
@@ -57,22 +107,25 @@ module ForemanOmaha
         ::FactParser.register_fact_parser(:foreman_omaha, ForemanOmaha::FactParser)
 
         Host::Managed.send(:include, ForemanOmaha::HostExtensions)
+        Host::Managed.send(:include, ForemanOmaha::OmahaFacetHostExtensions)
         HostsHelper.send(:include, ForemanOmaha::HostsHelperExtensions)
-      rescue => e
+      rescue StandardError => e
         Rails.logger.warn "ForemanOmaha: skipping engine hook (#{e})"
       end
     end
 
+    # Precompile any JS, Stylesheet or Image files under app/assets/
+    assets_to_precompile =
+      Dir.chdir(root) do
+        Dir['app/assets/javascripts/**/*', 'app/assets/images/**/*', 'app/assets/stylesheets/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last
+        end
+      end
     initializer 'foreman_omaha.assets.precompile' do |app|
-      app.config.assets.precompile += %w[foreman_omaha/Omaha.png]
+      app.config.assets.precompile += assets_to_precompile
     end
-
-    initializer 'foreman_omaha.configure_assets', :group => :assets do
-      SETTINGS[:foreman_omaha] = {
-        :assets => {
-          :precompile => ['foreman_omaha/Omaha.png']
-        }
-      }
+    initializer 'foreman_omaha.configure_assets', group: :assets do
+      SETTINGS[:foreman_omaha] = { assets: { precompile: assets_to_precompile } }
     end
 
     rake_tasks do

data/lib/foreman_omaha/version.rb

@@ -1,3 +1,3 @@
 module ForemanOmaha
-  VERSION = '0.0.3'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/tasks/foreman_omaha_tasks.rake

@@ -29,7 +29,7 @@ namespace :foreman_omaha do
                          "#{ForemanOmaha::Engine.root}/lib/**/*.rb",
                          "#{ForemanOmaha::Engine.root}/test/**/*.rb"]
       end
-    rescue
+    rescue StandardError
       puts 'Rubocop not loaded.'
     end
 
@@ -40,6 +40,4 @@ end
 Rake::Task[:test].enhance ['test:foreman_omaha']
 
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task['jenkins:unit'].enhance ['test:foreman_omaha', 'foreman_omaha:rubocop']
-end
+Rake::Task['jenkins:unit'].enhance ['test:foreman_omaha', 'foreman_omaha:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')

data/test/factories/feature.rb

@@ -1,4 +1,4 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :feature do
     trait :omaha do
       name 'Omaha'

data/test/factories/foreman_omaha_factories.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :omaha_report, :class => 'ForemanOmaha::OmahaReport' do
     host
     sequence(:reported_at) { |n| n.minutes.ago }
@@ -6,4 +6,19 @@ FactoryGirl.define do
     omaha_version '1068.9.0'
     type 'ForemanOmaha::OmahaReport'
   end
+
+  factory :omaha_facet, :class => 'ForemanOmaha::OmahaFacet' do
+    sequence(:last_report) { |n| n.minutes.ago }
+    version '1068.9.0'
+    oem 'rackspace'
+    sequence(:machineid) { SecureRandom.hex }
+    status 1
+    host
+    omaha_group
+  end
+
+  factory :omaha_group, :class => 'ForemanOmaha::OmahaGroup' do
+    sequence(:name) { |n| "Omaha Group #{n}" }
+    sequence(:uuid) { SecureRandom.uuid }
+  end
 end

data/test/factories/host.rb

@@ -0,0 +1,21 @@
+FactoryBot.modify do
+  factory :host do
+    trait :with_omaha_facet do
+      association :omaha_facet, :factory => :omaha_facet, :strategy => :build
+
+      transient do
+        omaha_status 1
+        omaha_version '1068.9.0'
+        omaha_oem 'rackspace'
+        omaha_group nil
+      end
+
+      after(:build) do |host, evaluator|
+        host.omaha_facet.status = evaluator.omaha_status
+        host.omaha_facet.version = evaluator.omaha_version
+        host.omaha_facet.oem = evaluator.omaha_oem
+        host.omaha_facet.omaha_group = evaluator.omaha_group if evaluator.omaha_group.present?
+      end
+    end
+  end
+end

data/test/factories/smart_proxy.rb

@@ -1,4 +1,4 @@
-FactoryGirl.modify do
+FactoryBot.modify do
   factory :smart_proxy do
     trait :omaha do
       features { |sp| [sp.association(:feature, :omaha)] }

data/test/functional/api/v2/omaha_groups_controller_test.rb

@@ -0,0 +1,32 @@
+require 'test_plugin_helper'
+
+class Api::V2::OmahaGroupsControllerTest < ActionController::TestCase
+  context '#index' do
+    test 'should list omaha groups' do
+      omaha_group = FactoryBot.create(:omaha_group, :name => 'Stable', :uuid => 'stable')
+      get :index
+      assert_response :success
+      body = ActiveSupport::JSON.decode(@response.body)
+      results = body['results']
+      assert results
+      entry = results.detect { |e| e['id'] == omaha_group.id }
+      assert entry
+      assert_equal omaha_group.name, entry['name']
+      assert_equal omaha_group.uuid, entry['uuid']
+    end
+  end
+
+  context '#show' do
+    let(:omaha_group) { FactoryBot.create(:omaha_group) }
+
+    test 'should show individual record' do
+      get :show, params: { :id => omaha_group.to_param }
+      assert_response :success
+      body = ActiveSupport::JSON.decode(@response.body)
+      refute_empty body
+      assert_equal omaha_group.id, body['id']
+      assert_equal omaha_group.name, body['name']
+      assert_equal omaha_group.uuid, body['uuid']
+    end
+  end
+end

data/test/functional/api/v2/omaha_reports_controller_test.rb

@@ -2,18 +2,18 @@ require 'test_helper'
 
 class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   test 'create valid' do
-    post :create, { :omaha_report => create_report }, set_session_user
+    post :create, params: { :omaha_report => create_report }, session: set_session_user
     assert_response :success
   end
 
   test 'create invalid' do
-    post :create, { :omaha_report => ['not a hash', 'throw an error'] }, set_session_user
+    post :create, params: { :omaha_report => ['not a hash', 'throw an error'] }, session: set_session_user
     assert_response :unprocessable_entity
   end
 
   test 'should get index' do
-    FactoryGirl.create(:omaha_report)
-    get :index, {}
+    FactoryBot.create(:omaha_report)
+    get :index
     assert_response :success
     assert_not_nil assigns(:omaha_reports)
     reports = ActiveSupport::JSON.decode(@response.body)
@@ -21,25 +21,25 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'should show individual record' do
-    report = FactoryGirl.create(:omaha_report)
-    get :show, :id => report.to_param
+    report = FactoryBot.create(:omaha_report)
+    get :show, params: { :id => report.to_param }
     assert_response :success
     show_response = ActiveSupport::JSON.decode(@response.body)
     assert !show_response.empty?
   end
 
   test 'should destroy report' do
-    report = FactoryGirl.create(:omaha_report)
+    report = FactoryBot.create(:omaha_report)
     assert_difference('ForemanOmaha::OmahaReport.count', -1) do
-      delete :destroy, :id => report.to_param
+      delete :destroy, params: { :id => report.to_param }
     end
     assert_response :success
     refute Report.find_by(id: report.id)
   end
 
   test 'should get reports for given host only' do
-    report = FactoryGirl.create(:omaha_report)
-    get :index, :host_id => report.host.to_param
+    report = FactoryBot.create(:omaha_report)
+    get :index, params: { :host_id => report.host.to_param }
     assert_response :success
     assert_not_nil assigns(:omaha_reports)
     reports = ActiveSupport::JSON.decode(@response.body)
@@ -48,8 +48,8 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'should return empty result for host with no reports' do
-    host = FactoryGirl.create(:host)
-    get :index, :host_id => host.to_param
+    host = FactoryBot.create(:host)
+    get :index, params: { :host_id => host.to_param }
     assert_response :success
     assert_not_nil assigns(:omaha_reports)
     reports = ActiveSupport::JSON.decode(@response.body)
@@ -58,8 +58,8 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'should get last report' do
-    reports = FactoryGirl.create_list(:omaha_report, 5)
-    get :last, set_session_user
+    reports = FactoryBot.create_list(:omaha_report, 5)
+    get :last, session: set_session_user
     assert_response :success
     assert_not_nil assigns(:omaha_report)
     report = ActiveSupport::JSON.decode(@response.body)
@@ -68,9 +68,9 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'should get last report for given host only' do
-    main_report = FactoryGirl.create(:omaha_report)
-    FactoryGirl.create_list(:omaha_report, 5)
-    get :last, { :host_id => main_report.host.to_param }, set_session_user
+    main_report = FactoryBot.create(:omaha_report)
+    FactoryBot.create_list(:omaha_report, 5)
+    get :last, params: { :host_id => main_report.host.to_param }, session: set_session_user
     assert_response :success
     assert_not_nil assigns(:omaha_report)
     report = ActiveSupport::JSON.decode(@response.body)
@@ -79,32 +79,32 @@ class Api::V2::OmahaReportsControllerTest < ActionController::TestCase
   end
 
   test 'should give error if no last report for given host' do
-    host = FactoryGirl.create(:host)
-    get :last, :host_id => host.to_param
+    host = FactoryBot.create(:host)
+    get :last, params: { :host_id => host.to_param }
     assert_response :not_found
   end
 
   test 'cannot view the last report without hosts view permission' do
-    report = FactoryGirl.create(:report)
+    report = FactoryBot.create(:report)
     setup_user('view', 'omaha_reports')
-    get :last, { :host_id => report.host.id }, set_session_user.merge(:user => User.current.id)
+    get :last, params: { :host_id => report.host.id }, session: set_session_user.merge(:user => User.current.id)
     assert_response :not_found
   end
 
   describe 'unpriveliged user' do
     def setup
-      User.current = FactoryGirl.create(:user, :admin)
+      User.current = FactoryBot.create(:user, :admin)
     end
 
     test 'hosts with a registered smart proxy on should create a report successfully' do
       Setting[:restrict_registered_smart_proxies] = true
       Setting[:require_ssl_smart_proxies] = false
 
-      proxy = FactoryGirl.create(:smart_proxy, :omaha)
+      proxy = FactoryBot.create(:smart_proxy, :omaha)
       host = URI.parse(proxy.url).host
       Resolv.any_instance.stubs(:getnames).returns([host])
       as_user :one do
-        post :create, :omaha_report => create_report
+        post :create, params: { :omaha_report => create_report }
       end
       assert_equal proxy, @controller.detected_proxy
       assert_response :created

data/test/functional/omaha_groups_controller_test.rb

@@ -0,0 +1,18 @@
+require 'test_plugin_helper'
+
+class OmahaGroupsControllerTest < ActionController::TestCase
+  test '#index' do
+    FactoryBot.create(:omaha_group)
+    get :index, session: set_session_user
+    assert_response :success
+    assert_not_nil assigns('omaha_groups')
+    assert_template 'index'
+  end
+
+  test '#show' do
+    omaha_group = FactoryBot.create(:omaha_group)
+    get :show, params: { :id => omaha_group.id }, session: set_session_user
+    assert_response :success
+    assert_template 'show'
+  end
+end

data/test/functional/omaha_hosts_controller_test.rb

@@ -0,0 +1,11 @@
+require 'test_plugin_helper'
+
+class OmahaHostsControllerTest < ActionController::TestCase
+  test '#index' do
+    FactoryBot.create(:host, :with_omaha_facet)
+    get :index, session: set_session_user
+    assert_response :success
+    assert_not_nil assigns('hosts')
+    assert_template 'index'
+  end
+end