katello 4.12.0.rc3 → 4.13.0.rc1

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

@@ -250,16 +250,18 @@
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Upstream Authentication Token' | translate }}" >
-        <input id="upstream_authentication_token"
-              name="upstream_authentication_token"
-              type="text"
-              autocomplete="off"
-              ng-model="repository.upstream_authentication_token"/>
-        <p class="help-block" translate>
-          Token of the upstream repository user for authentication. Leave empty if repository does not require authentication.
-        </p>
-      </div>
+      <span ng-show="repository.content_type === 'yum'">
+        <div bst-form-group label="{{ 'Upstream Authentication Token' | translate }}" >
+          <input id="upstream_authentication_token"
+                name="upstream_authentication_token"
+                type="text"
+                autocomplete="off"
+                ng-model="repository.upstream_authentication_token"/>
+          <p class="help-block" translate>
+            Token of the upstream repository user for authentication. Leave empty if repository does not require authentication.
+          </p>
+        </div>
+      </span>
 
       <div ng-repeat="option in genericRemoteOptions" ng-if="repository.generic_remote_options !== []">
         <div ng-if='option.input_type=="text"' bst-form-group label="{{ option.title | translate }}">

data/lib/katello/permission_creator.rb

@@ -54,7 +54,7 @@ module Katello
       @plugin.permission :manage_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:add_lifecycle_environment, :remove_lifecycle_environment,
-                                                                :update_counts, :sync, :reclaim_space, :cancel_sync],
+                                                                :update_counts, :sync, :reclaim_space, :verify_checksum, :cancel_sync],
                            'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => 'SmartProxy'
@@ -134,7 +134,7 @@ module Katello
       @plugin.permission :publish_content_views,
                          {
                            'katello/api/v2/content_views' => [:publish],
-                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories],
+                           'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories, :verify_checksum],
                            'katello/api/v2/content_imports' => [:version, :index]
                          },
                          :resource_type => 'Katello::ContentView',
@@ -142,7 +142,7 @@ module Katello
       @plugin.permission :promote_or_remove_content_views,
                          {
                            'katello/api/v2/content_view_versions' => [:promote],
-                           'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories]
+                           'katello/api/v2/content_views' => [:remove_from_environment, :remove, :republish_repositories, :verify_checksum]
                          },
                          :resource_type => 'Katello::ContentView',
                          :finder_scope => :promotable_or_removable

data/lib/katello/permissions/registry_permissions.rb

@@ -8,13 +8,10 @@ Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat
   'katello/api/registry/registry_proxies/catalog',
   'katello/api/registry/registry_proxies/tags_list',
   'katello/api/registry/registry_proxies/pull_manifest',
-  #'katello/api/registry/registry_proxies/push_manifest',
+  'katello/api/registry/registry_proxies/push_manifest',
   'katello/api/registry/registry_proxies/pull_blob',
   'katello/api/registry/registry_proxies/check_blob',
-  #'katello/api/registry/registry_proxies/start_upload_blob',
-  #'katello/api/registry/registry_proxies/upload_blob',
-  #'katello/api/registry/registry_proxies/chunk_upload_blob',
-  #'katello/api/registry/registry_proxies/finish_upload_blob',
-  'katello/api/registry/registry_proxies/status_upload_blob',
-  'katello/api/registry/registry_proxies/cancel_upload_blob'
+  'katello/api/registry/registry_proxies/start_upload_blob',
+  'katello/api/registry/registry_proxies/upload_blob',
+  'katello/api/registry/registry_proxies/finish_upload_blob'
 ]

data/lib/katello/plugin.rb

@@ -4,7 +4,7 @@ require 'katello/host_status_manager'
 # rubocop:disable Metrics/BlockLength
 
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 3.7'
+  requires_foreman '>= 3.11'
   register_gettext
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
@@ -373,13 +373,6 @@ Foreman::Plugin.register :katello do
         collection: proc { http_proxy_select },
         include_blank: N_("no global default")
 
-      setting 'cdn_ssl_version',
-        type: :string,
-        default: nil,
-        full_name: N_('CDN SSL version'),
-        description: N_("SSL version used to communicate with the CDN"),
-        collection: proc { hashify_parameters(Katello::Resources::CDN::SUPPORTED_SSL_VERSIONS) }
-
       setting 'katello_default_provision',
         type: :string,
         default: 'Kickstart default',
@@ -519,6 +512,12 @@ Foreman::Plugin.register :katello do
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
+      setting 'validate_host_lce_content_source_coherence',
+        type: :boolean,
+        default: true,
+        full_name: N_('Validate host/lifecycle environment/content source coherence'),
+        description: N_("Validate that a host's assigned lifecycle environment is synced by the smart proxy from which the host will get its content. Applies only to API requests; does not affect web UI checks")
+
       setting 'pulpcore_export_destination',
         type: :string,
         default: "/var/lib/pulp/exports",
@@ -585,7 +584,7 @@ Foreman::Plugin.register :katello do
         type: :integer,
         default: 120,
         full_name: N_('Expire soon days'),
-        description: N_('The number of days remaining in a subscription before you will be reminded about renewing it.')
+        description: N_('The number of days remaining in a subscription before you will be reminded about renewing it. Also used for manifest expiration warnings.')
 
       setting 'host_dmi_uuid_duplicates',
         type: :array,
@@ -629,12 +628,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Pulp bulk load size'),
         description: N_('The number of items fetched from a single paged Pulp API call.')
 
-      setting 'upload_profiles_without_dynflow',
-        type: :boolean,
-        default: true,
-        full_name: N_('Upload profiles without Dynflow'),
-        description: N_('Allow Katello to update host installed packages, enabled repos, and module inventory directly instead of wrapped in Dynflow tasks (try turning off if Puma processes are using too much memory)')
-
       setting 'orphan_protection_time',
         type: :integer,
         default: 1440,
@@ -676,6 +669,7 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
     RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
     RemoteExecutionFeature.register(:katello_change_content_source, N_("Katello: Configure host for new content source"), :description => N_("Replace content source on the target machine"), :provided_inputs => [])
+    RemoteExecutionFeature.register(:katello_upload_profile, N_("Katello: Upload Profile"), :description => N_("Upload package / repos profile"), :provided_inputs => [])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                     :description => N_("Perform a module stream action via Katello interface"),
                                     :provided_inputs => ['action', 'module_spec', 'options'])
@@ -727,7 +721,7 @@ Foreman::Plugin.register :katello do
   ], 'Role granting permission to import content views in an organization'
 
   role 'Content Exporter', [
-    :export_content, :view_products, :view_content_views, :view_organizations
+    :export_content, :view_products, :view_content_views, :create_content_views, :view_organizations
   ], 'Role granting permission to export content views in an organization'
 
   def find_katello_assets(args = {})

data/lib/katello/repository_types/ostree.rb

@@ -18,6 +18,12 @@ Katello::RepositoryTypeManager.register('ostree') do
   distribution_class PulpOstreeClient::OstreeOstreeDistribution
   repo_sync_url_class PulpOstreeClient::RepositorySyncURL
 
+  generic_remote_option :include_refs, title: N_("Include Refs"), type: Array, input_type: "text", delimiter: ",", default: [],
+                         description: N_("A comma-separated list of refs to include during a sync. The wildcards *, ? are recognized.")
+
+  generic_remote_option :exclude_refs, title: N_("Exclude Refs"), type: Array, input_type: "text", delimiter: ",", default: [],
+                         description: N_("A comma-separated list of tags to exclude during a sync. The wildcards *, ? are recognized. 'exclude_refs' is evaluated after 'include_refs'.")
+
   url_description N_("URL of an OSTree repository.")
 
   generic_content_type 'ostree_ref',
@@ -47,4 +53,5 @@ Katello::RepositoryTypeManager.register('ostree') do
   default_managed_content_type :ostree_ref
 
   test_url 'https://fixtures.pulpproject.org/ostree/small/'
+  test_url_root_options generic_remote_options: {include_refs: ['rawhide']}.to_json
 end

data/lib/katello/scheduled_jobs.rb

@@ -1,6 +1,12 @@
 # First, we check if there's a job already enqueued for any notifications
 ::Foreman::Application.dynflow.config.on_init do |world|
-  [CreateExpiredManifestNotifications, CreateHostLifecycleExpireSoonNotifications, CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
+  [
+    CreateExpiredManifestNotifications,
+    CreateHostLifecycleExpireSoonNotifications,
+    CreatePulpDiskSpaceNotifications,
+    SendExpireSoonNotifications,
+    CreateManifestExpireSoonWarningNotifications
+  ].each do |job_class|
     job_class.spawn_if_missing(world)
   end
 end

data/lib/katello/tasks/clean_backend_objects.rake

@@ -75,7 +75,7 @@ namespace :katello do
       print "The following changes will not actually be performed.  Rerun with COMMIT=true to apply the changes\n"
     end
 
-    SETTINGS[:katello][:candlepin][:bulk_load_size] = 1_500
+    SETTINGS[:katello][:candlepin][:bulk_load_size] = 125
     User.current = User.anonymous_admin
     cleaner = BackendCleaner.new
     cleaner.populate!

data/lib/katello/tasks/repository.rake

@@ -71,6 +71,12 @@ namespace :katello do
     end
   end
 
+  desc "Re-import all container manifests to populate labels and annotations."
+  task :import_container_manifest_labels => ["dynflow:client", "check_ping"] do
+    User.current = User.anonymous_api_admin
+    handle_manifest_label_updates
+  end
+
   def lookup_repositories
     lifecycle_envs = Katello::KTEnvironment.where(:name => ENV['LIFECYCLE_ENVIRONMENT']) if ENV['LIFECYCLE_ENVIRONMENT']
     content_views = Katello::ContentView.where(:name => ENV['CONTENT_VIEW']) if ENV['CONTENT_VIEW']
@@ -108,6 +114,22 @@ namespace :katello do
     end
   end
 
+  def handle_manifest_label_updates
+    batch_size = 1000
+    Katello::DockerManifest.
+      where(schema_version: 2).
+      where(annotations: {}, labels: {}).
+      where(is_bootable: false, is_flatpak: false).
+      find_in_batches(batch_size: batch_size) do |group|
+      manifest_unit_ids = group.pluck(:pulp_id)
+      index_service = Katello::ContentUnitIndexer.new(
+        content_type: Katello::RepositoryTypeManager.find_content_type("docker_manifest"),
+        pulp_content_ids: manifest_unit_ids
+      )
+      index_service.reimport_units
+    end
+  end
+
   def handle_missing_root_repo(root_repo)
     root_repo.destroy! if commit?
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.12.0.rc3".freeze
+  VERSION = "4.13.0.rc1".freeze
 end

data/locale/action_names.rb

@@ -4,7 +4,6 @@ _("Abstract")
 _("Attach subscriptions")
 _("Auto attach subscriptions")
 _("Bulk generate applicability for hosts")
-_("Combined Profile Update")
 _("Copy version units to library")
 _("Create Alternate Content Source")
 _("Create Export History")
@@ -48,7 +47,7 @@ _("Index errata")
 _("Index module streams")
 _("Index package groups")
 _("Instance update")
-_("Package Profile Update")
+_("Metadata generate")
 _("Product Create")
 _("Promote")
 _("Promotion to Environment")
@@ -72,7 +71,7 @@ _("Update CDN Configuration")
 _("Update Content Counts")
 _("Update Content Overrides")
 _("Update content urls")
-_("Update for host")
+_("Update content view environments for host")
 _("Update http proxy details")
 _("Update http proxy")
 _("Update redhat repository")
@@ -86,4 +85,6 @@ _("Update")
 _("Updating System Purpose for host")
 _("Upload into")
 _("Upload into")
+_("Verify checksum for content on smart proxy")
+_("Verify checksum of version repositories")
 _("Verify checksum")