katello 4.3.0.rc4 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83de032a01e5d20e480d164eb425db853b1eea9a4668eb1aa853bfaa5d6a703a
-  data.tar.gz: aad3b14f2608df9c71cb039222ced8baf98bc89537c28967fcc1d47ac3ce3c5c
+  metadata.gz: 5bebacc5b4b127cfadaeb424ce9f04aa6e2ba132a0d8d959d8456bd393418abf
+  data.tar.gz: 473b94c0aec5d6b73a174f334edf1f9079d42c53d16ef0ab60cc939af0e0e4b0
 SHA512:
-  metadata.gz: cb93e596697f4639b7b4ba3d512524f9880f63442bdba0b4963f73fe6aa18b61d4565f71f488a7cd99f54c0908cbe74cc59468b987450c5d02c9f8020a521761
-  data.tar.gz: 9ffa356f5005ab1e2119c119c24837530c23d4d004c1a9c99a3b120fc648f443bf126faae8adff3a5763714ba70d9aa412976f50b6d886e6dc3bd0fb4257dcce
+  metadata.gz: 000e85ae93b95be282c88d10eec6f364526cfdb9e377de7b56d82a8df882e8390c40690b4d7b0740c24196fa10d20d166b48779f3422699e7a970bfb1722cdc2
+  data.tar.gz: 23a1e59f555ddbe334a98d6937aa64de3d46b1bc6b8fb33a61166e317792686fae9f30af480d0037226eebf6d341769a15acd1972d7bb05d20696ab6af1fb9dc

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

@@ -76,7 +76,7 @@ module Katello
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use mirror on sync."), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy"), :required => true
     def republish_repositories
       unless ::Foreman::Cast.to_bool(params[:force])
         fail HttpErrors::BadRequest, _("Metadata republishing must be forced because it is a dangerous operation.")

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

@@ -7,7 +7,7 @@ module Katello
       generic_repo_wrap_params << option.name
     end
 
-    repo_wrap_params = RootRepository.attribute_names.concat([:ignore_global_proxy]) + generic_repo_wrap_params
+    repo_wrap_params = RootRepository.attribute_names.concat([:ignore_global_proxy, :mirror_on_sync]) + generic_repo_wrap_params
 
     wrap_parameters :repository, :include => repo_wrap_params
 
@@ -53,7 +53,8 @@ module Katello
       param :docker_tags_whitelist, Array, :desc => N_("Comma-separated list of tags to sync for Container Image repository")
       param :download_policy, ["immediate", "on_demand"], :desc => N_("download policy for yum repos (either 'immediate' or 'on_demand')")
       param :download_concurrency, :number, :desc => N_("Used to determine download concurrency of the repository in pulp3. Use value less than 20. Defaults to 10")
-      param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed")
+      param :mirror_on_sync, :bool, :desc => N_("true if this repository when synced has to be mirrored from the source and stale rpms removed (Deprecated)")
+      param :mirroring_policy, Katello::RootRepository::MIRRORING_POLICIES, :desc => N_("Policy to set for mirroring content.  Must be one of %s.") % RootRepository::MIRRORING_POLICIES
       param :verify_ssl_on_sync, :bool, :desc => N_("if true, Katello will verify the upstream url's SSL certifcates are signed by a trusted CA")
       param :upstream_username, String, :desc => N_("Username of the upstream repository user used for authentication")
       param :upstream_password, String, :desc => N_("Password of the upstream repository user used for authentication")
@@ -268,7 +269,7 @@ module Katello
 
     api :PUT, "/repositories/:id/republish", N_("Forces a republish of the specified repository, regenerating metadata and symlinks on the filesystem.")
     param :id, :number, :desc => N_("Repository identifier"), :required => true
-    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use mirror on sync."), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use the 'Complete Mirroring' mirroring policy."), :required => true
     def republish
       unless ::Foreman::Cast.to_bool(params[:force])
         fail HttpErrors::BadRequest, _('Metadata republishing must be forced because it is a dangerous operation.')
@@ -501,7 +502,7 @@ module Katello
 
     # rubocop:disable Metrics/CyclomaticComplexity
     def repository_params
-      keys = [:download_policy, :mirror_on_sync, :arch, :verify_ssl_on_sync, :upstream_password,
+      keys = [:download_policy, :mirror_on_sync, :mirroring_policy, :sync_policy, :arch, :verify_ssl_on_sync, :upstream_password,
               :upstream_username, :download_concurrency, :upstream_authentication_token,
               {:os_versions => []}, :deb_releases, :deb_components, :deb_architectures, :description,
               :http_proxy_policy, :http_proxy_id, :retain_package_versions_count, {:ignorable_content => []}
@@ -525,7 +526,8 @@ module Katello
         keys += [:url, :gpg_key_id, :ssl_ca_cert_id, :ssl_client_cert_id, :ssl_client_key_id, :unprotected, :name,
                  :checksum_type]
       end
-      params.require(:repository).permit(*keys).to_h.with_indifferent_access
+      to_return = params.require(:repository).permit(*keys).to_h.with_indifferent_access
+      handle_mirror_on_sync(to_return)
     end
 
     def get_content_credential(repo_params, content_type)
@@ -545,8 +547,8 @@ module Katello
                                                             :checksum_type, :download_policy, :http_proxy_policy).to_h.with_indifferent_access)
       root.docker_upstream_name = repo_params[:docker_upstream_name] if repo_params[:docker_upstream_name]
       root.docker_tags_whitelist = repo_params.fetch(:docker_tags_whitelist, []) if root.docker?
-      root.mirror_on_sync = ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync]) if repo_params.key?(:mirror_on_sync)
       root.verify_ssl_on_sync = ::Foreman::Cast.to_bool(repo_params[:verify_ssl_on_sync]) if repo_params.key?(:verify_ssl_on_sync)
+      root.mirroring_policy = repo_params[:mirroring_policy] || Katello::RootRepository::MIRRORING_POLICY_CONTENT
       root.upstream_username = repo_params[:upstream_username] if repo_params.key?(:upstream_username)
       root.upstream_password = repo_params[:upstream_password] if repo_params.key?(:upstream_password)
       root.upstream_authentication_token = repo_params[:upstream_authentication_token] if repo_params.key?(:upstream_authentication_token)
@@ -577,6 +579,19 @@ module Katello
     end
     # rubocop:enable Metrics/CyclomaticComplexity
 
+    def handle_mirror_on_sync(repo_params)
+      if !repo_params.key?(:mirroring_policy) && repo_params.key?(:mirror_on_sync)
+        ::Foreman::Deprecation.api_deprecation_warning("mirror_on_sync is deprecated in favor of mirroring_policy.  It will be removed in Katello 4.6.")
+        if ::Foreman::Cast.to_bool(repo_params[:mirror_on_sync])
+          repo_params[:mirroring_policy] = Katello::RootRepository::MIRRORING_POLICY_CONTENT
+        else
+          repo_params[:mirroring_policy] = Katello::RootRepository::MIRRORING_POLICY_ADDITIVE
+        end
+      end
+      repo_params.delete(:mirror_on_sync)
+      repo_params
+    end
+
     def error_on_rh_product
       fail HttpErrors::BadRequest, _("Red Hat products cannot be manipulated.") if @product.redhat?
     end
@@ -652,7 +667,7 @@ module Katello
     def check_import_parameters
       @repository.repository_type&.import_attributes&.each do |import_attribute|
         if import_attribute.required && params[import_attribute.api_param].blank?
-          fail HttpErrors::UnprocessableEntity, _("%s is required", import_attributes.api_param)
+          fail HttpErrors::UnprocessableEntity, _('%s is required') % import_attribute.api_param
         end
       end
     end

data/app/graphql/types/host_collection.rb

@@ -0,0 +1,18 @@
+module Types
+  class HostCollection < BaseObject
+    description "A collection of hosts"
+    model_class ::Katello::HostCollection
+
+    global_id_field :id
+    timestamps
+    field :name, String
+    field :description, String
+    field :max_hosts, Integer
+    field :unlimited_hosts, Boolean
+    has_many :hosts, Types::Host
+
+    def self.graphql_definition
+      super.tap { |type| type.instance_variable_set(:@name, 'Katello::HostCollection') }
+    end
+  end
+end

data/app/lib/actions/pulp3/abstract_async_task.rb

@@ -113,7 +113,7 @@ module Actions
       def overwrite_pulp_error(message)
         case message
         when 'This repository uses features which are incompatible with \'mirror\' sync. Please sync without mirroring enabled.'
-          'Please disable \'mirror on sync\' because the upstream repository refers to external resources.'
+          'The "Complete Mirroring" mirroring policy is not compatible with this repository.  You may want to update it to use "Content Only"'
         else
           message
         end

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

@@ -34,7 +34,7 @@ module Katello
           :content_type => katello_content_type,
           :unprotected => unprotected?,
           :download_policy => download_policy,
-          :mirror_on_sync => true
+          :mirroring_policy => Katello::RootRepository::MIRRORING_POLICY_COMPLETE
         )
 
         Repository.new(:root => root,

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

@@ -109,7 +109,7 @@ module Katello
         self.host_statuses.where(type: ::Katello::HostStatusManager::STATUSES.map(&:name)).each do |status|
           status.refresh!
         end
-        refresh_global_status!
+        refresh_global_status
       end
 
       def queue_refresh_content_host_status

data/app/models/katello/glue/provider.rb

@@ -1,6 +1,6 @@
 module Katello
   module Glue::Provider
-    DISTRIBUTOR_VERSION = 'sat-6.7'.freeze
+    DISTRIBUTOR_VERSION = 'sat-6.10'.freeze
 
     def self.included(base)
       base.send :include, InstanceMethods

data/app/models/katello/glue/pulp/repos.rb

@@ -136,6 +136,8 @@ module Katello
           repo_param[:download_policy] = Setting[:default_download_policy]
         end
 
+        repo_param[:mirroring_policy] = Katello::RootRepository::MIRRORING_POLICY_ADDITIVE if repo_param[:mirroring_policy].blank?
+
         RootRepository.new(repo_param.merge(:product_id => self.id))
       end
     end

data/app/models/katello/repository.rb

@@ -173,7 +173,7 @@ module Katello
     delegate :name, :label, :docker_upstream_name, :url, :download_concurrency, :to => :root
 
     delegate :name, :created_at, :updated_at, :major, :minor, :gpg_key_id, :gpg_key, :arch, :label, :url, :unprotected,
-             :content_type, :product_id, :checksum_type, :docker_upstream_name, :mirror_on_sync, :"mirror_on_sync?",
+             :content_type, :product_id, :checksum_type, :docker_upstream_name, :mirroring_policy,
              :download_policy, :verify_ssl_on_sync, :"verify_ssl_on_sync?", :upstream_username, :upstream_password,
              :upstream_authentication_token, :deb_releases,
              :deb_components, :deb_architectures, :ssl_ca_cert_id, :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_id,
@@ -285,14 +285,14 @@ module Katello
       ::Katello::Resources::CDN::CdnResource.ca_file if ::Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
     end
 
-    def using_mirrored_metadata?
-      self.yum? && self.library_instance? && self.mirror_on_sync
-    end
-
     def archive?
       self.environment.nil?
     end
 
+    def using_mirrored_metadata?
+      self.yum? && self.library_instance? && self.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+    end
+
     def in_default_view?
       content_view_version&.default_content_view?
     end

data/app/models/katello/root_repository.rb

@@ -38,6 +38,11 @@ module Katello
     RHEL9 = 'rhel-9'.freeze
     ALLOWED_OS_VERSIONS = [RHEL6, RHEL7, RHEL8, RHEL9].freeze
 
+    MIRRORING_POLICY_ADDITIVE = 'additive'.freeze
+    MIRRORING_POLICY_CONTENT = 'mirror_content_only'.freeze
+    MIRRORING_POLICY_COMPLETE = 'mirror_complete'.freeze
+    MIRRORING_POLICIES = [MIRRORING_POLICY_ADDITIVE, MIRRORING_POLICY_COMPLETE, MIRRORING_POLICY_CONTENT].freeze
+
     belongs_to :product, :inverse_of => :root_repositories, :class_name => "Katello::Product"
     has_one :provider, :through => :product
 
@@ -74,6 +79,7 @@ module Katello
     validate :ensure_valid_authentication_token, :if => :yum?
     validate :ensure_valid_deb_constraints, :if => :deb?
     validate :ensure_no_checksum_on_demand
+    validate :ensure_valid_mirroring_policy
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
     validates :product_id, :presence => true
     validates :content_type, :inclusion => {
@@ -107,6 +113,7 @@ module Katello
     }
     scope :orphaned, -> { where.not(id: Katello::Repository.pluck(:root_id).uniq) }
     scope :redhat, -> { joins(:provider).merge(Katello::Provider.redhat) }
+    scope :custom, -> { where.not(:id => self.redhat) }
     delegate :redhat?, :provider, :organization, to: :product
     delegate :cdn_configuration, to: :organization
 
@@ -145,6 +152,21 @@ module Katello
       end
     end
 
+    def valid_mirroring_policies
+      if self.yum?
+        MIRRORING_POLICIES
+      else
+        [MIRRORING_POLICY_ADDITIVE, MIRRORING_POLICY_CONTENT]
+      end
+    end
+
+    def ensure_valid_mirroring_policy
+      unless valid_mirroring_policies.include?(self.mirroring_policy)
+        errors.add(:mirroring_policy, _("Invalid mirroring policy for repository type %{type}, only %{policies} are valid.") %
+          {:type => self.content_type, :policies => valid_mirroring_policies.join(', ')})
+      end
+    end
+
     def ensure_valid_docker_attributes
       if (!url.blank? && docker_upstream_name.blank?)
         errors.add(:docker_upstream_name, N_("cannot be blank when Repository URL is provided."))
@@ -325,12 +347,16 @@ module Katello
       (%w(unprotected checksum_type container_repsoitory_name) & previous_changes.keys).any?
     end
 
+    def using_mirrored_content?
+      self.mirroring_policy != Katello::RootRepository::MIRRORING_POLICY_ADDITIVE
+    end
+
     def on_demand?
       self.download_policy == DOWNLOAD_ON_DEMAND
     end
 
     def pulp_update_needed?
-      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirror_on_sync verify_ssl_on_sync
+      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirroring_policy verify_ssl_on_sync
                                  upstream_username upstream_password ignorable_content
                                  ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id http_proxy_policy http_proxy_id download_concurrency)
       changeable_attributes += %w(name container_repository_name docker_tags_whitelist) if docker?

data/app/services/katello/component_view_presenter.rb

@@ -20,7 +20,7 @@ module Katello
         not_added_cvs = views.reject { |component_content_view| Katello::ContentViewComponent.where(composite_content_view_id: composite_cv.id, content_view_id: component_content_view.id).first }
         not_added_cvs.map { |component_content_view| ComponentViewPresenter.new(composite_cv, nil, Katello::ContentViewComponent.where(composite_content_view_id: composite_cv.id, content_view_id: component_content_view.id, latest: true).new) }
       else
-        views.map { |component_content_view| ComponentViewPresenter.new(cv, component_content_view) }
+        views.map { |component_content_view| ComponentViewPresenter.new(composite_cv, component_content_view) }
       end
     end
   end

data/app/services/katello/organization_creator.rb

@@ -16,7 +16,7 @@ module Katello
       User.as_anonymous_admin do
         Organization.not_created_in_katello.each do |org|
           creator = self.new(org)
-          creator.create!
+          creator.create!(raise_validation_errors: false)
         end
       end
     end
@@ -28,7 +28,9 @@ module Katello
     def seed!
       ActiveRecord::Base.transaction do
         @organization.setup_label_from_name
-        @organization.save!
+
+        # existing validation errors are not resolvable here, so don't validatate
+        @organization.save(validate: false)
 
         create_library_environment
         create_library_view
