katello 3.11.0.rc2 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33692b74c9a55f4c19bfe2791e7b6ea3c9e480441f8e6069916702f12d061287
-  data.tar.gz: 534f1a11e88cecf4a44218d51019cf2aaa567b310314c9dc415ab0b3e09ebd56
+  metadata.gz: 267be6055b2d210a259cba76847d38cdb98cfbe61c0cc2f0d621fae88f5f8c26
+  data.tar.gz: 7085283452d4f8069e69e0a469b3d3e665133a828d41358f900cd48a64903cc4
 SHA512:
-  metadata.gz: 3bd83f58ccd7cc236b1de78e2c8004ad6a870791b9bb9cfc4b2051d5af29fe71d1df61a4cb177473a07c88fb057cd2703c247eaa909684332cd7b6bc3a848564
-  data.tar.gz: 844f4cac7b5f9263c0b7a4c3883d1a53cf8fb73626860cda4ca94b66875022b5a60c8e25557442770700b6bfe58d5f661448bbb3371aa7779be1cb6b339f710d
+  metadata.gz: e88f9a1ae89d8f6924c624dca9e251cef617514c0ff5eb60b835b3aa8e8fc82ad2416ed0ae11f4c1c32999f675e1421a4e46d60cc311d087960ee2775e7d0e24
+  data.tar.gz: 7db70cea9f0ee0d5fea237fb50d58b76f76b966eea1c712f20d8f8ccd8d02cd2fd1c5ea8020499be81dfdf4351fb34cfecd05f6ab1c9e58b299f1990ea3479f9

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

@@ -125,7 +125,7 @@ module Katello
         @product_content = @product.product_content_by_id(params[:id])
       else
         content = Katello::Content.find_by(:cp_content_id => params[:id], :organization_id => @organization[:id])
-        @product_content = Katello::ProductContent.find_by(:id => content[:id])
+        @product_content = Katello::ProductContent.find_by(:content_id => content.id)
       end
       fail HttpErrors::NotFound, _("Couldn't find repository set with id '%s'.") % params[:id] if @product_content.nil?
       @product = @product_content.product if @product.nil?

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

@@ -1,7 +1,7 @@
 module Actions
   module Pulp
     module Repository
-      class Refresh < Pulp::Abstract
+      class Refresh < Pulp::AbstractAsyncTask
         input_format do
           param :capsule_id
           param :pulp_id
@@ -12,9 +12,13 @@ module Actions
           plan_self(:capsule_id => options[:capsule_id], :pulp_id => repository.pulp_id)
         end
 
-        def run
+        def invoke_external_task
           repo = ::Katello::Repository.find_by(:pulp_id => input[:pulp_id])
-          output[:results] = repo.backend_service(smart_proxy(input[:capsule_id])).refresh
+          if repo.nil?
+            repo = ::Katello::ContentViewPuppetEnvironment.find_by(:pulp_id => input[:pulp_id])
+            repo = repo.nonpersisted_repository
+          end
+          repo.backend_service(smart_proxy(input[:capsule_id])).refresh
         end
       end
     end

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

@@ -88,14 +88,19 @@ module Katello
       end
 
       def equivalent_kickstart_repository
-        return unless operatingsystem && kickstart_repository
+        return unless operatingsystem &&
+                      kickstart_repository &&
+                      operatingsystem.respond_to?(:kickstart_repos)
         ks_repos = operatingsystem.kickstart_repos(self)
         ks_repos.find { |repo| repo[:name] == kickstart_repository.label }
       end
 
       def matching_kickstart_repository?
         return true unless operatingsystem
-        operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == kickstart_repository_id }
+
+        if operatingsystem.respond_to? :kickstart_repos
+          return operatingsystem.kickstart_repos(self).any? { |repo| repo[:id] == kickstart_repository_id }
+        end
       end
 
       private

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

@@ -72,8 +72,9 @@ module Katello
 
         if content_view && lifecycle_environment && host.os && host.architecture
           Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).
-              where(:distribution_version => host.os.release,
-                    :distribution_arch => host.architecture.name)
+              where(:distribution_arch => host.architecture.name).
+              where("#{Katello::Repository.table_name}.distribution_version = :release or #{Katello::Repository.table_name}.distribution_version like :match",
+                      release: host.os.release, match: "#{host.os.release}.%")
         else
           []
         end

data/app/models/katello/glue/pulp/repos.rb

@@ -34,10 +34,6 @@ module Katello
     end
 
     module InstanceMethods
-      def empty?
-        return self.repos(library).empty?
-      end
-
       def distributions(env)
         to_ret = []
         self.repos(env).each do |repo|

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

@@ -149,9 +149,10 @@ module Katello
       end
 
       def refresh
-        update_or_associate_importer
-        update_or_associate_distributors
-        remove_unnecessary_distributors
+        tasks = update_or_associate_importer
+        tasks += update_or_associate_distributors
+        tasks += remove_unnecessary_distributors
+        tasks
       end
 
       def update_or_associate_importer
@@ -159,6 +160,7 @@ module Katello
         importer = generate_importer
         found = existing_importers.find { |i| i['importer_type_id'] == importer.id }
 
