katello 4.10.0.rc2 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf47fce24e4eb32ab555fa4a624f8cbf2ee04a9911fbe031ee7c005d323a9a50
-  data.tar.gz: 7247fdecda0b42666ac4eefa3ce2d6e8d005c1279bb59ab9cc6847dc79f3476c
+  metadata.gz: ba8012fd70673a2f1df8c3b0bb946e39d194fc7cd7a8d764b97002cf41fbb253
+  data.tar.gz: 76c982b7e81f585da523ba6fe37712c68d06b34f83d75379ab2fe6d455497e23
 SHA512:
-  metadata.gz: fec72e7378d6de1ccc70416273228202f1e33e2474799025d8efefb1f851c25948b3a4e7b3995852de983b0f4a6312f18b4b7c5682343a9d16f95f099a4b46aa
-  data.tar.gz: 9f8962a1d46bea986888c5dfb99ba639dd532b5ce9cac04c1d275ba21b7e2d76677cee24ac6c7089a0e1b2ec41bb55db636b32fa92e3d8ca07d13b6b2fc92dda
+  metadata.gz: 1bdc79f6e98f95cfac68d439e026a26c3a0b77af6fffcef64c2ca7a281899e57d5082c915640a72a2c26ac54a79c346f57a114aadb66f1dcfa03ccf3378fb5d6
+  data.tar.gz: 34fe62e89a179484ab8290eb3d65d75ea0b197da4373a6ec22486395830aeb30bffd119637b44f629f2fb224790c20f4453da25435af43b23bda58550233b6cc

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

@@ -12,7 +12,7 @@ module Actions
           unless repository.content_view.default?
             fail _("Can only remove content from within the Default Content View")
           end
-
+          content_units = valid_docker_manifests_to_delete!(content_units) if (repository.docker? && content_units.first.class::CONTENT_TYPE == 'docker_manifest')
           action_subject(repository)
 
           content_unit_ids = content_units.map(&:id)
@@ -58,6 +58,14 @@ module Actions
           end
         end
 
+        def valid_docker_manifests_to_delete!(content_units)
+          original_content_units = content_units
+          content_units = content_units.reject { |dm| dm.docker_tags.count > 0 || dm.docker_manifest_lists.count > 0 }
+          Rails.logger.warn("Docker Manifests with tags or manifest lists will be ignored; continuing...") if original_content_units.count != content_units.count
+          fail _("No docker manifests to delete after ignoring manifests with tags or manifest lists") if content_units.count == 0
+          content_units
+        end
+
         def humanized_name
           _("Remove Content")
         end

data/app/lib/katello/repo_discovery.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Katello
   class RepoDiscovery
     include Katello::Util::HttpProxy
@@ -42,6 +44,72 @@ module Katello
 
     private
 
+    def parse_parameter(field_value)
+      field_value.lstrip!
+      i = field_value.index(/[ \t=;,]/) || field_value.length
+      name = field_value.slice!(0, i).downcase(:ascii)
+      field_value.lstrip!
+      if field_value.delete_prefix!('=')
+        field_value.lstrip!
+        if field_value.delete_prefix!('"')
+          value = ''
+          until field_value.empty?
+            break if field_value.delete_prefix!('"')
+            field_value.delete_prefix!("\\")
+            value += field_value.slice!(0, 1) || ''
+          end
+        else
+          i = field_value.index(/[;,]/) || field_value.length
+          value = field_value.slice!(0, i)
+        end
+      end
+      {name: name, value: value || ''}
+    end
+
+    def parse_parameters(field_value)
+      seen_rel = false
+      has_next_rel = false
+      has_anchor = false
+      until field_value.empty?
+        field_value.lstrip!
+        break if field_value.delete_prefix!(';').nil?
+        param = parse_parameter(field_value)
+        case
+        when param[:name] == 'rel' && !seen_rel
+          seen_rel = true
+          has_next_rel = param[:value].downcase(:ascii).split(/[ \t]/).include?('next')
+        when param[:name] == 'anchor'
+          has_anchor = true
+        end
+      end
+      {has_next_rel: has_next_rel, has_anchor: has_anchor}
+    end
+
+    def get_next_link(link_header)
+      # This code mostly follows Appendix B "Algorithms of Parsing Link Header Fields" of RFC 8288
+      # "Web Linking", <https://www.rfc-editor.org/rfc/rfc8288#appendix-B> (that RFC appears to be
+      # silent about multiple "next" links, so just use the first one and ignore any additional
+      # ones, in the general spirit of being lenient):
+      return nil if link_header.nil?
+      field_value = link_header.clone
+      until field_value.empty?
+        # The following ignores any junk preceding the next <...> link URL:
+        m = field_value.match(/<(.*)>/)
+        break unless m
+        target_string = m[1]
+        field_value = m.post_match
+        params = parse_parameters(field_value)
+        if params[:has_next_rel]
+          # To keep it simple, ignore a link with an (unlikely) anchor parameter; but the RFC
+          # mandates that we "MUST NOT process the link without applying the anchor", so just raise
+          # an exception in that (unlikely) case:
+          fail "anchor not supported" if params[:has_anchor]
+          return target_string
+        end
+      end
+      nil
+    end
+
     def docker_search
       request_params = {
         method: :get,
@@ -61,9 +129,14 @@ module Katello
       rescue
         # Note: v2 endpoint does not support search
         request_params[:url] = "#{@uri}v2/_catalog"
-        results = RestClient::Request.execute(request_params)
-        JSON.parse(results)['repositories'].each do |result|
-          @found << result
+        loop do
+          results = RestClient::Request.execute(request_params)
+          JSON.parse(results)['repositories'].each do |result|
+            @found << result
+          end
+          next_uri = get_next_link(results.headers[:link])
+          break if next_uri.nil?
+          request_params[:url] = URI(request_params[:url]).merge(next_uri).to_s
         end
       end
       @found.sort!

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.10.0.rc2".freeze
+  VERSION = "4.10.0".freeze
 end

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js

@@ -3,13 +3,17 @@ import { useSelector, shallowEqual } from 'react-redux';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
-  Modal, ModalVariant,
+  Modal, ModalVariant, Popover, Button,
 } from '@patternfly/react-core';
+import {
+  HelpIcon,
+} from '@patternfly/react-icons';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { getRPMPackages } from '../../ContentViewDetailActions';
 import { selectRPMPackages, selectRPMPackagesStatus } from '../../ContentViewDetailSelectors';
+import './matchContentModal.scss';
 
 
 const columnHeaders = [
@@ -17,9 +21,9 @@ const columnHeaders = [
   __('Summary'),
 ];
 
-const emptyContentTitle = __('No matching RPM found.');
-const emptyContentBody = __("Given criteria doesn't match any RPMs. Try changing your rule.");
-const emptySearchTitle = __('Your search returned no matching RPMs.');
+const emptyContentTitle = __('No matching non-modular RPM found.');
+const emptyContentBody = __("Given criteria doesn't match any non-modular RPMs. Try changing your rule.");
+const emptySearchTitle = __('Your search returned no matching non-modular RPMs.');
 const emptySearchBody = __('Try changing your search criteria.');
 
 const CVRpmMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
@@ -41,6 +45,16 @@ const CVRpmMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
       isOpen
       onClose={onClose}
       appendTo={document.body}
+      help={
+        <Popover
+          headerContent={__('Help')}
+          bodyContent={__("Matching RPMs based on your created filter rule. Remember, RPM filters don't apply to modular RPMs.")}
+        >
+          <Button variant="plain" aria-label="Help" ouiaId="matching-content-modal-help">
+            <HelpIcon />
+          </Button>
+        </Popover>
+      }
     >
       <TableWrapper
         {...{

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/matchContentModal.scss

@@ -0,0 +1,3 @@
+.pf-c-empty-state {
+  margin-top: 0;
+}

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -6,8 +6,11 @@ import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
   Modal, ModalVariant, Form, FormGroup, TextInput,
-  ActionGroup, Button, FormSelect, FormSelectOption,
+  ActionGroup, Button, FormSelect, FormSelectOption, Popover,
 } from '@patternfly/react-core';
+import {
+  HelpIcon,
+} from '@patternfly/react-icons';
 import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
 import {
   selectCreateFilterRuleStatus,
@@ -135,6 +138,17 @@ const AddEditPackageRuleModal = ({
       isOpen
       onClose={onClose}
       appendTo={document.body}
+      help={
+        <Popover
+          headerContent={__('Help')}
+          bodyContent={__('Use filter rules to include or restrict certain content. ' +
+        "When selecting RPMs, be aware that RPM filters don't apply to modular RPMs.")}
+        >
+          <Button variant="plain" aria-label="Help" ouiaId="rpm-filter-rule-modal-help">
+            <HelpIcon />
+          </Button>
+        </Popover>
+      }
     >
       <Form onSubmit={(e) => {
         e.preventDefault();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.10.0.rc2
+  version: 4.10.0
 platform: ruby
 authors:
 - N/A
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -320,20 +320,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.0
+        version: 3.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement
@@ -4491,103 +4491,55 @@ files:
 - locale/Makefile
 - locale/README
 - locale/action_names.rb
-- locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
-- locale/bn_IN/LC_MESSAGES/katello.mo
 - locale/bn_IN/katello.po
-- locale/ca/LC_MESSAGES/katello.mo
 - locale/ca/katello.po
-- locale/cs/LC_MESSAGES/katello.mo
 - locale/cs/katello.po
-- locale/cs_CZ/LC_MESSAGES/katello.mo
 - locale/cs_CZ/katello.po
-- locale/de/LC_MESSAGES/katello.mo
 - locale/de/katello.po
-- locale/de_AT/LC_MESSAGES/katello.mo
 - locale/de_AT/katello.po
-- locale/de_DE/LC_MESSAGES/katello.mo
 - locale/de_DE/katello.po
-- locale/el/LC_MESSAGES/katello.mo
 - locale/el/katello.po
-- locale/en/LC_MESSAGES/katello.mo
 - locale/en/katello.po
-- locale/en_GB/LC_MESSAGES/katello.mo
 - locale/en_GB/katello.po
-- locale/en_US/LC_MESSAGES/katello.mo
 - locale/en_US/katello.po
-- locale/es/LC_MESSAGES/katello.mo
 - locale/es/katello.po
-- locale/et_EE/LC_MESSAGES/katello.mo
 - locale/et_EE/katello.po
-- locale/fr/LC_MESSAGES/katello.mo
 - locale/fr/katello.po
-- locale/gl/LC_MESSAGES/katello.mo
 - locale/gl/katello.po
-- locale/gu/LC_MESSAGES/katello.mo
 - locale/gu/katello.po
-- locale/he_IL/LC_MESSAGES/katello.mo
 - locale/he_IL/katello.po
-- locale/hi/LC_MESSAGES/katello.mo
 - locale/hi/katello.po
-- locale/id/LC_MESSAGES/katello.mo
 - locale/id/katello.po
-- locale/it/LC_MESSAGES/katello.mo
 - locale/it/katello.po
-- locale/ja/LC_MESSAGES/katello.mo
 - locale/ja/katello.po
-- locale/ka/LC_MESSAGES/katello.mo
 - locale/ka/katello.po
 - locale/katello.pot
-- locale/kn/LC_MESSAGES/katello.mo
 - locale/kn/katello.po
-- locale/ko/LC_MESSAGES/katello.mo
 - locale/ko/katello.po
-- locale/ml_IN/LC_MESSAGES/katello.mo
 - locale/ml_IN/katello.po
-- locale/mr/LC_MESSAGES/katello.mo
 - locale/mr/katello.po
-- locale/nl_NL/LC_MESSAGES/katello.mo
 - locale/nl_NL/katello.po
-- locale/or/LC_MESSAGES/katello.mo
 - locale/or/katello.po
-- locale/pa/LC_MESSAGES/katello.mo
 - locale/pa/katello.po
-- locale/pl/LC_MESSAGES/katello.mo
 - locale/pl/katello.po
-- locale/pl_PL/LC_MESSAGES/katello.mo
 - locale/pl_PL/katello.po
-- locale/pt/LC_MESSAGES/katello.mo
 - locale/pt/katello.po
-- locale/pt_BR/LC_MESSAGES/katello.mo
 - locale/pt_BR/katello.po
-- locale/ro/LC_MESSAGES/katello.mo
 - locale/ro/katello.po
-- locale/ro_RO/LC_MESSAGES/katello.mo
 - locale/ro_RO/katello.po
-- locale/ru/LC_MESSAGES/katello.mo
 - locale/ru/katello.po
-- locale/sl/LC_MESSAGES/katello.mo
 - locale/sl/katello.po
-- locale/sv_SE/LC_MESSAGES/katello.mo
 - locale/sv_SE/katello.po
-- locale/ta/LC_MESSAGES/katello.mo
 - locale/ta/katello.po
-- locale/ta_IN/LC_MESSAGES/katello.mo
 - locale/ta_IN/katello.po
-- locale/te/LC_MESSAGES/katello.mo
 - locale/te/katello.po
-- locale/tr/LC_MESSAGES/katello.mo
 - locale/tr/katello.po
 - locale/update-i18n
-- locale/vi/LC_MESSAGES/katello.mo
 - locale/vi/katello.po
-- locale/vi_VN/LC_MESSAGES/katello.mo
 - locale/vi_VN/katello.po
-- locale/zh/LC_MESSAGES/katello.mo
 - locale/zh/katello.po
-- locale/zh_CN/LC_MESSAGES/katello.mo
 - locale/zh_CN/katello.po
-- locale/zh_TW/LC_MESSAGES/katello.mo
 - locale/zh_TW/katello.po
 - package.json
 - vendor/assets/images/katello/add2.png
@@ -5078,6 +5030,7 @@ files:
 - webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js
 - webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContent.fixtures.json
 - webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js
+- webpack/scenes/ContentViews/Details/Filters/MatchContentModal/matchContentModal.scss
 - webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js
 - webpack/scenes/ContentViews/Details/Filters/Rules/DebPackage/AddEditDebPackageRuleModal.js
 - webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js
@@ -5509,7 +5462,7 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -5520,12 +5473,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []