katello 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50dbc6ac50280ac62f64e850e0d16444abed94953b491ac51db4530e8e377edb
-  data.tar.gz: e5d4e0fb485fcbdfd73d56c3f7e1d9952bdec57110447c683d55c2e81784a0f1
+  metadata.gz: 394c0b86328c832286333df0a23a4cdf78b828e1321d16182678a77dd263d919
+  data.tar.gz: a5df02b4fa3455885b598649b352f7ccb315cb958ca5346ef5f448544284ceb4
 SHA512:
-  metadata.gz: 56f172e039b743a27fddb7af888d01bfd42699da833b1afddeea3ea5d44b96abf38870d1fcc95481c538725974ccf343bfef35230a51ba916352054d9f0f8eee
-  data.tar.gz: 7ac8d7121b1d41d28417ed65904cb29444935f429c02d285766a8ada60c2f76d29f4015291045c583e4729c7ac5d9839a5d6bec50beaae06d09c7dcff2461ccc
+  metadata.gz: 703fdc37bae22b0b452ae2a144e05f2c5654678e64c0a56291a45047caaf730b6bdcc9da3db0bd4b936322b4634e3f0f5be7a9e5e5c64f719d3dab8e3cab201f
+  data.tar.gz: '0914650d9e9c5b7664850fee333422206952ee5b469dbb3058612ddffd40f30d24b436f23b62cea07707ed9682250e3ab39c18a8dc17f0b028cf11984896f0e6'

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

@@ -81,7 +81,7 @@ module Katello
     def create
       rhsm_params = params_to_rhsm_params
 
-      host = Katello::RegistrationManager.process_registration(rhsm_params, @content_view_environment)
+      host = Katello::RegistrationManager.process_registration(rhsm_params, [@content_view_environment])
       host.reload
       ::Katello::Host::SubscriptionFacet.update_facts(host, rhsm_params[:facts]) unless rhsm_params[:facts].blank?
 

data/app/lib/actions/katello/agent_action.rb

@@ -14,8 +14,10 @@ module Actions
 
       def plan(host, options)
         action_subject(host, :hostname => host.name, :content => options[:content])
-
-        dispatch_history_id = options.dig(:dispatch_histories, host.id.to_s) || ::Katello::Agent::Dispatcher.create_histories(
+        # options[:dispatch_histories] keys might be strings or integers
+        dispatch_history_id = options.dig(:dispatch_histories, host.id.to_s) ||
+        options.dig(:dispatch_histories, host.id.to_i) ||
+          ::Katello::Agent::Dispatcher.create_histories(
           host_ids: [host.id]
         ).first.id
 
@@ -44,7 +46,6 @@ module Actions
             history.dynflow_execution_plan_id = suspended_action.execution_plan_id
             history.dynflow_step_id = suspended_action.step_id
             history.save!
-
             dispatch_message(history) unless input[:bulk]
 
             schedule_timeout(timeout, optional: true)

data/app/lib/actions/katello/bulk_agent_action.rb

@@ -21,7 +21,10 @@ module Actions
 
       def spawn_plans
         args = input[:args].first
-        histories = ::Katello::Agent::DispatchHistory.where(id: args[:dispatch_histories].slice(*current_batch.map(&:to_s)).values)
+        # args[:dispatch_histories] keys are numeric host ids; they may be integer or string
+        # Hash#slice will return a filtered hash only with the specified keys, and ignore keys that don't exist
+        possible_keys = [*current_batch.map(&:to_i), *current_batch.map(&:to_s)]
+        histories = ::Katello::Agent::DispatchHistory.where(id: args[:dispatch_histories].slice(*possible_keys).values)
         ::Katello::Agent::Dispatcher.dispatch(
           args[:type].to_sym,
           histories,

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

@@ -14,6 +14,8 @@ module Actions
                 plan_self(source_repository_id: options[:source_repository].id, target_repository_id: repository.id, smart_proxy_id: smart_proxy.id)
               elsif publication_content_type && (force_publication || repository.publication_href.nil? || !repository.using_mirrored_metadata?)
                 plan_action(Actions::Pulp3::Repository::CreatePublication, repository, smart_proxy, options)
+              elsif !publication_content_type
+                plan_self(target_repository_id: repository.id, contents_changed: options[:contents_changed], skip_publication: true)
               end
               plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy) unless repository.unprotected
               plan_action(Actions::Pulp3::Repository::RefreshDistribution, repository, smart_proxy, :contents_changed => options[:contents_changed]) if Setting[:distribute_archived_cvv] || repository.environment
@@ -21,13 +23,18 @@ module Actions
           end
 
           def run
-            #we don't have to actually generate a publication, we can reuse the old one
             target_repo = ::Katello::Repository.find(input[:target_repository_id])
-            source_repo = ::Katello::Repository.find(input[:source_repository_id])
-            if (target_repo.publication_href != source_repo.publication_href && smart_proxy.pulp_primary?)
-              target_repo.clear_smart_proxy_sync_histories
+            if input[:skip_publication]
+              #Need to clear smart proxy sync histories for non-publication content_types: docker, ansible collection
+              target_repo.clear_smart_proxy_sync_histories if input[:contents_changed]
+            else
+              #we don't have to actually generate a publication, we can reuse the old one
+              source_repo = ::Katello::Repository.find(input[:source_repository_id])
+              if (target_repo.publication_href != source_repo.publication_href && smart_proxy.pulp_primary?)
+                target_repo.clear_smart_proxy_sync_histories
+              end
+              target_repo.update!(publication_href: source_repo.publication_href)
             end
-            target_repo.update!(publication_href: source_repo.publication_href)
           end
         end
       end

data/app/models/katello/candlepin/repository_mapper.rb

@@ -56,6 +56,7 @@ module Katello
       end
 
       def substitutor
+        fail _("Manifest does not have a valid subscription") if product.cdn_resource.nil?
         product.cdn_resource.substitutor
       end
 

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

@@ -1,6 +1,4 @@
 attributes :id, :uuid
-attributes :content_view_id, :content_view_name
-attributes :lifecycle_environment_id, :lifecycle_environment_name
 attributes :content_source_id, :content_source_name
 attributes :kickstart_repository_id, :kickstart_repository_name
 attributes :errata_counts
@@ -10,6 +8,15 @@ attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
+child :content_view_environments => :content_view_environments do
+  node :content_view do |cve|
+    { id: cve.content_view.id, name: cve.content_view.name, composite: cve.content_view.composite }
+  end
+  node :lifecycle_environment do |cve|
+    { id: cve.lifecycle_environment.id, name: cve.lifecycle_environment.name }
+  end
+end
+
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
   if content_view.present?
@@ -31,14 +38,6 @@ node :lifecycle_environment do |content_facet|
   end
 end
 
-child :content_views => :content_views do
-  attributes :id, :name, :composite
-end
-
-child :lifecycle_environments => :lifecycle_environments do
-  attributes :id, :name
-end
-
 child :content_source => :content_source do
   attributes :id, :name, :url
 end

data/db/migrate/20220228173251_remove_drpm_from_ignorable_content.rb

@@ -6,6 +6,7 @@ class RemoveDrpmFromIgnorableContent < ActiveRecord::Migration[6.0]
       else
         root.ignorable_content = []
       end
+      root.checksum_type = nil if root.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
       root.save!
     end
   end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html

@@ -1,7 +1,7 @@
 <section>
   <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in a future release.
+      Katello-agent is deprecated and will be removed in Katello 4.10.
     </span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -5,8 +5,6 @@
   <h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h3>
 </div>
 
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
-
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -2,7 +2,6 @@
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
-  <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
   <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>
       Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html

@@ -1,7 +1,6 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
 <h3 translate>Applicable Packages</h3>
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="warning" ng-hide="hostToolingEnabled">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html

@@ -2,8 +2,6 @@
 
 <h3 translate>Installed Packages</h3>
 
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
-
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.controller.js

@@ -15,6 +15,7 @@
  * @requires ContentHostsHelper
  * @requires simpleContentAccessEnabled
  * @requires newHostDetailsUI
+ * @requires BastionConfig
  *
  * @description
  *   Provides the functionality specific to Content Hosts for use with the Nutupane UI pattern.
@@ -22,8 +23,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsController',
-    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled', 'newHostDetailsUI',
-    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled, newHostDetailsUI) {
+    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled', 'newHostDetailsUI', 'BastionConfig',
+    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled, newHostDetailsUI, BastionConfig) {
         var nutupane, params, query;
 
         if ($location.search().search) {
@@ -51,6 +52,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
         $scope.nutupane = nutupane;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
         $scope.newHostDetailsUI = newHostDetailsUI;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
 
         // @TODO begin hack necessary because of foreman API bug http://projects.theforeman.org/issues/13877
         $scope.table.sortBy = function (column) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js

@@ -14,13 +14,14 @@
  * @requires deleteHostOnUnregister
  * @requires ContentHostsHelper
  * @requires simpleContentAccessEnabled
+ * @requires BastionConfig
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled',
-    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled) {
+    ['$scope', '$state', '$q', '$location', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper', 'simpleContentAccessEnabled', 'BastionConfig',
+    function ($scope, $state, $q, $location, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper, simpleContentAccessEnabled, BastionConfig) {
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
@@ -36,6 +37,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
+        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
 
         $scope.panel = {
             error: false,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html

@@ -54,6 +54,7 @@
 
   <nav data-block="navigation">
     <div content-access-mode-banner></div>
+    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
     <ul class="nav nav-tabs">
       <li ng-class="{active: isState('content-host.info')}">
         <a translate

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -66,6 +66,10 @@
     </span>
   </div>
 
+  <span data-block="messages">
+    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
+  </span>
+
   <span data-block="no-rows-message" translate>
     You currently don't have any Content Hosts, you can register one by clicking the button on the right and following the instructions.
   </span>

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.8.2".freeze
+  VERSION = "4.8.3".freeze
 end

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

@@ -44,6 +44,7 @@ import { defaultRemoteActionMethod,
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 import { useRexJobPolling } from '../RemoteExecutionHooks';
 import { errataStatusContemplation, friendlyErrataStatus } from '../../../../Errata/errataHelpers';
+import KatelloAgentDeprecationAlert from '../../common/KatelloAgentDeprecationAlert';
 
 const recalculateApplicability = ['edit_hosts'];
 const invokeRexJobs = ['create_job_invocations'];
@@ -465,6 +466,9 @@ export const ErrataTab = () => {
   return (
     <div>
       <div id="errata-tab">
+        {defaultRemoteAction === KATELLO_AGENT && (
+          <KatelloAgentDeprecationAlert />
+        )}
         <TableWrapper
           {...{
             metadata,

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

@@ -48,6 +48,7 @@ import { defaultRemoteActionMethod,
   userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 import { useRexJobPolling } from '../RemoteExecutionHooks';
+import KatelloAgentDeprecationAlert from '../../common/KatelloAgentDeprecationAlert';
 
 const invokeRexJobs = ['create_job_invocations'];
 const doKatelloAgentActions = ['edit_hosts'];
@@ -491,6 +492,9 @@ export const PackagesTab = () => {
   return (
     <div>
       <div id="packages-tab">
+        {showKatelloAgent && (
+          <KatelloAgentDeprecationAlert />
+        )}
         <TableWrapper
           {...{
             metadata,

data/webpack/components/extensions/HostDetails/common/KatelloAgentDeprecationAlert.js

@@ -0,0 +1,23 @@
+import React, { useState } from 'react';
+import {
+  Alert,
+  AlertActionCloseButton,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const KatelloAgentDeprecationAlert = () => {
+  const [kAgentAlertShowing, setKAgentAlertShowing] = useState(true);
+
+  return kAgentAlertShowing ? (
+    <Alert
+      variant="warning"
+      className="katello-agent-deprecation-alert"
+      ouiaId="katello-agent-deprecation-alert"
+      isInline
+      title={__('Katello-agent is deprecated and will be removed in Katello 4.10.')}
+      actionClose={<AlertActionCloseButton ouiaId="katello-agent-alert-close-button" onClose={() => setKAgentAlertShowing(false)} />}
+    />
+  ) : null;
+};
+
+export default KatelloAgentDeprecationAlert;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -412,16 +412,16 @@ dependencies:
   name: pulp_ostree_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -4699,6 +4699,7 @@ files:
 - webpack/components/extensions/HostDetails/Tabs/__tests__/tracesTab.test.js
 - webpack/components/extensions/HostDetails/Tabs/__tests__/yumInstallablePackages.fixtures.json
 - webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js
+- webpack/components/extensions/HostDetails/common/KatelloAgentDeprecationAlert.js
 - webpack/components/extensions/HostDetails/hostDetailsHelpers.js
 - webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageConstants.js
 - webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js