katello 3.14.1 → 3.15.0.rc1

data/app/services/katello/repository_type.rb

@@ -12,7 +12,9 @@ module Katello
       end
     end
 
-    def_field :allow_creation_by_user, :service_class, :pulp3_service_class, :pulp3_plugin, :pulp3_skip_publication
+    def_field :allow_creation_by_user, :service_class, :pulp3_service_class, :pulp3_plugin,
+              :pulp3_skip_publication, :pulp3_api_class
+
     attr_accessor :metadata_publish_matching_check, :index_additional_data_proc
     attr_reader :id, :unique_content_per_repo
 
@@ -31,7 +33,12 @@ module Katello
     end
 
     def content_types_to_index
-      @content_types.select { |type| type.index }
+      if SmartProxy.pulp_master.pulp3_repository_type_support?(self)
+        # type.index being false supersedes type.index_on_pulp3 being true
+        @content_types.select { |type| type.index && type.index_on_pulp3 }
+      else
+        @content_types.select { |type| type.index }
+      end
     end
 
     def default_managed_content_type(model_class = nil)
@@ -68,7 +75,7 @@ module Katello
     end
 
     class ContentType
-      attr_accessor :model_class, :priority, :pulp2_service_class, :pulp3_service_class, :index, :uploadable, :removable
+      attr_accessor :model_class, :priority, :pulp2_service_class, :pulp3_service_class, :index, :uploadable, :removable, :index_on_pulp3
 
       def initialize(options)
         self.model_class = options[:model_class]
@@ -76,6 +83,7 @@ module Katello
         self.pulp2_service_class = options[:pulp2_service_class]
         self.pulp3_service_class = options[:pulp3_service_class]
         self.index = options[:index].nil? ? true : options[:index]
+        self.index_on_pulp3 = options[:index_on_pulp3].nil? ? true : options[:index_on_pulp3]
         self.uploadable = options[:uploadable] || false
         self.removable = options[:removable] || false
       end

data/app/services/katello/repository_type_manager.rb

@@ -28,6 +28,13 @@ module Katello
         list.flatten
       end
 
+      def indexable_content_types
+        repository_types.
+                  values.
+                  map(&:content_types_to_index).
+                  flatten
+      end
+
       def creatable_by_user?(repository_type)
         return false unless (type = find(repository_type))
         type.allow_creation_by_user
@@ -51,6 +58,10 @@ module Katello
         repository_types[repository_type.to_s]
       end
 
+      def find_by(attribute, value)
+        repository_types.values.find { |type| type.try(attribute) == value }
+      end
+
       def find_repository_type(katello_label)
         repository_types.values.each do |repo_type|
           repo_type.content_types.each do |content_type|

data/app/views/dashboard/_subscription_widget.html.erb

@@ -2,8 +2,13 @@
   <%= _("Host Subscription Status") %>
 </h4>
 
-<% unless Organization.current.present? %>
+<% if Organization.current.blank? %>
   <p class="ca"><%= _("Please select an organization to view subscription status.") %></p>
+<% elsif Organization.current.golden_ticket?%>
+  <div class="bastion alert alert-info">
+    <span translate>This organization has Simple Content Access enabled. Hosts can consume from all repositories in their Content View regardless of subscription status.
+    </span>
+  </div>
 <% else %>
   <% total_count = total_host_count() %>
   <% partial_consumer_count = partial_consumer_count() %>

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

@@ -8,17 +8,10 @@ attributes :published_in_composite_content_view_ids
 attributes :content_view_id
 attributes :default
 attributes :description
-attributes :package_count
-attributes :module_stream_count
-attributes :srpm_count
-attributes :file_count
-attributes :package_group_count
-attributes :puppet_module_count
-attributes :docker_manifest_count
-attributes :docker_manifest_list_count
-attributes :docker_tag_count
-attributes :ostree_branch_count
-attributes :deb_count
+
+node do |version|
+  version.content_counts_map
+end
 
 node :errata_counts do |version|
   partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(version.errata))

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

@@ -4,7 +4,8 @@ attributes :id, :schema_version, :digest, :manifest_type
 
 child :docker_tags => :tags do
   attributes :associated_meta_tag_identifier => :id
-  attributes :repository_id, :name
+  attributes :repository => :repository_id
+  attributes :name
 end
 
 child :docker_manifests => :manifests do

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

@@ -4,7 +4,8 @@ attributes :id, :schema_version, :digest, :manifest_type
 
 child :docker_tags => :tags do
   attributes :associated_meta_tag_identifier => :id
-  attributes :repository_id, :name
+  attributes :repository => :repository_id
+  attributes :name
 end
 
 child :docker_manifest_lists => :manifest_lists do

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

@@ -1,4 +1,4 @@
 object @resource
 
 extends "katello/api/v2/package_groups/base"
-extends "katello/api/v2/package_groups/backend", :object => Katello::Pulp::PackageGroup.new(@resource.pulp_id)
+extends "katello/api/v2/package_groups/backend", :object => SmartProxy.pulp_master.pulp3_repository_type_support?('yum') ? Katello::Pulp3::PackageGroup.new(@resource.pulp_id) : Katello::Pulp::PackageGroup.new(@resource.pulp_id)

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

@@ -1,4 +1,5 @@
 object @resource
 
 extends "katello/api/v2/packages/base"
-extends "katello/api/v2/packages/backend", :object => Katello::Pulp::Rpm.new(@resource.pulp_id)
+extends "katello/api/v2/packages/backend",
+  :object => SmartProxy.pulp_master!.content_service("rpm").new(@resource.pulp_id)

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

@@ -49,6 +49,8 @@ end
 node :last_sync_words do |object|
   if (object.latest_dynflow_sync.respond_to?('ended_at') && object.latest_dynflow_sync.ended_at)
     time_ago_in_words(Time.parse(object.latest_dynflow_sync.ended_at.to_s))
+  elsif (audit = object.latest_sync_audit)
+    time_ago_in_words(audit.created_at)
   end
 end
 

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

@@ -26,9 +26,10 @@ glue(@resource.root) do
   attributes :deb_releases, :deb_components, :deb_architectures
   attributes :http_proxy_policy
   attributes :http_proxy_id
+  attributes :http_proxy_name
 
   node :http_proxy do
-    attributes :id => @resource.root&.http_proxy_id, :name => @resource.root&.http_proxy&.name
+    attributes :id => @resource.root&.http_proxy&.id, :name => @resource.root&.http_proxy&.name, :policy => @resource.root&.http_proxy_policy
   end
 
   attributes :ignorable_content

data/app/views/katello/api/v2/smart_proxies/pulp_info.json.rabl

@@ -0,0 +1,2 @@
+attributes :download_policy
+attributes :supported_pulp_types

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

@@ -22,5 +22,5 @@ child :subscription_facet => :subscription_facet_attributes do |_facet|
     attributes :id, :name
   end
 
-  attributes :host_type, :dmi_system_uuid
+  attributes :host_type, :dmi_uuid
 end

data/app/views/smart_proxies/plugins/_pulp3.html.erb

@@ -0,0 +1,19 @@
+<div class="row">
+  <h3><%= _('Pulpcore') %></h3>
+</div>
+<%= show_feature_version('pulpcore') %>
+<div class="row">
+  <div class="col-md-4">
+    <strong><%= _('Supported Content Types') %></strong>
+  </div>
+  <div class="col-md-8">
+    <ul style="list-style-type: none; padding: 0">
+    <% @smart_proxy.supported_pulp_types[:pulp3][:supported_types].each do |content_type| %>
+      <li><%= content_type %></li>
+    <% end %>
+    <% @smart_proxy.supported_pulp_types[:pulp3][:overriden_to_pulp2].each do |content_type| %>
+      <li><%= content_type + " (supported, but overridden to use Pulp 2)" %></li>
+    <% end %>
+    </ul>
+  </div>
+</div>

data/app/views/smart_proxies/pulp_status.html.erb

@@ -22,3 +22,13 @@
 <div class="col-md-8">
   <%= @pulp_status['known_workers'].size %><br />
 </div>
+<div class="col-md-4">
+  <strong><%= _('Supported Content Types') %></strong>
+</div>
+<div class="col-md-8">
+  <ul style="list-style-type: none; padding: 0">
+  <% @smart_proxy.supported_pulp_types[:pulp2][:supported_types].each do |content_type| %>
+    <li><%= content_type %></li>
+  <% end %>
+  </ul>
+</div>

data/db/migrate/20190930192813_add_pulp3_hrefs_to_content_types.rb

@@ -0,0 +1,10 @@
+class AddPulp3HrefsToContentTypes < ActiveRecord::Migration[5.2]
+  def change
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+                      Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag]
+
+    content_models.each do |model|
+      add_column model.table_name, :migrated_pulp3_href, :string, :default => nil, :null => true
+    end
+  end
+end

data/db/migrate/20191204020703_migrate_distribution_reference_to_use_repo_id.rb