@@ -40,14 +42,19 @@ module Katello
       end
     end
 
-    def create!
+    def create!(raise_validation_errors: true)
       ActiveRecord::Base.transaction do
         seed!
 
         create_backend_objects!
 
         @organization.created_in_katello = true
-        @organization.save!
+
+        begin
+          @organization.save!
+        rescue => e
+          raise e if raise_validation_errors
+        end
       end
     end
 

data/app/services/katello/pulp3/content_view_version/metadata_generator.rb

@@ -43,7 +43,7 @@ module Katello
 
         def generate_repository_metadata(repo)
           repo.slice(:name, :label, :description, :arch, :content_type, :unprotected,
-                     :checksum_type, :os_versions, :major, :minor).
+                     :checksum_type, :os_versions, :major, :minor, :download_policy, :mirroring_policy).
             merge(product: generate_product_metadata(repo.product),
                   gpg_key: generate_gpg_metadata(repo.gpg_key),
                   content: generate_content_metadata(repo.content),

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

@@ -78,6 +78,8 @@ module Katello
 
         def sync_url_params(sync_options)
           params = super
+          params.delete(:mirror)
+          params[:sync_policy] = repo.mirroring_policy
           params[:optimize] = sync_options[:optimize] if sync_options.key?(:optimize)
           params
         end

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

@@ -252,7 +252,7 @@ module Katello
       end
 
       def sync_url_params(_sync_options)
-        params = {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+        params = {remote: repo.remote_href, mirror: repo.root.mirroring_policy == Katello::RootRepository::MIRRORING_POLICY_CONTENT}
         params[:skip_types] = skip_types if skip_types
         params
       end
@@ -505,7 +505,7 @@ module Katello
       end
 
       def retain_package_versions_count
-        return 0 if root.retain_package_versions_count.nil? || root.mirror_on_sync?
+        return 0 if root.retain_package_versions_count.nil? || root.using_mirrored_content?
         root.retain_package_versions_count.to_i
       end
     end

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

@@ -128,6 +128,7 @@ module Katello
         sync_params = repo_service.sync_url_params(options)
         sync_params[:remote] = remote_href
         sync_params[:mirror] = true
+        sync_params.delete(:sync_policy)
         repository_sync_url_data = api.repository_sync_url_class.new(sync_params)
         [api.repositories_api.sync(repository_href, repository_sync_url_data)]
       end

data/app/services/katello/registration_manager.rb

@@ -234,7 +234,7 @@ module Katello
         host_collection_ids.each do |host_collection_id|
           host_collection = ::Katello::HostCollection.find(host_collection_id)
           if !host_collection.unlimited_hosts && host_collection.max_hosts >= 0 &&
-             host_collection.systems.length >= host_collection.max_hosts
+             host_collection.hosts.length >= host_collection.max_hosts
             fail _("Host collection '%{name}' exceeds maximum usage limit of '%{limit}'") %
                      {:limit => host_collection.max_hosts, :name => host_collection.name}
           end

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

@@ -6,6 +6,7 @@ attributes :pulp_id => :backend_identifier
 attributes :relative_path, :container_repository_name, :full_path, :library_instance_id
 attributes :version_href, :remote_href, :publication_href
 attributes :content_counts
+attributes :mirroring_policy
 
 glue(@object.root) do
   attributes :content_type, :url, :arch, :os_versions, :content_id, :generic_remote_options

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

@@ -8,7 +8,7 @@ glue(@resource.root) do
   attributes :content_type
   attributes :docker_upstream_name
   attributes :docker_tags_whitelist
-  attributes :mirror_on_sync, :verify_ssl_on_sync
+  attributes :verify_ssl_on_sync
   attributes :unprotected, :full_path, :checksum_type
   attributes :container_repository_name
   attributes :download_policy

data/db/migrate/20211202172358_add_repository_mirroring_policy.rb

@@ -0,0 +1,26 @@
+class AddRepositoryMirroringPolicy < ActiveRecord::Migration[6.0]
+  def up
+    add_column :katello_root_repositories, :mirroring_policy, :string
+
+    #RH repos can handle COMPLETE always, but custom cannot, so lets migrate custom to 'MIRRORING_POLICY_CONTENT'
+    Katello::RootRepository.where(:content_type => 'yum').redhat.where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
+    Katello::RootRepository.where(:content_type => 'yum').custom.where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT)
+
+    Katello::RootRepository.where.not(:content_type => 'yum').where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT)
+    Katello::RootRepository.where(:mirror_on_sync => false).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE)
+
+    change_column :katello_root_repositories, :mirroring_policy, :string, :null => false
+    remove_column :katello_root_repositories, :mirror_on_sync
+  end
+
+  def down
+    add_column :katello_root_repositories, :mirror_on_sync, :boolean, default: true, null: true
+
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE).update_all(:mirror_on_sync => true)
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT).update_all(:mirror_on_sync => true)
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE).update_all(:mirror_on_sync => false)
+    change_column :katello_root_repositories, :mirror_on_sync, :boolean, :null => false, :default => true
+
+    remove_column :katello_root_repositories, :mirroring_policy
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -19,8 +19,8 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
-        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService', 'MirroringPolicy',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService, MirroringPolicy) {
             $scope.organization = CurrentOrganization;
 
             $scope.progress = {uploading: false};
@@ -198,6 +198,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+            $scope.mirroringPolicies = MirroringPolicy.mirroringPolicies;
 
             $scope.checksumTypeDisplay = function (checksum) {
                 return Checksum.checksumType(checksum);
@@ -207,6 +208,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 return DownloadPolicy.downloadPolicyName(downloadPolicy);
             };
 
+            $scope.mirroringPolicyDisplay = MirroringPolicy.mirroringPolicyName;
+
             $scope.clearUpstreamAuth = function () {
                 $scope.repository['upstream_password'] = null;
                 $scope.repository['upstream_auth_exists'] = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -194,16 +194,8 @@
             on-save="save(repository)">
         </dd>
       </span>
-      <span ng-hide="repository.content_type === 'ostree'">
-        <dt translate>Mirror on Sync</dt>
-        <dd bst-edit-checkbox="repository.mirror_on_sync"
-            formatter="booleanToYesNo"
-            on-save="save(repository)"
-            readonly="denied('edit_products', product)">
-        </dd>
-      </span>
 
-      <span ng-show="repository.content_type === 'yum' && repository.mirror_on_sync === false">
+      <span ng-show="repository.content_type === 'yum' && repository.mirroring_policy === 'additive'">
         <dt translate>Retain package versions</dt>
         <dd bst-edit-number="repository.retain_package_versions_count"
             on-save="save(repository)"
@@ -322,6 +314,24 @@
             on-save="save(repository)">
         </dd>
       </span>
+      <span>
+        <dt translate>Mirroring Policy</dt>
+
+        <dd bst-edit-select="mirroringPolicyDisplay(repository.mirroring_policy, repository.content_type)"
+            readonly="denied('edit_products', product)"
+            selector="repository.mirroring_policy"
+            options="mirroringPolicies(repository.content_type)"
+            options-format="id as name for (id, name) in options"
+            on-save="save(repository)">
+        </dd>
+      </span>
+      <span ng-if="repository.content_type == 'docker'">
+        <dt translate>Limit Sync Tags</dt>
+        <dd bst-edit-text="repository.commaTagsWhitelist"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
       <span ng-if="repository.content_type == 'docker'">
         <dt translate>Limit Sync Tags</dt>
         <dd bst-edit-text="repository.commaTagsWhitelist"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/mirroring-policy.service.js

@@ -0,0 +1,30 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.repository.service:mirroringPolicy
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides a mirroringPolicy for repositories
+ */
+angular.module('Bastion.repositories').service('MirroringPolicy',
+    ['translate', function (translate) {
+
+        this.defaultMirroringPolicy = 'additive';
+
+        this.mirroringPolicies = function(repoType) {
+            var policies = {
+                'additive': translate('Additive'),
+                'mirror_content_only': translate('Content Only')
+            };
+            if (repoType === 'yum') {
+                policies['mirror_complete'] = translate('Complete Mirroring');
+            }
+            return policies;
+        };
+
+        this.mirroringPolicyName = function (policy, repoType) {
+            return this.mirroringPolicies(repoType)[policy];
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -17,14 +17,15 @@
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires OSVersions
- * #requires HttpProxyPolicy
+ * @requires HttpProxyPolicy
+ * @requires MirroringPolicy
  *
  * @description
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'MirroringPolicy',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions, MirroringPolicy) {
 
             function success() {
                 Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -61,8 +62,9 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             };
 
             $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
-                'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
-                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null});
+                'checksum_type': null, 'verify_ssl_on_sync': true,
+                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
+                'mirroring_policy': MirroringPolicy.defaultMirroringPolicy});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -77,6 +79,8 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
 
+            $scope.mirroringPolicies = MirroringPolicy.mirroringPolicies;
+
             $scope.$watch('repository.name', function () {
                 if ($scope.repositoryForm && $scope.repositoryForm.name) {
                     $scope.repositoryForm.name.$setValidity('server', true);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -272,18 +272,23 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-hide="repository.content_type === 'ostree'">
-        <label>
-          <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
-          <span translate>Mirror on Sync</span>
-        </label>
+      <div bst-form-group label="{{ 'Mirroring Policy' | translate }}">
+        <select id="mirroring_policy"
+                name="mirroring_policy"
+                ng-model="repository.mirroring_policy"
+                ng-options="id as name for (id, name) in mirroringPolicies(repository.content_type)">
+        </select>
 
-        <p class="help-block" translate>
-          Selecting this option will result in contents that are no longer part of the upstream repository being removed during synchronization.
+        <p class="help-block">
+          <ul>
+        <li translate><b>Additive:</b> new content available during sync will be added to the repository, and no content will be removed. </li>
+            <li translate><b>Mirror Content Only</b>: any new content available during sync will be added to the repository and any content removed from the upstream repository will be removed from the local repository.</li>
+            <li translate ng-show="repository.content_type == 'yum'"><b>Mirror Complete</b>: a sync behaves exactly like "Mirror Content Only", but also mirrors metadata as well.  This is the fastest method, and preserves repository signatures, but is only supported by yum and not by all upstream repositories.</li>
+          </ul>
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirror_on_sync === false)">
+      <div bst-form-group label="{{ 'Retain package versions' | translate }}" ng-if="(repository.content_type === 'yum' && repository.mirroring_policy === 'additive')">
         <input id="retain_package_versions_count" name="retain_package_versions_count" ng-model="repository.retain_package_versions_count" type="number"/>
 
         <p class="help-block">

data/lib/katello/plugin.rb

@@ -199,6 +199,9 @@ Foreman::Plugin.register :katello do
 
   register_global_js_file 'global'
 
+  register_graphql_query_field :host_collection, '::Types::HostCollection', :record_field
+  register_graphql_query_field :host_collections, '::Types::HostCollection', :collection_field
+
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.3.0.rc4".freeze
+  VERSION = "4.3.0".freeze
 end

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

@@ -37,7 +37,7 @@ const ContentDetails = (props) => {
         loadingText={__('Loading')}
       >
         <TabContainer id="content-tabs-container" defaultActiveKey={1}>
-          <Grid bsClass="container-fluid">
+          <Grid>
             <Row>
               <Col sm={12}>
                 <Nav id="content-nav-container" bsClass="nav nav-tabs">