katello 3.14.0.rc1 → 3.14.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e2baddffe6d51af8dbaa2e187ada9d5be93c145a8b3bea3113b77f49592b14
-  data.tar.gz: 3b42136f2440dc5c12e17472bcaa112d21a2d9e4db649dcbfcaa8f6b847d6732
+  metadata.gz: fdc69d79c80c2099fe91eff58b35861a0cebf3dd5ac4affa128d2b8751619769
+  data.tar.gz: 41cc9a3b3b657e44325274002b19884ae4c5b993c106ff191bfccf749d5a9a6c
 SHA512:
-  metadata.gz: 179fe38f2b010e92ee61df9cec470142d2889ba0f03894eb7ac4ac4f4a96801f1e37106249dbdd3c851c2fdc7ed84b69ee001efa7f6e48c71d56c3618be1405b
-  data.tar.gz: e98d76db3da13831b995f31bc5e6332ac7942e3179e679fb95756b911d0509313e31d09922cc6242eb0889abf1cb78aec72079c2601f9d7746d839f1d34b5b9e
+  metadata.gz: b28ea4eeb0db67f2b2bdba025b9191a57c54830e928f222b5c6f281eb1fc51a89cbb15d18f17eed853e914765ea57d9f1577f04a604fcc697786fe4c3b4217fd
+  data.tar.gz: e94f4bc8c64f672d5886ac900df8e13cc7322338fa048ec8eedcce1181adbaeb5c749119ebc86df734e021a014f89142554b236457fcb80819b535a2c60716dd

data/app/assets/javascripts/katello/containers/container.js

@@ -60,7 +60,7 @@ KT.container = (function(){
             noCapsules = $("#no_capsules"),
             org = getOrg(),
             spinner = $("#load_capsules"),
-            url = foreman_url("/api/smart_proxies"),
+            url = tfm.tools.foremanUrl("/api/smart_proxies"),
             params = {
                 organization_id: getOrg(),
                 search: "feature = \"Pulp Node\" or feature = \"Pulp\"",
@@ -95,7 +95,7 @@ KT.container = (function(){
         var environmentDropdown = $('#kt_environment_id'),
             org = getOrg(),
             spinner = $("#load_environments"),
-            url = foreman_url("/katello/api/organizations/" + org + "/environments");
+            url = tfm.tools.foremanUrl("/katello/api/organizations/" + org + "/environments");
 
         resetEnvironments();
         if (org !== "") {
@@ -121,7 +121,7 @@ KT.container = (function(){
             noCV = $("#no_content_views"),
             env = getEnvironment(),
             spinner = $("#load_content_views"),
-            url = foreman_url("/katello/api/organizations/" + getOrg() + "/content_views");
+            url = tfm.tools.foremanUrl("/katello/api/organizations/" + getOrg() + "/content_views");
             params = {
                 environment_id : env
             };
@@ -156,7 +156,7 @@ KT.container = (function(){
             noRepos = $("#no_repositories"),
             cv = getContentView(),
             spinner = $("#load_repositories"),
-            url = foreman_url("/katello/api/repositories/"),
+            url = tfm.tools.foremanUrl("/katello/api/repositories/"),
             params = {
                 organization_id: getOrg(),
                 content_view_id: cv,
@@ -194,7 +194,7 @@ KT.container = (function(){
         var repo = getRepo(),
             tagsDropdown = $("#tag_id"),
             spinner = $("#load_tags"),
-            url = foreman_url("/katello/api/repositories/" + repo + "/docker_tags"),
+            url = tfm.tools.foremanUrl("/katello/api/repositories/" + repo + "/docker_tags"),
             params = {};
 
         resetTags();

data/app/assets/javascripts/katello/hosts/activation_key_edit.js

@@ -19,7 +19,7 @@ function ktLoadActivationKeys() {
     // environment & content view.
     $.ajax({
         type: 'get',
-        url:  foreman_url('/katello/api/v2/environments/' + getSelectedEnvId() + '/activation_keys'),
+        url:  tfm.tools.foremanUrl('/katello/api/v2/environments/' + getSelectedEnvId() + '/activation_keys'),
         data: {'content_view_id': getSelectedContentViewId()},
         success: function(response) {
             KT.hosts.availableActivationKeys = {};

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -37,7 +37,7 @@ KT.hosts.fetchContentViews = function () {
     select.find('option').remove();
     if (envId) {
         KT.hosts.signalContentViewFetch(true);
-        var url = foreman_url('/katello/api/v2/content_views/');
+        var url = tfm.tools.foremanUrl('/katello/api/v2/content_views/');
         $.get(url, {environment_id: envId, full_result: true}, function (data) {
             select.append($("<option />"));
             $.each(data.results, function(index, view) {

data/app/assets/javascripts/katello/sync_management/sync_management.js

@@ -98,7 +98,7 @@ KT.content_actions = (function(){
 
             $.ajax({
               type: 'DELETE',
-              url: foreman_url('/katello/sync_management/' + repo_id + '?organization_id=' + getOrg()),
+              url: tfm.tools.foremanUrl('/katello/sync_management/' + repo_id + '?organization_id=' + getOrg()),
               dataType: 'json',
               success: function(data) {
               },
@@ -112,7 +112,7 @@ KT.content_actions = (function(){
         if (syncing.length ===0){
             return;
         }
-        var url = foreman_url('/katello/sync_management/sync_status');
+        var url = tfm.tools.foremanUrl('/katello/sync_management/sync_status');
         updater = $.PeriodicalUpdater(url, {
               data: function(){return {repoids:getSyncing(), organization_id:getOrg()}},
               method: 'get',
@@ -167,7 +167,7 @@ KT.content = (function(){
                 progressBar = $('<a/>').attr('class', 'progress').text(" ");
 
             if(task_id !== undefined) {
-                progressBar.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
+                progressBar.attr('href', tfm.tools.foremanUrl('/foreman_tasks/tasks/' + task_id));
             }
 
             progress = progress ? progress : 0;
@@ -189,7 +189,7 @@ KT.content = (function(){
         finishRepo = function(repo_id, state, duration, raw_state, error_details, task_id){
             var element = $("#repo-" + repo_id);
             var messages = [];
-            var url = foreman_url('/foreman_tasks/tasks/' + task_id);
+            var url = tfm.tools.foremanUrl('/foreman_tasks/tasks/' + task_id);
             state = '<a href="' + url + '">' + state + '</a>';
             element.find(".result .result-info").html(state);
             fadeUpdate(element.find(".duration"), duration);
@@ -211,7 +211,7 @@ KT.content = (function(){
             starttime = starttime === null ? katelloI18n.no_start_time : starttime;
 
             if(task_id !== undefined) {
-                pg.attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
+                pg.attr('href', tfm.tools.foremanUrl('/foreman_tasks/tasks/' + task_id));
             }
 
             fadeUpdate(element.find(".start_time"), starttime);
@@ -219,7 +219,7 @@ KT.content = (function(){
             fadeUpdate(element.find(".duration"), '');
             fadeUpdate(element.find(".size"), display_size);
             element.find('.size').data('size', size);
-            element.find('.info-tipsy').attr('href', foreman_url('/foreman_tasks/tasks/' + task_id));
+            element.find('.info-tipsy').attr('href', tfm.tools.foremanUrl('/foreman_tasks/tasks/' + task_id));
             progress = progress === 100 ? 99 : progress;
             value.show();
             value.animate({'width': progress },{ queue:false,

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

@@ -62,7 +62,7 @@ module Katello
     def_param_group :repo_create do
       param :label, String, :required => false
       param :product_id, :number, :required => true, :desc => N_("Product the repository belongs to")
-      param :content_type, RepositoryTypeManager.creatable_repository_types.keys, :required => true, :desc => N_("type of repo (either 'yum', 'deb', 'puppet', 'docker', or 'ostree')")
+      param :content_type, RepositoryTypeManager.creatable_repository_types.keys, :required => true, :desc => N_("type of repo")
     end
 
     api :GET, "/repositories", N_("List of enabled repositories")

data/app/lib/actions/katello/content_view/publish.rb

@@ -3,7 +3,7 @@ module Actions
   module Katello
     module ContentView
       class Publish < Actions::EntryAction
-        # rubocop:disable MethodLength
+        # rubocop:disable MethodLength,Metrics/AbcSize
         def plan(content_view, description = "", options = {})
           action_subject(content_view)
           content_view.check_ready_to_publish!
@@ -31,15 +31,21 @@ module Actions
                                                           :notes => description,
                                                           :triggered_by => options[:triggered_by]
                                                          )
+          source_repositories = []
+          content_view.publish_repositories do |repositories|
+            source_repositories += [repositories]
+          end
 
           sequence do
             plan_action(ContentView::AddToEnvironment, version, library)
+            repository_mapping = plan_action(ContentViewVersion::CreateRepos, version, source_repositories).repository_mapping
+
             concurrence do
-              content_view.publish_repositories do |repositories|
+              source_repositories.each do |repositories|
                 sequence do
-                  clone_to_version = plan_action(Repository::CloneToVersion, repositories, version,
+                  plan_action(Repository::CloneToVersion, repositories, version, repository_mapping[repositories],
                                                  :repos_units => options[:repos_units])
-                  plan_action(Repository::CloneToEnvironment, clone_to_version.new_repository, library)
+                  plan_action(Repository::CloneToEnvironment, repository_mapping[repositories], library)
                 end
               end
 
@@ -76,6 +82,9 @@ module Actions
               attrs[:metadata] = metadata
             end
           end
+
+          output[:content_view_id] = input[:content_view_id]
+          output[:content_view_version_id] = input[:content_view_version_id]
         end
 
         def rescue_strategy_for_self

data/app/lib/actions/katello/content_view_puppet_environment/destroy.rb

@@ -4,7 +4,9 @@ module Actions
       class Destroy < Actions::EntryAction
         def plan(puppet_env)
           action_subject(puppet_env)
-          plan_action(Pulp::Repository::Destroy, content_view_puppet_environment_id: puppet_env.id)
+          if ::Katello::RepositoryTypeManager.enabled?('puppet')
+            plan_action(Pulp::Repository::Destroy, content_view_puppet_environment_id: puppet_env.id)
+          end
           plan_self
         end
 

data/app/lib/actions/katello/content_view_version/create_repos.rb

@@ -0,0 +1,25 @@
+module Actions
+  module Katello
+    module ContentViewVersion
+      class CreateRepos < Actions::Base
+        # allows accessing the build object from the superior action
+        attr_accessor :repository_mapping
+        def plan(version, source_repositories = [])
+          self.repository_mapping = {}
+          concurrence do
+            source_repositories.each do |repositories|
+              new_repository = repositories.first.build_clone(content_view: version.content_view,
+                                                             version: version)
+              plan_action(Repository::Create, new_repository, true, false)
+              repository_mapping[repositories] = new_repository
+            end
+          end
+        end
+
+        def humanized_name
+          _("Create Repositories")
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -16,8 +16,9 @@ module Actions
         end
 
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/AbcSize
         def plan(old_version, environments, options = {})
-          dep_solve = options.fetch(:resolve_dependencies, false)
+          dep_solve = options.fetch(:resolve_dependencies, true)
           description = options.fetch(:description, '')
           content = options.fetch(:content, {})
           new_components = options.fetch(:new_components, [])
@@ -36,11 +37,25 @@ module Actions
                                                           :notes => description)
 
           copy_action_outputs = []
+          repos_to_clone = repos_to_copy(old_version, new_components)
 
           sequence do
+            repository_mapping = plan_action(ContentViewVersion::CreateRepos, new_content_view_version, repos_to_clone).repository_mapping
+
+            repos_to_clone.each do |source_repos|
+              plan_action(Repository::CloneToVersion,
+                          source_repos,
+                          new_content_view_version,
+                          repository_mapping[source_repos],
+                          incremental: true)
+            end
+
             concurrence do
-              repos_to_copy(old_version, new_components).each do |source_repos|
-                copy_action_outputs += copy_repos(source_repos, new_content_view_version, content, dep_solve)
+              repos_to_clone.each do |source_repos|
+                copy_action_outputs += copy_repos(repository_mapping[source_repos],
+                                                  new_content_view_version,
+                                                  content,
+                                                  dep_solve)
               end
 
               sequence do
@@ -64,13 +79,14 @@ module Actions
           end
         end
 
-        def copy_repos(source_repos, new_version, content, dep_solve)
+        def copy_repos(new_repo, new_version, content, dep_solve)
           copy_output = []
           sequence do
-            new_repo = plan_action(Repository::CloneToVersion, source_repos, new_version, :incremental => true).new_repository
             solve_dependencies = new_version.content_view.solve_dependencies || dep_solve
             copy_output += copy_deb_content(new_repo, solve_dependencies, content[:deb_ids])
-            copy_output += copy_yum_content(new_repo, solve_dependencies, content[:package_ids], content[:errata_ids])
+            copy_output += copy_yum_content(new_repo, solve_dependencies,
+                                            content[:package_ids],
+                                            content[:errata_ids])
 
             plan_action(Katello::Repository::MetadataGenerate, new_repo)
             plan_action(Katello::Repository::IndexContent, id: new_repo.id)
@@ -121,8 +137,10 @@ module Actions
         def run
           content = { ::Katello::Erratum::CONTENT_TYPE => [],
                       ::Katello::Rpm::CONTENT_TYPE => [],
+                      ::Katello::ModuleStream::CONTENT_TYPE => [],
                       ::Katello::Deb::CONTENT_TYPE => [],
-                      ::Katello::PuppetModule::CONTENT_TYPE => []}
+                      ::Katello::PuppetModule::CONTENT_TYPE => []
+                    }
 
           input[:copy_action_outputs].each do |copy_output|
             copy_output[:pulp_tasks].each do |pulp_task|
@@ -132,6 +150,8 @@ module Actions
                 case type
                 when ::Katello::Erratum::CONTENT_TYPE
                   content[::Katello::Erratum::CONTENT_TYPE] << unit['id']
+                when ::Katello::ModuleStream::CONTENT_TYPE
+                  content[::Katello::ModuleStream::CONTENT_TYPE] << "#{unit['name']}:#{unit['stream']}:#{unit['version']}"
                 when ::Katello::Rpm::CONTENT_TYPE
                   content[::Katello::Rpm::CONTENT_TYPE] << ::Katello::Util::Package.build_nvra(unit)
                 when ::Katello::Deb::CONTENT_TYPE
@@ -222,7 +242,7 @@ module Actions
             unless deb_ids.blank?
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
                                           ::Katello::Deb.with_identifiers(deb_ids),
-                                        resolve_dependencies: dep_solve).output
+                                          incremental_update: dep_solve).output
             end
           end
           copy_outputs
@@ -233,14 +253,14 @@ module Actions
           if new_repo.content_type == ::Katello::Repository::YUM_TYPE
             unless errata_ids.blank?
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
-                                        ::Katello::Erratum.with_identifiers(errata_ids),
-                                        resolve_dependencies: dep_solve).output
+                                          ::Katello::Erratum.with_identifiers(errata_ids),
+                                          incremental_update: dep_solve).output
             end
 
             unless package_ids.blank?
               copy_outputs << plan_action(Pulp::Repository::CopyUnits, new_repo.library_instance, new_repo,
-                                        ::Katello::Rpm.with_identifiers(package_ids),
-                                        resolve_dependencies: dep_solve).output
+                                          ::Katello::Rpm.with_identifiers(package_ids),
+                                          incremental_update: dep_solve).output
             end
           end
           copy_outputs

data/app/lib/actions/katello/environment/destroy.rb

@@ -42,7 +42,11 @@ module Actions
 
         def finalize
           environment = ::Katello::KTEnvironment.find(input['kt_environment']['id'])
-          environment.destroy!
+
+          # CapsuleLifecycleEnvironment can cause issues when auditing, it will try to associate the audit to the deleted taxonomy
+          ::Katello::CapsuleLifecycleEnvironment.without_auditing do
+            environment.destroy!
+          end
         end
       end
     end

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -18,6 +18,8 @@ module Actions
               load_resources
             end
 
+            load_hosts_guests
+
             ActiveRecord::Base.transaction do
               @hosts.each do |uuid, host|
                 update_host(uuid, host)
@@ -30,6 +32,16 @@ module Actions
           end
         end
 
+        def load_hosts_guests
+          @hosts.each do |uuid, host|
+            host.subscription_facet ||= host.build_subscription_facet(uuid: uuid)
+            # Only preload the virtual guests if 'guestIds' is not returned by Candlepin
+            consumer = @candlepin_attributes[uuid]
+            next unless consumer && consumer.try(:[], 'guestIds').empty?
+            host.subscription_facet.candlepin_consumer.virtual_guests
+          end
+        end
+
         # Loads all resources needed for refreshing subscription facet
         def load_resources
           @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).map { |org| [org.label, org] }.to_h
@@ -136,7 +148,6 @@ module Actions
         end
 
         def update_subscription_facet(uuid, host)
-          host.subscription_facet ||= host.build_subscription_facet(uuid: uuid)
           if @candlepin_attributes.key?(uuid)
             host.subscription_facet.candlepin_consumer.consumer_attributes = @candlepin_attributes[uuid]
             host.subscription_facet.import_database_attributes

data/app/lib/actions/katello/repository/clone_to_version.rb

@@ -2,17 +2,10 @@ module Actions
   module Katello
     module Repository
       class CloneToVersion < Actions::Base
-        # allows accessing the build object from the superior action
-        attr_accessor :new_repository
-
-        def plan(repositories, content_view_version, options = {})
+        def plan(repositories, content_view_version, destination_repository, options = {})
           incremental = options.fetch(:incremental, false)
           content_view = content_view_version.content_view
           filters = incremental ? [] : content_view.filters.applicable(repositories.first)
-
-          self.new_repository = repositories.first.build_clone(content_view: content_view,
-                                                               version: content_view_version)
-
           rpm_filenames = extract_rpm_filenames(options.fetch(:repos_units, nil), repositories.first.label)
           fail _('Cannot publish a composite with rpm filenames') if content_view.composite? && rpm_filenames&.any?
           if rpm_filenames&.any?
@@ -20,12 +13,11 @@ module Actions
             Rails.logger.warn("Filters on content view have been overridden by passed-in filename list during publish") if filters.any?
           end
 
-          copy_contents = new_repository.master?
+          copy_contents = destination_repository.master?
           fail _('Cannot publish a link repository if multiple component clones are specified') if !copy_contents && repositories.count > 1
 
           sequence do
-            plan_action(Repository::Create, new_repository, true, false)
-            plan_action(::Actions::Katello::Repository::CloneContents, repositories, new_repository,
+            plan_action(::Actions::Katello::Repository::CloneContents, repositories, destination_repository,
                         purge_empty_contents: true,
                         filters: filters,
                         rpm_filenames: rpm_filenames,

data/app/lib/actions/pulp/repository/copy_units.rb

@@ -8,19 +8,16 @@ module Actions
                       target_repo_id: target_repo.id,
                       class_name: units.first.class.name,
                       unit_ids: units.pluck(:id),
-                      resolve_dependencies: options[:resolve_dependencies])
+                      incremental_update: options[:incremental_update])
           end
         end
 
         def invoke_external_task
           source_repo = ::Katello::Repository.find(input[:source_repo_id])
           target_repo = ::Katello::Repository.find(input[:target_repo_id])
-
           units = input[:class_name].constantize.where(:id => input[:unit_ids])
-
-          override_config = ::Katello::Repository.build_override_config(input)
-
-          source_repo.backend_service(SmartProxy.pulp_master).copy_units(target_repo, units, override_config)
+          source_repo.backend_service(SmartProxy.pulp_master).copy_units(target_repo, units,
+                                                                          incremental_update: input[:incremental_update])
         end
       end
     end

data/app/lib/actions/pulp/repository/refresh.rb

@@ -13,7 +13,7 @@ module Actions
             repo = ::Katello::ContentViewPuppetEnvironment.find_by(:pulp_id => input[:pulp_id])
             repo = repo.nonpersisted_repository
           end
-          repo.backend_service(smart_proxy(input[:capsule_id])).refresh
+          repo.backend_service(smart_proxy(input[:capsule_id])).refresh_if_needed
         end
       end
     end

data/app/lib/actions/pulp/repository/sync.rb

@@ -66,7 +66,9 @@ module Actions
         end
 
         def presenter
-          repo = ::Katello::Repository.find(input['repo_id'])
+          repo = ::Katello::Repository.find(input['repo_id']) if input['repo_id']
+          # For repo sync tasks older than katello 3.14, we only have pulp_id available in input.
+          repo ||= ::Katello::Repository.where(:pulp_id => input['pulp_id']).first if input['pulp_id']
 
           if repo.try(:puppet?)
             Presenters::PuppetPresenter.new(self)