katello 3.15.0.1 → 3.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92aa6e8e0a5a914d6c6351cd79438c043c6949bd2a5e045bf200377e9b4ff804
-  data.tar.gz: b3ce81e811303eb3d96b0db1128579a0c65666c23e072bdb769ce85144870ca4
+  metadata.gz: d0e59e380081b85056d0babdeff1cc1bf1922da00e775bf2636c8d77217a1056
+  data.tar.gz: 23b423ff8b50a973affd765cd9f44c5ca2ae9581539dfb5858918f16b8962092
 SHA512:
-  metadata.gz: d214ba3f5a060b6c83045488b0e83d03ca7e89990ccf5e5bf1f0469b7aa3812e2499fce157ed4a10bffe7d0e20843a85b9d744d3f9c4f0ebdf4a4c61aedcf12a
-  data.tar.gz: 296802f07b77527a7efcc1181d4b2c05aeaaf55551f0db865f0c5c1e3b45ad9f049189436bb2c1d35769ca7ab5470499d2bad343eb798278120e86328b1fb567
+  metadata.gz: 73817fdabb0fdb4d47dd1f295858b38778dad330ad29e1b54a06c0365916217a88f421ed2cf9fa24e4f6d4ea62314a554428029879cb3b3201e38c5d7c2a957e
+  data.tar.gz: 210ad0aa94dfc1d1528d4430051f7d43642b85882761ebc9016eb24c81ef1b4170934f411635dccfa2f2fd2ee100e1878089267519af013353291406e1397357

data/app/controllers/katello/api/v2/docker_tags_controller.rb

@@ -25,6 +25,23 @@ module Katello
       end
     end
 
+    api :GET, "/docker_tags/:id/repositories", N_("List of repositories for a docker meta tag")
+    def repositories
+      tag = DockerMetaTag.find(params[:id])
+
+      if tag.repositories.size > 1 #pulp3
+        repos = tag.repositories.non_archived
+      else
+        repos = []
+        tag.related_tags.each do |related|
+          repos << related.repositories.non_archived
+        end
+        repos.flatten!
+      end
+
+      respond_with_template_collection('index', 'repositories', collection: full_result_response(repos))
+    end
+
     private
 
     def find_repositories

data/app/lib/actions/katello/capsule_content/sync_capsule.rb

@@ -31,6 +31,10 @@ module Actions
           end
         end
 
+        def resource_locks
+          :link
+        end
+
         def rescue_strategy
           Dynflow::Action::Rescue::Skip
         end

data/app/lib/actions/katello/orphan_cleanup/remove_orphans.rb

@@ -13,6 +13,19 @@ module Actions
                 Actions::Pulp3::Orchestration::OrphanCleanup::RemoveOrphans,
                 proxy)
             end
+            plan_self
+          end
+        end
+
+        def run
+          models = []
+          ::Katello::RepositoryTypeManager.repository_types.each_value do |repo_type|
+            indexable_types = repo_type.content_types_to_index
+            models += indexable_types&.map(&:model_class)
+            models.select! { |model| model.many_repository_associations }
+          end
+          models.each do |model|
+            model.joins("left join katello_#{model.repository_association} on #{model.table_name}.id = katello_#{model.repository_association}.#{model.unit_id_field}").where("katello_#{model.repository_association}.#{model.unit_id_field} IS NULL").destroy_all
           end
         end
       end

data/app/lib/actions/katello/pulp_selector.rb

@@ -3,6 +3,7 @@ module Actions
     module PulpSelector
       def plan_pulp_action(backend_actions, repository, smart_proxy, *args)
         fail "nil smart_proxy passed to PulpSelector" if smart_proxy.nil?
+        smart_proxy.fix_pulp3_capabilities(repository.content_type)
         planned = plan_optional_pulp_action(backend_actions, repository, smart_proxy, *args)
         fail "Could not locate an action for type #{smart_proxy.backend_service_type(repository)}" unless planned
         planned

data/app/lib/katello/errors.rb

@@ -45,6 +45,12 @@ module Katello
       end
     end
 
+    class PulpcoreMissingCapabilities < StandardError
+      def message
+        _("A smart proxy seems to have been refreshed without pulpcore being running.  You may want to ")
+      end
+    end
+
     class ConnectionRefusedException < StandardError; end
 
     class MaxHostsReachedException < StandardError; end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -106,7 +106,7 @@ module Katello
 
       def import_package_profile(simple_packages)
         found = import_package_profile_in_bulk(simple_packages)
-        sync_package_associations(found.map(&:id))
+        sync_package_associations(found.map(&:id).uniq)
       end
 
       def import_package_profile_in_bulk(simple_packages)
@@ -127,9 +127,14 @@ module Katello
                                           :arch => simple_package.arch)
         end
         InstalledPackage.import(installed_packages, validate: false, on_duplicate_key_ignore: true)
+        #re-lookup all imported to pickup any duplicates/conflicts
+        imported = InstalledPackage.where(:nvrea => installed_packages.map(&:nvrea)).select(:id).to_a
 
-        found << installed_packages
-        found.flatten
+        if imported.count != installed_packages.count
+          Rails.logger.warn("Mismatch found in installed package insertion, expected #{installed_packages.count} but only could find #{imported.count}.  This is most likley a bug.")
+        end
+
+        (found + imported).flatten
       end
 
       def import_enabled_repositories(repos)

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -152,6 +152,19 @@ module Katello
         end
       end
 
+      def missing_pulp3_capabilities?
+        pulp3_enabled? && self.capabilities(PULP3_FEATURE).empty?
+      end
+
+      def fix_pulp3_capabilities(type)
+        if missing_pulp3_capabilities? && !pulp2_preferred_for_type?(type)
+          self.refresh
+          if self.capabilities(::SmartProxy::PULP3_FEATURE).empty?
+            fail Katello::Errors::PulpcoreMissingCapabilities
+          end
+        end
+      end
+
       def pulp3_repository_type_support?(repository_type, check_pulp2_preferred = true)
         repository_type_obj = repository_type.is_a?(String) ? Katello::RepositoryTypeManager.repository_types[repository_type] : repository_type
         fail "Cannot find repository type #{repository_type}, is it enabled?" unless repository_type_obj

data/app/models/katello/docker_meta_tag.rb

@@ -107,7 +107,7 @@ module Katello
       if grouped
         grouped_fields = "#{table_name}.name, katello_repositories.root_id"
         ids = distinct.select("ON (#{grouped_fields}) #{table_name}.id").joins(:repositories)
-        where(:id => ids).where("#{self.table_name}.schema1_id in (#{sql}) or #{self.table_name}.schema2_id in (#{sql})")
+        self.where(:id => ids)
       else
         self.where("#{self.table_name}.schema1_id in (#{sql}) or #{self.table_name}.schema2_id in (#{sql})")
       end

data/app/models/katello/installed_package.rb

@@ -4,8 +4,8 @@ module Katello
       allow :nvra, :nvrea, :name
     end
 
-    has_many :hosts, :through => :host_installed_packages, :class_name => "::Host"
     has_many :host_installed_packages, :class_name => "Katello::HostInstalledPackage", :dependent => :destroy, :inverse_of => :installed_package
+    has_many :hosts, :through => :host_installed_packages, :class_name => "::Host"
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :nvrea

data/app/services/katello/pulp/simple_package.rb

@@ -13,8 +13,8 @@ module Katello
       end
 
       def nvrea
-        if epoch == "0"
-          @nvra
+        if epoch.nil? || epoch.to_s == "0"
+          nvra
         else
           "#{@name}-#{@epoch}:#{@version}-#{@release}.#{@arch}"
         end

data/app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb

@@ -15,4 +15,4 @@ kind: job_template
 %>
 
 <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
-<%= render_template('Run Command - Ansible Default', :command => "yum update-minimal #{advisories}") %>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>

data/app/views/foreman/job_templates/install_group_-_katello_ansible_default.erb

@@ -13,4 +13,4 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum group install #{input('package')}") %>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y group install #{input('package')}") %>

data/app/views/foreman/job_templates/remove_group_-_katello_ansible_default.erb

@@ -13,4 +13,4 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum group remove #{input('package')}") %>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y group remove #{input('package')}") %>

data/app/views/foreman/job_templates/update_group_-_katello_ansible_default.erb

@@ -13,4 +13,4 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum group update #{input('package')}") %>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y group update #{input('package')}") %>

data/app/views/foreman/job_templates/update_package_-_katello_ansible_default.erb

@@ -13,4 +13,4 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<%= render_template('Run Command - Ansible Default', :command => "yum update #{input('package')}") %>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y update #{input('package')}") %>

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -18,7 +18,7 @@ child :docker_manifest => :manifest do
   attributes :schema_version, :digest, :manifest_type
 end
 
