katello 3.12.0.rc2 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a559345d7e312acbfda66d5aabecce6e5660d1b483939c8bcc7d5aa997c080
-  data.tar.gz: 877fa0b949c590d3264b4d9504a03572d6831d0debdd83f968320d39c3c13bde
+  metadata.gz: 1014f15535a58f5e1728c5a9bb6c564a9b9a095b1efa80efa6a9f4249d56824c
+  data.tar.gz: f655e1161eb1767cc87b8e9de5883befe95968202ade0a29eae5912c2436e9d4
 SHA512:
-  metadata.gz: f4b0220844a897184e3c24a8e95216500842aa73388a5207cd396f02a91a0e08fb1fc2b4084eae2f1c3acbc4ccccafb626fc319c430d80d3243a1077cee29c99
-  data.tar.gz: 6f1187da5a113f91e04acb2c25334923bd2db31f97bc106bd8e5668fe8511def1ddf5acb827cc362603c1045f6393a2bd217917642d150af5fe7b78f305965f8
+  metadata.gz: 9295f9e67103e6913e61ed365389c705113ca12638a413d21020f7d596fc0ffd0063652fcd7435fa496facc62122d1f948cb713bc7f375c0b96e642002d8e204
+  data.tar.gz: 84f9ad06abe7182a733551da25fecfdea1857927f77b98670fc54fbe832c2455e3d5701912bb6b15e9d3d9889d675d460e159a18ea73f277d2cb4f1f8702a2bc

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

@@ -9,6 +9,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
+    param :uuid, String, :desc => N_("uuid of the puppet module"), :deprecated => true
     param_group :search, ::Katello::Api::V2::ApiController
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))

data/app/lib/actions/candlepin/owner/import_products.rb

@@ -10,7 +10,8 @@ module Actions
           organization = ::Organization.find(input[:organization_id])
           ::Katello::Product.without_auditing do
             User.as_anonymous_admin do
-              organization.redhat_provider.import_products_from_cp
+              updated_content = organization.redhat_provider.import_products_from_cp.content_url_updated
+              ForemanTasks.async_task(Katello::Repository::UpdateContentUrls, updated_content) if updated_content.present?
             end
           end
         end

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

@@ -0,0 +1,17 @@
+module Actions
+  module Katello
+    module Repository
+      class UpdateContentUrls < Actions::EntryAction
+        def plan(content_to_update)
+          concurrence do
+            content_to_update.each do |content|
+              content.repositories.each do |repo|
+                plan_action(Katello::Repository::UpdateRedhatRepository, repo)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Actions
+  module Katello
+    module Repository
+      class UpdateMetadataSync < Actions::Base
+        def plan(repository)
+          sequence do
+            plan_action(Katello::Repository::MetadataGenerate, repository)
+            concurrence do
+              ::SmartProxy.with_repo(repository).each do |capsule|
+                next if capsule.pulp_master?
+                plan_action(Katello::CapsuleContent::Sync, capsule, repository_id: repository.id)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+module Actions
+  module Katello
+    module Repository
+      class UpdateRedhatRepository < Actions::EntryAction
+        def plan(repo)
+          action_subject repo
+          repo.root.update_attributes!(:url => upstream_url(repo)) if repo.library_instance?
+          repo.update_attributes!(relative_path: relative_path(repo))
+          plan_action(::Actions::Pulp::Repository::Refresh, repo)
+          plan_self(:repository_id => repo.id)
+        end
+
+        def run
+          repository = ::Katello::Repository.find(input[:repository_id])
+          ForemanTasks.async_task(Katello::Repository::UpdateMetadataSync, repository)
+        end
+
+        private
+
+        def relative_path(repo)
+          repo.generate_repo_path(repo.generate_content_path)
+        end
+
+        def upstream_url(repo)
+          repo.product.repo_url(repo.generate_content_path)
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/sync_plan/run.rb

@@ -16,16 +16,10 @@ module Actions
           add_missing_task_group(sync_plan)
           action_subject(sync_plan)
           User.as_anonymous_admin do
-            fail _("No products in sync plan") unless sync_plan.products
-
             syncable_products = sync_plan.products.syncable
             syncable_roots = ::Katello::RootRepository.where(:product_id => syncable_products).has_url
 
-            fail _("No syncable repositories found for selected products and options.") if syncable_roots.empty?
-
-            plan_action(::Actions::BulkAction, ::Actions::Katello::Repository::Sync,
-                        syncable_roots.map(&:library_instance))
-
+            plan_action(::Actions::BulkAction, ::Actions::Katello::Repository::Sync, syncable_roots.map(&:library_instance)) unless syncable_roots.empty?
             plan_self(:sync_plan_name => sync_plan.name)
           end
         end

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

@@ -56,6 +56,11 @@ module Katello
         }
         scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE) }
 
+        def self.with_repo(repo)
+          joins(:capsule_lifecycle_environments).
+          where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
+        end
+
         def self.pulp_master
           unscoped.with_features(PULP_FEATURE).first
         end

data/app/models/katello/content.rb

@@ -54,5 +54,13 @@ module Katello
         prod_content_importer.import
       end
     end
+
+    def can_update_to_url?(new_url)
+      # We need to match the substitutable variables from
+      # current content_url and new_url
+      current_subs = content_url&.scan(/\$\w+/)&.sort
+      new_url_subs = new_url&.scan(/\$\w+/)&.sort
+      current_subs == new_url_subs
+    end
   end
 end

data/app/models/katello/glue/provider.rb

@@ -136,6 +136,7 @@ module Katello
         end
         prod_content_importer.import
         self.index_subscriptions(self.organization)
+        prod_content_importer
       end
 
       def import_product(product_json)

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

@@ -117,7 +117,9 @@ module Katello
         if self.provider.provider_type == Provider::CUSTOM
           content_url.dup
         else
-          self.provider.repository_url + content_url
+          path = content_url.sub(%r{^/}, '')
+          repo_url = self.provider.repository_url&.sub(%r{/$}, '')
+          "#{repo_url}/#{path}"
         end
       end
 

data/app/models/katello/repository.rb

@@ -345,9 +345,17 @@ module Katello
       return task && task.main_action.pulp_task_id == pulp_task_id
     end
 
-    def generate_repo_path
-      _org, _content, content_path = (self.library_instance || self).relative_path.split("/", 3)
+    def generate_content_path
+      path = content.content_url
+      root.substitutions.each do |key, value|
+        path = path.gsub("$#{key}", value) if value
+      end
+      path
+    end
 
+    def generate_repo_path(content_path = nil)
+      _org, _content, content_path = (self.library_instance || self).relative_path.split("/", 3) if content_path.blank?
+      content_path = content_path.sub(%r|^/|, '')
       if self.environment
         cve = ContentViewEnvironment.where(:environment_id => self.environment,
                                            :content_view_id => self.content_view).first

data/app/services/katello/product_content_importer.rb

@@ -20,11 +20,13 @@ module Katello
     #    },
     #    "enabled":false
     # }
+    attr_reader :content_url_updated
 
     def initialize
       @contents_to_create = []
       @product_contents_to_create = []
       @product_mapping = {}
+      @content_url_updated = []
     end
 
     def add_product_content(product, product_content_json)
@@ -98,8 +100,21 @@ module Katello
 
     #cannot use activerecord-improt to update content, as we rely on after_update callback
     private def update_content(content, prod_content_json)
+      attrs_to_update = {}
       new_name = prod_content_json[:content][:name]
-      content.update_attributes!(:name => new_name) if content.name != new_name
+      attrs_to_update[:name] = new_name if content.name != new_name
+
+      new_url = prod_content_json[:content][:contentUrl]
+      if content.content_url != new_url
+        if content.can_update_to_url?(new_url)
+          attrs_to_update[:content_url] = new_url
+          @content_url_updated << content
+        else
+          Rails.logger.warn(_("Substitution Mismatch. Unable to update for content: (%{content}). From [%{content_url}] To [%{new_url}].") %
+                      { content: content.inspect, content_url: content.content_url, new_url: new_url })
+        end
+      end
+      content.update_attributes!(attrs_to_update) unless attrs_to_update.blank?
     end
 
     private def update_product_content(product_content, new_enabled_value)

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

@@ -7,7 +7,7 @@ UpgradeTask.define_tasks(:katello) do
     {: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'},
-    {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'}
-
+    {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'},
+    {:name => 'katello:upgrades:3.12:remove_pulp2_notifier'}
   ]
 end

data/engines/bastion/app/assets/stylesheets/bastion/nutupane.scss

@@ -183,7 +183,7 @@ td.row-select {
 
 .info-paragraph {
   padding-left: 0px;
-  white-space: pre;
+  white-space: pre-wrap;
 }
 
 .detail:not(:last-child) {

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

@@ -32,7 +32,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultServiceLevels = ['Self-Support', 'Standard', 'Premium'];
 
-        $scope.purposeAddonsList = [];
         $scope.purposeAddonsCount = 0;
 
         $scope.panel = {
@@ -64,24 +63,24 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.saveSubscriptionFacet = function (host) {
             var newHost = {id: host.id};
-            var addOns = [];
-
-            angular.forEach($scope.purposeAddonsList, function (addOn) {
-                if (addOn.selected) {
-                    addOns.push(addOn.name);
-                }
-            });
 
             newHost['subscription_facet_attributes'] = {
                 id: host.subscription_facet_attributes.id,
                 autoheal: host.subscription_facet_attributes.autoheal,
                 'purpose_role': host.subscription_facet_attributes.purpose_role,
                 'purpose_usage': host.subscription_facet_attributes.purpose_usage,
-                'purpose_addons': addOns,
                 'service_level': host.subscription_facet_attributes.service_level,
                 'release_version': host.subscription_facet_attributes.release_version
             };
 
+            if ($scope.purposeAddonsList) {
+                newHost['subscription_facet_attributes']['purpose_addons'] = _.chain($scope.purposeAddonsList).filter(function(addOn) {
+                    return addOn.selected;
+                }).map(function(addOn) {
+                    return addOn.name;
+                }).value();
+            }
+
             return $scope.save(newHost, true);
         };
         // @TODO end hack
@@ -186,7 +185,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 });
 
                 angular.forEach(addOns, function (addOn) {
-                    $scope.purposeAddonsList.push({"name": addOn, "selected": $scope.host.subscription_facet_attributes.purpose_addons.indexOf(addOn) > -1});
+                    $scope.purposeAddonsList.push({"name": addOn, "selected": purposeAddons.indexOf(addOn) > -1});
                 });
 
                 return $scope.purposeAddonsList;

data/lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake

@@ -0,0 +1,13 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.12' do
+      desc "removes the unused pulp2 notifier"
+      task :remove_pulp2_notifier => %w(environment) do
+        SmartProxy.pulp_master!.pulp_api.resources.event_notifier.list.each do |notifier|
+          Rails.logger.info("Deleting notifier #{notifier['id']}")
+          SmartProxy.pulp_master!.pulp_api.resources.event_notifier.delete(notifier['id'])
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.12.0.rc2
+  version: 3.12.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -745,6 +745,9 @@ files:
 - app/lib/actions/katello/repository/sync.rb
 - app/lib/actions/katello/repository/sync_hook.rb
 - app/lib/actions/katello/repository/update.rb
+- app/lib/actions/katello/repository/update_content_urls.rb
+- app/lib/actions/katello/repository/update_metadata_sync.rb
+- app/lib/actions/katello/repository/update_redhat_repository.rb
 - app/lib/actions/katello/repository/upload_errata.rb
 - app/lib/actions/katello/repository/upload_files.rb
 - app/lib/actions/katello/repository/upload_package_group.rb
@@ -3918,6 +3921,7 @@ files:
 - lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake
 - lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake
 - lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake
+- lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
@@ -4348,9 +4352,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.2