katello 3.10.0 → 3.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 549f4d68cf5b318cdd905af9f64484b4b9e72c47a63e97c9762eb8d1a9bfd727
-  data.tar.gz: e3ffb0fc087a2af96c68197dfde40416216d0d63c89e34106b89c6bf5d4282c7
+  metadata.gz: 8798a06f36592ba61b6f81d34e9e9f625875748ff28db06be37f37bd5788f60d
+  data.tar.gz: 2b17845bb2a28a81561f5e2d873616d25bd7ce0bff191a4a7d2c46836f2b05b8
 SHA512:
-  metadata.gz: 0d0d88d495d52f78327a79dc19ece1997275474e3ee33049b681540eb18242a75b0a097c272d7d61e602d4c1cb400fb86b170727b74501bfeb9595eecbdb3fe9
-  data.tar.gz: 9362b8d400c5424c60de7b58f99c538fe45dcba35c280204243045e110d1086fee3159e853234365d07214fcb60ba7d3c95429695f4056b87da57fa7bba21083
+  metadata.gz: fffb292706b356b1ec255806e507d965c7dd143fc75cddf97e1d35ea0ef32fa867a56a1dba463dd1bb11a5557576848784fc1a903469f13d375545ea1b313860
+  data.tar.gz: cb4ecec8972f1318a553afd24697eb457e64914e9395467d093fdf5dd634b32e86bf4cfaf730ee663c37a7ae000c007b9dd22a452dfc9d9256e47519133efbc8

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/katello/product/destroy.rb

@@ -35,9 +35,7 @@ module Actions
                             cp_id: product.cp_id, organization_label: product.organization.label)
               plan_action(Candlepin::Product::DeleteSubscriptions,
                             cp_id: product.cp_id, organization_label: product.organization.label)
-            end
 
-            unless organization_destroy
               concurrence do
                 remaining_product_content.each do |pc|
                   plan_action(Candlepin::Product::ContentRemove,
@@ -49,6 +47,8 @@ module Actions
               end
             end
 
+            clear_pool_associations(product)
+
             plan_self(:product_id => product.id)
           end
         end
@@ -62,6 +62,10 @@ module Actions
           _("Delete Product")
         end
 
+        def clear_pool_associations(product)
+          product.pool_products.delete_all
+        end
+
         def view_versions(product)
           cvvs = product.published_content_view_versions.uniq
           views = cvvs.inject({}) do |result, version|

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

@@ -20,8 +20,9 @@ module Actions
             errata = errata_match?(source_repo, target_repo)
             package_groups = package_groups_match?(source_repo, target_repo)
             distributions = distributions_match?(source_repo, target_repo)
+            checksum_match = (target_repo.saved_checksum_type == source_repo.saved_checksum_type)
 
-            output[:matching_content] = srpms_match && rpms && errata && package_groups && distributions && target_repo.published?
+            output[:matching_content] = srpms_match && rpms && errata && package_groups && distributions && target_repo.published? && checksum_match
           end
 
           if source_repo.content_type == ::Katello::Repository::DEB_TYPE

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

@@ -20,8 +20,16 @@ module Actions
                         target_repo,
                         :source_repository => source_repo,
                         :matching_content => output[:matching_content])
+
+            plan_self(:source_checksum_type => source_repo.saved_checksum_type, :target_repo_id => target_repo.id) unless source_repo.saved_checksum_type == target_repo.saved_checksum_type
           end
         end
+
+        def finalize
+          repository = ::Katello::Repository.find(input[:target_repo_id])
+          source_checksum_type = input[:source_checksum_type]
+          repository.update_attributes!(saved_checksum_type: source_checksum_type) if (repository && source_checksum_type)
+        end
       end
     end
   end

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/lib/katello/concerns/renderer_extensions.rb

@@ -7,7 +7,7 @@ module Katello
         def kickstart_attributes
           super
 
-          medium_provider = Katello::ManagedContentMediumProvider.new(host.content_facet)
+          medium_provider = Katello::ManagedContentMediumProvider.new(host)
           content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
 
           if content_view && host.operatingsystem.is_a?(Redhat) &&

data/app/lib/katello/util/cdn_var_substitutor.rb

@@ -60,7 +60,8 @@ module Katello
         return resolved if to_resolve.empty?
 
         futures = to_resolve.map do |path_with_substitution|
-          Concurrent.future do
+          future_namespace = defined?(Concurrent::Promises) ? Concurrent::Promises : Concurrent
+          future_namespace.future do
             path_with_substitution.resolve_substitutions(@resource)
           end
         end

data/app/models/katello/activation_key.rb

@@ -59,7 +59,8 @@ module Katello
     scoped_search :on => :content_view_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :description, :complete_value => true
     scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
-    scoped_search :on => :id, :relation => :subscriptions, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id
+    scoped_search :on => :id, :relation => :subscriptions, :rename => :subscription_id, :complete_value => true,
+                  :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER, :ext_method => :find_by_subscription_id
 
     def environment_exists
       if environment_id && environment.nil?

data/app/models/katello/candlepin/repository_mapper.rb

@@ -106,7 +106,11 @@ module Katello
       end
 
       def unprotected?
-        kickstart? || file?
+        kickstart? || file? || suse?
+      end
+
+      def suse?
+        content.content_type == Repository::YUM_TYPE && !!path.downcase.match(/suse/) # rubocop:disable Style/DoubleNegation
       end
 
       def file?

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

@@ -41,11 +41,7 @@ module Katello
       end
 
       def kickstart_repos(host)
-        distribution_repos = distribution_repositories(host)
-
-        return [] if distribution_repos.empty?
-
-        distros = distribution_repos.where(distribution_bootable: true)
+        distros = distribution_repositories(host).where(distribution_bootable: true)
         if distros && host.content_source
           distros.map { |distro| distro.to_hash(host.content_source) }
         else
@@ -55,7 +51,7 @@ module Katello
 
       def variant_repo(host, variant)
         if variant && host.content_source
-          product_id = host&.content_facet&.kickstart_repository&.product_id
+          product_id = host.try(:content_facet).try(:kickstart_repository).try(:product_id) || host.try(:kickstart_repository).try(:product_id)
           distro = distribution_repositories(host)
             .joins(:product)
             .where(
@@ -75,7 +71,7 @@ module Katello
               where(:distribution_version => host.os.release,
                     :distribution_arch => host.architecture.name)
         else
-          []
+          Katello::Repository.none
         end
       end
     end

data/app/models/katello/erratum.rb

@@ -217,7 +217,8 @@ module Katello
         module_stream_attributes = []
         json.each do |package_item|
           if package_item['module']
-            module_stream = ModuleStream.where(package_item['module']).first_or_create!
+            module_stream = ModuleStream.where(package_item['module']).first
+            next if module_stream.blank?
             nvreas = package_item["packages"].map { |hash| Util::Package.build_nvra(hash) }
             module_stream_id_column = "#{ModuleStreamErratumPackage.table_name}.module_stream_id"
             existing = ErratumPackage.joins(:module_streams).

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/models/katello/ostree_branch.rb

@@ -9,7 +9,6 @@ module Katello
     scoped_search :on => :version, :complete_value => true
     scoped_search :on => :commit, :complete_value => true
     scoped_search :on => :uuid, :complete_value => true
-    scoped_search :on => :version_date, :complete_value => true, :rename => :created
 
     CONTENT_TYPE = Pulp::OstreeBranch::CONTENT_TYPE
 
@@ -20,8 +19,7 @@ module Katello
     def update_from_json(json)
       update_attributes(:name => json[:branch],
                         :version => json[:metadata][:version],
-                        :commit => json[:commit],
-                        :version_date => json[:_created].to_datetime
+                        :commit => json[:commit]
                        )
     end
   end

data/app/models/katello/root_repository.rb

@@ -231,10 +231,14 @@ module Katello
       (%w(unprotected checksum_type container_repsoitory_name) & previous_changes.keys).any?
     end
 
+    def on_demand?
+      self.download_policy == Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND
+    end
+
     def pulp_update_needed?
       changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirror_on_sync verify_ssl_on_sync
                                  upstream_username upstream_password ostree_upstream_sync_policy ostree_upstream_sync_depth ignore_global_proxy ignorable_content)
-      changeable_attributes += %w(name container_repository_name) if docker?
+      changeable_attributes += %w(name container_repository_name docker_tags_whitelist) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?
       changeable_attributes.any? { |key| previous_changes.key?(key) }
     end

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

@@ -123,9 +123,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
@@ -133,6 +134,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')
@@ -140,35 +142,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)
+                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
     end
   end

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

@@ -19,7 +19,7 @@ module Katello
         end
 
         def generate_distributors
-          puppet_install_dist = Runcible::Models::PuppetInstallDistributor.new(puppet_install_distributor_path, :id => repo.pulp_id, :auto_publish => true)
+          puppet_install_dist = Runcible::Models::PuppetInstallDistributor.new(puppet_install_distributor_path, :id => repo.pulp_id, :auto_publish => false)
           puppet_dist = Runcible::Models::PuppetDistributor.new(nil, (root.unprotected || false), true,
                                                                 :id => "#{repo.pulp_id}_puppet", :auto_publish => true)
           [puppet_dist, puppet_install_dist]

data/app/views/katello/api/v2/ostree_branches/show.json.rabl

@@ -1,4 +1,4 @@
 object @resource
 
 attributes :uuid, :id
-attributes :name, :version, :commit, :version_date
+attributes :name, :version, :commit

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

@@ -18,7 +18,7 @@ child({:available_content => :available_content}, :if => params[:include_availab
 end
 
 child :sync_plan do
-  attributes :id, :name, :description, :sync_date, :interval, :next_sync
+  attributes :id, :name, :description, :sync_date, :interval, :next_sync, :cron_expression
 end
 
 node :repository_count do |product|

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/db/migrate/20190326145039_remove_version_date_from_ostree_branch.rb

@@ -0,0 +1,5 @@
+class RemoveVersionDateFromOstreeBranch < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :katello_ostree_branches, :version_date, :timestamp
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -5,6 +5,8 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:upgrades:3.8:clear_checksum_type'},
     {:name => 'katello:upgrades:3.9:migrate_sync_plans'},
-    {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'}
+    {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'},
+    {:name => 'katello:upgrades:3.11:import_yum_metadata'},
+    {:name => 'katello:upgrades:3.11:update_puppet_repos'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-module-streams.controller.js

@@ -61,6 +61,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
               return scope.nutupaneParams.status;
           },
           function() {
+              $scope.nutupaneParams.page = 1;
               $scope.moduleStreamsNutupane.refresh();
           }
         );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -62,7 +62,7 @@
                 params: {
                     'content_type': "ostree",
                     'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'created',
+                    'sort_by': 'version',
                     'sort_order': 'DESC'
                 }
             },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html

@@ -9,7 +9,6 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
-        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -18,7 +17,6 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
-        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-ostree.html

@@ -18,7 +18,6 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
-        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -27,7 +26,6 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
-        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-info.html

@@ -10,9 +10,6 @@
 
       <dt translate>Commit</dt>
       <dd>{{ branch.commit }}</dd>
-
-      <dt translate>Date</dt>
-      <dd>{{ branch.version_date }}</dd>
     </dl>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/partials/sync-status.html

@@ -14,6 +14,11 @@
     Weekly on {{ product.sync_plan.sync_date | date:'EEEE' }} at {{ product.sync_plan.sync_date | date:'mediumTime' }} (Server Time)
   </span>
 </dd>
+<dd ng-if="product.sync_plan.cron_expression">
+  <span translate>
+    Custom Cron : {{ product.sync_plan.cron_expression }}
+  </span>
+</dd>
 <dd ng-hide="product.sync_plan.next_sync">
   <span translate>
     Synced manually, no interval set.

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html

@@ -19,7 +19,6 @@
           <th bst-table-column><span translate>Branch Name</span></th>
           <th bst-table-column><span translate>Version</span></th>
           <th bst-table-column><span translate>Commit</span></th>
-          <th bst-table-column><span translate>Date</span></th>
         </tr>
       </thead>
 
@@ -34,9 +33,6 @@
           <td bst-table-cell>
             {{ item.commit }}
           </td>
-          <td bst-table-cell>
-            {{ item.version_date }}
-          </td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -14,7 +14,12 @@ module BastionKatello
 
       Bastion.register_plugin(
         :name => 'bastion_katello',
-        :javascript => 'bastion_katello/bastion_katello',
+        :javascript => proc do
+          [
+            javascript_include_tag(*webpack_asset_paths('katello:common', :extension => 'js'), "data-turbolinks-track" => true),
+            javascript_include_tag('bastion_katello/bastion_katello')
+          ]
+        end,
         :stylesheet => 'bastion_katello/bastion_katello',
         :pages => %w(
           activation_keys

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

@@ -0,0 +1,16 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.11' do
+      desc "update puppet repos to regenerate pulp configuration"
+      task :update_puppet_repos => %w(environment) do
+        User.current = User.anonymous_admin
+        Katello::Repository.puppet_type.each do |repo|
+          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' }
+          SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+        end
+      end
+    end
+  end
+end

data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake

@@ -5,24 +5,25 @@ namespace :katello do
       task :clear_checksum_type => %w(environment) do
         User.current = User.anonymous_admin
 
-        Katello::Repository.yum_type.find_each do |repo|
-          repo.transaction do
+        Katello::RootRepository.yum_type.find_each do |root_repo|
+          root_repo.transaction do
             begin
-              if repo.on_demand? && repo.url.present?
-                repo.update_attribute(:checksum_type, nil)
+              if root_repo.on_demand? && root_repo.url.present?
+                root_repo.update_attribute(:checksum_type, nil)
 
-                if repo.find_distributor[:config]&.delete(:checksum_type)
-                  Katello.pulp_server.resources.repository.update_distributor(
-                    repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
-                end
-              end
+                root_repo.repositories.each do |repo|
+                  begin
+                    repo.update_attribute(:saved_checksum_type, nil)
 
-              if repo.library_instance?
-                repo.update_attributes!(
-                  source_repo_checksum_type: repo.pulp_scratchpad_checksum_type)
+                    if repo.find_distributor[:config]&.delete(:checksum_type)
+                      SmartProxy.pulp_master.pulp_api.resources.repository.update_distributor(
+                        repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
+                    end
+                  # rubocop:disable HandleExceptions
+                  rescue RestClient::ResourceNotFound
+                  end
+                end
               end
-            # rubocop:disable HandleExceptions
-            rescue RestClient::ResourceNotFound
             end
           end
         end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.10.0".freeze
+  VERSION = "3.10.1".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/RedHatRepositories/components/EnabledRepository/__tests__/__snapshots__/EnabledRepository.test.js.snap

@@ -16,6 +16,7 @@ exports[`Enabled Repositories Component should render 1`] = `
   description="some label"
   heading="foo "
   hideCloseIcon={false}
+  initExpanded={false}
   key="1"
   leftContent={
     <RepositoryTypeIcon

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/__test__/__snapshots__/RepositorySetRepository.test.js.snap

@@ -61,6 +61,7 @@ exports[`RepositorySetRepository Component should render 1`] = `
     </span>
   }
   hideCloseIcon={false}
+  initExpanded={false}
   leftContent={null}
   onCloseCompoundExpand={[Function]}
   onExpand={[Function]}

data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js

@@ -137,6 +137,11 @@ SubscriptionDetails.propTypes = {
   loadProducts: PropTypes.func.isRequired,
   subscriptionDetails: PropTypes.shape({}).isRequired,
   history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
+  match: PropTypes.shape({
+    params: PropTypes.shape({
+      id: PropTypes.string.isRequired,
+    }).isRequired,
+  }).isRequired,
 };
 
 export default SubscriptionDetails;

data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetails.test.js

@@ -14,7 +14,7 @@ jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
 
 describe('subscriptions details page', () => {
   it('should render and contain appropiate components', async () => {
-    const match = { params: { id: 1 } };
+    const match = { params: { id: '1' } };
     const noop = () => {};
 
     const wrapper = shallow(<SubscriptionDetails

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -89,4 +89,6 @@ export const SUBSCRIPTION_TABLE_DEFAULT_COLUMNS = [
   'contract_number',
   'start_date',
   'end_date',
+  'consumed',
+  'quantity',
 ];

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -78,7 +78,7 @@ class SubscriptionsPage extends Component {
       }
     }
 
-    if (!isEqual(organization.owner_details, prevProps.organization.owner_details)) {
+    if (!isEqual(organization, prevProps.organization)) {
       this.pollTasks();
     }
   }
@@ -104,11 +104,13 @@ class SubscriptionsPage extends Component {
   pollTasks() {
     const { pollBulkSearch, organization } = this.props;
 
-    pollBulkSearch({
-      action: `organization '${organization.owner_details.displayName}'`,
-      result: 'pending',
-      label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
-    }, BULK_TASK_SEARCH_INTERVAL, organization.id);
+    if (organization && organization.owner_details) {
+      pollBulkSearch({
+        action: `organization '${organization.owner_details.displayName}'`,
+        result: 'pending',
+        label: BLOCKING_FOREMAN_TASK_TYPES.join(' or '),
+      }, BULK_TASK_SEARCH_INTERVAL, organization.id);
+    }
 
     this.props.loadSetting('content_disconnected');
     this.props.loadSubscriptions();

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js

@@ -15,32 +15,44 @@ const loadTables = () => new Promise((resolve) => {
 describe('subscriptions page', () => {
   const noop = () => {};
   const organization = { owner_details: { upstreamConsumer: 'blah' } };
+  const page = shallow(<SubscriptionsPage
+    organization={organization}
+    subscriptions={successState}
+    subscriptionTableSettings={settingsSuccessState}
+    loadSetting={loadSetting}
+    loadTables={loadTables}
+    loadTableColumns={loadTableColumns}
+    createColumns={createColumns}
+    updateColumns={updateColumns}
+    loadSubscriptions={loadSubscriptions}
+    updateQuantity={updateQuantity}
+    pollTaskUntilDone={noop}
+    pollBulkSearch={noop}
+    deleteSubscriptions={() => {}}
+    resetTasks={noop}
+    uploadManifest={noop}
+    deleteManifest={noop}
+    refreshManifest={noop}
+    updateSearchQuery={noop}
+    openManageManifestModal={noop}
+    closeManageManifestModal={noop}
+    openDeleteModal={noop}
+    closeDeleteModal={noop}
+    openTaskModal={noop}
+    closeTaskModal={noop}
+    disableDeleteButton={noop}
+    enableDeleteButton={noop}
+  />);
 
   it('should render', async () => {
-    const page = shallow(<SubscriptionsPage
-      organization={organization}
-      subscriptions={successState}
-      subscriptionTableSettings={settingsSuccessState}
-      loadSetting={loadSetting}
-      loadTables={loadTables}
-      loadTableColumns={loadTableColumns}
-      createColumns={createColumns}
-      updateColumns={updateColumns}
-      loadSubscriptions={loadSubscriptions}
-      updateQuantity={updateQuantity}
-      pollTaskUntilDone={noop}
-      pollBulkSearch={noop}
-      deleteSubscriptions={() => {}}
-      resetTasks={noop}
-      uploadManifest={noop}
-      deleteManifest={noop}
-      refreshManifest={noop}
-      updateSearchQuery={noop}
-      openManageManifestModal={noop}
-      closeManageManifestModal={noop}
-      openDeleteModal={noop}
-      closeDeleteModal={noop}
-    />);
     expect(toJson(page)).toMatchSnapshot();
   });
+
+  it('should poll tasks when org changes', async () => {
+    jest.spyOn(page.instance(), 'pollTasks');
+
+    page.setProps({ organization: { id: 1 } });
+
+    expect(page.instance().pollTasks).toHaveBeenCalled();
+  });
 });

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -421,12 +421,12 @@ export const tableColumns = [
   {
     key: 'consumed',
     label: 'Consumed',
-    value: false,
+    value: true,
   },
   {
     key: 'quantity',
     label: 'Entitlements',
-    value: false,
+    value: true,
   },
 ];
 export const loadTableColumnsSuccessAction = [
@@ -439,6 +439,8 @@ export const loadTableColumnsSuccessAction = [
         'contract_number',
         'start_date',
         'end_date',
+        'consumed',
+        'quantity',
       ],
     },
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.10.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-15 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,6 +104,9 @@ dependencies:
   name: foreman_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -111,6 +114,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -165,7 +171,7 @@ dependencies:
         version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -175,7 +181,7 @@ dependencies:
         version: 2.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: anemone
   requirement: !ruby/object:Gem::Requirement
@@ -1626,6 +1632,7 @@ files:
 - db/migrate/20181008201422_add_modules_to_errata_packages.rb
 - db/migrate/20181017181806_available_module_streams.rb
 - db/migrate/20181027014323_add_applicable_modules.rb
+- db/migrate/20190326145039_remove_version_date_from_ostree_branch.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -2229,6 +2236,7 @@ files:
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake
+- lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/upgrades/3.9/migrate_sync_plans.rake
 - lib/katello/tasks/virt_who_report.rake