+        tasks = []
         if found
           ssl_ca_cert = importer.config.delete('ssl_ca_cert')
           ssl_client_cert = importer.config.delete('ssl_client_cert')
@@ -166,36 +168,40 @@ module Katello
           importer.config['basic_auth_username'] = nil if importer.config['basic_auth_username'].blank?
           importer.config['basic_auth_password'] = nil if importer.config['basic_auth_password'].blank?
           # Update ssl options by themselves workaround for https://pulp.plan.io/issues/2727
-          smart_proxy.pulp_api.resources.repository.update_importer(repo.pulp_id, found['id'], :ssl_client_cert => ssl_client_cert,
+          tasks << smart_proxy.pulp_api.resources.repository.update_importer(repo.pulp_id, found['id'], :ssl_client_cert => ssl_client_cert,
                                                     :ssl_client_key => ssl_client_key, :ssl_ca_cert => ssl_ca_cert)
-          smart_proxy.pulp_api.resources.repository.update_importer(repo.pulp_id, found['id'], importer.config)
+          tasks << smart_proxy.pulp_api.resources.repository.update_importer(repo.pulp_id, found['id'], importer.config)
         else
-          smart_proxy.pulp_api.resources.repository.associate_importer(repo.pulp_id, repo.importers.first['importer_type_id'], importer.config)
+          tasks << smart_proxy.pulp_api.resources.repository.associate_importer(repo.pulp_id, repo.importers.first['importer_type_id'], importer.config)
         end
+        tasks
       end
 
       def update_or_associate_distributors
+        tasks = []
         existing_distributors = backend_data["distributors"]
         generate_distributors.each do |distributor|
           found = existing_distributors.find { |i| i['distributor_type_id'] == distributor.type_id }
           if found
-            smart_proxy.pulp_api.resources.repository.
-                update_distributor(repo.pulp_id, found['id'], distributor.config)
+            tasks << smart_proxy.pulp_api.resources.repository.update_distributor(repo.pulp_id, found['id'], distributor.config)
           else
             smart_proxy.pulp_api.resources.repository.
                 associate_distributor(repo.pulp_id, distributor.type_id, distributor.config, :distributor_id => distributor.id,
                                       :auto_publish => distributor.auto_publish)
           end
         end
+        tasks
       end
 
       def remove_unnecessary_distributors
+        tasks = []
         existing_distributors = backend_data["distributors"]
         generated_distributors = generate_distributors
         existing_distributors.each do |distributor|
           found = generated_distributors.find { |dist| dist.type_id == distributor['distributor_type_id'] }
-          smart_proxy.pulp_api.resources.repository.delete_distributor(repo.pulp_id, distributor['id']) unless found
+          tasks << smart_proxy.pulp_api.resources.repository.delete_distributor(repo.pulp_id, distributor['id']) unless found
         end
+        tasks
       end
 
       def copy_units(destination_repo, units, options = {})

data/app/views/katello/layouts/react.html.erb

@@ -11,6 +11,6 @@
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
     <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
     <div id="reactRoot"></div>
+    <%= mount_react_component('katello', '#reactRoot') %>
 <% end %>
 <%= render file: "layouts/base" %>
-<%= mount_react_component('katello', '#reactRoot') %>

data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake

@@ -1,6 +1,13 @@
 namespace :katello do
   namespace :upgrades do
     namespace '3.11' do
+      def wait_on_task(task, time = 0.1)
+        task = SmartProxy.pulp_master.pulp_api.resources.task.poll(task['task_id'])
+        return if Actions::Pulp::AbstractAsyncTask::FINISHED_STATES.include?(task['state'])
+        sleep time
+        wait_on_task(task, time + 0.2)
+      end
+
       desc "update puppet repos to regenerate pulp configuration"
       task :update_puppet_repos => %w(environment) do
         User.current = User.anonymous_admin
@@ -9,7 +16,8 @@ namespace :katello do
             puts "Refreshing repository #{repo.label} (#{repo.id})"
             install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
             if install_dist
-              SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+              response = SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+              wait_on_task('task_id' => response['spawned_tasks'][0]['task_id'])
             end
             ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
           rescue RestClient::ResourceNotFound

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.11.0.rc2".freeze
+  VERSION = "3.11.0".freeze
 end

data/webpack/containers/Application/config.js

@@ -31,7 +31,7 @@ export const links = [
   },
   {
     // eslint-disable-next-line no-useless-escape
-    path: 'subscriptions/:id([0-9]*$)',
+    path: 'subscriptions/:id([0-9]+)',
     component: withHeader(SubscriptionDetails, { title: __('Subscription Details') }),
   },
   {
@@ -43,7 +43,7 @@ export const links = [
     component: withHeader(ModuleStreams, { title: __('Module Streams') }),
   },
   {
-    path: 'module_streams/:id([0-9]*$)',
+    path: 'module_streams/:id([0-9]+)',
     component: withHeader(ModuleStreamDetails, { title: __('Module Stream Details') }),
   },
 ];

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailProductContent.test.js.snap

@@ -6,7 +6,6 @@ exports[`subscription detail product content page renders correctly 1`] = `
 >
   <div
     className="list-group-item"
-    initExpanded={false}
   >
     <div
       className="list-group-item-header"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.11.0.rc2
+  version: 3.11.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2662,9 +2662,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6