katello 4.7.1 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fd9bf94317048633ae54a2cf106cc08d6248b531e3da56bc68fb43fe5f018e
-  data.tar.gz: 76539311bac6cda0b3cceec6b5d6bdf5407ad5c836807df5f35a48f5a5395212
+  metadata.gz: 1085e9921f43ff4ed75e3f6f8a21769ed8866b91d5e5715a20a6a39317d9695a
+  data.tar.gz: 64599d569adf852a6f5b7dc82f23c204f386bc0361e8fb345fedcd2b73a7d1d0
 SHA512:
-  metadata.gz: 8de554bb59b8f31e882f41926695708f1b92107c1da3a6479aaad00f6abe3f4477d3ce010af4f6ee846796ffb7c7782cbe4df545f52caee7ce93cb24e7f8cefd
-  data.tar.gz: 6835bc877ac980afa81cd3166812972c0d8caac75407f670d55f8537027aab8b2f9f9e69351835ac54373a7d10f80090e02384ea9d61381b5d2eb37598a3406b
+  metadata.gz: 1006d71c0a3562cc415a9117664450bc5bb8f65058ddfc4d0d56a55d42ef49d5b6fdb27ab5e493510b2febfc964fb80789747014db7dbee376158f98f8d7de0f
+  data.tar.gz: fc20f108a5658f8ceef9aadfcb2d19443645d57b9b9f4770ae14f4f2521572cb5bffefd0148f594aadbc94d0a04df83dbb9f3d94d4c0cb9944c74a876b4bcff8

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

@@ -341,6 +341,7 @@ module Katello
     end
 
     def validate_release_version
+      @organization ||= find_organization
       if params[:release_version].present? && !@organization.library.available_releases.include?(params[:release_version])
         fail HttpErrors::BadRequest, _("Invalid release version: [%s]") % params[:release_version]
       end

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

@@ -1,7 +1,6 @@
 module Katello
   class Api::V2::SimpleContentAccessController < Api::V2::ApiController
     before_action :find_organization
-    before_action :check_upstream_connection
 
     resource_description do
       description "Red Hat subscriptions management platform."
@@ -11,7 +10,8 @@ module Katello
     api :GET, "/organizations/:organization_id/simple_content_access/eligible",
       N_("Check if the specified organization is eligible for Simple Content Access")
     def eligible
-      eligible = @organization.upstream_consumer.simple_content_access_eligible?
+      ::Foreman::Deprecation.api_deprecation_warning("This endpoint is deprecated and will be removed in a future release. All organizations are now eligible for Simple Content Access.")
+      eligible = @organization.simple_content_access_eligible?
       render json: { simple_content_access_eligible: eligible }
     end
 

data/app/lib/actions/candlepin/environment/set_content.rb

@@ -52,7 +52,13 @@ module Actions
         def existing_ids
           ::Katello::Resources::Candlepin::Environment.
               find(input[:cp_environment_id])[:environmentContent].map do |content|
-            content[:content][:id]
+            if content.key?('contentId')
+              # Supports Candlepin 4.2.11 and up
+              content['contentId']
+            else
+              # Supports Candlepin versions below 4.2.11
+              content[:content][:id]
+            end
           end
         end
       end

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

@@ -9,6 +9,7 @@ module Actions
           action_subject root.library_instance
 
           repo_params[:url] = nil if repo_params[:url] == ''
+          repo_params[:checksum_type] = nil if repo_params[:download_policy] == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
           update_cv_cert_protected = repo_params.key?(:unprotected) && (repo_params[:unprotected] != repository.unprotected)
           create_acs = create_acs?(repository.url, repo_params[:url])
           delete_acs = delete_acs?(repository.url, repo_params[:url])

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

@@ -90,6 +90,10 @@ module Katello
           self.providers.anonymous.first
         end
 
+        def simple_content_access_eligible?
+          self.content_access_mode_list.include?('org_environment')
+        end
+
         def manifest_imported?(cached: false)
           Rails.cache.fetch("#{self.label}_manifest_imported?", expires_in: 1.minute, force: !cached) do
             owner_details['upstreamConsumer'].present?
@@ -238,10 +242,6 @@ module Katello
           # doesn't provide much benefit for the frustration it creates.
           self.save(validate: false)
         end
-
-        def upstream_consumer
-          Katello::Candlepin::UpstreamConsumer.new(self)
-        end
       end
     end
   end

data/app/models/katello/glue/candlepin/owner.rb

@@ -45,6 +45,10 @@ module Katello
         self.owner_details['contentAccessMode']
       end
 
+      def content_access_mode_list
+        self.owner_details['contentAccessModeList'].split(',')
+      end
+
       def simple_content_access?(cached: true)
         Rails.cache.fetch("#{self.label}_simple_content_access?", expires_in: 1.minute, force: !cached) do
           content_access_mode == "org_environment"

data/app/services/katello/pulp3/ansible_collection.rb

@@ -30,22 +30,25 @@ module Katello
       end
 
       def self.insert_child_associations(units, pulp_id_to_id)
-        tag_names = units.map { |unit| unit['tags'].map { |tag| tag[:name] } }.flatten
-        tag_rows = tag_names.map { |name| {name: name } }
-        Katello::AnsibleTag.insert_all(tag_rows, unique_by: [:name]) if tag_rows.any?
-
+        insert_tags units
         collection_tag_rows = []
         units.each do |unit|
           katello_id = pulp_id_to_id[unit['pulp_href']]
           #delete old tags
-          unit_tags = unit['tags'].map { |tag| tag[:name] }
+          unit_tags = unit['tags']&.map { |tag| tag[:name] }
           Katello::AnsibleCollectionTag.where(:ansible_collection_id => katello_id).where.not(:ansible_tag_id => Katello::AnsibleTag.where(:name => unit_tags)).delete_all
-          collection_tag_rows += Katello::AnsibleTag.where(:name => unit_tags).pluck(:id).map { |tag_id| {ansible_collection_id: katello_id, ansible_tag_id: tag_id} }
+          collection_tag_rows += Katello::AnsibleTag.where(:name => unit_tags)&.pluck(:id)&.map { |tag_id| {ansible_collection_id: katello_id, ansible_tag_id: tag_id} }
         end
 
         collection_tag_rows.flatten!
         Katello::AnsibleCollectionTag.insert_all(collection_tag_rows, unique_by: [:ansible_collection_id, :ansible_tag_id]) unless collection_tag_rows.empty?
       end
+
+      def self.insert_tags(units)
+        tag_names = units.map { |unit| unit['tags']&.map { |tag| tag[:name] } }&.flatten
+        tag_rows = tag_names&.compact&.map { |name| {name: name } }
+        Katello::AnsibleTag.insert_all(tag_rows, unique_by: [:name]) if tag_rows.any?
+      end
     end
   end
 end

data/app/services/katello/pulp3/repository.rb

@@ -385,6 +385,8 @@ module Katello
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?
         remote_options.merge!(username: root&.upstream_username,
                               password: root&.upstream_password)
+        remote_options[:username] = nil if remote_options[:username] == ''
+        remote_options[:password] = nil if remote_options[:password] == ''
         remote_options.merge!(ssl_remote_options)
       end
 

data/app/services/katello/pulp3/smart_proxy_mirror_repository.rb

@@ -26,7 +26,7 @@ module Katello
           api = repo_type.pulp3_api(smart_proxy)
           version_hrefs = api.repository_versions
           orphan_version_hrefs = api.list_all.collect do |pulp_repo|
-            mirror_repo_versions = api.versions_list_for_repository(pulp_repo.pulp_href, ordering: :_created)
+            mirror_repo_versions = api.versions_list_for_repository(pulp_repo.pulp_href, ordering: ['-pulp_created'])
             version_hrefs = mirror_repo_versions.select { |repo_version| repo_version.number != 0 }.collect { |version| version.pulp_href }
 
             version_hrefs - [pulp_repo.latest_version_href]
@@ -104,7 +104,7 @@ module Katello
 
           remotes.each do |remote|
             if !repo_names.include?(remote.name) && !acs_remotes.include?(remote.pulp_href)
-              tasks << api.delete_remote(href: remote.pulp_href)
+              tasks << api.delete_remote(remote.pulp_href)
             end
           end
         end

data/db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb

@@ -0,0 +1,9 @@
+class EnsureRepoUsernamePasswordNilNotBlank < ActiveRecord::Migration[6.1]
+  def change
+    ::Katello::Repository.library.each do |repo|
+      if repo.upstream_username == '' && repo.upstream_password == ''
+        repo.update(upstream_username: nil, upstream_password: nil)
+      end
+    end
+  end
+end

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -21,17 +21,17 @@
     angular.module('Bastion').value('simpleContentAccessEnabled', <%= Organization.current.simple_content_access? if Organization.current %>);
     angular.module('Bastion').value('isManifestImported', <%= !!Organization.current&.manifest_imported?(cached: true) %>)
     angular.module('Bastion').value('foreman', tfm);
-    angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
-    angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
-    angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));
+    angular.module('Bastion').value('repositoryTypes', angular.fromJson(`<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>`));
+    angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`));
+    angular.module('Bastion').value('globalContentProxy', angular.fromJson(`<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>`));
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");
-    angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
+    angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`));
     angular.module('Bastion.auth').value('CurrentUser', {
         id: <%= User.current.id %>,
         admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
     });
-    angular.module('Bastion.auth').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
+    angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
   </script>
   <% Bastion.plugins.each do |name, plugin| %>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -30,6 +30,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 $scope.repository['ignore_srpms'] = $scope.repository['ignorable_content'] && $scope.repository['ignorable_content'].includes("srpm");
                 $scope.repository['ansible_collection_auth_exists'] = $scope.repository['ansible_collection_auth_url'] && $scope.repository['ansible_collection_auth_token'];
                 $scope.genericContentTypes = RepositoryTypesService.genericContentTypes($scope.repository['content_type']);
+                $scope.immediateDownloadPolicy = $scope.repository['download_policy'] === 'immediate';
             });
 
             $scope.gpgKeys = function () {
@@ -140,6 +141,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);
+                    $scope.immediateDownloadPolicy = repository['download_policy'] === 'immediate';
                     $scope.repository.ignore_srpms = $scope.repository.ignorable_content && $scope.repository.ignorable_content.includes("srpm");
                     if (!_.isEmpty(response["include_tags"])) {
                         repository.commaIncludeTags = repository["include_tags"].join(", ");

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -315,6 +315,13 @@
             options-format="id as name for (id, name) in options"
             on-save="save(repository)">
         </dd>
+        <dd>
+          <p bst-alert='info' ng-show="immediateDownloadPolicy && repository.download_policy == 'on_demand'">
+            <span translate>
+              Changing download policy to "On Demand" will also clear the checksum type if set. The repository will use the upstream checksum type to verify downloads.
+            </span>
+          </p>
+        </dd>
       </span>
       <span>
         <dt translate>Mirroring Policy</dt>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.7.1".freeze
+  VERSION = "4.7.3".freeze
 end

data/webpack/components/RoutedTabs/index.js

@@ -22,17 +22,13 @@ const RoutedTabs = ({
         className="margin-0-24"
       >
         {tabs.map(({ key, title }) => (
-          <a
-            key={key}
+          <Tab
             href={`#/${key}`}
-            style={{ textDecoration: 'none' }}
-          >
-            <Tab
-              eventKey={key}
-              aria-label={title}
-              title={<TabTitleText>{title}</TabTitleText>}
-            />
-          </a>
+            key={key}
+            eventKey={key}
+            aria-label={title}
+            title={<TabTitleText>{title}</TabTitleText>}
+          />
         ))}
       </Tabs>
       <div className="margin-16-0">
@@ -64,4 +60,3 @@ RoutedTabs.defaultProps = {
 };
 
 export default withRouter(RoutedTabs);
-

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -405,7 +405,7 @@ test('Remove is disabled when in select all mode', async (done) => {
   fireEvent.click(selectAllCheckbox);
   getByRole('button', { name: 'bulk_actions' }).click();
 
-  const removeButton = getByRole('button', { name: 'bulk_remove' });
+  const removeButton = getByRole('menuitem', { name: 'bulk_remove' });
   await patientlyWaitFor(() => expect(removeButton).toBeInTheDocument());
   expect(removeButton).toHaveAttribute('aria-disabled', 'true');
 

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -35,8 +35,10 @@ exports[`ActivationKeys renders 1`] = `
     inputAutoComplete="off"
     inputIdPrefix=""
     isCreatable={false}
+    isCreateOptionOnTop={false}
     isCreateSelectOptionObject={false}
     isDisabled={true}
+    isFlipEnabled={true}
     isGrouped={false}
     isInputFilterPersisted={false}
     isInputValuePersisted={false}
@@ -53,15 +55,20 @@ exports[`ActivationKeys renders 1`] = `
     ouiaSafe={true}
     placeholderText="No Activation keys to select"
     position="left"
+    removeFindDomNode={false}
     removeSelectionAriaLabel="Remove"
     selections={Array []}
+    shouldResetOnSelect={true}
     toggleAriaLabel="Options menu"
     toggleIcon={null}
     toggleId={null}
+    toggleIndicator={null}
+    typeAheadAriaDescribedby=""
     typeAheadAriaLabel=""
     validated="default"
     variant="typeaheadmulti"
     width=""
+    zIndex={9999}
   />
 </FormGroup>
 `;

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/Force.test.js.snap

@@ -6,9 +6,11 @@ exports[`Force renders 1`] = `
 >
   <Checkbox
     className=""
+    component="div"
     id="reg_katello_force"
     isChecked={false}
     isDisabled={false}
+    isRequired={false}
     isValid={true}
     label={
       <span>

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/IgnoreSubmanErrors.test.js.snap

@@ -6,9 +6,11 @@ exports[`IgnoreSubmanErrors renders 1`] = `
 >
   <Checkbox
     className=""
+    component="div"
     id="reg_katello_ignore"
     isChecked={false}
     isDisabled={false}
+    isRequired={false}
     isValid={true}
     label={
       <span>

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/LifeCycleEnvironment.test.js.snap

@@ -10,6 +10,7 @@ exports[`LifecycleEnvironment renders 1`] = `
     className="without_select2"
     id="reg_katello_lce"
     isDisabled={true}
+    isIconSprite={false}
     isRequired={false}
     onBlur={[Function]}
     onChange={[Function]}

data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js

@@ -40,7 +40,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
   const [caCertName, setCACertName] = useState('');
   const [productIds, setProductIds] = useState([]);
   const [productNames, setProductNames] = useState([]);
-  const [currentStep, setCurrentStep] = useState(1);
   const dispatch = useDispatch();
 
   useEffect(
@@ -139,8 +138,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     <ACSCreateContext.Provider value={{
       show,
       setIsOpen,
-      currentStep,
-      setCurrentStep,
       acsType,
       setAcsType,
       contentType,
@@ -186,10 +183,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
       <Wizard
         title={__('Add an alternate content source')}
         steps={steps}
-        startAtStep={currentStep}
-        onGoToStep={({ id }) => setCurrentStep(id)}
-        onNext={({ id }) => setCurrentStep(id)}
-        onBack={({ id }) => setCurrentStep(id)}
         onClose={() => {
           setIsOpen(false);
         }}

data/webpack/scenes/AlternateContentSources/Create/Steps/ACSCreateFinish.js

@@ -1,7 +1,9 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
 import useDeepCompareEffect from 'use-deep-compare-effect';
+import { WizardContextConsumer } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import ACSCreateContext from '../ACSCreateContext';
@@ -9,10 +11,16 @@ import { selectCreateACS, selectCreateACSError, selectCreateACSStatus } from '..
 import getAlternateContentSources, { createACS } from '../../ACSActions';
 import Loading from '../../../../components/Loading';
 
-const ACSCreateFinish = () => {
+const ACSCreateFinishWrapper = () => (
+  <WizardContextConsumer>
+    {({ activeStep }) => <ACSCreateFinish activeStep={activeStep} />}
+  </WizardContextConsumer>
+);
+
+const ACSCreateFinish = ({ activeStep }) => {
   const { push } = useHistory();
+  const currentStep = activeStep.id;
   const {
-    currentStep,
     setIsOpen,
     acsType,
     contentType,
@@ -94,4 +102,10 @@ const ACSCreateFinish = () => {
   return <Loading loadingText={__('Saving alternate content source...')} />;
 };
 
-export default ACSCreateFinish;
+ACSCreateFinish.propTypes = {
+  activeStep: PropTypes.shape({
+    id: PropTypes.number.isRequired,
+  }).isRequired,
+};
+
+export default ACSCreateFinishWrapper;

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -205,7 +205,7 @@ const CVErrataDateFilterContent = ({
                     value={startDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setStartDate}
+                    onChange={(e, val) => setStartDate(val)}
                     dateParse={dateParse}
                     placeholder={startEntry ? 'MM/DD/YYYY' : __('Start date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}
@@ -227,7 +227,7 @@ const CVErrataDateFilterContent = ({
                     value={endDate}
                     invalidFormatText={invalidDateFormat}
                     dateFormat={dateFormat}
-                    onChange={setEndDate}
+                    onChange={(e, val) => setEndDate(val)}
                     dateParse={dateParse}
                     placeholder={endEntry ? 'MM/DD/YYYY' : __('End date')}
                     isDisabled={!hasPermission(permissions, 'edit_content_views')}

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -206,12 +206,12 @@ const CVErrataIDFilterContent = ({
     } else setSelectedTypes([...selectedTypes, selection]);
   };
 
-  const setValidStartDate = (value) => {
+  const setValidStartDate = (e, value) => {
     setStartDate(value);
     if (validAPIDate(value)) setApiStartDate(value);
   };
 
-  const setValidEndDate = (value) => {
+  const setValidEndDate = (e, value) => {
     setEndDate(value);
     if (validAPIDate(value)) setApiEndDate(value);
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1485,7 +1485,6 @@ files:
 - app/services/katello/candlepin/message_handler.rb
 - app/services/katello/candlepin/pool_service.rb
 - app/services/katello/candlepin/system_purpose.rb
-- app/services/katello/candlepin/upstream_consumer.rb
 - app/services/katello/candlepin_event_listener.rb
 - app/services/katello/component_view_presenter.rb
 - app/services/katello/content_unit_indexer.rb
@@ -2235,6 +2234,7 @@ files:
 - db/migrate/20220920173656_add_http_proxy_to_smart_proxy.rb
 - db/migrate/20220920180858_remove_http_proxy_from_katello_alternate_content_sources.rb
 - db/migrate/20221206170122_update_ignore_srpm_to_false_for_mirror_complete.rb
+- db/migrate/20230119003859_ensure_repo_username_password_nil_not_blank.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb

data/app/services/katello/candlepin/upstream_consumer.rb

@@ -1,28 +0,0 @@
-module Katello
-  module Candlepin
-    class UpstreamConsumer
-      def initialize(organization)
-        @organization = organization
-      end
-
-      def simple_content_access_eligible?
-        eligible = true
-        ::Organization.as_org(@organization) do
-          content_modes = resource_class.content_access
-
-          if content_modes.key?(:contentAccessModeList)
-            eligible = content_modes[:contentAccessModeList].include?('org_environment')
-          end
-        end
-
-        eligible
-      end
-
-      private
-
-      def resource_class
-        Katello::Resources::Candlepin::UpstreamConsumer
-      end
-    end
-  end
-end