katello 4.13.0 → 4.13.1

data/webpack/global_test_setup.js.bak

@@ -0,0 +1,59 @@
+import nock from 'nock';
+import checkForOuiaIds from './ouia_id_check';
+
+// runs before each test to make sure console.error output will
+// fail a test (i.e. default PropType missing). Check the error
+// output and traceback for actual error.
+const originalConsoleError = global.console.error;
+global.console.error = (error, stack) => {
+  originalConsoleError(error); // ensure error is printed to console, comment
+  // in case of ouia-id check
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  // const ignore = ['in ForwardRef (created by Tabs)',
+  //    'in Button (created by Label)', 'created by _default',
+  //    'created by PaginationOptionsMenu', 'created by TypeAheadItems',
+  //    'The prop `ouiaId` is marked as required in `Modal`, but its value is `undefined`',
+  //    'created by WizardHeader', 'created by Navigation',
+  //    'created by ActionsColumn', 'created by InactiveText', 'created by Select',
+  //    'created by Context.Consumer', 'created by DualListSelector'];
+
+  /* eslint-disable-next-line no-console */
+  if (stack) console.log(stack); // Prints out original stack trace
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  //  if (error && !ignore.some(e => error.includes(e))) {
+  //   originalConsoleError(error); // ensure error is printed to console
+  //   console.log(stack); // Prints out original stack trace
+  // }
+
+  throw new Error(error); // comment this and uncomment the next line when checking for ouia ids
+  // if (!error.includes('Failed prop type')) throw new Error(error);
+};
+
+// Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
+jest.setTimeout(process.env.JEST_TIMEOUT || 15000);
+
+// uncomment this to see if tests are trying to make real API requests
+// beforeAll(() => {
+//   nock.disableNetConnect();
+// });
+
+afterAll(() => {
+  jest.resetModules();
+  if (global.gc) global.gc();
+});
+
+beforeEach(() => {
+  if (!nock.isActive()) { nock.activate(); }
+});
+
+// To see where you need to add ouiaIds:
+// 1. uncomment this and the import above
+checkForOuiaIds();
+// 2. (optional) uncomment the line in global.console.error function above
+
+afterEach(() => {
+  nock.cleanAll();
+});
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.13.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,21 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: anemone
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webrick
+  name: spidr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -258,6 +244,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -268,6 +257,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +270,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -288,6 +283,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
 - !ruby/object:Gem::Dependency
   name: pulp_ansible_client
   requirement: !ruby/object:Gem::Requirement
@@ -354,20 +352,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.25.2
+        version: 3.26.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.25.2
+        version: 3.26.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.27.0
 - !ruby/object:Gem::Dependency
   name: pulp_certguard_client
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +376,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -388,6 +389,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.50.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 3.49.14
 - !ruby/object:Gem::Dependency
   name: pulp_python_client
   requirement: !ruby/object:Gem::Requirement
@@ -1043,6 +1047,8 @@ files:
 - app/lib/katello/resources/candlepin/upstream_pool.rb
 - app/lib/katello/resources/cdn.rb
 - app/lib/katello/resources/cdn/katello_cdn.rb
+- app/lib/katello/resources/discovery/container.rb
+- app/lib/katello/resources/discovery/yum.rb
 - app/lib/katello/resources/registry.rb
 - app/lib/katello/util/candlepin_repository_checker.rb
 - app/lib/katello/util/cdn_var_substitutor.rb
@@ -1053,6 +1059,7 @@ files:
 - app/lib/katello/util/errata.rb
 - app/lib/katello/util/filter_clause_generator.rb
 - app/lib/katello/util/hostgroup_facets_helper.rb
+- app/lib/katello/util/http_helper.rb
 - app/lib/katello/util/http_proxy.rb
 - app/lib/katello/util/model.rb
 - app/lib/katello/util/module_stream_clause_generator.rb
@@ -1097,6 +1104,7 @@ files:
 - app/mailers/katello/errata_mailer.rb
 - app/mailers/katello/subscription_mailer.rb
 - app/mailers/katello/task_mailer.rb
+- app/models/732bd3db9f64c621c64d2be4f2a838727aac0845.patch
 - app/models/katello/activation_key.rb
 - app/models/katello/activation_key_purpose_addon.rb
 - app/models/katello/alternate_content_source.rb
@@ -1257,6 +1265,7 @@ files:
 - app/models/katello/pulp3/repository_reference.rb
 - app/models/katello/purpose_addon.rb
 - app/models/katello/repository.rb
+- app/models/katello/repository.rb.bak
 - app/models/katello/repository_ansible_collection.rb
 - app/models/katello/repository_content_view_filter.rb
 - app/models/katello/repository_deb.rb
@@ -1348,8 +1357,10 @@ files:
 - app/services/katello/pulp3/content_view_version/import_export_common.rb
 - app/services/katello/pulp3/content_view_version/import_gpg_keys.rb
 - app/services/katello/pulp3/content_view_version/import_validator.rb
+- app/services/katello/pulp3/content_view_version/import_validator.rb.bak
 - app/services/katello/pulp3/content_view_version/importable_products.rb
 - app/services/katello/pulp3/content_view_version/importable_repositories.rb
+- app/services/katello/pulp3/content_view_version/importable_repositories.rb.bak
 - app/services/katello/pulp3/content_view_version/metadata_generator.rb
 - app/services/katello/pulp3/content_view_version/metadata_map.rb
 - app/services/katello/pulp3/content_view_version/syncable_format_export.rb
@@ -2060,7 +2071,6 @@ files:
 - db/migrate/20240423112842_add_fields_to_katello_docker_manifest.rb
 - db/migrate/20240502192021_change_katello_repository_rpms_id_seq_to_big_int.rb
 - db/migrate/20240520142245_add_container_push_props_to_repo.rb
-- db/migrate/20240531193030_remove_sha1_repository_checksum_type.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -4340,6 +4350,7 @@ files:
 - lib/katello/tasks/test.rake
 - lib/katello/tasks/unify_hosts.rake
 - lib/katello/tasks/update_content_default_http_proxy.rake
+- lib/katello/tasks/update_repository_expiry.rake
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/4.0/remove_ostree_puppet_content.rake
@@ -4356,7 +4367,6 @@ files:
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb
 - lib/katello/version.rb
-- lib/monkeys/anemone.rb
 - lib/monkeys/ar_postgres_evr_t.rb
 - lib/monkeys/fx_sqlite_skip.rb
 - lib/monkeys/remove_hidden_distribution.rb
@@ -4368,102 +4378,150 @@ files:
 - locale/action_names.rb
 - locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
+- locale/bn/katello.po.time_stamp
 - locale/bn_IN/LC_MESSAGES/katello.mo
 - locale/bn_IN/katello.po
+- locale/bn_IN/katello.po.time_stamp
 - locale/ca/LC_MESSAGES/katello.mo
 - locale/ca/katello.po
+- locale/ca/katello.po.time_stamp
 - locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
+- locale/cs/katello.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/katello.mo
 - locale/cs_CZ/katello.po
+- locale/cs_CZ/katello.po.time_stamp
 - locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
+- locale/de/katello.po.time_stamp
 - locale/de_AT/LC_MESSAGES/katello.mo
 - locale/de_AT/katello.po
+- locale/de_AT/katello.po.time_stamp
 - locale/de_DE/LC_MESSAGES/katello.mo
 - locale/de_DE/katello.po
+- locale/de_DE/katello.po.time_stamp
 - locale/el/LC_MESSAGES/katello.mo
 - locale/el/katello.po
+- locale/el/katello.po.time_stamp
 - locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
+- locale/en/katello.po.time_stamp
 - locale/en_GB/LC_MESSAGES/katello.mo
 - locale/en_GB/katello.po
+- locale/en_GB/katello.po.time_stamp
 - locale/en_US/LC_MESSAGES/katello.mo
 - locale/en_US/katello.po
+- locale/en_US/katello.po.time_stamp
 - locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
+- locale/es/katello.po.time_stamp
 - locale/et_EE/LC_MESSAGES/katello.mo
 - locale/et_EE/katello.po
+- locale/et_EE/katello.po.time_stamp
 - locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
+- locale/fr/katello.po.time_stamp
 - locale/gl/LC_MESSAGES/katello.mo
 - locale/gl/katello.po
+- locale/gl/katello.po.time_stamp
 - locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
+- locale/gu/katello.po.time_stamp
 - locale/he_IL/LC_MESSAGES/katello.mo
 - locale/he_IL/katello.po
+- locale/he_IL/katello.po.time_stamp
 - locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
+- locale/hi/katello.po.time_stamp
 - locale/id/LC_MESSAGES/katello.mo
 - locale/id/katello.po
+- locale/id/katello.po.time_stamp
 - locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
+- locale/it/katello.po.time_stamp
 - locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
+- locale/ja/katello.po.time_stamp
 - locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
+- locale/ka/katello.po.time_stamp
 - locale/katello.pot
 - locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
+- locale/kn/katello.po.time_stamp
 - locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
+- locale/ko/katello.po.time_stamp
 - locale/ml_IN/LC_MESSAGES/katello.mo
 - locale/ml_IN/katello.po
+- locale/ml_IN/katello.po.time_stamp
 - locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
+- locale/mr/katello.po.time_stamp
 - locale/nl_NL/LC_MESSAGES/katello.mo
 - locale/nl_NL/katello.po
+- locale/nl_NL/katello.po.time_stamp
 - locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
+- locale/or/katello.po.time_stamp
 - locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
+- locale/pa/katello.po.time_stamp
 - locale/pl/LC_MESSAGES/katello.mo
 - locale/pl/katello.po
+- locale/pl/katello.po.time_stamp
 - locale/pl_PL/LC_MESSAGES/katello.mo
 - locale/pl_PL/katello.po
+- locale/pl_PL/katello.po.time_stamp
 - locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
+- locale/pt/katello.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
+- locale/pt_BR/katello.po.time_stamp
 - locale/ro/LC_MESSAGES/katello.mo
 - locale/ro/katello.po
+- locale/ro/katello.po.time_stamp
 - locale/ro_RO/LC_MESSAGES/katello.mo
 - locale/ro_RO/katello.po
+- locale/ro_RO/katello.po.time_stamp
 - locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
+- locale/ru/katello.po.time_stamp
 - locale/sl/LC_MESSAGES/katello.mo
 - locale/sl/katello.po
+- locale/sl/katello.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/katello.mo
 - locale/sv_SE/katello.po
+- locale/sv_SE/katello.po.time_stamp
 - locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
+- locale/ta/katello.po.time_stamp
 - locale/ta_IN/LC_MESSAGES/katello.mo
 - locale/ta_IN/katello.po
+- locale/ta_IN/katello.po.time_stamp
 - locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
+- locale/te/katello.po.time_stamp
 - locale/tr/LC_MESSAGES/katello.mo
 - locale/tr/katello.po
+- locale/tr/katello.po.time_stamp
 - locale/update-i18n
 - locale/vi/LC_MESSAGES/katello.mo
 - locale/vi/katello.po
+- locale/vi/katello.po.time_stamp
 - locale/vi_VN/LC_MESSAGES/katello.mo
 - locale/vi_VN/katello.po
+- locale/vi_VN/katello.po.time_stamp
 - locale/zh/LC_MESSAGES/katello.mo
 - locale/zh/katello.po
+- locale/zh/katello.po.time_stamp
 - locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
+- locale/zh_CN/katello.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
+- locale/zh_TW/katello.po.time_stamp
 - package.json
 - vendor/assets/images/katello/add2.png
 - vendor/assets/images/katello/addhost.png
@@ -4798,6 +4856,7 @@ files:
 - webpack/containers/Application/withHeaders.js
 - webpack/global_index.js
 - webpack/global_test_setup.js
+- webpack/global_test_setup.js.bak
 - webpack/index.js
 - webpack/mockRequest.js
 - webpack/ouia_id_check.js
@@ -5421,7 +5480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman

data/db/migrate/20240531193030_remove_sha1_repository_checksum_type.rb

@@ -1,10 +0,0 @@
-class RemoveSha1RepositoryChecksumType < ActiveRecord::Migration[6.1]
-  def up
-    ::Katello::Repository.where(saved_checksum_type: 'sha1').update(saved_checksum_type: nil)
-    ::Katello::RootRepository.where(checksum_type: 'sha1').update(checksum_type: nil)
-  end
-
-  def down
-    fail ActiveRecord::IrreversibleMigration
-  end
-end

data/lib/monkeys/anemone.rb

@@ -1,33 +0,0 @@
-# Provides a patch to https://github.com/chriskite/anemone/blob/next/lib/anemone/http.rb#L162
-# to allow providing proxy user and password
-
-module Anemone
-  class HTTP
-    #
-    # The proxy user string
-    #
-    def proxy_user
-      @opts[:proxy_user]
-    end
-
-    #
-    # The proxy password
-    #
-    def proxy_password
-      @opts[:proxy_password]
-    end
-
-    def refresh_connection(url)
-      http = Net::HTTP.new(url.host, url.port, proxy_host, proxy_port, proxy_user, proxy_password)
-
-      http.read_timeout = read_timeout if read_timeout
-
-      if url.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      @connections[url.host][url.port] = http.start
-    end
-  end
-end