@@ -0,0 +1,22 @@
+class MigrateDistributionReferenceToUseRepoId < ActiveRecord::Migration[5.2]
+  class DistributionReference < Katello::Model
+    self.table_name = 'katello_distribution_references'
+  end
+
+  def up
+    #this was done before being deployed in production, so this should be okay,
+    # although existing pulp3 repos will not work properly
+    DistributionReference.destroy_all
+
+    #work around sqlite add_column with non_null issue
+    add_column :katello_distribution_references, :repository_id, :integer, :index => true
+    change_column :katello_distribution_references, :repository_id, :integer, :null => false
+
+    remove_column :katello_distribution_references, :root_repository_id
+    add_foreign_key :katello_distribution_references, :katello_repositories, :column => :repository_id, :primary_key => :id
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20191204214919_add_content_view_version_counts.rb

@@ -0,0 +1,7 @@
+class AddContentViewVersionCounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_content_view_versions, :content_counts, :text
+    Katello::ContentViewVersion.reset_column_information
+    Katello::ContentViewVersion.all.each(&:update_content_counts!)
+  end
+end

data/db/migrate/20191213161248_add_dmi_uuid_to_katello_subscription_facets.rb

@@ -0,0 +1,6 @@
+class AddDmiUuidToKatelloSubscriptionFacets < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_subscription_facets, :dmi_uuid, :string
+    add_index :katello_subscription_facets, :dmi_uuid
+  end
+end

data/db/migrate/20200109162354_drop_host_update_lock_setting.rb

@@ -0,0 +1,5 @@
+class DropHostUpdateLockSetting < ActiveRecord::Migration[5.2]
+  def up
+    Setting.where(name: 'host_update_lock').delete_all
+  end
+end

data/db/seeds.d/104-proxy.rb

@@ -16,7 +16,7 @@ User.as(::User.anonymous_api_admin.login) do
     fail "Unable to create proxy feature: #{format_errors feature}"
   end
 
-  ["Pulp", "Pulp Node", "Pulp3"].each do |input|
+  ["Pulp", "Pulp Node", "Pulpcore"].each do |input|
     f = Feature.where(:name => input).first_or_create
     fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
   end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -10,6 +10,8 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.11:update_puppet_repos'},
     {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'},
     {:name => 'katello:upgrades:3.12:remove_pulp2_notifier'},
-    {:name => 'katello:upgrades:3.13:republish_deb_metadata'}
+    {:name => 'katello:upgrades:3.13:republish_deb_metadata'},
+    {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
+    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'}
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -17,8 +17,8 @@
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscriptionsModalController',
-    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'Notification', 'hostIds',
-        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, Notification, hostIds) {
+    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'Notification', 'hostIds', 'contentAccessMode',
+        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, Notification, hostIds, contentAccessMode) {
             var success, error, params = {
                 'organization_id': CurrentOrganization,
                 'sort_order': 'ASC',
@@ -53,6 +53,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
             $scope.contentNutupane.masterOnly = true;
             $scope.contentNutupane.load();
             $scope.groupedSubscriptions = {};
+            $scope.contentAccessMode = contentAccessMode;
 
             $scope.$watch('table.rows', function (rows) {
                 $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html

@@ -7,14 +7,19 @@
 
     <div class="row">
       <div class="col-sm-12">
-        <button type="button" class="btn btn-default" ng-click="autoAttach()" ng-disabled="table.numSelected > 0">
+        <button type="button" class="btn btn-default" ng-click="autoAttach()" ng-disabled="table.numSelected > 0 || contentAccessMode === 'org_environment'">
           <span translate>Auto-Attach</span>
         </button>
-        <p class="help-text" ng-show="table.numSelected === 0">
+
+        <p class="help-text" ng-show="table.numSelected === 0 && contentAccessMode != 'org_environment'">
           Auto-attach available subscriptions to all selected hosts.
         </p>
 
-        <p class="help-text" ng-show="table.numSelected > 0">
+        <p>
+        <div content-access-mode-banner/>
+        </p>
+
+        <p class="help-text" ng-show="table.numSelected > 0 && contentAccessMode != 'org_environment'">
           Auto-attach uses all available subscriptions, not a selected subset.
         </p>
       </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -19,8 +19,8 @@
         <dt translate>Subscription UUID</dt>
         <dd>{{ host.subscription_facet_attributes.uuid }}</dd>
 
-        <dt translate>Bios UUID</dt>
-        <dd>{{ host.subscription_facet_attributes.dmi_system_uuid }}</dd>
+        <dt translate>BIOS UUID</dt>
+        <dd>{{ host.subscription_facet_attributes.dmi_uuid }}</dd>
 
         <dt translate>Description</dt>
         <dd bst-edit-textarea="host.comment"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html

@@ -52,7 +52,7 @@
                   ng-if="componentContentView.versions.length > 0"
                   ng-model="componentContentView.versionId"
                   ng-selected="latest"
-                  ng-options="cvv.id as cvv.version for cvv in availableVersions | orderBy: '-version'">
+                  ng-options="cvv.id as cvv.version for cvv in availableVersions | orderBy: '-id'">
           </select>
           <span ng-if="componentContentView.versions.length === 0" ng-model="componentContentView.version" translate>Always Use Latest (Currently no versions)</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html

@@ -44,7 +44,7 @@
                   readonly="denied('edit_content_views', contentView)"
                   selector="contentViewComponent.versionId"
                   options="getAvailableVersions(contentViewComponent.content_view)"
-                  options-format="option.id as option.version for option in options | orderBy: '-version'"
+                  options-format="option.id as option.version for option in options | orderBy: '-id'"
                   on-save="saveContentViewComponent(contentViewComponent)"
                   ng-if="contentViewComponent.content_view.version_count > 0">
             </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-http-proxy-modal.html

@@ -1,5 +1,5 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header">Http Proxy Management</h4>
+  <h4 data-block="modal-header">HTTP Proxy Management</h4>
 
   <div data-block="modal-body">
     <div class="row">
@@ -21,7 +21,7 @@
     <form name="proxyForm" class="col-sm-5" novalidate role="form">
 
       <div class="form-group">
-        <label translate>Http Proxy Policy:</label>
+        <label translate>HTTP Proxy Policy:</label>
         <select required
                 id="http_proxy_policy"
                 name="http_proxy_policy"
@@ -32,7 +32,7 @@
 
       <span ng-show="proxyOptions.httpProxyPolicy === 'use_selected_http_proxy'">
         <div class="form-group">
-          <label translate>Http Proxy:</label>
+          <label translate>HTTP Proxy:</label>
           <span translate ng-show="proxies.length == 0">
             No HTTP Proxies found
           </span>

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

@@ -151,7 +151,7 @@
       </span>
 
       <span>
-        <dt translate>Http Proxy</dt>
+        <dt translate>HTTP Proxy</dt>
         <dd bst-edit-custom="repository.http_proxy_policy"
             readonly="denied('edit_products', product)"
             on-save="save(repository)"
@@ -169,7 +169,7 @@
           </form>
 
           <span ng-show="repository.http_proxy_policy === 'use_selected_http_proxy'">
-            <div translate>Http Proxy</div>
+            <div translate>HTTP Proxy</div>
             <span translate ng-show="proxies.length == 0">
               No HTTP Proxies found
             </span>

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

@@ -219,7 +219,7 @@
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Http Proxy Policy' | translate }}">
+      <div bst-form-group label="{{ 'HTTP Proxy Policy' | translate }}">
         <select required
                 id="http_proxy_policy"
                 name="http_proxy_policy"
@@ -228,7 +228,7 @@
         </select>
       </div>
       <span ng-show="repository.http_proxy_policy === 'use_selected_http_proxy'">
-        <div bst-form-group label="{{ 'Http Proxy' | translate }}">
+        <div bst-form-group label="{{ 'HTTP Proxy' | translate }}">
           <span translate ng-show="proxies.length == 0">
             No HTTP Proxies found
           </span>

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

@@ -88,9 +88,12 @@
           <td bst-table-cell>{{ repository.content_type }}</td>
           <td bst-table-cell>
             <span ng-show="repository.url">
-              <span ng-show="repository.last_sync == null" translate>
+              <span ng-show="repository.last_sync == null && repository.last_sync_words == null" translate>
                 Not Synced
               </span>
+              <span ng-show="repository.last_sync == null && repository.last_sync_words" translate>
+                Completed {{ repository.last_sync_words }} ago
+              </span>
               <span ng-show="repository.last_sync !== null && repository.last_sync.ended_at == null" translate>
                 <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
               </span>

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

@@ -44,7 +44,7 @@
 
         <li role="menuitem" ng-show="permitted('edit_products')" ng-class="{disabled: table.numSelected === 0}">
           <a ng-click="openHttpProxyModal()" disable-link="table.numSelected === 0" translate>
-            Manage Http Proxy
+            Manage HTTP Proxy
           </a>
         </li>