katello 3.15.2 → 3.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad9b04f40e657a51875c8695653860da9fb8ae7
-  data.tar.gz: 812424e72605d87d742fa45d14b09a9eaebeaa30
+  metadata.gz: 54f3c8f8f08fc3a97cb04de42a964ed3d108177e
+  data.tar.gz: 78a9f9aeedd477f1d00419723aa0f6394d5059dc
 SHA512:
-  metadata.gz: 5e2c8979164f4403578cd093a6b34cb88bc091aa28179bb2c420730cc2bb10e2bf0cdf7ba2e5ac445b78cc0ba3fa46a21c4ce85c3447b88a8535b0ef5898f7c4
-  data.tar.gz: a8634db2c5e979b92723e368dbf92e42766d5f20d0f8757b4f88f3ac6bf56eb7c7e4f86e14510b6bb6101d517713b915aff01f6d5145ea2ac2c85ac05e0fb87c
+  metadata.gz: 88a7845a0580e2a15ea5369a3a456a9721d1e21cee99f4778afae02f36e0998e9fed606a38354803332eded5896f5db01d24ca4ab87e127e27bc6355f7ff9d7c
+  data.tar.gz: 221debb1187c60710e648fcdd047a278fa5d6aa2d0f86b6b76ad126d2b2e096a969c88a2df639025077d10572ae55e4e5d2167cbc3ac1bb86b5db44015235a58

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

@@ -8,6 +8,7 @@ module Katello
           :inverse_of => :http_proxy, :dependent => :nullify
         after_update :update_default_proxy_setting
         after_commit :update_repository_proxy_details
+        before_destroy :remove_references_to_proxy
 
         def self.default_global_content_proxy
           if Setting[:content_default_http_proxy]
@@ -16,6 +17,34 @@ module Katello
         end
       end
 
+      def repositories_with_proxy(proxy_id)
+        root_repos = RootRepository.with_selected_proxy(proxy_id)
+
+        if self == HttpProxy.default_global_content_proxy
+          root_repos += RootRepository.with_global_proxy
+        end
+
+        root_repos
+      end
+
+      def remove_references_to_proxy
+        root_repos = repositories_with_proxy(nil).uniq.sort
+
+        setting = Setting.find_by(name: 'content_default_http_proxy')
+        if setting&.value && setting.value == self.name
+          setting.update_attribute(:value, '')
+        end
+
+        unless root_repos.empty?
+          ForemanTasks.async_task(
+            ::Actions::BulkAction,
+            ::Actions::Katello::Repository::Update,
+            root_repos,
+            http_proxy_policy: Katello::RootRepository::GLOBAL_DEFAULT_HTTP_PROXY,
+            http_proxy_id: nil)
+        end
+      end
+
       def update_default_proxy_setting
         changes = self.previous_changes
         if changes.key?(:name)
@@ -32,13 +61,7 @@ module Katello
         changes = self.previous_changes
         if changes.key?(:url) || changes.key?(:username) || changes.key?(:password)
 
-          root_repos = RootRepository.with_selected_proxy(id)
-
-          if self == HttpProxy.default_global_content_proxy
-            root_repos += RootRepository.with_global_proxy
-          end
-
-          repos = root_repos.uniq.collect(&:library_instance)
+          repos = repositories_with_proxy(id).uniq.collect(&:library_instance)
 
           unless repos.empty?
             ForemanTasks.async_task(

data/app/models/katello/root_repository.rb

@@ -97,7 +97,7 @@ module Katello
     scope :with_no_proxy, -> { where(:http_proxy_policy => RootRepository::NO_DEFAULT_HTTP_PROXY) }
     scope :with_selected_proxy, ->(http_proxy_id) {
       where(:http_proxy_policy => RootRepository::USE_SELECTED_HTTP_PROXY).
-      where("http_proxy_id = ?", http_proxy_id)
+      where(:http_proxy_id => http_proxy_id)
     }
     delegate :redhat?, :provider, :organization, to: :product
 

data/app/models/setting/content.rb

@@ -2,7 +2,7 @@ class Setting::Content < Setting
   #rubocop:disable Metrics/MethodLength
   #rubocop:disable Metrics/AbcSize
 
-  validate :content_default_http_proxy, if: proc { |s| s.name == 'content_default_http_proxy' }
+  validate :content_default_http_proxy, if: proc { |s| s.name == 'content_default_http_proxy' && HttpProxy.table_exists? }
 
   after_save :add_organizations_and_locations_if_global_http_proxy
 

data/lib/katello/tasks/common.rake

@@ -0,0 +1,7 @@
+namespace :katello do
+  task :disable_dynflow do
+    #Ensures that we run as a dynflow 'client'
+    ::Rails.application.dynflow.initialize!
+    ForemanTasks.dynflow.config.remote = true
+  end
+end

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,7 +1,9 @@
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
+
 namespace :katello do
   desc "Remove orphaned and unneeded content/repos from a smart proxy.\
         Run with SMART_PROXY_ID=1 to run for a single smart proxy."
-  task :delete_orphaned_content => ["environment"] do
+  task :delete_orphaned_content => ["environment", "disable_dynflow"] do
     User.current = User.anonymous_admin
     smart_proxy_id = ENV['SMART_PROXY_ID']
     if smart_proxy_id

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,3 +1,5 @@
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
+
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
   task :pulp3_migration => ["environment", "disable_dynflow", "check_ping"] do

data/lib/katello/tasks/repository.rake

@@ -1,8 +1,6 @@
-namespace :katello do
-  task :disable_dynflow do
-    ForemanTasks.dynflow.config.remote = true
-  end
+load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
 
+namespace :katello do
   def commit?
     ENV['COMMIT'] == 'true' || ENV['FOREMAN_UPGRADE'] == '1'
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.2".freeze
+  VERSION = "3.15.3".freeze
 end

data/webpack/components/Content/ContentTable.js

@@ -34,6 +34,8 @@ const ContentTable = ({ content, tableSchema, onPaginationChange }) => {
 ContentTable.propTypes = {
   content: PropTypes.shape({
     loading: PropTypes.bool,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     itemCount: PropTypes.number,

data/webpack/components/Content/Details/ContentDetails.js

@@ -59,9 +59,12 @@ ContentDetails.propTypes = {
   contentDetails: PropTypes.shape({
     loading: PropTypes.bool,
     name: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     profiles: PropTypes.array,
     repositories: PropTypes.array,
     artifacts: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
     stream: PropTypes.string,
   }).isRequired,
   schema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,

data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js

@@ -83,8 +83,11 @@ AnsibleCollectionDetails.propTypes = {
     name: PropTypes.string,
     namespace: PropTypes.string,
     version: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     repositories: PropTypes.array,
     tags: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
   }).isRequired,
 };
 

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js

@@ -81,9 +81,12 @@ ModuleStreamDetails.propTypes = {
   moduleStreamDetails: PropTypes.shape({
     loading: PropTypes.bool,
     name: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     profiles: PropTypes.array,
     repositories: PropTypes.array,
     artifacts: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
     stream: PropTypes.string,
   }).isRequired,
 };

data/webpack/scenes/RedHatRepositories/RedHatRepositoriesPage.js

@@ -111,6 +111,8 @@ RedHatRepositoriesPage.propTypes = {
     recommended: PropTypes.bool,
     loading: PropTypes.bool,
     search: PropTypes.shape({}),
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     missingPermissions: PropTypes.array,
   }).isRequired,
 };

data/webpack/scenes/RedHatRepositories/components/EnabledRepository/EnabledRepository.js

@@ -94,6 +94,8 @@ EnabledRepository.propTypes = {
   search: PropTypes.shape({
     query: PropTypes.string,
     searchList: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     filters: PropTypes.array,
   }),
   pagination: PropTypes.shape({

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository/RepositorySetRepository.js

@@ -141,6 +141,8 @@ RepositorySetRepository.propTypes = {
   enabledSearch: PropTypes.shape({
     query: PropTypes.string,
     searchList: PropTypes.string,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     filters: PropTypes.array,
   }),
   enabledPagination: PropTypes.shape({

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

@@ -45,6 +45,8 @@ SubscriptionDetailAssociations.propTypes = {
   subscriptionDetails: PropTypes.shape({
     id: PropTypes.number,
     host_count: PropTypes.number,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     activation_keys: PropTypes.array,
   }).isRequired,
 };

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

@@ -50,6 +50,8 @@ const SubscriptionDetailProductContent = ({ productContent }) => {
 
 SubscriptionDetailProductContent.propTypes = {
   productContent: PropTypes.shape({
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
 };

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

@@ -18,6 +18,8 @@ const SubscriptionDetailProducts = ({ subscriptionDetails }) => (
 
 SubscriptionDetailProducts.propTypes = {
   subscriptionDetails: PropTypes.shape({
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     provided_products: PropTypes.array,
   }).isRequired,
 };

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -352,6 +352,8 @@ ManageManifestModal.propTypes = {
   simpleContentAccess: PropTypes.bool,
   manifestHistory: PropTypes.shape({
     loading: PropTypes.bool,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
   setModalClosed: PropTypes.func.isRequired,

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -264,10 +264,13 @@ SubscriptionsPage.propTypes = {
   loadTableColumns: PropTypes.func.isRequired,
   simpleContentAccess: PropTypes.bool,
   subscriptions: PropTypes.shape({
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    /* eslint-disable react/forbid-prop-types */
     disconnected: PropTypes.bool,
     tableColumns: PropTypes.array,
     selectedTableColumns: PropTypes.array,
     missingPermissions: PropTypes.array,
+    /* eslint-enable react/forbid-prop-types */
   }).isRequired,
   activePermissions: PropTypes.shape({
     can_delete_manifest: PropTypes.bool,

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js

@@ -262,6 +262,8 @@ UpstreamSubscriptionsPage.propTypes = {
   upstreamSubscriptions: PropTypes.shape({
     loading: PropTypes.bool,
     itemCount: PropTypes.number,
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     task: PropTypes.shape({

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -276,6 +276,8 @@ SubscriptionsTable.propTypes = {
   subscriptions: PropTypes.shape({
     loading: PropTypes.bool,
     availableQuantities: PropTypes.shape({}),
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
   subscriptionDeleteModalOpen: PropTypes.bool.isRequired,

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/UpdateDialog.js

@@ -47,7 +47,7 @@ const UpdateDialog = ({
 UpdateDialog.propTypes = {
   show: PropTypes.bool.isRequired,
   updateQuantity: PropTypes.func.isRequired,
-  updatedQuantity: PropTypes.shape(PropTypes.Object).isRequired,
+  updatedQuantity: PropTypes.shape({}).isRequired,
   showUpdateConfirm: PropTypes.func.isRequired,
   enableEditing: PropTypes.func.isRequired,
 };

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Dialogs/index.js

@@ -17,10 +17,10 @@ const Dialogs = ({
 );
 
 Dialogs.propTypes = {
-  updateDialog: PropTypes.shape(UpdateDialog.propTypes).isRequired,
-  unsavedChangesDialog: PropTypes.shape(UnsavedChangesDialog.propTypes).isRequired,
-  inputsErrorsDialog: PropTypes.shape(InputsErrorsDialog.propTypes).isRequired,
-  deleteDialog: PropTypes.shape(DeleteDialog.propTypes).isRequired,
+  updateDialog: PropTypes.shape({}).isRequired,
+  unsavedChangesDialog: PropTypes.shape({}).isRequired,
+  inputsErrorsDialog: PropTypes.shape({}).isRequired,
+  deleteDialog: PropTypes.shape({}).isRequired,
 };
 
 export default Dialogs;

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js

@@ -95,6 +95,8 @@ Table.propTypes = {
     searchIsActive: PropTypes.bool,
     itemCount: PropTypes.number,
     pagination: PropTypes.shape({}),
+    // Disabling rule as existing code failed due to an eslint-plugin-react update
+    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
   }).isRequired,
   loadSubscriptions: PropTypes.func.isRequired,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.3
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -4125,6 +4125,7 @@ files:
 - lib/katello/tasks/clean_backend_objects.rake
 - lib/katello/tasks/clean_old_file_repos.rake
 - lib/katello/tasks/clean_published_repo_directories.rake
+- lib/katello/tasks/common.rake
 - lib/katello/tasks/delete_orphaned_content.rake
 - lib/katello/tasks/import_applicability.rake
 - lib/katello/tasks/import_subscriptions.rake