katello 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ea3c4cf86616b6ca34f3ada6f3e1f47b7eef60139ad3e7044160f790ff89eab
-  data.tar.gz: ea2376411d5f4e2cae3f091d6ccfcf95675c295402cec46f9fb030bfff4f184f
+  metadata.gz: 12ea739397f1f4d796d7f7f7d0b6a052cd3ae03ff70cf81a0cfcd7c995eff9f1
+  data.tar.gz: c2898a211d290e996a71b0ca8ce68ef6353f1b76530f1cbca8c38eeb0ec2f19d
 SHA512:
-  metadata.gz: ea3dac10a91dbf39c22ec8c3cc91621647d11b7643bdc28b3f9130bbf99caf8e8dcf87c617a04267dfb054a1453a442c94b7729711be8fe92e692f087178b149
-  data.tar.gz: 2b2ca31cc56a54cebd4a4d09a4cd041509e72fe387fef05cd327627edfb3eed9b4b4cf0531aa167a3e982d9e5309e5608f2c941ffb2f2ac49afcfa819b5bf85c
+  metadata.gz: a9f45a56723f68dd3e058d6b6b39ce1efe47bdef3c6ef49824e23ba56131bce7a3280f11cb5d967f3a1b065d48fb9b1b8ad1cfda66ca8c4385b8d9690446a510
+  data.tar.gz: 8d5d93e17e005cdcb2825891d3d2e1835633dfc9a1bb38f9621e26d9f17faef11a496a3e5fdf4894b502c8fd2f73bf64d0590f28031885e6d81912f801a308e8

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

@@ -389,6 +389,11 @@ module Katello
     def upload_content
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Container Image content.") if @repository.docker?
       fail Katello::Errors::InvalidRepositoryContent, _("Cannot upload Ansible collections.") if @repository.ansible_collection?
+      unless params[:content_type].empty? || RepositoryTypeManager.uploadable_content_types.map(&:label).include?(params[:content_type])
+        msg = _("Invalid params provided - content_type must be one of %s") %
+          RepositoryTypeManager.uploadable_content_types.map(&:label).sort.join(",")
+        fail HttpErrors::UnprocessableEntity, msg
+      end
 
       filepaths = Array.wrap(params[:content]).compact.collect do |content|
         {path: content.path, filename: content.original_filename}

data/app/helpers/katello/content_source_helper.rb

@@ -37,6 +37,8 @@ module Katello
           --server.prefix="#{content_source.rhsm_url.path}" \
           --rhsm.repo_ca_cert="$KATELLO_SERVER_CA_CERT" \
           --rhsm.baseurl="#{content_source.pulp_content_url}"
+
+        subscription-manager facts --update
       CMD
     end
   end

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

@@ -34,7 +34,7 @@ module Actions
 
             concurrence do
               plan_self(:repository_id => repository.id, :clone => clone)
-              if repository.url.present?
+              if !clone && repository.url.present?
                 repository.product.alternate_content_sources.with_type(repository.content_type).each do |acs|
                   acs.smart_proxies.each do |smart_proxy|
                     smart_proxy_acs = ::Katello::SmartProxyAlternateContentSource.create(alternate_content_source_id: acs.id, smart_proxy_id: smart_proxy.id, repository_id: repository.id)

data/app/lib/actions/pulp3/repository/repair.rb

@@ -3,7 +3,7 @@ module Actions
     module Repository
       class Repair < Pulp3::AbstractAsyncTask
         include Helpers::Presenter
-        def plan(repository_id, smart_proxy)
+        def plan(repository_id, smart_proxy = SmartProxy.pulp_primary)
           plan_self(:repository_id => repository_id, :smart_proxy_id => smart_proxy.id)
         end
 

data/app/services/katello/bulk_items_helper.rb

@@ -20,12 +20,12 @@ module Katello
       params[:excluded] ||= {}
 
       items = model_scope
-      if params[:included][:ids]
+      if params[:included][:ids].present?
         items = model_scope.where(key => params[:included][:ids])
-      elsif params[:included][:search]
+      elsif params[:included][:search].present?
         items = model_scope.search_for(params[:included][:search])
       end
-      if params[:excluded][:ids]
+      if params[:excluded][:ids].present?
         items = items.where.not(key => params[:excluded][:ids])
       end
 

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])
       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/api/core.rb

@@ -74,8 +74,8 @@ module Katello
           nil
         end
 
-        def repository_version_class
-          client_module::RepositoryVersion
+        def repair_class
+          client_module::Repair
         end
 
         def cancel_task(task_href)

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

@@ -55,12 +55,15 @@ module Katello
           bugzillas += build_bugzillas(katello_id, unit['references'])
           cves += build_cves(katello_id, unit['references'])
           packages += build_packages(katello_id, unit['pkglist'])
-          modules += build_modules(katello_id, unit['pkglist'])
         end
 
         Katello::ErratumBugzilla.insert_all(bugzillas, unique_by: [:erratum_id, :bug_id, :href]) if bugzillas.any?
         Katello::ErratumCve.insert_all(cves, unique_by: [:erratum_id, :cve_id, :href]) if cves.any?
         Katello::ErratumPackage.insert_all(packages, unique_by: [:erratum_id, :nvrea, :name, :filename]) if packages.any?
+        units.each do |unit|
+          katello_id = pulp_id_to_id[unit['id']]
+          modules += build_modules(katello_id, unit['pkglist'])
+        end
         ModuleStreamErratumPackage.insert_all(modules, unique_by: [:module_stream_id, :erratum_package_id]) if modules.any?
         nil
       end

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

@@ -12,11 +12,12 @@ module Katello
 
         def remote_options
           options = common_remote_options
-          uri = URI(root.url)
+          uri = root.url ? URI(root.url) : nil
           unless root.upstream_authentication_token.blank?
             options.merge!(sles_auth_token: root.upstream_authentication_token)
           end
-          options.merge!(url: uri.to_s, policy: root.download_policy)
+          options.merge!(url: uri.to_s) if uri
+          options.merge!(policy: root.download_policy)
         end
 
         def publication_options(repository_version)

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

@@ -55,7 +55,7 @@ module Katello
       end
 
       def repair(repository_version_href)
-        data = api.repository_version_class.new
+        data = api.repair_class.new
         api.repository_versions_api.repair(repository_version_href, data)
       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]
@@ -83,7 +83,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/seeds.d/102-organizations.rb

@@ -1,7 +1,7 @@
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
-# !!! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!!
+# !! PLEASE KEEP THIS SCRIPT IDEMPOTENT !!
 #
 
 unless Rails.env.test?

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

@@ -21,17 +21,18 @@
     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| %>
     <%= include_plugin_js(plugin) %>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.6.0".freeze
+  VERSION = "4.6.1".freeze
 end

data/webpack/components/Table/TableWrapper.js

@@ -19,6 +19,7 @@ import { orgId } from '../../services/api';
 const TableWrapper = ({
   actionButtons,
   alwaysShowActionButtons,
+  alwaysShowToggleGroup,
   toggleGroup,
   children,
   metadata,
@@ -62,7 +63,7 @@ const TableWrapper = ({
   const hideToolbar = !searchQuery && !filtersAreActive &&
     allTableProps.status === STATUS.RESOLVED && total === 0;
   const showActionButtons = actionButtons && (alwaysShowActionButtons || !hideToolbar);
-  const showToggleGroup = toggleGroup && !hideToolbar;
+  const showToggleGroup = toggleGroup && (alwaysShowToggleGroup || !hideToolbar);
   const paginationParams = useCallback(() =>
     ({ per_page: perPage, page }), [perPage, page]);
   const prevRequest = useRef({});
@@ -275,6 +276,7 @@ TableWrapper.propTypes = {
   searchPlaceholderText: PropTypes.string,
   actionButtons: PropTypes.node,
   alwaysShowActionButtons: PropTypes.bool,
+  alwaysShowToggleGroup: PropTypes.bool,
   toggleGroup: PropTypes.node,
   children: PropTypes.node,
   // additionalListeners are anything that should trigger another API call, e.g. a filter
@@ -319,6 +321,7 @@ TableWrapper.defaultProps = {
   searchPlaceholderText: undefined,
   actionButtons: null,
   alwaysShowActionButtons: true,
+  alwaysShowToggleGroup: false,
   toggleGroup: null,
   displaySelectAllCheckbox: false,
   selectedCount: 0,

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.js

@@ -431,6 +431,7 @@ export const ErrataTab = () => {
           displaySelectAllCheckbox={showActions}
           requestKey={HOST_ERRATA_KEY}
           alwaysShowActionButtons={false}
+          alwaysShowToggleGroup={hostIsNonLibrary}
         >
           <Thead>
             <Tr>

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsTab.js

@@ -46,6 +46,14 @@ import {
   userPermissionsFromHostDetails,
 } from '../../hostDetailsHelpers';
 
+const moduleStreamSupported = ({ os, version }) =>
+  os.match(/RedHat|CentOS|Rocky|AlmaLinux|OracleLinux/i) && Number(version) > 7;
+export const hideModuleStreamsTab = ({ hostDetails }) => {
+  const osMatch = hostDetails?.operatingsystem_name?.match(/(\w+) (\d+)/);
+  if (!osMatch) return true;
+  const [, os, version] = osMatch;
+  return !(osMatch && moduleStreamSupported({ os, version }));
+};
 
 const EnabledIcon = ({ streamText, streamInstallStatus, upgradable }) => {
   switch (true) {

data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js

@@ -54,6 +54,10 @@ import {
   getHostRepositorySets,
   setContentOverrides,
 } from './RepositorySetsActions';
+
+import { selectOrganization, selectOrganizationStatus } from '../../Cards/SystemPurposeCard/SystemPurposeSelectors';
+import { getOrganization } from '../../Cards/SystemPurposeCard/SystemPurposeActions';
+
 import { REPOSITORY_SETS_KEY, STATUSES, STATUS_TO_PARAM, PARAM_TO_FRIENDLY_NAME } from './RepositorySetsConstants.js';
 import { selectRepositorySetsStatus } from './RepositorySetsSelectors';
 import './RepositorySetsTab.scss';
@@ -121,7 +125,7 @@ const ArchRestrictedIcon = ({ archRestricted }) => (
     />}
   >
     <Label color="orange" className="arch-restricted-label" style={{ marginLeft: '8px' }}>
-      {__(archRestricted)}
+      {archRestricted}
     </Label>
   </Tooltip>
 );
@@ -144,7 +148,7 @@ const OsRestrictedIcon = ({ osRestricted }) => (
     />}
   >
     <Label color="blue" className="os-restricted-label" style={{ marginLeft: '8px' }}>
-      {__(osRestricted)}
+      {osRestricted}
     </Label>
   </Tooltip>
 );
@@ -161,9 +165,16 @@ const RepositorySetsTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
   const {
     id: hostId,
-    subscription_status: subscriptionStatus,
     content_facet_attributes: contentFacetAttributes,
+    organization_id: orgId,
   } = hostDetails;
+
+  const organizationDetails = useSelector(state => selectOrganization(state, orgId));
+  const orgStatus = useSelector(state => selectOrganizationStatus(state, orgId));
+
+  const {
+    simple_content_access: simpleContentAccess,
+  } = organizationDetails;
   const canDoContentOverrides = can(
     editHosts,
     userPermissionsFromHostDetails({ hostDetails }),
@@ -179,7 +190,6 @@ const RepositorySetsTab = () => {
   } = contentFacet;
   const nonLibraryHost = contentViewDefault === false ||
     lifecycleEnvironmentLibrary === false;
-  const simpleContentAccess = (Number(subscriptionStatus) === 5);
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
   const toggleBulkAction = () => setIsBulkActionOpen(prev => !prev);
   const dispatch = useDispatch();
@@ -247,6 +257,12 @@ const RepositorySetsTab = () => {
       simpleContentAccess, apiSortParams, statusSelected, STATUS_LABEL],
   );
 
+  useEffect(() => {
+    if (orgId && orgStatus !== STATUS.RESOLVED) {
+      dispatch(getOrganization({ orgId }));
+    }
+  }, [orgId, orgStatus, dispatch]);
+
   const response = useSelector(state => selectAPIResponse(state, REPOSITORY_SETS_KEY));
   const { results, error: errorSearchBody, ...metadata } = response;
   const status = useSelector(state => selectRepositorySetsStatus(state));
@@ -420,6 +436,7 @@ const RepositorySetsTab = () => {
   } else {
     alertText = nonScaAlert;
   }
+
   return (
     <div>
       <div id="repo-sets-tab">
@@ -522,7 +539,7 @@ const RepositorySetsTab = () => {
               } = repoSet;
               const { isEnabled, isOverridden } =
                 getEnabledValue({ enabled, enabledContentOverride });
-              const showArchRestricted = archRestricted !== 'noarch';
+              const showArchRestricted = archRestricted && archRestricted !== 'noarch';
               return (
                 <Tr key={id} ouiaId={`tr-${rowIndex}`}>
                   {canDoContentOverrides ? (

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

@@ -8,7 +8,6 @@ import mockRepoSetData from './repositorySets.fixtures.json';
 import mockBookmarkData from './bookmarks.fixtures.json';
 import mockContentOverride from './contentOverrides.fixtures.json';
 
-
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
   userPermissionsFromHostDetails: () => ({
@@ -33,8 +32,15 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
       HOST_DETAILS: {
         response: {
           id: 1,
+          organization_id: 1,
           content_facet_attributes: { ...facetAttributes },
-          subscription_status: 5, // Simple Content Access
+        },
+        status: 'RESOLVED',
+      },
+      ORGANIZATION_1: {
+        response: {
+          id: 1,
+          simple_content_access: true,
         },
         status: 'RESOLVED',
       },
@@ -182,7 +188,6 @@ test('Toggle Group shows if it\'s the library environment but a non-default cont
     queryByLabelText,
     getByText,
   } = renderWithRedux(<RepositorySetsTab />, options);
-
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getByText(firstRepoSet.contentUrl)).toBeInTheDocument());
   expect(queryByLabelText('Limit to environment')).toBeInTheDocument();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4472,52 +4472,30 @@ files:
 - locale/README
 - locale/action_names.rb
 - locale/bn/katello.po
-- locale/bn/katello.po.time_stamp
 - locale/cs/katello.po
-- locale/cs/katello.po.time_stamp
 - locale/de/katello.po
-- locale/de/katello.po.time_stamp
 - locale/en/katello.po
-- locale/en/katello.po.time_stamp
 - locale/es/katello.po
-- locale/es/katello.po.time_stamp
 - locale/fr/katello.po
-- locale/fr/katello.po.time_stamp
 - locale/gu/katello.po
-- locale/gu/katello.po.time_stamp
 - locale/hi/katello.po
-- locale/hi/katello.po.time_stamp
 - locale/it/katello.po
-- locale/it/katello.po.time_stamp
 - locale/ja/katello.po
-- locale/ja/katello.po.time_stamp
 - locale/katello.pot
 - locale/kn/katello.po
-- locale/kn/katello.po.time_stamp
 - locale/ko/katello.po
-- locale/ko/katello.po.time_stamp
 - locale/mr/katello.po
-- locale/mr/katello.po.time_stamp
 - locale/or/katello.po
-- locale/or/katello.po.time_stamp
 - locale/pa/katello.po
-- locale/pa/katello.po.time_stamp
 - locale/pt/katello.po
-- locale/pt/katello.po.time_stamp
 - locale/pt_BR/katello.po
-- locale/pt_BR/katello.po.time_stamp
 - locale/ru/katello.po
-- locale/ru/katello.po.time_stamp
 - locale/ta/katello.po
-- locale/ta/katello.po.time_stamp
 - locale/te/katello.po
-- locale/te/katello.po.time_stamp
 - locale/update-i18n
 - locale/zanata.xml
 - locale/zh_CN/katello.po
-- locale/zh_CN/katello.po.time_stamp
 - 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