-child :repository => :repository do
+child :repositories => :repositories do
   attributes :id, :name, :full_path
 end
 

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -57,3 +57,11 @@ end
 child :content_view => :content_view do |_repo|
   attribute :id, :name
 end
+
+child :content_view_version do
+  attributes :id, :name, :content_view_id
+end
+
+child :environment do
+  attributes :id, :name
+end

data/config/routes/api/v2.rb

@@ -163,6 +163,9 @@ Katello::Engine.routes.draw do
             get :auto_complete_name
             get :compare
           end
+          member do
+            get :repositories
+          end
         end
 
         api_resources :environments, :only => [:index, :show, :create, :update, :destroy] do

data/db/migrate/20200429153103_installed_package_bad_nvrea.rb

@@ -0,0 +1,14 @@
+class InstalledPackageBadNvrea < ActiveRecord::Migration[5.2]
+  def up
+    Katello::InstalledPackage.where(:epoch => "0").find_each do |pkg|
+      simple = Katello::Pulp::SimplePackage.new(pkg.attributes)
+      if pkg.nvrea != simple.nvrea
+        pkg.update_column(:nvrea, simple.nvrea)
+      end
+    end
+  end
+
+  def down
+    #noop
+  end
+end

data/db/migrate/20200501155054_installed_package_unique_nvrea.rb

@@ -0,0 +1,64 @@
+class InstalledPackageUniqueNvrea < ActiveRecord::Migration[5.2]
+  def fix_missing_attributes
+    #bug in dynflow may have resulted in old code running and not properly populating fields
+    # This block is basically copied from 20200129172534_add_epoch_version_release_arch_to_katello_installed_packages.rb
+    epoch_non_0 = ::Katello::Rpm.where.not(epoch: [0, nil]).pluck(:nvra, :epoch).to_h
+    installed_packages = []
+    ::Katello::InstalledPackage.where(:nvrea => nil).each do |pkg|
+      epoch = epoch_non_0[pkg.nvra] || "0"
+
+      attributes_hash = ::Katello::Util::Package.parse_nvrea(pkg.nvra)
+      attributes_hash[:epoch] = epoch
+      attributes_hash[:nvra] = pkg.nvra
+      if epoch == "0"
+        attributes_hash[:nvrea] = pkg.nvra
+      else
+        attributes_hash[:nvrea] = "#{pkg.name}-#{epoch}:#{attributes_hash[:version]}-"\
+                                  "#{attributes_hash[:release]}.#{attributes_hash[:arch]}"
+      end
+
+      installed_packages << ::Katello::InstalledPackage.new(attributes_hash)
+    end
+    ::Katello::InstalledPackage.import(installed_packages, validate: false, batch_size: 50_000,
+                                       on_duplicate_key_update: {conflict_target: [:nvra],
+                                                                 columns: [:nvrea, :epoch, :version, :release, :arch]})
+  end
+
+  def consolidate_duplicate_nvreas
+    host_installed_packages = []
+    deletable_installed_package_ids = []
+    Katello::InstalledPackage.having('count(nvrea) > 1').group(:nvrea).pluck(:nvrea).each do |nvrea|
+      found = Katello::InstalledPackage.includes(:host_installed_packages).where(:nvrea => nvrea).to_a
+      to_keep = found.pop
+      found.each do |duplicate|
+        duplicate.host_ids.each do |host_id|
+          host_installed_packages << {:installed_package_id => to_keep.id, :host_id => host_id}
+        end
+        deletable_installed_package_ids << duplicate.id
+      end
+    end
+    if host_installed_packages.any?
+      Katello::HostInstalledPackage.import(host_installed_packages, validate: false, on_duplicate_key_ignore: true)
+    end
+    if deletable_installed_package_ids.any?
+      Katello::HostInstalledPackage.where(installed_package_id: deletable_installed_package_ids).delete_all
+      Katello::InstalledPackage.where(id: deletable_installed_package_ids).delete_all
+    end
+  end
+
+  def up
+    fix_missing_attributes
+    #now there should be no NULL nvreas
+    change_column :katello_installed_packages, :nvrea, :string, :null => false
+
+    consolidate_duplicate_nvreas
+    add_index "katello_installed_packages", [:nvrea], :unique => true
+    remove_index "katello_installed_packages", [:nvra]
+  end
+
+  def down
+    remove_index "katello_installed_packages", [:nvrea]
+    add_index "katello_installed_packages", [:nvra], :unique => true
+    change_column :katello_installed_packages, :nvrea, :string, :null => true
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-environments.controller.js

