katello 4.11.0.rc1 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2ec07cb634ffb6ddacf126df2d61f0db72a530b1cc8fae166fda6a3cfe68de
-  data.tar.gz: e29532e23032690a5a310f52d25065049292bded4221fc469aafae208e114c05
+  metadata.gz: 338456e8404dcc70c487c85c1d1ce10a52faf40c5ba3d19b6969250ec977cd93
+  data.tar.gz: eb9e87fddfde9dbe5c5cf8c094b2fad23d2128e96b360d2b2de0ee7a6e00e8c4
 SHA512:
-  metadata.gz: 1c7f69a4d82aa99c9c79b7d91cb78be4979edd6db9739b71ea7791b0988d34eb70f3aa3e641d34dae6d1432f14d824005b201bab392ee3ba60ebcf54fe333eac
-  data.tar.gz: d00aa557dbf348d30f1ee18e393f57029fd832901acdddad48af2db0d444413f9b3b361be66f2c2cd07b83ed41d8b7bbfffd895b077364ee7ed632b6bfb15cc7
+  metadata.gz: 73da7aa80f8aca8c4ffb4461d43d555418b13a1cbb4deddc13a3dda620a5572ae31049d890e03d9743b3854d0dc3027de8ac0933956c02250a80c679eb07a980
+  data.tar.gz: bbd2fa44e5938e913d958f89190d6091ae6d00a1a156f553ce1c5ddbd243f20872f48c340fb0eb9eca0c6d5e0f0b23820d9bc750dd0de6b3571b0578b716b1d7

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -276,7 +276,7 @@ module Katello
     end
 
     def get_content_source_id(hostname)
-      proxies = SmartProxy.authorized.filter do |sp|
+      proxies = SmartProxy.unscoped.authorized.filter do |sp|
         hostname == URI.parse(sp.url).hostname
       end
       return nil if proxies.length != 1
@@ -474,7 +474,20 @@ module Katello
     def update_host_registered_through(host, headers)
       parent_host = get_parent_host(headers)
       host.subscription_facet.update_attribute(:registered_through, parent_host)
-      content_source_id = get_content_source_id(parent_host)
+      set_host_content_source(host, parent_host)
+    end
+
+    def registering_thru_load_balancer?(hostname)
+      ::SmartProxy.behind_load_balancer(hostname).present?
+    end
+
+    def set_host_content_source(host, content_source_hostname)
+      content_source_id = get_content_source_id(content_source_hostname)
+      if registering_thru_load_balancer?(content_source_hostname)
+        Rails.logger.info "Host %s registered through load balancer %s" % [host.name, content_source_hostname]
+        content_source_id = ::SmartProxy.behind_load_balancer(content_source_hostname)&.first&.id
+      end
+      Rails.logger.warn "Host %s registered through unknown proxy %s" % [host.name, content_source_hostname] if content_source_id.nil?
       host.content_facet.update_attribute(:content_source_id, content_source_id)
     end
 

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

@@ -10,7 +10,7 @@ module Katello
     api :GET, "/organizations/:organization_id/simple_content_access/eligible",
       N_("Check if the specified organization is eligible for Simple Content Access. %s") % sca_only_deprecation_text, deprecated: true
     def eligible
-      ::Foreman::Deprecation.api_deprecation_warning("This endpoint is deprecated and will be removed in Katello 4.12. All organizations are now eligible for Simple Content Access.")
+      ::Foreman::Deprecation.api_deprecation_warning(N_("This endpoint is deprecated and will be removed in Katello 4.12. 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/controllers/katello/concerns/organizations_controller_extensions.rb

@@ -25,7 +25,7 @@ module Katello
             begin
               @taxonomy = Organization.new(resource_params)
               sca = ::Foreman::Cast.to_bool(params[:simple_content_access])
-              ::Foreman::Deprecation.api_deprecation_warning("Simple Content Access will be required for all organizations in Katello 4.12.")
+              ::Foreman::Deprecation.api_deprecation_warning(N_("Simple Content Access will be required for all organizations in Katello 4.12."))
               ::Katello::OrganizationCreator.new(@taxonomy, sca: sca).create!
               @taxonomy.reload
               switch_taxonomy

data/app/lib/katello/util/cvecf_migrator.rb

@@ -0,0 +1,34 @@
+module Katello
+  module Util
+    class CVECFMigrator # used in db/migrate/20220929204746_add_content_view_environment_content_facet.rb
+      def execute!
+        hosts_with_no_cve = []
+        hosts_with_missing_cve = []
+
+        ::Host::Managed.all.each do |host|
+          next if host.content_facet.blank?
+          if ::Katello::ContentView.exists?(id: host.content_facet.content_view_id) && ::Katello::KTEnvironment.exists?(host.content_facet.lifecycle_environment_id)
+            cve = ::Katello::ContentViewEnvironment.find_by(content_view_id: host.content_facet.content_view_id, environment_id: host.content_facet.lifecycle_environment_id)
+            if cve.blank?
+              hosts_with_no_cve << host
+            end
+          else
+            hosts_with_missing_cve << host
+          end
+        end
+
+        if hosts_with_missing_cve.present? || hosts_with_no_cve.present?
+          Rails.logger.warn "Found #{hosts_with_no_cve.count} hosts whose lifecycle environment does not have a corresponding ContentViewEnvironment"
+          Rails.logger.warn "Found #{hosts_with_missing_cve.count} hosts whose content facet is missing either content_view_id or lifecycle_environment_id"
+          Rails.logger.info "You may want to change the content view / lifecycle environment for these hosts manually."
+        end
+        (hosts_with_no_cve + hosts_with_missing_cve).each do |host|
+          default_content_view = host.organization.default_content_view
+          library = host.organization.library
+          Rails.logger.info "Updating host #{host.name} with default content_view_id and lifecycle_environment_id"
+          host.content_facet&.update_columns(content_view_id: default_content_view&.id, lifecycle_environment_id: library&.id)
+        end
+      end
+    end
+  end
+end

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

@@ -91,12 +91,17 @@ module Katello
 
         def remote_execution_proxies(provider, *_rest)
           proxies = super
-          if (name = subscription_facet&.registered_through)
-            registered_through = SmartProxy.with_features(provider)
+          name = subscription_facet&.registered_through
+          result = []
+          if name.present?
+            result = SmartProxy.with_features(provider)
                                            .authorized
                                            .where(name: name)
+            if result.blank?
+              result = SmartProxy.authorized.behind_load_balancer(name)
+            end
           end
-          proxies[:registered_through] = registered_through || []
+          proxies[:registered_through] = result
           proxies
         end
       end
@@ -193,7 +198,7 @@ module Katello
           property :content_views, 'ContentView', desc: 'Returns content views associated with the host'
           property :installed_packages, array_of: 'InstalledPackage', desc: 'Returns a list of packages installed on the host'
         end
-      end
+      end # of included block
 
       def check_host_registration
         if subscription_facet

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

@@ -68,6 +68,18 @@ module Katello
         }
         scope :with_content, -> { with_features(PULP_FEATURE, PULP_NODE_FEATURE, PULP3_FEATURE) }
 
+        def self.load_balanced
+          proxies = unscoped.with_content # load balancing is only supported for pulp proxies
+          ids = proxies.select { |proxy| proxy.load_balanced? }.map(&:id)
+          proxies.where(id: ids)
+        end
+
+        def self.behind_load_balancer(load_balancer_hostname)
+          proxies = unscoped.with_content
+          ids = proxies.select { |proxy| proxy.load_balanced? && proxy.registration_host == load_balancer_hostname }.map(&:id)
+          proxies.where(id: ids)
+        end
+
         def self.with_repo(repo)
           joins(:capsule_lifecycle_environments).
             where("#{Katello::CapsuleLifecycleEnvironment.table_name}.lifecycle_environment_id" => repo.environment_id)
@@ -121,6 +133,15 @@ module Katello
         SmartProxy.joins(:smart_proxy_alternate_content_sources).where('katello_smart_proxy_alternate_content_sources.smart_proxy_id' => self.id)
       end
 
+      def registration_host
+        url = self.setting('Registration', 'registration_url').presence || self.url
+        URI.parse(url).host
+      end
+
+      def load_balanced?
+        URI.parse(self.url).host != self.registration_host
+      end
+
       def update_content_counts!
         # {:content_view_versions=>{87=>{:repositories=>{1=>{:metadata=>{},:counts=>{:rpms=>98, :module_streams=>9898}}}}}
         new_content_counts = { content_view_versions: {} }

data/app/models/katello/content.rb

@@ -50,7 +50,7 @@ module Katello
         cp_products = ::Katello::Resources::Candlepin::Product.all(org.label, [:id, :productContent])
         product_hash = cp_products.group_by { |prod| prod['id'] }
 
-        prod_content_importer = Katello::ProductContentImporter.new(product_hash)
+        prod_content_importer = Katello::ProductContentImporter.new(cp_products)
         org.products.each do |product|
           product_json = product_hash[product.cp_id]&.first
 

data/app/services/katello/product_content_importer.rb

@@ -21,46 +21,6 @@ module Katello
     #    "enabled":false
     # }
     #
-    #Example cp_products json structure (key:values where values are arrays and productContent is an array of contents inside value array)
-    # {
-    #    "230"=>
-    #   [{"id"=>"230",
-    #     "productContent"=>
-    #      [{"content"=>
-    #         {"created"=>"2023-11-01T18:02:54+0000",
-    #          "updated"=>"2023-11-01T18:02:54+0000",
-    #          "uuid"=>"ff8080818b715841018b8c0d76d90190",
-    #          "id"=>"3996",
-    #          "type"=>"yum",
-    #          "label"=>"rhel-7-server-rt-htb-rpms",
-    #          "name"=>"Red Hat Enterprise Linux for Real Time HTB (RHEL 7 Server) (RPMs)",
-    #          "vendor"=>"Red Hat",
-    #          "contentUrl"=>"/content/htb/rhel/server/7/$basearch/rt/os",
-    #          "requiredTags"=>"rhel-7-server",
-    #          "releaseVer"=>nil,
-    #          "gpgUrl"=>"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release",
-    #          "modifiedProductIds"=>[],
-    #          "arches"=>nil,
-    #          "metadataExpire"=>1},
-    #        "enabled"=>false},
-    #       {"content"=>
-    #         {"created"=>"2023-11-01T18:02:54+0000",
-    #          "updated"=>"2023-11-01T18:02:54+0000",
-    #          "uuid"=>"ff8080818b715841018b8c0d76d90181",
-    #          "id"=>"2165",
-    #          "type"=>"yum",
-    #          "label"=>"rhel-7-server-optional-htb-debug-rpms",
-    #          "name"=>"Red Hat Enterprise Linux 7 Server - Optional HTB (Debug RPMs)",
-    #          "vendor"=>"Red Hat",
-    #          "contentUrl"=>"/content/htb/rhel/server/7/$basearch/optional/debug",
-    #          "requiredTags"=>"rhel-7-server",
-    #          "releaseVer"=>nil,
-    #          "gpgUrl"=>"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release",
-    #          "modifiedProductIds"=>[],
-    #          "arches"=>nil,
-    #          "metadataExpire"=>1},
-    #        "enabled"=>false}]}]
-    # }
     attr_reader :content_url_updated
 
     def initialize(cp_products = [])
@@ -76,13 +36,13 @@ module Katello
     end
 
     def find_product_for_content(content_id)
-      #Hash.find converts hash into enumerable iterating over each key,value pair which we can capture based on find result
-      cp_product_id, __cp_product_value = @cp_products.find do |prod_json|
-        prod_json&.last&.first&.[]('productContent')&.any? do |product_content_json|
-          product_content_json["content"]["id"] == content_id
+      prod = @cp_products.find do |prod_json|
+        next if prod_json&.[]('productContent').blank?
+        prod_json['productContent'].any? do |product_content_json|
+          product_content_json&.dig("content", "id") == content_id
         end
       end
-      ::Katello::Product.find_by(cp_id: cp_product_id)
+      ::Katello::Product.find_by(cp_id: prod["id"]) if prod
     end
 
     def fetch_product_contents_to_move(product, prod_contents_json)

data/db/migrate/20220929204746_add_content_view_environment_content_facet.rb

@@ -8,12 +8,13 @@ class AddContentViewEnvironmentContentFacet < ActiveRecord::Migration[6.1]
       t.references :content_view_environment, :null => false, :index => false, :foreign_key => { :to_table => 'katello_content_view_environments' }
       t.references :content_facet, :null => false, :index => false, :foreign_key => { :to_table => 'katello_content_facets' }
     end
+    ::Katello::Util::CVECFMigrator.new.execute!
     FakeContentFacet.all.each do |content_facet|
       cve_id = ::Katello::KTEnvironment.find(content_facet.lifecycle_environment_id)
           .content_view_environments
           .find_by(content_view_id: content_facet.content_view_id)
-          .id
-      unless ::Katello::ContentViewEnvironmentContentFacet.create(
+          &.id
+      unless cve_id.present? && ::Katello::ContentViewEnvironmentContentFacet.create(
         content_facet_id: content_facet.id,
         content_view_environment_id: cve_id
       )
@@ -39,14 +40,46 @@ class AddContentViewEnvironmentContentFacet < ActiveRecord::Migration[6.1]
 
     ::Katello::ContentViewEnvironmentContentFacet.all.each do |cvecf|
       content_facet = cvecf.content_facet
-      content_facet.content_view_id = cvecf.content_view_environment.content_view_id
-      content_facet.lifecycle_environment_id = cvecf.content_view_environment.environment_id
+      cve = cvecf.content_view_environment
+      default_org = cve.environment&.organization
+      default_cv_id = default_org&.default_content_view&.id
+      default_lce_id = default_org&.library&.id
+      cv_id = cvecf.content_view_environment.content_view_id || default_cv_id
+      lce_id = cvecf.content_view_environment.environment_id || default_lce_id
+      say "Updating content_facet #{content_facet.id} with cv_id #{cv_id} and lce_id #{lce_id}"
+      content_facet.content_view_id = cv_id
+      content_facet.lifecycle_environment_id = lce_id
       content_facet.save(validate: false)
     end
 
+    ensure_no_null_cv_lce
     change_column :katello_content_facets, :content_view_id, :integer, :null => false
     change_column :katello_content_facets, :lifecycle_environment_id, :integer, :null => false
 
     drop_table :katello_content_view_environment_content_facets
   end
+
+  def ensure_no_null_cv_lce
+    # The following is to try to prevent PG::NotNullViolation: ERROR:  column "content_view_id" contains null values
+    # since we add null constraints to the columns in the next step
+    content_facets_without_cv = ::Katello::Host::ContentFacet.where(content_view_id: nil)
+    if content_facets_without_cv.any?
+      say "Found #{content_facets_without_cv.count} content_facets with nil content_view_id"
+      content_facets_without_cv.each do |content_facet|
+        say "reassigning bad content_facet #{content_facet.id} to default content view"
+        content_facet.content_view_id = content_facet.host&.organization&.default_content_view&.id
+        content_facet.save(validate: false)
+      end
+    end
+
+    content_facets_without_lce = ::Katello::Host::ContentFacet.where(lifecycle_environment_id: nil)
+    if content_facets_without_lce.any?
+      say "Found #{content_facets_without_lce.count} content_facets with nil lifecycle_environment_id"
+      content_facets_without_lce.each do |content_facet|
+        say "reassigning bad content_facet #{content_facet.id} to default lifecycle environment"
+        content_facet.lifecycle_environment_id = content_facet.host&.organization&.library&.id
+        content_facet.save(validate: false)
+      end
+    end
+  end
 end

data/lib/katello/version.rb

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

data/lib/katello.rb

@@ -6,6 +6,7 @@ require "rabl"
 require "oauth"
 require "gettext_i18n_rails"
 require "foreman-tasks"
+require "foreman_remote_execution"
 require "rest_client"
 require "anemone"
 require "securerandom"

data/package.json

@@ -31,7 +31,7 @@
     "@testing-library/user-event": "^13.5.0",
     "@theforeman/builder": ">= 6.0.0",
     "@theforeman/find-foreman": "^4.8.0",
-    "@theforeman/eslint-plugin-rules": "^12.0.1",
+    "@theforeman/eslint-plugin-rules": "^12.2.0",
     "axios-mock-adapter": "^1.10.0",
     "eslint": "^6.2.2",
     "eslint-config-airbnb": "^16.0.0",

data/webpack/components/Content/Details/ContentDetails.js

@@ -10,7 +10,7 @@ const ContentDetails = (props) => {
 
   const tabHeaders = () => {
     const tabs = schema.map(node => (
-      <NavItem key={node.key} eventKey={node.key} ouiaId={`${node.key}-nav-item`}>
+      <NavItem key={node.key} eventKey={node.key}>
         <div>{node.tabHeader}</div>
       </NavItem>
     ));
@@ -40,12 +40,12 @@ const ContentDetails = (props) => {
           <Grid>
             <Row>
               <Col sm={12}>
-                <Nav id="content-nav-container" bsClass="nav nav-tabs" ouiaId="content-details-nav">
+                <Nav id="content-nav-container" bsClass="nav nav-tabs">
                   {schema && tabHeaders()}
                 </Nav>
               </Col>
             </Row>
-            <TabContent animation={false} ouiaId="content-details-tab-content">
+            <TabContent animation={false}>
               {schema && tabPanes()}
             </TabContent>
           </Grid>

data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap

@@ -35,7 +35,6 @@ exports[`Content Details Info should render and contain appropriate components 1
               bsClass="nav nav-tabs"
               id="content-nav-container"
               justified={false}
-              ouiaId="content-details-nav"
               pullLeft={false}
               pullRight={false}
               stacked={false}
@@ -45,7 +44,6 @@ exports[`Content Details Info should render and contain appropriate components 1
                 disabled={false}
                 eventKey={1}
                 key="1"
-                ouiaId="1-nav-item"
               >
                 <div>
                   Details
@@ -56,7 +54,6 @@ exports[`Content Details Info should render and contain appropriate components 1
                 disabled={false}
                 eventKey={2}
                 key="2"
-                ouiaId="2-nav-item"
               >
                 <div>
                   Repositories
@@ -70,7 +67,6 @@ exports[`Content Details Info should render and contain appropriate components 1
           bsClass="tab"
           componentClass="div"
           mountOnEnter={false}
-          ouiaId="content-details-tab-content"
           unmountOnExit={false}
         >
           <TabPane

data/webpack/components/SelectOrg/SetOrganization.js

@@ -74,7 +74,6 @@ class SetOrganization extends Component {
               <div className="col-sm-3">
                 <a href={`/organizations/${id}/select`}>
                   <Button
-                    ouiaId="select-org-button"
                     disabled={this.state.disabled}
                     className="btn btn-primary"
                     onClick={this.onSend}

data/webpack/components/TooltipButton/TooltipButton.js

@@ -6,7 +6,7 @@ import './TooltipButton.scss';
 const TooltipButton = ({
   disabled, title, tooltipText, tooltipId, tooltipPlacement, renderedButton, ...props
 }) => {
-  if (!disabled) return renderedButton || (<Button {...props} ouiaId="tooltip-button">{title}</Button>);
+  if (!disabled) return renderedButton || (<Button {...props}>{title}</Button>);
   return (
     <OverlayTrigger
       placement={tooltipPlacement}
@@ -14,7 +14,7 @@ const TooltipButton = ({
       overlay={<Tooltip id={tooltipId}>{tooltipText}</Tooltip>}
     >
       <div className="tooltip-button-helper">
-        {renderedButton || (<Button {...props} disabled ouiaId="tooltip-disabled-button">{title}</Button>)}
+        {renderedButton || (<Button {...props} disabled>{title}</Button>)}
       </div>
     </OverlayTrigger>
   );

data/webpack/components/TooltipButton/__snapshots__/TooltipButton.test.js.snap

@@ -30,7 +30,6 @@ exports[`TooltipButton renders disabled TooltipButton 1`] = `
       bsClass="btn"
       bsStyle="default"
       disabled={true}
-      ouiaId="tooltip-disabled-button"
     >
       some-title
     </Button>
@@ -74,7 +73,6 @@ exports[`TooltipButton renders enabled TooltipButton 1`] = `
   bsClass="btn"
   bsStyle="default"
   disabled={false}
-  ouiaId="tooltip-button"
 >
   some-title
 </Button>
@@ -89,6 +87,5 @@ exports[`TooltipButton renders minimal TooltipButton 1`] = `
   bsClass="btn"
   bsStyle="default"
   disabled={false}
-  ouiaId="tooltip-button"
 />
 `;

data/webpack/components/pf3Table/components/Table.js

@@ -42,7 +42,6 @@ const Table = ({
         {body}
       </PfTable.PfProvider>
       {shouldRenderPagination && (
-        // eslint-disable-next-line @theforeman/rules/require-ouiaid
         <Pagination
           itemCount={itemCount}
           onChange={onPaginationChange}

data/webpack/scenes/ContentViews/Details/Repositories/RepoIcon.js

@@ -14,7 +14,7 @@ const RepoIcon = ({ type }) => {
   };
   const Icon = iconMap[type] || BoxIcon;
 
-  return <Tooltip content={<div>{type}</div>}><Icon /></Tooltip>;
+  return <Tooltip content={<div>{type}</div>}><Icon aria-label={`${type}_type_icon`} /></Tooltip>;
 };
 
 RepoIcon.propTypes = {

data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap

@@ -119,7 +119,6 @@ exports[`RedHatRepositories page should render 1`] = `
               onChange={[Function]}
               onPerPageSelect={null}
               onSetPage={null}
-              ouiaId="enabled-repos-pagination"
               page={1}
               perPage={null}
               updateParamsByUrl={true}

data/webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.js

@@ -19,7 +19,6 @@ const RecommendedRepositorySetsToggler = ({
   return (
     <div className={classes} {...props}>
       <Switch
-        ouiaId="enabled-repo-set-switch"
         bsSize="mini"
         value={enabled}
         onChange={() => onChange(!enabled)}

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepositories.js

@@ -53,7 +53,7 @@ export class RepositorySetRepositories extends Component {
 
     if (data.error) {
       return (
-        <Alert type="danger" ouiaId="repo-set-alert">
+        <Alert type="danger">
           <span>{data.error.displayMessage}</span>
         </Alert>
       );

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RecommendedRepositorySetsToggler.test.js.snap

@@ -19,7 +19,6 @@ exports[`RecommendedRepositorySetsToggler rendering renders recommended-reposito
     onChange={[Function]}
     onColor="primary"
     onText="ON"
-    ouiaId="enabled-repo-set-switch"
     readonly={false}
     tristate={false}
     value={true}

data/webpack/scenes/RedHatRepositories/components/__tests__/__snapshots__/RepositorySetRepositories.test.js.snap

@@ -18,7 +18,6 @@ exports[`RepositorySetRepositories Component should render with error 1`] = `
 <Alert
   className=""
   onDismiss={null}
-  ouiaId="repo-set-alert"
   type="danger"
 >
   <span>