katello 4.16.0.rc1 → 4.16.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4dbecbe0ea63d269d079ba27290c0555a840d56a20ea99d819fc5b29dd4f9ce
-  data.tar.gz: 277fec506ee6f0e7489a19215940c08d0a84f92d699aebd578a539ea1497b699
+  metadata.gz: f6ecb6347baf2c799dbe9d379a919b386d066fb16447ebdb7b5b940a9ae7329e
+  data.tar.gz: dea48f30f60751b97523e93e5d9dfa35b516d66feaeceb31808ba9b0ed0fed7b
 SHA512:
-  metadata.gz: 045d712597dfe3cda9f5d5d654355d972894dcde66b1c9cad647cddcafd7d5d999c04f791b27da067fb1f0961be6383f4385799273ad97975f5f69e28592dc59
-  data.tar.gz: 4586f525f1a2feb056723c321830cb384133e7b4701139281b8122c5c029e0e4bde0f6e000a9522cc27bf94abaf0f2d40afe027c76667ecd965b1702f9cd35ef
+  metadata.gz: a1dfd988175ae50e81a44dd84aa9fd5bc725ed5d8f53a89c15534fae391d2f50958077ba4c8b2c809287f14b50a3339594fabcf593d9aca20ffbeb446d6375cf
+  data.tar.gz: 4feb89b53b4727e8344ac7e03335e7dea113c3cf496430a6309116f4552e6a404b5d68df8d1a58a04c3d0a27e9125c8736ad1148f16cc746b63829145f4398d4

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -146,13 +146,13 @@ KT.hosts.onKatelloHostEditLoad = function(){
 
     $.each(prefixes, function(index, prefix) {
         $.each(attributes, function(attrIndex, attribute) {
-            $('body').on('change', '#' + prefix + '_' + attribute, function () {
+            $('body').on('select2:select select2:unselecting', '#' + prefix + '_' + attribute, function () {
                 KT.hosts.toggle_installation_medium();
             });
         });
     });
 
-    $('body').on('change', '#content_source_id', function () {
+    $('body').on('select2:select select2:unselecting', '#content_source_id', function () {
         KT.hosts.contentSourceChanged();
         KT.hosts.toggle_installation_medium();
     });
@@ -266,14 +266,15 @@ KT.hosts.on_synced_content_dropdown_change = function() {
 
 KT.hosts.set_install_media_bindings = function() {
     // reset the host medium id
-    $("#host_medium_id").on("change", KT.hosts.on_install_media_dropdown_change);
-    $("#s2id_host_medium_id").on("change", KT.hosts.on_install_media_dropdown_change);
-    $("#hostgroup_medium_id").on("change", KT.hosts.on_install_media_dropdown_change);
-    $("#s2id_hostgroup_medium_id").on("change", KT.hosts.on_install_media_dropdown_change);
+    $("#host_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
+    $("#s2id_host_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
+    $("#hostgroup_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
+    $("#s2id_hostgroup_medium_id").on("select2:select", KT.hosts.on_install_media_dropdown_change);
 };
-
 KT.hosts.set_synced_content_bindings = function() {
-    KT.hosts.get_synced_content_dropdown().change(KT.hosts.on_synced_content_dropdown_change);
+    KT.hosts
+      .get_synced_content_dropdown()
+      .on('select2:select', KT.hosts.on_synced_content_dropdown_change);
 };
 
 KT.hosts.set_media_selection_bindings = function() {

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -23,7 +23,19 @@ module Katello
     end
 
     rescue_from RestClient::Exception do |e|
-      Rails.logger.error pp_exception(e)
+      # Log BLOB_UNKNOWN errors as info.
+      # These 404s occur as part of podman push's blob lookup and should not be reported as errors.
+      if e.http_code == 404
+        body = JSON.parse(e.http_body) rescue {}
+        if body["errors"]&.any? { |error| error["code"] == "BLOB_UNKNOWN" }
+          Rails.logger.info pp_exception(e)
+        else
+          Rails.logger.error pp_exception(e)
+        end
+      else
+        Rails.logger.error pp_exception(e)
+      end
+
       if request_from_katello_cli?
         render json: { errors: [e.http_body] }, status: e.http_code
       else

data/app/lib/actions/pulp3/orchestration/repository/multi_copy_all_units.rb

@@ -12,6 +12,11 @@ module Actions
                                           solve_dependencies: solve_dependencies)
                 plan_action(Actions::Pulp3::Repository::SaveVersions, extended_repo_map.values.pluck(:dest_repo),
                             tasks: copy_action.output[:pulp_tasks])
+                repo_id_map = {}
+                extended_repo_map.each do |source_repos, dest_repo_map|
+                  repo_id_map[source_repos.first.id] = dest_repo_map[:dest_repo].id if dest_repo_map[:filters].blank?
+                end
+                plan_self(repo_id_map: repo_id_map)
               end
             else
               repo_id_map = {}

data/app/models/katello/content_view.rb

@@ -42,12 +42,12 @@ module Katello
              :through => :content_view_environments
     has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :through => :content_view_environment_content_facets,
              :inverse_of => :content_views
-    has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
+    has_many :hosts, -> { reorder(:id).distinct }, :class_name => "::Host::Managed", :through => :content_facets,
              :inverse_of => :content_views
 
     has_many :content_view_environment_activation_keys, :class_name => "Katello::ContentViewEnvironmentActivationKey",
              :through => :content_view_environments
-    has_many :activation_keys, :class_name => "Katello::ActivationKey", :through => :content_view_environment_activation_keys,
+    has_many :activation_keys, -> { reorder(:id).distinct }, :class_name => "Katello::ActivationKey", :through => :content_view_environment_activation_keys,
              :inverse_of => :content_views
 
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",

data/app/models/katello/repository.rb

@@ -1046,6 +1046,7 @@ module Katello
 
     def deb_content_url_options
       return '' unless version_href
+      return '' if backend_service(SmartProxy.pulp_primary).version_missing_structure_content?
 
       components = deb_pulp_components.join(',')
       distributions = deb_pulp_distributions.join(',')

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

@@ -39,7 +39,7 @@ module Katello
         end
 
         def mirror_remote_options
-          distributions = if repo.deb_using_structured_apt?
+          distributions = if repo.deb_using_structured_apt? && !version_missing_structure_content?
                             repo.deb_pulp_distributions.join(' ')
                           else
                             'default'
@@ -48,11 +48,29 @@ module Katello
           super.merge({distributions: distributions})
         end
 
+        def version_missing_structure_content?
+          # There may be old pulp_deb repo versions that have no package_release_components to go with the packages.
+          # This could be because packages were uploaded with Katello < 4.12
+          # It may also affect filtered CV versions created with very old Katello versions.
+          # This method can identify such cases, so that we may fall back to simple publishing.
+          return false if repo.version_href.blank?
+          # We cannot just use api here, because this is sometimes the proxy api, and we always want to talk to the primary!
+          api_primary = self.class.instance_for_type(repo, ::SmartProxy.pulp_primary).api
+          version = api_primary.repository_versions_api.read(repo.version_href)
+          apt_content_types = version&.content_summary&.present&.keys
+          return apt_content_types.include?('deb.package') && !apt_content_types.include?('deb.package_release_component')
+        end
+
         def publication_options(repository)
           ss = api.signing_services_api.list(name: SIGNING_SERVICE_NAME).results
           popts = super(repository)
-          popts.merge!({ structured: true })
-          popts.merge!({ simple: true }) unless repository.deb_using_structured_apt?
+          if version_missing_structure_content?
+            popts.merge!({ structured: false })
+            popts.merge!({ simple: true })
+          else
+            popts.merge!({ structured: true })
+            popts.merge!({ simple: true }) unless repository.deb_using_structured_apt?
+          end
           popts[:signing_service] = ss[0].pulp_href if ss && ss.length == 1
           popts
         end

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -39,6 +39,8 @@ child :content_facet => :content_facet_attributes do
     node(:view_activation_keys) { user.can?("view_activation_keys") }
     node(:view_products) { user.can?("view_products") }
     node(:create_bookmarks) { user.can?("create_bookmarks") }
+    node(:view_smart_proxies) { user.can?("view_smart_proxies") }
+    node(:view_capsule_content) { user.can?("view_capsule_content") }
   end
 end
 

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -5,8 +5,9 @@
     option.kt-cv  { margin-left: 1em; }
 </style>
 <% spinner_path = asset_path('spinner.gif') %>
+<% can_change_content_source = User.current.can?("view_smart_proxies") && User.current.can?("view_capsule_content") %>
 
-<% if edit_action? && !using_hostgroups_page? && !using_discovered_hosts_page? %>
+<% if edit_action? && !using_hostgroups_page? && !using_discovered_hosts_page? && can_change_content_source %>
   <div style="margin-left: 270px">
     <%= link_to _("Change content source"), "/change_host_content_source?fromPage=hostEdit&host_id=#{@host.id}&initialContentSourceId=#{@host.content_source_id}" %>
   </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html

@@ -56,6 +56,7 @@
           <select ng-hide="contentViews.length === 0 || activationKey.environment === undefined "
                   id="content_view_id"
                   name="content_view_id"
+                  ng-required="activationKey.environment"
                   ng-model="activationKey.content_view_id"
                   ng-options="contentView.id as contentView.name for contentView in contentViews"
                   autofocus>
@@ -64,7 +65,7 @@
             The selected environment contains no Content Views, please select a different environment.
           </span>
           <span class="help-block" ng-show="activationKey.environment === undefined" translate>
-            Please select an environment.
+            Please select a lifecycle environment. Lifecycle environment and content view must be provided together.
           </span>
         </div>
       </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-release-version-modal.controller.js

@@ -27,12 +27,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkReleaseVersi
         }
 
         $scope.selected = {
-            release: undefined
+            release: ""
         };
         $scope.fetchingReleases = true;
 
         Organization.releaseVersions({id: CurrentOrganization}, function (response) {
             $scope.releases = response.results;
+            // Add empty string to unset the release version
+            $scope.releases.unshift("");
             $scope.fetchingReleases = false;
         });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html

@@ -27,7 +27,7 @@
         <i ng-show="fetchingReleases" class="fa fa-spinner inline-icon fa-spin"></i>
         <select ng-hide="fetchingReleases || releases.length === 0"
                 type="select"
-                ng-options="release for release in releases"
+                ng-options="release === '' ? '(unset)' : release for release in releases"
                 ng-model="selected.release">
         </select>
 

data/lib/katello/version.rb

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

data/webpack/ForemanColumnExtensions/index.js

@@ -31,9 +31,7 @@ const hostsIndexColumnExtensions = [
   {
     columnName: 'bootc_booted_image',
     title: (
-      <span id="image-mode-column-title-icon">
-        <FontAwesomeImageModeIcon title={__('Image mode / package mode')} />
-      </span>
+      <Text title={__('Image mode / package mode')} ouiaId="image-mode-column-title" className="pf-c-table__text">{__('Type')}</Text>
     ),
     wrapper: (hostDetails) => {
       const imageMode = hostDetails?.content_facet_attributes?.bootc_booted_image;

data/webpack/components/extensions/HostDetails/ActionsBar/index.js

@@ -22,6 +22,9 @@ const HostActionsBar = () => {
   const recalculateApplicability = ['edit_hosts', 'create_job_invocations'];
   const showRecalculate =
     can(recalculateApplicability, userPermissionsFromHostDetails({ hostDetails }));
+  const changeContentSource = ['view_smart_proxies', 'view_capsule_content'];
+  const showChangeContentSource =
+    can(changeContentSource, userPermissionsFromHostDetails({ hostDetails }));
 
   const refreshHostDetails = () => dispatch({
     type: 'API_GET',
@@ -62,14 +65,17 @@ const HostActionsBar = () => {
         </DropdownItem>
       )
       }
-      <DropdownItem
-        ouiaId="katello-change-host-content-source"
-        key="katello-change-host-content-source"
-        href={foremanUrl(`/change_host_content_source?host_id=${hostDetails?.id}&initialContentSourceId=${hostDetails?.content_facet_attributes?.content_source_id}`)}
-        icon={<CubeIcon />}
-      >
-        {__('Change content source')}
-      </DropdownItem>
+      {showChangeContentSource && (
+        <DropdownItem
+          ouiaId="katello-change-host-content-source"
+          key="katello-change-host-content-source"
+          href={foremanUrl(`/change_host_content_source?host_id=${hostDetails?.id}&initialContentSourceId=${hostDetails?.content_facet_attributes?.content_source_id}`)}
+          icon={<CubeIcon />}
+        >
+          {__('Change content source')}
+        </DropdownItem>
+      )
+      }
     </>
   );
 };

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -42,12 +42,9 @@ const recommendedRepositoriesSatTools = [
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-capsule-6.16-for-rhel-8-x86_64-rpms',
-  'satellite-maintenance-6.16-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.16-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.16-for-rhel-9-x86_64-rpms',
-  'satellite-maintenance-6.16-for-rhel-9-x86_64-rpms',
-  'satellite-capsule-6.16-for-rhel-9-x86_64-rpms',
+  'satellite-utils-6.17-for-rhel-9-x86_64-rpms',
+  'satellite-maintenance-6.17-for-rhel-9-x86_64-rpms',
+  'satellite-capsule-6.17-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

data/webpack/scenes/BootedContainerImages/BootedContainerImagesPage.js

@@ -134,40 +134,42 @@ const BootedContainerImagesPage = () => {
               </>
             </Tr>
           </Thead>
-          <Tbody>
-            {status === STATUS.PENDING && results.length === 0 && (
-              <Tr ouiaId="table-loading">
-                <Td colSpan={100}>
-                  <EmptyPage
-                    message={{
-                      type: 'loading',
-                      text: __('Loading...'),
-                    }}
-                  />
-                </Td>
-              </Tr>
-            )}
-            {!(status === STATUS.PENDING) &&
-              results.length === 0 &&
-              !errorMessage && (
-                <Tr ouiaId="table-empty">
+          {(results.length === 0 || errorMessage) && (
+            <Tbody>
+              {status === STATUS.PENDING && results.length === 0 && (
+                <Tr ouiaId="table-loading">
                   <Td colSpan={100}>
                     <EmptyPage
                       message={{
-                        type: 'empty',
+                        type: 'loading',
+                        text: __('Loading...'),
                       }}
                     />
                   </Td>
                 </Tr>
-            )}
-            {errorMessage && (
-              <Tr ouiaId="table-error">
-                <Td colSpan={100}>
-                  <EmptyPage message={{ type: 'error', text: errorMessage }} />
-                </Td>
-              </Tr>
-            )}
-          </Tbody>
+              )}
+              {!(status === STATUS.PENDING) &&
+                results.length === 0 &&
+                !errorMessage && (
+                  <Tr ouiaId="table-empty">
+                    <Td colSpan={100}>
+                      <EmptyPage
+                        message={{
+                          type: 'empty',
+                        }}
+                      />
+                    </Td>
+                  </Tr>
+              )}
+              {errorMessage && (
+                <Tr ouiaId="table-error">
+                  <Td colSpan={100}>
+                    <EmptyPage message={{ type: 'error', text: errorMessage }} />
+                  </Td>
+                </Tr>
+              )}
+            </Tbody>
+          )}
           {results?.map((result, rowIndex) => {
             const { bootc_booted_image: bootcBootedImage, digests } = result;
             const isExpanded = imageIsExpanded(bootcBootedImage);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.16.0.rc1
+  version: 4.16.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails