katello 4.5.0.rc2 → 4.6.0.rc2

data/db/migrate/20220610165621_add_repositories_and_products_to_acs.rb

@@ -0,0 +1,23 @@
+class AddRepositoriesAndProductsToAcs < ActiveRecord::Migration[6.1]
+  def change
+    add_reference :katello_smart_proxy_alternate_content_sources, :repository, null: true, index: false
+    remove_index :katello_smart_proxy_alternate_content_sources, [:alternate_content_source_id, :smart_proxy_id]
+    add_index :katello_smart_proxy_alternate_content_sources, [:alternate_content_source_id, :smart_proxy_id, :repository_id],
+              name: 'index_katello_smart_proxy_acs_on_acs_id_smart_proxy_id_repo_id'
+
+    create_table 'katello_alternate_content_source_products' do |t|
+      t.references :alternate_content_source, null: false, index: false
+      t.references :product, null: false, index: false
+    end
+
+    add_foreign_key 'katello_alternate_content_source_products', 'katello_alternate_content_sources',
+      name: 'katello_alternate_content_source_products_id_fk', column: 'alternate_content_source_id'
+    add_foreign_key 'katello_alternate_content_source_products', 'katello_products',
+      name: 'katello_alternate_content_source_products_repo_id_fk', column: 'product_id'
+
+    add_index :katello_alternate_content_source_products, :alternate_content_source_id,
+      name: 'index_katello_acs_products_on_acs_id'
+    add_index :katello_alternate_content_source_products, :product_id,
+      name: 'index_katello_acs_products_on_product_id'
+  end
+end

data/engines/bastion/app/views/bastion/layouts/application.html.erb

@@ -7,4 +7,4 @@
   </div>
 <% end %>
 
-<%= render file: "bastion/layouts/assets" %>
+<%= render template: "bastion/layouts/assets" %>

data/engines/bastion/app/views/bastion/layouts/application_ie.html.erb

@@ -1 +1 @@
-<%= render file: "bastion/layouts/application" %>
+<%= render template: "bastion/layouts/application" %>

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -38,4 +38,4 @@
   <% end %>
 <% end %>
 
-<%= render file: "layouts/base" %>
+<%= render template: "layouts/base" %>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.routes.js

@@ -115,7 +115,7 @@ angular.module('Bastion.activation-keys').config(['$stateProvider', function ($s
     })
     .state('activation-key.copy', {
         url: '/copy',
-        permission: 'create_activation_key',
+        permission: 'create_activation_keys',
         controller: 'ActivationKeyCopyController',
         templateUrl: 'activation-keys/details/views/activation-key-copy.html',
         ncyBreadcrumb: {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -8,7 +8,7 @@
   <div data-block="item-actions" bst-feature-flag="custom_products">
     <span select-action-dropdown>
       <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem" ng-hide="denied('create_activation_key')">
+        <li role="menuitem" ng-hide="denied('create_activation_keys')">
           <a ui-sref="activation-key.copy" translate>
             Copy Activation Key
           </a>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js

@@ -45,7 +45,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
 
         $scope.updateAll = function () {
             $scope.working = true;
-            HostPackage.updateAll({id: $scope.host.id}, $scope.openEventInfo, $scope.errorHandler);
+            $scope.performPackageAction('packageUpdate', '');
         };
 
         $scope.performPackageAction = function (actionType, term) {
@@ -57,9 +57,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         $scope.performViaKatelloAgent = function (actionType, term) {
-            var terms = term.split(/ *, */);
+            var terms = [];
+            if (term === '') {
+                packageActions.updateAll();
+            } else {
+                terms = term.split(/ *, */);
+                packageActions[actionType](terms);
+            }
             $scope.working = true;
-            packageActions[actionType](terms);
         };
 
         $scope.performViaRemoteExecution = function(actionType, term, customize) {
@@ -76,6 +81,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         packageActions = {
+            updateAll: function () {
+                HostPackage.updateAll({id: $scope.host.id}, $scope.openEventInfo, $scope.errorHandler);
+            },
             packageInstall: function (termList) {
                 HostPackage.install({id: $scope.host.id, packages: termList}, $scope.openEventInfo, $scope.errorHandler);
             },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -60,7 +60,7 @@
         <div class="form-group">
           <button class="btn btn-default" type="button"
                   translate
-                  ng-disabled="remoteExecutionByDefault || !katelloAgentPresent || working"
+                  ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
                   ng-click="updateAll()">
             Update All Packages
           </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html

@@ -49,7 +49,7 @@
         <button class="btn btn-default"
                 type="button"
                 translate
-                ng-disabled="remoteExecutionByDefault || working || !katelloAgentPresent"
+                ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
                 ng-click="updateAll()">
           Update All Packages
         </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment-content.controller.js

@@ -11,6 +11,8 @@
     function EnvironmentContentController($scope, ContentService, ContentView, Repository, translate, $location) {
         var nutupane, allRepositories, nutupaneParams;
 
+        $scope.controllerName = 'katello_environments';
+
         function fetchContentViews(environmentId) {
             ContentView.queryUnpaged({'environment_id': environmentId}, function (data) {
                 $scope.contentViews = [$scope.contentView].concat(data.results);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js

@@ -16,6 +16,8 @@
             loading: true
         };
 
+        $scope.controllerName = 'katello_environments';
+
         $scope.repositoryTypeEnabled = RepositoryTypesService.repositoryTypeEnabled;
         $scope.environment = Environment.get({id: $scope.$stateParams.environmentId}, function () {
             $scope.panel.loading = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html

@@ -20,7 +20,7 @@
     <tbody>
       <tr bst-table-row ng-repeat="contentView in table.rows">
         <td bst-table-cell>
-          <a ui-sref="content-view.versions({contentViewId: contentView.id})">
+          <a href="/content_views/{{contentView.id}}">
             {{ contentView.name }}
           </a>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.controller.js

@@ -26,6 +26,7 @@ angular.module('Bastion.environments').controller('EnvironmentsController',
             };
 
             var nutupane = new Nutupane(Environment, params);
+            $scope.controllerName = 'katello_environments';
             $scope.table = nutupane.table;
             $scope.loading = true;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/environments.html

@@ -34,10 +34,10 @@
                 OSTree Repositories <div>{{ library.counts.ostree_repositories || 0 }}</div>
               </td>
               <td class="info-block" ng-show="library.counts.docker_repositories > 0" translate>
-	      <td class="info-block" ng-show="library.counts.deb_repositories > 0" translate>
-                Deb Repositories <div>{{ library.counts.deb_repositories || 0 }}</div>
-              </td>
                 Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>
+                </td>
+	            <td class="info-block" ng-show="library.counts.deb_repositories > 0" translate>
+                Deb Repositories <div>{{ library.counts.deb_repositories || 0 }}</div>
               </td>
               <td class="info-block" ng-show="library.counts.packages > 0" translate>
                 Packages <div>{{ library.counts.packages || 0 }}</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -2068,6 +2068,10 @@ msgstr ""
 msgid "Docker Repositories"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/environments/views/environments.html
+msgid "Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
 msgid "Docker Repository Selection"
 msgstr ""
@@ -3983,10 +3987,6 @@ msgstr ""
 msgid "Publish New Version"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
-msgid "Publish via HTTPS"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-views/details/content-view-versions.controller.js
 msgid "Published"
 msgstr ""
@@ -5924,7 +5924,6 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-http-proxy-modal.html
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js
 #: app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js
 msgid "Yes"

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

@@ -255,9 +255,6 @@
         </dd>
       </span>
 
-      <dt translate>Publish via HTTPS</dt>
-      <dd translate>Yes</dd>
-
       <span ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <dt translate>Unprotected</dt>
         <dd bst-edit-checkbox="repository.unprotected"

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -25,7 +25,6 @@ module BastionKatello
           activation_keys
           content_credentials
           content_hosts
-          legacy
           debs
           docker_tags
           files

data/lib/katello/engine.rb

@@ -40,8 +40,7 @@ module Katello
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil,
-          :notifier_ca_path => "/etc/pki/tls/certs/ca-bundle.crt"
+          :sync_KBlimit => nil
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',

data/lib/katello/permission_creator.rb

@@ -350,8 +350,8 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible],
-                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible, :simple_content_access_status],
+                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible, :status]
                          },
                          :resource_type => 'Katello::Subscription'
     end

data/lib/katello/permissions/host_permissions.rb

@@ -52,6 +52,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/index',
   'katello/api/v2/host_subscriptions/events',
   'katello/api/v2/host_subscriptions/product_content',
+  'katello/api/v2/host_subscriptions/enabled_repositories',
   'katello/api/v2/hosts_bulk_actions/applicable_errata',
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',

data/lib/katello/plugin.rb

@@ -517,18 +517,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Pulp 3 export destination filepath'),
         description: N_("On-disk location for pulp 3 exported repositories")
 
-      setting 'pulp_client_key',
-        type: :string,
-        default: "/etc/pki/katello/private/pulp-client.key",
-        full_name: N_('Pulp client key'),
-        description: N_("Path for ssl key used for pulp server auth")
-
-      setting 'pulp_client_cert',
-        type: :string,
-        default: "/etc/pki/katello/certs/pulp-client.crt",
-        full_name: N_('Pulp client cert'),
-        description: N_("Path for ssl cert used for pulp server auth")
-
       setting 'sync_total_timeout',
         type: :integer,
         default: 3600,
@@ -673,6 +661,12 @@ Foreman::Plugin.register :katello do
         default: true,
         full_name: N_('Allow deleting repositories in published content views'),
         description: N_("If this is enabled, repositories can be deleted even when they belong to published content views. The deleted repository will be removed from all content view versions.")
+
+      setting 'distribute_archived_cvv',
+        type: :boolean,
+        default: true,
+        full_name: N_('Distribute archived content view versions'),
+        description: N_("If this is enabled, repositories of content view versions without environments (\"archived\") will be distributed at '/pulp/content/<organization>/content_views/<content view>/X.Y/...'.")
     end
   end
 

data/lib/katello/tasks/refresh_alternate_content_sources.rake

@@ -2,9 +2,14 @@ namespace :katello do
   desc 'Refresh all alternate content sources'
   task :refresh_alternate_content_sources => ["dynflow:client"] do
     User.current = User.anonymous_admin
-    ::ForemanTasks.async_task(::Actions::BulkAction,
-                              ::Actions::Katello::AlternateContentSource::Refresh,
-                              ::Katello::AlternateContentSource.all)
-    puts _("Alternate content source refreshing started in the background.")
+    alternate_content_sources = ::Katello::AlternateContentSource.all
+    if alternate_content_sources.present?
+      ::ForemanTasks.async_task(::Actions::BulkAction,
+                                ::Actions::Katello::AlternateContentSource::Refresh,
+                                alternate_content_sources)
+      puts _("Alternate content source refreshing started in the background.")
+    else
+      puts _("No alternate content sources to refresh.")
+    end
   end
 end

data/lib/katello/tasks/refresh_repos.rake

@@ -0,0 +1,8 @@
+namespace :katello do
+  desc 'Refresh all repositories in all smart proxies and main server'
+  task :refresh_repos => ["environment", "dynflow:client"] do
+    User.current = User.anonymous_api_admin
+    ::ForemanTasks.async_task(::Actions::BulkAction, ::Actions::Pulp3::Orchestration::Repository::RefreshRepos, SmartProxy.all)
+    puts _("Repos are being refreshed in the background.")
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.5.0.rc2".freeze
+  VERSION = "4.6.0.rc2".freeze
 end

data/locale/action_names.rb

@@ -1,17 +1,59 @@
 # Autogenerated!
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
+_("Create")
+_("Delete Activation Key")
+_("Update")
+_("Agent action")
+_("Create Alternate Content Source")
+_("Destroy Alternate Content Source")
+_("Refresh Alternate Content Source")
+_("Update Alternate Content Source")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Generate host applicability")
+_("Bulk generate applicability for hosts")
+_("Generate repository applicability")
+_("Synchronize smart proxy")
+_("Sync capsule")
+_("Update CDN Configuration")
+_("Delete")
+_("Promote")
+_("Promotion to Environment")
+_("Publish")
+_("Remove Versions and Associations")
+_("Remove from Environment")
+_("Remove Version")
+_("Export")
+_("Import Content View Version")
+_("Import Default Content View")
+_("Import Repository")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Delete Lifecycle Environment")
+_("Publish Lifecycle Environment Repositories")
+_("Attach subscriptions")
+_("Auto attach subscriptions")
+_("Destroy Content Host")
+_("Install Applicable Errata")
+_("Hypervisors")
+_("Hypervisors update")
+_("Remove subscriptions")
+_("Update Content Overrides")
+_("Update for host")
+_("Update release version for host")
+_("Updating System Purpose for host")
 _("Package Profile Update")
 _("Combined Profile Update")
 _("Destroy")
 _("Product Create")
 _("Delete Product")
 _("Reindex subscriptions")
-_("Update")
 _("Update http proxy")
-_("Delete")
-_("Create")
 _("Delete Package Group")
 _("Discover")
-_("Errata mail")
 _("Fetch pxe files")
 _("Filtered index content")
 _("Upload into")
@@ -30,52 +72,13 @@ _("Verify checksum")
 _("Disable")
 _("Enable")
 _("Run Sync Plan:")
+_("Abstract")
 _("Create Export History")
 _("Create Import History")
+_("Create Syncable Export History")
 _("Copy version units to library")
-_("Export")
 _("Export Library")
 _("Export Repository")
 _("Import")
-_("Abstract")
+_("Syncable export")
 _("Remote action:")
-_("Updating System Purpose for host")
-_("Update release version for host")
-_("Update for host")
-_("Update Content Overrides")
-_("Remove subscriptions")
-_("Import Default Content View")
-_("Import Content View Version")
-_("Remove Version")
-_("Hypervisors update")
-_("Hypervisors")
-_("Install Applicable Errata")
-_("Destroy Content Host")
-_("Auto attach subscriptions")
-_("Attach subscriptions")
-_("Publish Lifecycle Environment Repositories")
-_("Delete Lifecycle Environment")
-_("Republish Version Repositories")
-_("Incremental Update")
-_("Import Repository")
-_("Remove from Environment")
-_("Remove Versions and Associations")
-_("Publish")
-_("Promotion to Environment")
-_("Promote")
-_("Incremental Update of  Content View Version(s) ")
-_("Update CDN Configuration")
-_("Sync capsule")
-_("Synchronize smart proxy")
-_("Generate repository applicability")
-_("Bulk generate applicability for hosts")
-_("Generate host applicability")
-_("Update Alternate Content Source")
-_("Destroy Alternate Content Source")
-_("Create Alternate Content Source")
-_("Agent action")
-_("Delete Activation Key")
-_("Abstract async task")
-_("Import Puppet classes")
-_("Import facts")
-_("Action with sub plans")