katello 4.1.0.rc2.1 → 4.1.0.rc2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c3ca9aa522c8826e59a58d05088e583f7c3534927eca263c2f02cb8a1ebbc40
-  data.tar.gz: a4934230cbbd27a3fe4c56df4ae496053cfcc58737ad915fcf9a320b32a9fce7
+  metadata.gz: 2b5fdc201af935cf74af29ff64e8b4ac30918984308a428615d4297780bf714e
+  data.tar.gz: df90a5fee570cae2ff2a3b9978fa91062a3d6dc8b1b704460780d6ef4141cc7a
 SHA512:
-  metadata.gz: 8938e80bc139117c1a4cec2de936657049a7cde59fa3380b5ab7e627f9e44f4359955e39c7003fea5f6ca8e0bd8af1c4ff8881ef1b143c64da1686ffc8a1a348
-  data.tar.gz: 8d53413bfc591eb020ed5aba779727858e607c32379755ced239da48f91c0bf00227db9b61b728d1d1f784297a8c06e86d2550c17e406c24cef82d3e19c658e0
+  metadata.gz: 805ab590d81e32061ad21253b114e354189d8fa7379564a6bfa2b5f33215b3ed3715ee6d693b1ee61d709fa66f0fc72536efe1dcc51970b48de7f45390491674
+  data.tar.gz: a268def3988ff20934d0d218562e4b8f980457b5576803e9065a9f7b263a7371690ec510a40afa0719785868b8a3b7c31118e18a443d40ecf1ca002b474f7b99

data/app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb

@@ -0,0 +1,22 @@
+module Actions
+  module Katello
+    module ContentViewVersion
+      class AutoCreateRedhatRepositories < Actions::Base
+        def plan(organization:, metadata:)
+          helper = ::Katello::Pulp3::ContentViewVersion::ImportableRepositories.
+                      new(organization: organization,
+                      metadata: metadata, redhat: true)
+          helper.generate!
+          sequence do
+            helper.creatable.each do |root|
+              plan_action(::Actions::Katello::RepositorySet::EnableRepository, root[:product], root[:content], root[:substitutions])
+            end
+            helper.updatable.each do |root|
+              plan_action(::Actions::Katello::Repository::Update, root[:repository], root[:options])
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/katello/content_view_version/import.rb

@@ -26,6 +26,7 @@ module Actions
           sequence do
             plan_action(AutoCreateProducts, organization: content_view.organization, metadata: metadata)
             plan_action(AutoCreateRepositories, organization: content_view.organization, metadata: metadata)
+            plan_action(AutoCreateRedhatRepositories, organization: content_view.organization, metadata: metadata)
             plan_action(ResetContentViewRepositoriesFromMetadata, content_view: content_view, metadata: metadata)
             plan_action(::Actions::Katello::ContentView::Publish, content_view, description,
                           path: path,

data/app/models/katello/root_repository.rb

@@ -10,7 +10,7 @@ module Katello
 
     encrypts :upstream_password
 
-    IGNORABLE_CONTENT_UNIT_TYPES = %w(rpm drpm srpm distribution erratum).freeze
+    IGNORABLE_CONTENT_UNIT_TYPES = %w(srpm).freeze
     CHECKSUM_TYPES = %w(sha1 sha256).freeze
 
     OSTREE_UPSTREAM_SYNC_POLICY_LATEST = "latest".freeze

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

@@ -61,12 +61,12 @@ module Katello
           gpg
         end
 
-        def self.metadata_map(metadata, product_only: false, custom_only: false)
+        def self.metadata_map(metadata, product_only: false, custom_only: false, redhat_only: false)
           # Create a map that looks like -> {[product, repo]: {name: 'Foo Repo', label:.....}}
           # these values should be curated from the metadata.
           metadata_map = {}
           metadata[:repositories].values.each do |repo|
-            next if custom_only && repo[:redhat]
+            next if (custom_only && repo[:redhat]) || (redhat_only && !repo[:redhat])
             if product_only
               metadata_map[repo[:product][:label]] = repo[:product]
             else

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

@@ -19,8 +19,9 @@ module Katello
             ensure_importing_cvv_does_not_exist!
             ensure_from_cvv_exists!
           end
+          ensure_manifest_imported!
           ensure_metadata_matches_repos_in_library!
-          ensure_redhat_repositories_metadata_are_in_the_library!
+          ensure_redhat_products_metadata_are_in_the_library!
         end
 
         def ensure_pulp_importable!
@@ -57,6 +58,14 @@ module Katello
           end
         end
 
+        def ensure_manifest_imported!
+          rh_repos = ::Katello::Pulp3::ContentViewVersion::Import.metadata_map(metadata, redhat_only: true)
+          if rh_repos.any? && !content_view.organization.manifest_imported?
+            fail _("No manifest found. Import a manifest with the appropriate subscriptions "\
+                   "before importing content.")
+          end
+        end
+
         def repos_in_library
           ::Katello::Pulp3::ContentViewVersion::Import.
                               repositories_in_library(content_view.organization)
@@ -67,6 +76,7 @@ module Katello
         end
 
         def ensure_metadata_matches_repos_in_library!
+          metadata_map = ::Katello::Pulp3::ContentViewVersion::Import.metadata_map(metadata)
           interested_repos = ::Katello::Pulp3::ContentViewVersion::Import.
                                       intersecting_repos_library_and_metadata(organization: organization,
                                                                               metadata: metadata)
@@ -86,19 +96,34 @@ module Katello
           end
         end
 
-        def ensure_redhat_repositories_metadata_are_in_the_library!
-          # repos_in_library look like [["prod1", "repo1", "Anonymous"], ["prod2", "repo2", "Red Hat"]]
-          rh_repos_in_library = repos_in_library.redhat
-          product_repos_in_library = rh_repos_in_library.map { |repo| [repo.product.label, repo.label] }
-          product_repos_in_metadata = metadata[:repositories].values.map { |repo| [repo[:product][:label], repo[:label]] if repo[:redhat] }
-          product_repos_in_metadata.compact!
-
-          # product_repos_in_library & product_repos_in_metadata look like [["prod1", "repo1", false], ["prod2", "repo2", false]]
-          product_repos_not_in_library = product_repos_in_metadata - product_repos_in_library
-          unless product_repos_not_in_library.blank?
-            repos_in_import = generate_product_repo_i18n_string(product_repos_not_in_library)
-            fail _("The following repositories provided in the import metadata are either not available in the Library or are of incorrect Respository Type. "\
-                    "Please add or enable the repositories before importing\n "\
+        def ensure_redhat_products_metadata_are_in_the_library!
+          products_in_library = ::Katello::Product.in_org(organization).redhat.pluck(:label)
+
+          # Map products to repositories in the metadata
+          # {product_label: [repositories with this product]}
+          products_in_metadata_map = {}
+
+          metadata[:repositories].values.each do |repo|
+            next unless repo[:redhat]
+            products_in_metadata_map[repo[:product][:label]] ||= []
+            products_in_metadata_map[repo[:product][:label]] << repo
+          end
+
+          products_not_in_library = products_in_metadata_map.keys - products_in_library
+
+          unless products_not_in_library.blank?
+            # make a list of [product_name, repo_name] pairs to report to the user
+            product_repos = []
+            products_not_in_library.each do |prod|
+              products_in_metadata_map[prod].each do |repo|
+                product_name = metadata[:products][prod][:name]
+                repo_name = repo[:name]
+                product_repos << [product_name, repo_name]
+              end
+            end
+
+            repos_in_import = generate_product_repo_i18n_string(product_repos)
+            fail _("The organization's manifest does not contain the subscriptions required to enable the following repositories.\n "\
                     "%{repos}" % { content_view: content_view.name, repos: repos_in_import.join("")}
                   )
           end

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

@@ -2,20 +2,25 @@ module Katello
   module Pulp3
     module ContentViewVersion
       class ImportableRepositories
-        attr_accessor :creatable, :updatable, :organization, :metadata
+        attr_reader :creatable, :updatable, :organization, :metadata, :redhat
 
-        def initialize(organization:, metadata:)
-          self.organization = organization
-          self.metadata = metadata
-          self.creatable = []
-          self.updatable = []
+        def initialize(organization:, metadata:, redhat: false)
+          @organization = organization
+          @metadata = metadata
+          @creatable = []
+          @updatable = []
+          @redhat = redhat
+        end
+
+        def product_content_by_label(content_label)
+          ::Katello::Content.find_by_label(content_label)
         end
 
         def repositories_in_library
           return @repositories_in_library unless @repositories_in_library.blank?
-
+          repo_type = redhat ? :redhat : :custom
           # fetch a list of [product, repo] pairs for every non-redhat library repo
-          product_repos_in_library = Import.repositories_in_library(organization).custom.
+          product_repos_in_library = Import.repositories_in_library(organization).send(repo_type).
                                       pluck("#{Katello::Product.table_name}.label",
                                             "#{Katello::RootRepository.table_name}.label")
           @repositories_in_library = Set.new(product_repos_in_library.compact)
@@ -27,7 +32,7 @@ module Katello
           #         They are ready to be created
           # updatable: repo that are both in the metadata and library.
           #         These may contain updates to the repo and hence ready to be updated.
-          metadata_map = Import.metadata_map(metadata, custom_only: true)
+          metadata_map = Import.metadata_map(metadata, custom_only: !redhat, redhat_only: redhat)
           metadata_map.keys.each do |product_label, repo_label|
             product = Katello::Product.in_org(organization).find_by(label: product_label)
             fail _("Unable to find product '%s' in organization '%s'" % [product_label, organization.name]) if product.blank?
@@ -37,10 +42,18 @@ module Katello
             else
               params[:gpg_key_id] = organization.gpg_keys.find_by(name: params[:gpg_key][:name]).id
             end
-            params = params.except(:redhat, :product, :gpg_key)
+            content = params[:content]
+            params = params.except(:redhat, :product, :gpg_key, :content)
             if repositories_in_library.include? [product_label, repo_label]
               repo = ::Katello::RootRepository.find_by(product: product, label: repo_label)
               updatable << { repository: repo, options: params.except(:label, :name, :content_type) }
+            elsif redhat
+              product_content = product_content_by_label(content[:label])
+              substitutions = {
+                basearch: params[:arch],
+                releasever: params[:minor]
+              }
+              creatable << { product: product, content: product_content, substitutions: substitutions }
             else
               creatable << { repository: product.add_repo(params) }
             end

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

@@ -46,6 +46,7 @@ module Katello
                      :checksum_type, :os_versions, :major, :minor).
             merge(product: generate_product_metadata(repo.product),
                   gpg_key: generate_gpg_metadata(repo.gpg_key),
+                  content: generate_content_metadata(repo.content),
                   redhat: repo.redhat?)
         end
 
@@ -60,6 +61,11 @@ module Katello
           gpg.slice(:name, :content_type, :content)
         end
 
+        def generate_content_metadata(content)
+          return {} if content.blank?
+          { id: content.cp_content_id, label: content.label }
+        end
+
         def zip_gpg_keys(entities)
           # this goes through each repo/product
           # identifies gpg keys

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

@@ -12,7 +12,6 @@
  * @requires DownloadPolicy
  * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
- * @requires YumContentUnits
  * @requires HttpProxyPolicy
  * @requires OSVersions
  *
@@ -20,14 +19,15 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'YumContentUnits', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, YumContentUnits, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions) {
             $scope.organization = CurrentOrganization;
 
             $scope.progress = {uploading: false};
 
             $scope.repository.$promise.then(function () {
                 $scope.uploadURL = 'katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
+                $scope.repository['ignore_srpms'] = $scope.repository['ignorable_content'].includes("srpm");
             });
 
             $scope.gpgKeys = function () {
@@ -89,6 +89,13 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.save = function (repository, saveUpstreamAuth) {
                 var deferred = $q.defer();
+                if (repository.content_type === 'yum' && typeof repository.ignore_srpms !== 'undefined') {
+                    if (repository['ignore_srpms']) {
+                        repository['ignorable_content'] = ["srpm"];
+                    } else {
+                        repository['ignorable_content'] = [];
+                    }
+                }
 
                 if (!saveUpstreamAuth) {
                     repository['upstream_username'] = null;
@@ -106,6 +113,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);
+                    $scope.repository.ignore_srpms = $scope.repository.ignorable_content.includes("srpm");
                     if (!_.isEmpty(response["docker_tags_whitelist"])) {
                         repository.commaTagsWhitelist = repository["docker_tags_whitelist"].join(", ");
                     } else {
@@ -171,7 +179,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
             $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
-            $scope.ignorableYumContentUnits = YumContentUnits.units;
 
             $scope.checksumTypeDisplay = function (checksum) {
                 return Checksum.checksumType(checksum);

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

@@ -211,20 +211,11 @@
       </span>
 
       <span ng-if="repository.content_type === 'yum'">
-        <dt translate>Ignorable Content</dt>
-        <dd bst-edit-custom="repository.ignorable_content"
-            readonly="denied('edit_products', product)"
+        <dt translate>Ignore SRPMs</dt>
+        <dd bst-edit-checkbox="repository.ignore_srpms"
+            formatter="booleanToYesNo"
             on-save="save(repository)"
-            formatter="yumIgnorableContentFilter"
-            formatter-options="repository"
-            >
-            <div translate>Use Ctrl-click to multi-select/deselect items.</div>
-            <select id="ignorable_content"
-                    name="ignorable_content"
-                    multiple="true"
-                    ng-model="repository.ignorable_content"
-                    ng-options="id as name for (id, name) in ignorableYumContentUnits">
-            </select>
+            readonly="denied('edit_products', product)">
         </dd>
       </span>
 

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

@@ -18,15 +18,14 @@
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires OSVersions
- * @requires YumContentUnits
  * #requires HttpProxyPolicy
  *
  * @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', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
 
             function success() {
                 Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -80,7 +79,6 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
             $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
-            $scope.ignorableYumContentUnits = YumContentUnits.units;
 
             $scope.$watch('repository.name', function () {
                 if ($scope.repositoryForm && $scope.repositoryForm.name) {
@@ -125,6 +123,11 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                 }
                 if (repository.content_type === 'yum') {
                     repository.os_versions = $scope.osVersionsParam();
+                    if ($scope.repositoryForm.ignore_srpms.$modelValue) {
+                        repository.ignorable_content = ["srpm"];
+                    } else {
+                        repository.ignorable_content = [];
+                    }
                 }
                 if (repository.content_type !== 'yum') {
                     repository['download_policy'] = '';

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

@@ -175,17 +175,14 @@
 
       </div>
 
-      <div bst-form-group label="{{ 'Ignorable Content' | translate }}"  ng-if="repository.content_type === 'yum'">
-        <select id="ignorable_content"
-                name="ignorable_content"
-                multiple="true"
-                ng-model="repository.ignorable_content"
-                ng-options="id as name for (id, name) in ignorableYumContentUnits">
-        </select>
+      <div class="checkbox" ng-if="repository.content_type === 'yum'">
+        <label>
+          <input id="ignore_srpms" name="ignore_srpms" ng-model="repository.ignore_srpms" type="checkbox"/>
+          <span translate>Ignore SRPMs</span>
+        </label>
 
         <p class="help-block">
-          <span translate>Select content units to ignore while synchronizing this repository.</span><br />
-          <span translate>Use Ctrl-click to multi-select/deselect items.</span>
+          <span translate>Selecting this option will exclude SRPMs from repository synchronization.</span><br />
         </p>
       </div>
 

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc2.1
+  version: 4.1.0.rc2.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -865,6 +865,7 @@ files:
 - app/lib/actions/katello/content_view_environment/reassign_objects.rb
 - app/lib/actions/katello/content_view_version/after_promote_hook.rb
 - app/lib/actions/katello/content_view_version/auto_create_products.rb
+- app/lib/actions/katello/content_view_version/auto_create_redhat_repositories.rb
 - app/lib/actions/katello/content_view_version/auto_create_repositories.rb
 - app/lib/actions/katello/content_view_version/before_promote_hook.rb
 - app/lib/actions/katello/content_view_version/create_repos.rb