katello 3.10.1.1 → 3.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '087bc97edc39f4b7908123edaad6e55681fcbbfcb97f8893b1b65f66fc32524a'
-  data.tar.gz: 61dc569f04b31039e5d388fd5bcdac63ebee181881b5129bfa32be385aded197
+  metadata.gz: 60a32175969fbaf3d07e70d2d7eeaa593be7e0a43495475c777321e4c0412c9a
+  data.tar.gz: b3bf8a7d38822fef072ce04c26759e1456d028a154eac96fb3d1583b3900c550
 SHA512:
-  metadata.gz: 4785900de31d50e44bb40cd203851026beca678fc2fd857e5db2b6115574a98971b3aab0846c9c10add3ba1b4774007f32caf48c5ad66078e50cf17338a99333
-  data.tar.gz: 439ef7806bb5ac4168aa771cd6964c99789028f1c9e3a76679fd700e8df97d9d82952da42a28624093e734fabc4d17072c5f00738aca0e8b19362ce119365f45
+  metadata.gz: c60fb44171334e6ab716824ec893b35489d9ce5c6b1f2620fdd8e416b60d7b9f787a6b0311c48e50cfe9010f7aca4635d314ff7309c31d972b5071359e3f3ef6
+  data.tar.gz: 5e2b0a41509fa090c341676c5946ff8e939b77909be7777b9185f138bb7a94a970cdf8cc4ebf2247ff28ba3568da3396c6c17c09dfcae7f91b1b4a2d71f438e8

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,6 +6,7 @@ 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:update_puppet_repos'}
   ]
 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.10.1.1".freeze
+  VERSION = "3.10.2".freeze
 end

data/package.json

@@ -59,7 +59,7 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "^2.5.1",
+    "patternfly-react": "<=2.32.0",
     "prop-types": "^15.6.0",
     "query-string": "^6.1.0",
     "react": "^16.4.0",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.10.1.1
+  version: 3.10.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2236,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.10/update_gpg_key_urls.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