katello 3.4.5 → 3.5.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.routes.js

@@ -60,7 +60,7 @@ angular.module('Bastion.subscriptions').config(['$stateProvider', function ($sta
         }
     })
     .state('subscription.content-hosts', {
-        url: '/content-hosts',
+        url: '/content-hosts?search',
         permission: 'view_subscriptions',
         controller: 'SubscriptionContentHostsController',
         templateUrl: 'subscriptions/details/views/subscription-content-hosts.html',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html

@@ -3,9 +3,12 @@
     No tasks exist for this resource.
   </span>
 
+  <div data-block="search">
+    <input type="text" class="form-control" placeholder="{{ 'Filter' | translate }}" ng-model="taskFilter" />
+  </div>
+
   <div data-block="table">
-    <table bst-table="table"
-           ng-class="{'table-mask': table.working}" class="table table-striped table-bordered">
+    <table bst-table="table" ng-class="{'table-mask': table.working}" class="table table-striped table-bordered">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="Status"><span translate>Status</span></th>
@@ -16,7 +19,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="task in table.rows">
+        <tr bst-table-row ng-repeat="task in table.rows | filter:taskFilter">
           <td bst-table-cell>
             <div ng-class="{ active: (task.state === 'pending' || task.state === 'running') }" class="progress progress-striped">
               <span uib-progressbar animate="false" value="task.progressbar.value" type="{{task.progressbar.type}}"></span>

data/lib/katello/permissions/host_permissions.rb

@@ -34,6 +34,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
+  'hosts/content_hosts',
   'hosts/puppet_environment_for_content_view',
   'katello/api/v2/host_autocomplete/auto_complete_search',
   'katello/api/v2/host_errata/index',

data/lib/katello/plugin.rb

@@ -1,7 +1,7 @@
 require 'katello/permission_creator'
 
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.15'
+  requires_foreman '>= 1.16'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'), :after => :monitor_menu do
     menu :top_menu,
@@ -239,10 +239,10 @@ Foreman::Plugin.register :katello do
   end
 
   tests_to_skip("AccessPermissionsTest" => [
-    'foreman_tasks/api/tasks/callback should have a permission that grants access',
-    'bastion/bastion/index should have a permission that grants access',
-    'bastion/bastion/index_ie should have a permission that grants access'
-  ])
+                  'foreman_tasks/api/tasks/callback should have a permission that grants access',
+                  'bastion/bastion/index should have a permission that grants access',
+                  'bastion/bastion/index_ie should have a permission that grants access'
+                ])
 
   add_controller_action_scope(HostsController, :index) do |base_scope|
     base_scope
@@ -256,6 +256,8 @@ Foreman::Plugin.register :katello do
       .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
 
+  register_info_provider Katello::Host::InfoProvider
+
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
 end

data/lib/katello/tasks/clean_installed_packages.rake

@@ -0,0 +1,54 @@
+namespace :katello do
+  desc "Clean duplicate installed packages"
+  task :clean_installed_packages => :environment do
+    User.current = User.anonymous_admin
+
+    puts "Populating cache"
+    cache = PackageCache.new
+    cache.populate
+
+    total = ::Host.count
+    count = 1
+    ::Host.find_each do |host|
+      puts "Host #{count}/#{total} #{host.name}"
+
+      if host.installed_package_ids.any?
+        nvras = host.installed_packages.pluck(:nvra)
+        ids = nvras.map { |nvra| cache.fetch(nvra) }
+        existing_ids = host.installed_package_ids.to_a
+        unless existing_ids.sort == ids.sort
+          host.sync_package_associations(ids)
+        end
+      end
+      count += 1
+    end
+
+    existing = Katello::HostInstalledPackage.select(:installed_package_id).uniq.pluck(:installed_package_id)
+
+    batch = 20_000
+    until Katello::InstalledPackage.where('id not in (?)', existing).limit(1).count == 0
+      deleted = Katello::InstalledPackage.where('id not in (?)', existing).where("id < #{batch}").delete_all
+      sleep(3) if deleted > 0
+      puts "Batch of installed packages deleted, #{Katello::InstalledPackage.count} remaining in total"
+      batch += 20_000
+    end
+
+    Setting[:bulk_query_installed_packages] = true
+  end
+
+  class PackageCache
+    def initialize
+      @cache = {}
+    end
+
+    def populate
+      Katello::InstalledPackage.select("nvra, MIN(id) as id").group("nvra").each do |pkg|
+        @cache[pkg.nvra] = pkg.id
+      end
+    end
+
+    def fetch(nvra)
+      @cache[nvra] ||= Katello::InstalledPackage.where(:nvra => nvra).first.id
+    end
+  end
+end

data/lib/katello/tasks/import_subscriptions.rake

@@ -0,0 +1,8 @@
+namespace :katello do
+  task :import_subscriptions => ["environment"] do
+    User.current = User.anonymous_api_admin
+    puts _("Importing Subscriptions")
+    Katello::Subscription.import_all
+    Katello::Pool.import_all
+  end
+end

data/lib/katello/tasks/{setup.rake → reset.rake}

@@ -26,6 +26,15 @@ namespace :katello do
     end
   end
 
+  task :reset_default_smart_proxy do
+    User.current = User.anonymous_admin
+    hostname = Socket.gethostname.chomp
+    Setting['ssl_ca_file'] = "/etc/pki/katello/certs/katello-default-ca.crt"
+    Setting['ssl_certificate'] = "/etc/pki/katello/certs/#{hostname}-foreman-client.crt"
+    Setting['ssl_priv_key'] = "/etc/pki/katello/private/#{hostname}-foreman-client.key"
+    SmartProxy.where(name: hostname, url: "https://#{hostname}:9090").first_or_create!
+  end
+
   desc "Resets Foreman/Katello development environemnt. WARNING: This will destroy all your Foreman and Katello data."
   task :reset_backends do
     Rake::Task['katello:reset_backends:candlepin'].invoke
@@ -43,5 +52,6 @@ namespace :katello do
     # Otherwise migration and seeds fail because they require a reloaded environment
     system('rake db:migrate')
     system('rake db:seed')
+    Rake::Task['katello:reset_default_smart_proxy'].invoke
   end
 end

data/lib/katello/tasks/test.rake

@@ -103,6 +103,24 @@ namespace :test do
         Rake::Task[test_task.name].invoke
       end
 
+      desc "Delete scenario vcr cassettes and run the katello scenario tests in live mode"
+      task :live_scenarios => ['db:test:prepare'] do
+        files = Dir[File.join(::Katello::Engine.root, 'test/fixtures/vcr_cassettes/scenarios/', '**/*.yml')]
+        files.each { |file| File.delete(file) }
+
+        ENV['mode'] = 'all'
+        test_task = Rake::TestTask.new('katello_scenario_test_task') do |t|
+          t.libs << ["test", "#{Katello::Engine.root}/test"]
+          t.test_files = [
+            "#{Katello::Engine.root}/test/scenarios/*_test.rb"
+          ]
+          t.verbose = true
+          t.warning = false
+        end
+
+        Rake::Task[test_task.name].invoke
+      end
+
       desc "Run the Katello plugin unit glue test suite."
       task :glue => ['db:test:prepare'] do
         test_task = Rake::TestTask.new('katello_glue_test_task') do |t|

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.4.5".freeze
+  VERSION = "3.5.0.rc1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.0.rc1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,26 +136,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: apipie-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: runcible
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 2.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +210,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -206,7 +220,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -891,6 +905,7 @@ files:
 - app/models/katello/gpg_key.rb
 - app/models/katello/hash_util.rb
 - app/models/katello/host/content_facet.rb
+- app/models/katello/host/info_provider.rb
 - app/models/katello/host/subscription_facet.rb
 - app/models/katello/host_collection.rb
 - app/models/katello/host_collection_hosts.rb
@@ -927,6 +942,7 @@ files:
 - app/models/katello/rpm.rb
 - app/models/katello/subscription.rb
 - app/models/katello/subscription_facet_activation_key.rb
+- app/models/katello/subscription_facet_pool.rb
 - app/models/katello/subscription_product.rb
 - app/models/katello/subscription_status.rb
 - app/models/katello/sync_plan.rb
@@ -951,6 +967,7 @@ files:
 - app/services/cert/rhsm_client.rb
 - app/services/katello/authentication/client_authentication.rb
 - app/services/katello/candlepin/consumer.rb
+- app/services/katello/candlepin/message_handler.rb
 - app/services/katello/event_queue.rb
 - app/services/katello/proxy_status/pulp.rb
 - app/services/katello/proxy_status/pulp_node.rb
@@ -1388,6 +1405,10 @@ files:
 - db/migrate/20170222131211_change_pool_columns_to_dates.rb
 - db/migrate/20170321012632_fill_in_content_view_components.rb
 - db/migrate/20170523182831_create_docker_meta_tag.rb
+- db/migrate/20170718142148_create_katello_subscription_facet_pools.rb
+- db/migrate/20170821170915_add_index_to_installed_packages.rb
+- db/migrate/20170821170916_add_nvra_index_to_installed_packages.rb
+- db/migrate/20170913183848_add_errata_counts.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1424,6 +1445,8 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/new-activation-key.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/architectures/architecture.factory.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/architectures/architectures.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js
@@ -1443,12 +1466,14 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-host-collections-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-packages-modal.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-errata-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-host-collections-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/errata-content-hosts.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/errata-details.html
@@ -1823,18 +1848,15 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/puppet-modules.routes.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/puppet-modules/views/puppet-modules.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/content-override-helper.service.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-set.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-sets-enabled.filter.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-sets.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/setting.factory.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/settings/settings.module.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-activation-keys.controller.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-content-hosts.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-product-details.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-products.controller.js
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-activation-keys.html
-- engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-content-hosts.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-products.html
@@ -1924,15 +1946,17 @@ files:
 - lib/katello/repository_types/puppet.rb
 - lib/katello/repository_types/yum.rb
 - lib/katello/tasks/clean_backend_objects.rake
+- lib/katello/tasks/clean_installed_packages.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/import_applicability.rake
+- lib/katello/tasks/import_subscriptions.rake
 - lib/katello/tasks/jenkins.rake
 - lib/katello/tasks/regenerate_ueber_certs.rake
 - lib/katello/tasks/reimport.rake
 - lib/katello/tasks/repository.rake
+- lib/katello/tasks/reset.rake
 - lib/katello/tasks/rubocop.rake
-- lib/katello/tasks/setup.rake
 - lib/katello/tasks/test.rake
 - lib/katello/tasks/unify_hosts.rake
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
@@ -1941,13 +1965,11 @@ files:
 - lib/katello/tasks/upgrades/2.4/import_package_groups.rake
 - lib/katello/tasks/upgrades/2.4/import_puppet_modules.rake
 - lib/katello/tasks/upgrades/2.4/import_rpms.rake
-- lib/katello/tasks/upgrades/2.4/import_subscriptions.rake
 - lib/katello/tasks/upgrades/3.0/add_export_distributor.rake
 - lib/katello/tasks/upgrades/3.0/delete_docker_v1_content.rake
 - lib/katello/tasks/upgrades/3.0/update_puppet_repository_distributors.rake
 - lib/katello/tasks/upgrades/3.0/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrades/3.3/hypervisors.rake
-- lib/katello/tasks/upgrades/3.3/import_subscriptions.rake
 - lib/katello/tasks/upgrades/3.4/remove_unused_products.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -2035,13 +2057,13 @@ files:
 - vendor/assets/javascripts/katello/jquery.treeTable.js
 - vendor/assets/javascripts/katello/jquery.trunk8.js
 - vendor/assets/stylesheets/katello/facebox.css
-- vendor/assets/stylesheets/katello/jquery-ui-1.8.11.custom.css
+- vendor/assets/stylesheets/katello/jquery-ui-1.8.11.custom.css.scss
 - vendor/assets/stylesheets/katello/jquery.jnotify.css
-- vendor/assets/stylesheets/katello/jquery.loadmask.css
+- vendor/assets/stylesheets/katello/jquery.loadmask.css.scss
 - vendor/assets/stylesheets/katello/jquery.multiselect.css
 - vendor/assets/stylesheets/katello/jquery.multiselect.filter.css
-- vendor/assets/stylesheets/katello/jquery.treeTable.scss
-- vendor/assets/stylesheets/katello/ui.spinner.css
+- vendor/assets/stylesheets/katello/jquery.treeTable.css.scss
+- vendor/assets/stylesheets/katello/ui.spinner.css.scss
 homepage: http://www.katello.org
 licenses: []
 metadata: {}
@@ -2056,9 +2078,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-activation-keys.controller.js

@@ -1,30 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.subscriptions.controller:SubscriptionActivationKeysController
- *
- * @requires $scope
- * @requires $q
- * @requires translate
- * @requires Subscription
- *
- * @description
- *   Provides the functionality for the subscription details for activation keys.
- */
-angular.module('Bastion.subscriptions').controller('SubscriptionActivationKeysController',
-    ['$scope', '$q', 'translate', 'Subscription',
-    function ($scope, $q, translate, Subscription) {
-
-        if ($scope.activationKeys) {
-            $scope.working = false;
-        } else {
-            $scope.working = true;
-        }
-
-        $scope.table = {};
-
-        Subscription.get({id: $scope.$stateParams.subscriptionId}, function (subscription) {
-            $scope.activationKeys = subscription['activation_keys'];
-            $scope.working = false;
-        });
-    }]
-);