katello 3.4.5 → 3.5.0.rc1

data/db/migrate/20160426145517_move_host_description_to_host_comment.rb

@@ -1,5 +1,5 @@
 class MoveHostDescriptionToHostComment < ActiveRecord::Migration
-  class Host < ActiveRecord::Base
+  class Host < ApplicationRecord
     self.table_name = "hosts"
   end
 

data/db/migrate/20160617124149_remove_duplicate_view_filters.rb

@@ -1,8 +1,8 @@
 class RemoveDuplicateViewFilters < ActiveRecord::Migration
-  class Role < ActiveRecord::Base
+  class Role < ApplicationRecord
   end
 
-  class Filter < ActiveRecord::Base
+  class Filter < ApplicationRecord
     belongs_to :role
     has_many :filterings, :dependent => :destroy
     has_many :permissions, :through => :filterings
@@ -10,12 +10,12 @@ class RemoveDuplicateViewFilters < ActiveRecord::Migration
     scope :unlimited, -> { where(:search => nil, :taxonomy_search => nil) }
   end
 
-  class Filtering < ActiveRecord::Base
+  class Filtering < ApplicationRecord
     belongs_to :filter
     belongs_to :permission
   end
 
-  class Permission < ActiveRecord::Base
+  class Permission < ApplicationRecord
     has_many :filterings, :dependent => :destroy
     has_many :filters, :through => :filterings
   end

data/db/migrate/20160619223332_fix_viewer_role.rb

@@ -1,9 +1,9 @@
 class FixViewerRole < ActiveRecord::Migration
-  class Role < ActiveRecord::Base
+  class Role < ApplicationRecord
     has_many :filters
   end
 
-  class Filter < ActiveRecord::Base
+  class Filter < ApplicationRecord
     belongs_to :role
     has_many :filterings, :dependent => :destroy
     has_many :permissions, :through => :filterings
@@ -16,12 +16,12 @@ class FixViewerRole < ActiveRecord::Migration
     end
   end
 
-  class Filtering < ActiveRecord::Base
+  class Filtering < ApplicationRecord
     belongs_to :filter
     belongs_to :permission
   end
 
-  class Permission < ActiveRecord::Base
+  class Permission < ApplicationRecord
   end
 
   def change

data/db/migrate/20160701180402_add_sortable_version_to_puppet_modules.rb

@@ -1,5 +1,5 @@
 class AddSortableVersionToPuppetModules < ActiveRecord::Migration
-  class PuppetModule < ActiveRecord::Base
+  class PuppetModule < ApplicationRecord
     self.table_name = "katello_puppet_modules"
   end
 

data/db/migrate/20160924213020_change_katello_widget_names.rb

@@ -1,5 +1,5 @@
 class ChangeKatelloWidgetNames < ActiveRecord::Migration
-  class Widget < ActiveRecord::Base
+  class Widget < ApplicationRecord
     self.table_name = "widgets"
   end
 

data/db/migrate/20161014133811_move_content_view_version_description_to_histories.rb

@@ -1,11 +1,11 @@
 class MoveContentViewVersionDescriptionToHistories < ActiveRecord::Migration
-  class FakeContentViewVersion < ActiveRecord::Base
+  class FakeContentViewVersion < ApplicationRecord
     self.table_name = 'katello_content_view_versions'
     has_many :history, :class_name => "CVHistory", :inverse_of => :content_view_version,
                        :dependent => :destroy, :foreign_key => :katello_content_view_version_id
   end
 
-  class CVHistory < ActiveRecord::Base
+  class CVHistory < ApplicationRecord
     self.table_name = 'katello_content_view_histories'
     belongs_to :content_view_version, :class_name => "FakeContentViewVersion", :foreign_key => :katello_content_view_version_id, :inverse_of => :history
     SUCCESSFUL = 'successful'.freeze

data/db/migrate/20161026191118_fix_invalid_interfaces.rb

@@ -1,5 +1,5 @@
 class FixInvalidInterfaces < ActiveRecord::Migration
-  class FakeNic < ActiveRecord::Base
+  class FakeNic < ApplicationRecord
     self.table_name = 'nics'
 
     def type

data/db/migrate/20170321012632_fill_in_content_view_components.rb

@@ -1,18 +1,18 @@
 class FillInContentViewComponents < ActiveRecord::Migration
-  class FakeContentView < ActiveRecord::Base
+  class FakeContentView < ApplicationRecord
     self.table_name = 'katello_content_views'
 
     has_many :content_view_components, :class_name => "FakeContentViewVersion", :dependent => :destroy,
              :inverse_of => :composite_content_view, :foreign_key => :composite_content_view_id
   end
 
-  class FakeContentViewVersion < ActiveRecord::Base
+  class FakeContentViewVersion < ApplicationRecord
     self.table_name = 'katello_content_view_versions'
 
     has_many :content_view_components, :inverse_of => :content_view_version, :dependent => :destroy, :class_name => 'FakeContentViewComponent'
   end
 
-  class FakeContentViewComponent < ActiveRecord::Base
+  class FakeContentViewComponent < ApplicationRecord
     self.table_name = 'katello_content_view_components'
 
     belongs_to :content_view_version, :class_name => "FakeContentViewVersion",

data/db/migrate/20170718142148_create_katello_subscription_facet_pools.rb

@@ -0,0 +1,15 @@
+class CreateKatelloSubscriptionFacetPools < ActiveRecord::Migration
+  def change
+    create_table :katello_subscription_facet_pools do |t|
+      t.column :subscription_facet_id, :integer, required: true
+      t.column :pool_id, :integer, required: true
+    end
+    add_index "katello_subscription_facet_pools", [:pool_id, :subscription_facet_id], :unique => true,
+              :name => "index_katello_sub_facet_pools_on_sfid_poolid"
+
+    add_foreign_key "katello_subscription_facet_pools", "katello_pools",
+                    :name => "katello_sub_facet_pools_pool_id_fk", :column => "pool_id"
+    add_foreign_key "katello_subscription_facet_pools", "katello_subscription_facets",
+                   :name => "katello_sub_facet_pools_sf_id_fk", :column => "subscription_facet_id"
+  end
+end

data/db/migrate/20170821170915_add_index_to_installed_packages.rb

@@ -0,0 +1,5 @@
+class AddIndexToInstalledPackages < ActiveRecord::Migration
+  def change
+    add_index :katello_installed_packages, [:name, :nvra]
+  end
+end

data/db/migrate/20170821170916_add_nvra_index_to_installed_packages.rb

@@ -0,0 +1,5 @@
+class AddNvraIndexToInstalledPackages < ActiveRecord::Migration
+  def change
+    add_index :katello_installed_packages, [:nvra]
+  end
+end

data/db/migrate/20170913183848_add_errata_counts.rb

@@ -0,0 +1,23 @@
+class AddErrataCounts < ActiveRecord::Migration
+  def up
+    add_column :katello_content_facets, :installable_security_errata_count, :integer, :null => false, :default => 0
+    add_column :katello_content_facets, :installable_enhancement_errata_count, :integer, :null => false, :default => 0
+    add_column :katello_content_facets, :installable_bugfix_errata_count, :integer, :null => false, :default => 0
+
+    add_column :katello_content_facets, :applicable_rpm_count, :integer, :null => false, :default => 0
+    add_column :katello_content_facets, :upgradable_rpm_count, :integer, :null => false, :default => 0
+
+    Katello::Host::ContentFacet.find_each do |content_facet|
+      content_facet.update_applicability_counts
+    end
+  end
+
+  def down
+    remove_column :katello_content_facets, :installable_security_errata_count
+    remove_column :katello_content_facets, :installable_enhancement_errata_count
+    remove_column :katello_content_facets, :installable_bugfix_errata_count
+
+    remove_column :katello_content_facets, :applicable_rpm_count
+    remove_column :katello_content_facets, :upgradable_rpm_count
+  end
+end

data/db/seeds.d/101-locations.rb

@@ -5,8 +5,8 @@
 #
 
 if Location.exists? &&
-    !Setting[:default_location_subscribed_hosts].present? ||
-    !Setting[:default_location_puppet_content].present?
+    Setting[:default_location_subscribed_hosts].blank? ||
+    Setting[:default_location_puppet_content].blank?
   # Create a new location to be used as the Katello Default.
   default_location = Location.where(:name => ENV['SEED_LOCATION']).first_or_create
   if Setting[:default_location_subscribed_hosts].empty?

data/db/seeds.d/102-organizations.rb

@@ -5,9 +5,9 @@
 #
 
 Organization.all.each do |org|
-  User.current = User.anonymous_admin
-  ForemanTasks.sync_task(::Actions::Katello::Organization::Create, org) unless org.library
-  User.current = nil
+  User.as(::User.anonymous_api_admin.login) do
+    ForemanTasks.sync_task(::Actions::Katello::Organization::Create, org) unless org.library
+  end
 end
 
 if ENV['SEED_ORGANIZATION']

data/db/seeds.d/103-provisioning_templates.rb

@@ -4,41 +4,39 @@
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
 
-::User.current = ::User.anonymous_api_admin
+User.as(::User.anonymous_api_admin.login) do
+  # Provisioning Templates
 
-# Provisioning Templates
-
-kinds = [:provision, :finish, :user_data].inject({}) do |hash, kind|
-  hash[kind] = TemplateKind.find_by(:name => kind)
-  hash
-end
+  kinds = [:provision, :finish, :user_data].inject({}) do |hash, kind|
+    hash[kind] = TemplateKind.find_by(:name => kind)
+    hash
+  end
 
-templates = [{:name => "Katello Kickstart Default",           :source => "kickstart-katello.erb",      :template_kind => kinds[:provision]},
-             {:name => "Katello Kickstart Default User Data", :source => "userdata-katello.erb",       :template_kind => kinds[:user_data]},
-             {:name => "Katello Kickstart Default Finish",    :source => "finish-katello.erb",         :template_kind => kinds[:finish]},
-             {:name => "subscription_manager_registration",   :source => "snippets/_subscription_manager_registration.erb", :snippet => true},
-             {:name => "Katello Atomic Kickstart Default",    :source => "kickstart-katello-atomic.erb", :template_kind => kinds[:provision]}]
+  templates = [{:name => "Katello Kickstart Default",           :source => "kickstart-katello.erb",      :template_kind => kinds[:provision]},
+               {:name => "Katello Kickstart Default User Data", :source => "userdata-katello.erb",       :template_kind => kinds[:user_data]},
+               {:name => "Katello Kickstart Default Finish",    :source => "finish-katello.erb",         :template_kind => kinds[:finish]},
+               {:name => "subscription_manager_registration",   :source => "snippets/_subscription_manager_registration.erb", :snippet => true},
+               {:name => "Katello Atomic Kickstart Default",    :source => "kickstart-katello-atomic.erb", :template_kind => kinds[:provision]}]
 
-templates.each do |template|
-  template[:template] = File.read(File.join(Katello::Engine.root, "app/views/foreman/unattended", template.delete(:source)))
-  ProvisioningTemplate.where(:name => template["name"]).first_or_create do |pt|
-    pt.vendor = "Katello"
-    pt.default = true
-    pt.locked = true
-    pt.name = template[:name]
-    pt.template = template[:template]
-    pt.template_kind = template[:template_kind] if template[:template_kind]
-    pt.snippet = template[:snippet] if template[:snippet]
+  templates.each do |template|
+    template[:template] = File.read(File.join(Katello::Engine.root, "app/views/foreman/unattended", template.delete(:source)))
+    ProvisioningTemplate.where(:name => template["name"]).first_or_create do |pt|
+      pt.vendor = "Katello"
+      pt.default = true
+      pt.locked = true
+      pt.name = template[:name]
+      pt.template = template[:template]
+      pt.template_kind = template[:template_kind] if template[:template_kind]
+      pt.snippet = template[:snippet] if template[:snippet]
+    end
+    ProvisioningTemplate.find_by(name: template[:name]).update_attributes!(:template => template[:template])
   end
-  ProvisioningTemplate.find_by(name: template[:name]).update_attributes!(:template => template[:template])
-end
 
-# Ensure all default templates are seeded into the first org and loc
-ProvisioningTemplate.where(:default => true).each do |template|
-  template.organizations << Organization.first unless template.organizations.include?(Organization.first) || Organization.count.zero?
-  if Location.exists? && !template.location_ids.include?(Location.default_location_ids)
-    template.location_ids << Location.default_location_ids
+  # Ensure all default templates are seeded into the first org and loc
+  ProvisioningTemplate.where(:default => true).each do |template|
+    template.organizations << Organization.first unless template.organizations.include?(Organization.first) || Organization.count.zero?
+    if Location.exists? && !template.location_ids.include?(Location.default_location_ids)
+      template.location_ids << Location.default_location_ids
+    end
   end
 end
-
-::User.current = nil

data/db/seeds.d/104-proxy.rb

@@ -9,17 +9,15 @@ def format_errors(model = nil)
   model.errors.full_messages.join(';')
 end
 
-::User.current = ::User.anonymous_api_admin
+User.as(::User.anonymous_api_admin.login) do
+  # Proxy features
+  feature = Feature.where(:name => 'Pulp').first_or_create
+  if feature.nil? || feature.errors.any?
+    fail "Unable to create proxy feature: #{format_errors feature}"
+  end
 
-# Proxy features
-feature = Feature.where(:name => 'Pulp').first_or_create
-if feature.nil? || feature.errors.any?
-  fail "Unable to create proxy feature: #{format_errors feature}"
+  ["Pulp", "Pulp Node"].each do |input|
+    f = Feature.where(:name => input).first_or_create
+    fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+  end
 end
-
-["Pulp", "Pulp Node"].each do |input|
-  f = Feature.where(:name => input).first_or_create
-  fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
-end
-
-::User.current = nil

data/db/seeds.d/106-mail_notifications.rb

@@ -3,40 +3,38 @@
 #
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
-::User.current = ::User.anonymous_api_admin
+User.as(::User.anonymous_api_admin.login) do
+  # The notification names are used as humanized labels. These need to be
+  # translated as well as the description
+  N_('Host errata advisory')
+  N_('Sync errata')
+  N_('Promote errata')
 
-# The notification names are used as humanized labels. These need to be
-# translated as well as the description
-N_('Host errata advisory')
-N_('Sync errata')
-N_('Promote errata')
+  # Mail Notifications
+  notifications = [
+    {:name              => :host_errata_advisory,
+     :description       => N_('A summary of available and applicable errata for your hosts'),
+     :mailer            => 'Katello::ErrataMailer',
+     :method            => 'host_errata',
+     :subscription_type => 'report'
+    },
 
-# Mail Notifications
-notifications = [
-  {:name              => :host_errata_advisory,
-   :description       => N_('A summary of available and applicable errata for your hosts'),
-   :mailer            => 'Katello::ErrataMailer',
-   :method            => 'host_errata',
-   :subscription_type => 'report'
-  },
+    {:name              => :sync_errata,
+     :description       => N_('A summary of new errata after a repository is synchronized'),
+     :mailer            => 'Katello::ErrataMailer',
+     :method            => 'sync_errata',
+     :subscription_type => 'alert'
+    },
 
-  {:name              => :sync_errata,
-   :description       => N_('A summary of new errata after a repository is synchronized'),
-   :mailer            => 'Katello::ErrataMailer',
-   :method            => 'sync_errata',
-   :subscription_type => 'alert'
-  },
+    {:name              => :promote_errata,
+     :description       => N_('A post-promotion summary of hosts with installable errata'),
+     :mailer            => 'Katello::ErrataMailer',
+     :method            => 'promote_errata',
+     :subscription_type => 'alert'
+    }
+  ]
 
-  {:name              => :promote_errata,
-   :description       => N_('A post-promotion summary of hosts with installable errata'),
-   :mailer            => 'Katello::ErrataMailer',
-   :method            => 'promote_errata',
-   :subscription_type => 'alert'
-  }
-]
-
-notifications.each do |notification|
-  ::MailNotification.where(name: notification[:name]).first_or_create!(notification)
+  notifications.each do |notification|
+    ::MailNotification.where(name: notification[:name]).first_or_create!(notification)
+  end
 end
-
-::User.current = nil

data/db/seeds.d/107-enable_dynflow.rb

@@ -3,7 +3,6 @@
 #
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
-::User.current = ::User.anonymous_api_admin
-
-Setting.find_by(:name => "dynflow_enable_console").update_attributes!(:value => true) if Rails.env.development?
-::User.current = nil
+User.as(::User.anonymous_api_admin.login) do
+  Setting.find_by(:name => "dynflow_enable_console").update_attributes!(:value => true) if Rails.env.development?
+end

data/db/seeds.d/108-subcription-bookmarks.rb

@@ -4,16 +4,18 @@
 # !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
 #
 
-Bookmark.without_auditing do
-  bookmarks = [
-    {:name => "list hypervisors", :query => 'hypervisor = true', :controller => "hosts"},
-    {:name => "future", :query => 'starts > Today', :controller => "katello_subscriptions"},
-    {:name => "expiring soon", :query => 'expires 30 days from now', :controller => "katello_subscriptions"}
-  ]
+User.as_anonymous_admin do
+  Bookmark.without_auditing do
+    bookmarks = [
+      {:name => "list hypervisors", :query => 'hypervisor = true', :controller => "hosts"},
+      {:name => "future", :query => 'starts > Today', :controller => "katello_subscriptions"},
+      {:name => "expiring soon", :query => 'expires 30 days from now', :controller => "katello_subscriptions"}
+    ]
 
-  bookmarks.each do |input|
-    next if audit_modified? Bookmark, input[:name], :controller => input[:controller]
-    b = Bookmark.find_or_create_by({ :public => true }.merge(input))
-    fail "Unable to create bookmark: #{format_errors b}" if b.nil? || b.errors.any?
+    bookmarks.each do |input|
+      next if SeedHelper.audit_modified? Bookmark, input[:name], :controller => input[:controller]
+      b = Bookmark.find_or_create_by({ :public => true }.merge(input))
+      fail "Unable to create bookmark: #{format_errors b}" if b.nil? || b.errors.any?
+    end
   end
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -1,6 +1,6 @@
 angular.module('Bastion.activation-keys').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('activation-keys', {
-        url: '/activation_keys',
+        url: '/activation_keys?search',
         permission: 'view_activation_keys',
         template: '<div ui-view></div>',
         views: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html

@@ -70,7 +70,7 @@
       </span>
 
       <div bst-form-buttons
-           on-cancel="transitionTo('activation-keys ')"
+           on-cancel="transitionTo('activation-keys')"
            on-save="save(activationKey)"
            working="working">
       </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/architectures/architecture.factory.js

@@ -0,0 +1,15 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.architectures.factory:Architecture
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for architectures.
+ */
+angular.module('Bastion.architectures').factory('Architecture',
+    ['BastionResource', function (BastionResource) {
+        var resource = BastionResource('/api/v2/architectures/');
+        return resource;
+    }]
+);