@@ -20,36 +20,24 @@ angular.module('Bastion.docker-tags').controller('DockerTagEnvironmentsControlle
             'sort_order': 'ASC',
             'paged': false
         };
+
         var nutupane = new Nutupane(DockerTag, params, null, {disableAutoLoad: true});
 
         var renderTable = function () {
-            var ids = _.map($scope.tag.related_tags, 'id');
-            var newParams = {
-                'organization_id': CurrentOrganization,
-                'search': $location.search().search || "",
-                'sort_by': 'name',
-                'sort_order': 'ASC',
-                'paged': false,
-                'ids[]': ids
-            };
-            $scope.table = nutupane.table;
-            nutupane.setParams(newParams);
-            $scope.panel.loading = false;
-            if (!_.isEmpty(ids)) {
-                nutupane.refresh();
-            }
+            params.action = 'repositories';
+            params.id = $scope.tag.id;
+
+            nutupane.setParams(params);
+            nutupane.refresh();
         };
 
+        $scope.table = nutupane.table;
+
         $scope.controllerName = 'katello_docker_tags';
 
-        if ($scope.tag) {
+        $scope.tag.$promise.then(function() {
             $scope.panel.loading = false;
-        }
-
-        if ($scope.tag && $scope.tag.related_tags) {
             renderTable();
-        } else {
-            $scope.tag.$promise.then(renderTable);
-        }
+        });
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html

@@ -27,19 +27,19 @@
 
       <tbody>
         <tr bst-table-row
-            ng-repeat="tag in table.rows | filter:dockerTagFilter">
+            ng-repeat="repo in table.rows | filter:dockerTagFilter">
           <td bst-table-cell>
-            <a ui-sref="environment.details({environmentId: tag.environment.id})">
-              {{ tag.environment.name }}
+            <a ui-sref="environment.details({environmentId: repo.kt_environment.id})">
+              {{ repo.kt_environment.name }}
             </a>
           </td>
           <td bst-table-cell>
-            <a ui-sref="content-view.version.docker({contentViewId: tag.content_view_version.content_view_id, versionId: tag.content_view_version.id})">
-              {{ tag.content_view_version.name }}
+            <a ui-sref="content-view.version.docker({contentViewId: repo.content_view_version.content_view_id, versionId: repo.content_view_version.id})">
+              {{ repo.content_view_version.name }}
             </a>
           </td>
           <td bst-table-cell>
-            {{ tag.repository.full_path }}:{{ tag.name }}
+            {{ repo.full_path }}:{{ tag.name }}
           </td>
         </tr>
       </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.controller.js

@@ -44,5 +44,13 @@ angular.module('Bastion.docker-tags').controller('DockerTagsController',
             }
             return versions.join(", ");
         };
+
+        $scope.getRepositoryNames = function (tag) {
+            return tag.repositories.map(function(repo) {
+                return repo.name;
+            }).filter(function(item, index, names) {
+                return names.indexOf(item) >= index;
+            }).sort().join(', ');
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.docker-tags').factory('DockerTag',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('katello/api/v2/docker_tags/:id/',
+        return BastionResource('katello/api/v2/docker_tags/:id/:action/',
             {id: '@id'},
             {
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html

@@ -39,7 +39,7 @@
             {{ tag.product.name }}
           </td>
           <td bst-table-cell>
-            {{ tag.repository.name }}
+            {{ getRepositoryNames(tag) }}
           </td>
         </tr>
       </tbody>

data/lib/katello/permission_creator.rb

@@ -258,7 +258,12 @@ module Katello
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/docker_manifest_lists' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search, :auto_complete_name, :compare],
+                           'katello/api/v2/docker_tags' => [:index,
+                                                            :show,
+                                                            :auto_complete_search,
+                                                            :auto_complete_name,
+                                                            :compare,
+                                                            :repositories],
                            'katello/api/v2/file_units' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.0.1".freeze
+  VERSION = "3.15.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.15.0.1
+  version: 3.15.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1894,6 +1894,8 @@ files:
 - db/migrate/20200121213430_katello_repository_rpms_id_big_int.rb
 - db/migrate/20200129172534_add_epoch_version_release_arch_to_katello_installed_packages.rb
 - db/migrate/20200402130013_add_repsoitory_docker_meta_tag_f_key.rb
+- db/migrate/20200429153103_installed_package_bad_nvrea.rb
+- db/migrate/20200501155054_installed_package_unique_nvrea.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb