katello 3.11.1 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9cf1e3fb4076039f50b51d4f980f244ffb5734c57a81e3333573368e2bd6d3b
-  data.tar.gz: 83cf29642598dca1622d0813e607a377a220ec87f85cc54ff9783b3cec488bbb
+  metadata.gz: c6bc74e910b6619e481c98639a8c35762b2a190950dd08105741c148fa67e625
+  data.tar.gz: 97d7a845754bb44a742c2d3179daedee6a3efb4dbb2678b2cb533c359564a6e2
 SHA512:
-  metadata.gz: 48c26149a3886a3f02ec6abeda2706c195958254fb4751078fddcf7187613badadfff71328fc19570bae5e79dbf85250978cfca8fb902fd3124bea1071c7e871
-  data.tar.gz: 1b01c2da357fcdf719a6207854df618c1bb7654832a06612abc084a718661e3388e52a27d85a40e730811c7f3f1e100ed2286642c951afbf6faa2e51ec45b0c4
+  metadata.gz: 83be864e4e5b9d12b9dd148b45640742c5d6754f058e5f8f7ee602a5822af4836308ee39c6ab828256aa67acb2d87f8d6677dfb75bf0c59bbbeb8a2dc4409a10
+  data.tar.gz: 3b74fc7608493a0bea334ee4e508edf1dec92800fa2d438defe2f417624e6fd9a866d2da5d59094b92a70e326007cfbe02edcdd5b54d0eb1127255b3b2f985a3

data/app/lib/katello/resources/candlepin/content.rb

@@ -12,8 +12,9 @@ module Katello
             JSON.parse(content_json).with_indifferent_access
           end
 
-          def all(owner_label)
-            content_json = Candlepin::CandlepinResource.get(path(owner_label), self.default_headers).body
+          def all(owner_label, include_only: nil)
+            includes = include_only ? "?#{included_list(include_only)}" : ""
+            content_json = Candlepin::CandlepinResource.get(path(owner_label) + includes, self.default_headers).body
             JSON.parse(content_json)
           end
 

data/app/models/katello/host/info_provider.rb

@@ -28,7 +28,7 @@ module Katello
           'label' => host.content_view.try(:label),
           'latest-version' => host.content_view.try(:latest_version),
           'version' => content_version.try(:version),
-          'published' => content_version.try(:created_at).try(:time),
+          'published' => content_version.try(:created_at).try(:time).to_s,
           'components' => content_view_components
         }
 
@@ -43,7 +43,7 @@ module Katello
           cv_label = cv.component_version.content_view.label
           components[cv_label] = {}
           components[cv_label]['version'] = cv.component_version.try(:version)
-          components[cv_label]['published'] = cv.component_version.try(:created_at).try(:time)
+          components[cv_label]['published'] = cv.component_version.try(:created_at).try(:time).to_s
         end
         components
       end

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

@@ -6,9 +6,9 @@ UpgradeTask.define_tasks(:katello) do
     {: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:update_gpg_key_urls'},
     {: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'}
-
   ]
 end

data/lib/katello/tasks/upgrades/3.10/update_gpg_key_urls.rake

@@ -0,0 +1,32 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.10' do
+      desc "Update repositories with API V1 GPG URLs"
+      task :update_gpg_key_urls => ["environment", "katello:check_ping"] do
+        User.current = User.anonymous_admin
+
+        ::Organization.all.each do |org|
+          org_contents = Katello::Resources::Candlepin::Content.all(org.label, include_only: [:id, :gpgUrl])
+
+          org_contents.each do |cp_content|
+            gpg_url = cp_content['gpgUrl']
+            if gpg_url && gpg_url.match(/katello\/api\/repositories/)
+              content = Katello::Content.where(cp_content_id: cp_content['id'], organization: org).first
+
+              if content.nil?
+                Rails.logger.warn("Candlepin Content id=#{cp_content['id']} isn't in our DB. Try running 'rake katello:reimport' first.")
+              else
+                root_repo = Katello::RootRepository.in_organization(org).where(content_id: content.cp_content_id).first
+                new_gpg_url = root_repo.library_instance.yum_gpg_key_url
+                cp_content['gpgUrl'] = new_gpg_url
+                Katello::Resources::Candlepin::Content.update(org.label, cp_content)
+                content.gpg_url = new_gpg_url
+                content.save!
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.11.1".freeze
+  VERSION = "3.11.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.11.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2238,6 +2238,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.10/update_gpg_key_urls.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.8/clear_checksum_type.rake
@@ -2674,7 +2675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ''