katello 4.4.0.1 → 4.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b7c14fb8d3608a0596bbe874028ed8966b14c2d530e8f22dd33253e678e7f7b
-  data.tar.gz: 4d762d2ac2cbe0c7362b52901c4fdf671421aae11fe9c3fdf6146b8729221895
+  metadata.gz: 9e2cbec78c4d297f09f1517b095e566c055bd14e2b3d4a534a5f904f8e9d43bc
+  data.tar.gz: 5f96a7ce828a6ac081883643f8f79d55088ded4a5a06d86c4bfc69fababc315e
 SHA512:
-  metadata.gz: 63470c8748cb2f52087d0e6afb152b3e1d7ac7b0985f755ea662189acf807945fba766f6def46417995b665a914adfcf62d5041bb2ea1381c03031a07d34ac34
-  data.tar.gz: 39dfbe4fe023dd34b8f371b2df102ffe8a9318c7f8ee0e67aa37b371c06ac171a8ab73fe6359ca17209209c73e7d083caf91e301b9e3ff040bb68069d48103c0
+  metadata.gz: c109e2ed4481c10d8bc475b706aa00498f3cfce65fb2f9ec6cf589be8da2a47344561b31d45a5721aaab9743ccdbf751ec665663b858c26eb433803db59bbc6c
+  data.tar.gz: 87d9b9ced044f3b34df8045a1ca1a02ca5ba695e4048999290fc0594f21186065c63036b93d4b1beef09162ddf9bb60c06dbd7cde7057df8a456a5701b8e9e3d

data/app/lib/actions/katello/repository/filtered_index_content.rb

@@ -36,7 +36,7 @@ module Actions
             else
               unit_ids = search_units(repo)
             end
-            ::Katello::Deb.import_all(unit_ids, repo)
+            ::Katello::Deb.import_all(unit_ids, repo, {filtered_indexing: true})
           elsif repo.yum?
             if input[:import_upload_task] && input[:import_upload_task][:content_unit_href]
               unit_ids = [input[:import_upload_task][:content_unit_href]]
@@ -48,9 +48,9 @@ module Actions
               unit_ids = search_units(repo)
             end
             if input[:content_type] == ::Katello::Srpm::CONTENT_TYPE
-              ::Katello::Srpm.import_all(unit_ids, repo)
+              ::Katello::Srpm.import_all(unit_ids, repo, {filtered_indexing: true})
             else
-              ::Katello::Rpm.import_all(unit_ids, repo)
+              ::Katello::Rpm.import_all(unit_ids, repo, {filtered_indexing: true})
             end
           end
         end

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

@@ -81,7 +81,8 @@ module Katello
 
       def import_all(unit_ids, repository = nil, options = {})
         content_type = options[:content_type] || self.content_type
-        Katello::ContentUnitIndexer.new(content_type: Katello::RepositoryTypeManager.find_content_type(content_type), repository: repository, pulp_content_ids: unit_ids).import_all
+        filtered_indexing = options[:filtered_indexing] || false
+        Katello::ContentUnitIndexer.new(content_type: Katello::RepositoryTypeManager.find_content_type(content_type), repository: repository, pulp_content_ids: unit_ids).import_all(filtered_indexing)
       end
 
       def copy_repository_associations(source_repo, dest_repo)

data/app/services/katello/content_unit_indexer.rb

@@ -21,9 +21,9 @@ module Katello
       end
     end
 
-    def import_all
+    def import_all(filtered_indexing = false)
+      additive = filtered_indexing || (@repository&.mirroring_policy == 'additive')
       association_tracker = RepoAssociationTracker.new(@content_type, @service_class, @repository)
-
       units_from_pulp.each do |units|
         units.each do |unit|
           association_tracker.push(unit)
@@ -52,7 +52,7 @@ module Katello
       end
 
       if @model_class.many_repository_associations && @repository
-        sync_repository_associations(association_tracker)
+        sync_repository_associations(association_tracker, additive: additive)
       end
     end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.4.0.1".freeze
+  VERSION = "4.4.0.2".freeze
 end

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/CdnConfigurationConstants.js

@@ -9,5 +9,6 @@ export const CDN_CONFIGURATION_TYPES = {
   airgapped: __('Air-gapped'),
 };
 
+export const DEFAULT_ORGANIZATION_LABEL = 'Default_Organization';
 export const DEFAULT_CONTENT_VIEW_LABEL = 'Default_Organization_View';
 export const DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL = 'Library';

data/webpack/scenes/Subscriptions/Manifest/CdnConfigurationTab/UpstreamServerTypeForm.js

@@ -18,7 +18,7 @@ import {
 import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
-import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL } from './CdnConfigurationConstants';
+import { UPSTREAM_SERVER, DEFAULT_CONTENT_VIEW_LABEL, DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL, DEFAULT_ORGANIZATION_LABEL } from './CdnConfigurationConstants';
 import EditableTextInput from '../../../../components/EditableTextInput';
 
 import {
@@ -37,15 +37,17 @@ const UpstreamServerTypeForm = ({
   const [username, setUsername] = useState(cdnConfiguration.username);
   const [password, setPassword] = useState(null);
   const [organizationLabel, setOrganizationLabel] =
-    useState(cdnConfiguration.upstream_organization_label);
+    useState(cdnConfiguration.upstream_organization_label || DEFAULT_ORGANIZATION_LABEL);
   const [sslCaCredentialId, setSslCaCredentialId] = useState(cdnConfiguration.ssl_ca_credential_id);
   const updatingCdnConfiguration = useSelector(state => selectUpdatingCdnConfiguration(state));
 
   const [contentViewLabel, setContentViewLabel] =
-    useState(cdnConfiguration.upstream_content_view_label);
+    useState(cdnConfiguration.upstream_content_view_label ||
+      DEFAULT_CONTENT_VIEW_LABEL);
 
   const [lifecycleEnvironmentLabel, setLifecycleEnvironmentLabel] =
-    useState(cdnConfiguration.upstream_lifecycle_environment_label);
+    useState(cdnConfiguration.upstream_lifecycle_environment_label ||
+      DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL);
 
   const [updateEnabled, setUpdateEnabled] = useState(false);
 
@@ -85,7 +87,7 @@ const UpstreamServerTypeForm = ({
       url,
       username,
       password,
-      upstream_organization_label: organizationLabel,
+      upstream_organization_label: organizationLabel || DEFAULT_ORGANIZATION_LABEL,
       ssl_ca_credential_id: sslCaCredentialId,
       upstream_content_view_label: contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL,
       upstream_lifecycle_environment_label: lifecycleEnvironmentLabel ||
@@ -184,7 +186,7 @@ const UpstreamServerTypeForm = ({
           <TextInput
             aria-label="cdn-lifecycle-environment-label"
             type="text"
-            value={lifecycleEnvironmentLabel || DEFAULT_LIFECYCLE_ENVIRONMENT_LABEL}
+            value={lifecycleEnvironmentLabel || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={setLifecycleEnvironmentLabel}
           />
@@ -195,7 +197,7 @@ const UpstreamServerTypeForm = ({
           <TextInput
             aria-label="cdn-content-view-label"
             type="text"
-            value={contentViewLabel || DEFAULT_CONTENT_VIEW_LABEL}
+            value={contentViewLabel || ''}
             isDisabled={updatingCdnConfiguration}
             onChange={setContentViewLabel}
           />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.4.0.1
+  version: 4.4.0.2
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails