katello 3.18.0.rc2.1 → 4.0.0.rc2

data/app/services/katello/pulp3/repository.rb

@@ -1,5 +1,5 @@
+# rubocop:disable Metrics/ClassLength
 require "pulpcore_client"
-
 module Katello
   module Pulp3
     class Repository
@@ -48,6 +48,10 @@ module Katello
         nil
       end
 
+      def published?
+        !repo.publication_href.nil?
+      end
+
       def skip_types
         nil
       end
@@ -188,8 +192,9 @@ module Katello
         api.repositories_api.read(repository_reference.try(:repository_href))
       end
 
-      def delete(href = repository_reference.try(:repository_href))
-        repository_reference.try(:destroy)
+      def delete_repository(repo_reference = repository_reference)
+        href = repo_reference.try(:repository_href)
+        repo_reference.try(:destroy)
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 
@@ -257,8 +262,12 @@ module Katello
         create_version(:base_version => from_repository.version_href)
       end
 
+      def version_zero?
+        repo.version_href.ends_with?('/versions/0/')
+      end
+
       def delete_version
-        ignore_404_exception { api.repository_versions_api.delete(repo.version_href) }
+        ignore_404_exception { api.repository_versions_api.delete(repo.version_href) } unless version_zero?
       end
 
       def create_version(options = {})

data/app/services/katello/pulp3/repository/docker.rb

@@ -52,6 +52,11 @@ module Katello
                                       api.class.recursive_manage_class.new(content_units: options[:remove_content_units]))
         end
 
+        def tag_manifest(name, digest)
+          api.repositories_api.tag(repository_reference.repository_href,
+                                   api.class.tag_image_class.new(tag: name, digest: digest))
+        end
+
         def add_content(content_unit_href)
           content_unit_href = [content_unit_href] unless content_unit_href.is_a?(Array)
           api.repositories_api.add(repository_reference.repository_href, content_units: content_unit_href)

data/app/services/katello/pulp3/repository/yum.rb

@@ -207,14 +207,20 @@ module Katello
           tasks
         end
 
-        def copy_all(source_repository)
-          data = PulpRpmClient::Copy.new
-          data.config = [{
-            source_repo_version: source_repository.version_href,
-            dest_repo: repository_reference.repository_href
-          }]
-
-          [api.copy_api.copy_content(data)]
+        def copy_all(source_repository, mirror: false)
+          if mirror
+            data = PulpRpmClient::RepositoryAddRemoveContent.new(
+                      base_version: source_repository.version_href)
+
+            [api.repositories_api.modify(repository_reference.repository_href, data)]
+          else
+            data = PulpRpmClient::Copy.new
+            data.config = [{
+              source_repo_version: source_repository.version_href,
+              dest_repo: repository_reference.repository_href
+            }]
+            [api.copy_api.copy_content(data)]
+          end
         end
 
         def remove_all_content_from_repo(repo_href)
@@ -334,7 +340,7 @@ module Katello
           multi_copy_units(repo_id_map, dependency_solving)
         end
 
-        def copy_content_for_source(source_repository, options = {})
+        def copy_content_for_source(source_repository, options = {}) # rubocop:disable Metrics/CyclomaticComplexity
           filters = [ContentViewErratumFilter, ContentViewPackageGroupFilter, ContentViewPackageFilter].collect do |filter_class|
             filter_class.where(:id => options[:filter_ids])
           end

data/app/services/katello/pulp3/task.rb

@@ -68,6 +68,10 @@ module Katello
         task_data[:finish_time] || FINISHED_STATES.include?(task_data[:state])
       end
 
+      def progress_reports
+        task_data['progress_reports']
+      end
+
       def poll
         task_data(true)
         self

data/app/services/katello/pulp3/task_group.rb

@@ -53,6 +53,10 @@ module Katello
         task_group_data['all_tasks_dispatched'] == true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
       end
 
+      def group_progress_reports
+        task_group_data['group_progress_reports']
+      end
+
       def poll
         clear_task_group_data
         task_group_data

data/app/services/katello/registration_manager.rb

@@ -115,6 +115,8 @@ module Katello
         # This can be cleaned up later via clean_backend_objects.
         pulp_consumer_destory(host.content_facet.uuid) if host.content_facet.try(:uuid) && pulp2_supported?
 
+        delete_agent_queue(host) if host.content_facet.try(:uuid)
+
         host.subscription_facet.try(:destroy!)
 
         if unregistering
@@ -266,6 +268,14 @@ module Katello
         Rails.logger.warn(_("Pulp Consumer %s has already been removed") % host_uuid)
       end
 
+      def delete_agent_queue(host)
+        queue_name = Katello::Agent::Dispatcher.host_queue_name(host)
+        Katello::EventQueue.push_event(::Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, host.id) do |attrs|
+          attrs[:metadata] = { queue_name: queue_name }
+          attrs[:process_after] = 10.minutes.from_now
+        end
+      end
+
       def populate_content_facet(host, content_view_environment, uuid)
         content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
         content_facet.content_view = content_view_environment.content_view

data/app/services/katello/repository_type.rb

@@ -33,7 +33,7 @@ module Katello
     end
 
     def content_types_to_index
-      if SmartProxy.pulp_primary.pulp3_repository_type_support?(self)
+      if SmartProxy.pulp_primary&.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

data/app/views/foreman/smart_proxies/_content_tab.html.erb

@@ -1,48 +1,5 @@
-<br />
+<%= javascript_include_tag *webpack_asset_paths('katello', extension: 'js') %>
 
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <th translate>Content View Name</th>
-      <th translate>Composite</th>
-      <th translate>Last Published</th>
-      <th translate>Hosts</th>
-      <th translate>Products</th>
-      <th translate>Apt repos</th>
-      <th translate>Yum repos</th>
-      <th translate>Container Image repos</th>
-      <th translate>Deb Packages</th>
-      <th translate>RPM Packages</th>
-      <th translate>Errata</th>
-      <th translate>Puppet modules</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat-start="env in syncStatus.lifecycle_environments">
-      <td colspan="10"
-          ng-click="toggleExpandEnvironment(env)"
-          class="expander {{isEnvronmentExpanded(env) ? '' : 'collapsed'}}">
-        <span class="caret"></span>
-        {{ env.name }}
-      </td>
-    </tr>
-    <tr ng-repeat-end ng-repeat="cv in env.content_views" ng-show="isEnvronmentExpanded(env)">
-      <td>
-        <a href="{{ productsOrVersionUrl(cv.default, cv.id) }}" target="_self">
-          {{ cv.name }}
-        </a>
-      </td>
-      <td>{{ cv.composite | booleanToYesNo }}</td>
-      <td>{{ cv.last_published }}</td>
-      <td>{{ cv.counts.content_hosts }}</td>
-      <td>{{ cv.counts.products }}</td>
-      <td>{{ cv.counts.apt_repositories }}</td>
-      <td>{{ cv.counts.yum_repositories }}</td>
-      <td>{{ cv.counts.docker_repositories }}</td>
-      <td>{{ cv.counts.deb_packages }}</td>
-      <td>{{ cv.counts.packages }}</td>
-      <td>{{ cv.counts.errata }}</td>
-      <td>{{ cv.counts.puppet_modules }}</td>
-    </td>
-  </tbody>
-</table>
+<br />
+<% @smartProxyId= @smart_proxy.id %>
+<%= react_component('Content', smartProxyId: @smartProxyId,)  %>

data/app/views/foreman/smart_proxies/show.html.erb

@@ -1,4 +1,4 @@
-<% if @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if @smart_proxy.pulp_mirror? -%>
   <div ng-controller="CapsuleContentController">
     <%= render :file => 'smart_proxies/show' %>
   </div>

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -17,33 +17,30 @@ child @lifecycle_environments => :lifecycle_environments do
   node :syncable do |env|
     @capsule.environment_syncable?(env)
   end
-  node :counts do |env|
-    counts = {
-      :content_hosts => env.hosts.authorized("view_hosts").count,
-      :content_views => env.content_views.non_default.count,
-      :products => env.products.enabled.count
-    }
-    repo_data = @capsule.smart_proxy_service.current_repositories_data(env)
-    counts.merge!(Katello::Pulp::ContentCountsCalculator.new(repo_data).calculate)
-  end
 
-  node :content_views do |env|
-    env.content_views.map do |content_view|
-      attributes = {
-        :id => content_view.id,
-        :label => content_view.label,
-        :name => content_view.name,
-        :composite => content_view.composite,
-        :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
-        :default => content_view.default,
-        :counts => {
-          :content_hosts => content_view.hosts.authorized("view_hosts").count,
-          :products => content_view.products.enabled.count
-        }
+  if @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE) || @capsule.has_feature?(SmartProxy::PULP3_FEATURE)
+    node :counts do |env|
+      {
+        :content_views => env.content_views.non_default.count
       }
-      repo_data = @capsule.smart_proxy_service.current_repositories_data(env, content_view)
-      attributes[:counts].merge!(Katello::Pulp::ContentCountsCalculator.new(repo_data).calculate)
-      attributes
+    end
+
+    node :content_views do |env|
+      env.content_views.map do |content_view|
+        attributes = {
+          :id => content_view.id,
+          :label => content_view.label,
+          :name => content_view.name,
+          :composite => content_view.composite,
+          :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
+          :default => content_view.default,
+          :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
+          :counts => {
+            :repositories => @capsule.current_repositories_data(env, content_view).try(:count)
+          }
+        }
+        attributes
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 object @resource
 
 attributes :destination_server, :path, :id, :metadata
+attributes :export_type => :type
 
 node :content_view_version do |h|
   h.content_view_version.name

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

@@ -4,6 +4,12 @@ extends "katello/api/v2/content_views/base"
 
 attributes :content_host_count
 
+node :errors do
+  unless @resource.valid?
+    attribute :messages => @resource.errors.full_messages
+  end
+end
+
 child :duplicate_repositories_to_publish => :duplicate_repositories_to_publish do
   attributes :id, :name
   node :components do |repo|

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

@@ -4,17 +4,15 @@ extends "api/v2/taxonomies/show"
 
 attributes :task_id, :label, :redhat_repository_url
 
-if ::SETTINGS[:katello][:use_cp]
-  attributes :system_purposes, :system_purposes
-  attributes :service_levels, :service_level
+attributes :system_purposes, :system_purposes
+attributes :service_levels, :service_level
 
-  node :simple_content_access do |org|
-    org.simple_content_access?
-  end
+node :simple_content_access do |org|
+  org.simple_content_access?
+end
 
-  node :owner_details do |org|
-    partial('katello/api/v2/organizations/owner_details', object: OpenStruct.new(org.owner_details))
-  end
+node :owner_details do |org|
+  partial('katello/api/v2/organizations/owner_details', object: OpenStruct.new(org.owner_details))
 end
 
 node :default_content_view_id do |org|

data/app/views/katello/layouts/react.html.erb

@@ -10,7 +10,8 @@
     <%= notifications %>
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
     <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-    <div id="reactRoot"></div>
-    <%= mount_react_component('katello', '#reactRoot') %>
+    <div id="reactRoot">
+      <%= react_component('katello') %>
+    </div>
 <% end %>
 <%= render file: "layouts/base" %>

data/app/views/katello/sync_management/_products.html.erb

@@ -42,5 +42,5 @@
     </tbody>
   </table>
 
-  <%= submit_tag _('Synchronize Now'), :class => 'button fr', :id => 'sync_button' %>
+  <%= submit_tag _('Synchronize Now'), :class => 'btn btn-default fr', :id => 'sync_button' %>
 <% end %>

data/app/views/overrides/activation_keys/_host_tab_pane.html.erb

@@ -9,13 +9,9 @@
 
   <%= field(f, _("Activation Keys"),
             :help_inline => _("The value will be available in templates as @host.params['#{kt_ak_label}']")) do
-    tag.div id: :kt_activation_keys
+    react_component('TypeAheadSelect', { id: 'kt_activation_keys', multiple: true, allowNew: true })
   end %>
 
-  <%= mount_react_component('TypeAheadSelect', '#kt_activation_keys',
-                            {id: 'kt_activation_keys', multiple: true, allowNew: true}.to_json,
-                            { flatten_data: true }) %>
-
   <div class="alert alert-info">
     <p><b><%= _('Subscriptions information based on selected activation keys:') %></b></p>
     <ul id="ak-subscriptions-info"></ul>

data/app/views/overrides/organizations/_edit_override.html.erb

@@ -3,10 +3,7 @@
   <%= javascript_include_tag 'katello/organizations/download_certificate' %>
 
   <%= text_f f, :label, :disabled => true, :class => 'input-xlarge' %>
-
-  <% if ::SETTINGS[:katello][:use_cp] %>
-    <%= selectable_f(f, :service_level, options_for_select(service_level_options, service_level_selected), {}, :label => _('Default System SLA')) %>
-  <% end %>
+  <%= selectable_f(f, :service_level, options_for_select(service_level_options, service_level_selected), {}, :label => _('Default System SLA')) %>
 
   <%= field(f, _('Debug Certificate'),
             :help_inline => _('This certificate allows a user to view the repositories in any environment from a browser.')) do

data/app/views/overrides/smart_proxies/_environment_tab.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.pulp_mirror? -%>
   <li id="kt_environments_tab">
     <a href="#kt_environments" data-toggle="tab"><%= _('Lifecycle Environments') %></a>
   </li>

data/app/views/overrides/smart_proxies/_environment_tab_pane.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.pulp_mirror? -%>
   <div class="tab-pane" id="kt_environments">
     <%= multiple_selects f, :lifecycle_environments, Katello::KTEnvironment.completer_scope(:organization_id => ::Organization.current.try(:id)), @smart_proxy.lifecycle_environment_ids, {:label => _('Lifecycle Environments')}, @smart_proxy.default_capsule? ? {:disabled => :disabled } : {}  %>
 

data/config/katello.yaml.example

@@ -10,9 +10,6 @@
     :ostree: true
     :ansible_collection: true
 
-  :use_cp: true # set to true/false if you want to override default
-  :use_pulp: true # set to true/false if you want to override default
-
   :rest_client_timeout: 30
   :gpg_strict_validation: false
 

data/config/routes/api/v2.rb

@@ -113,6 +113,22 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :content_exports, :only => [] do
+          collection do
+            post :version
+            post :library
+            get :index
+            get :api_status
+          end
+        end
+
+        api_resources :content_export_incrementals, :only => [] do
+          collection do
+            post :version
+            post :library
+          end
+        end
+
         api_resources :content_view_versions, :except => [:create] do
           member do
             post :promote
@@ -121,11 +137,15 @@ Katello::Engine.routes.draw do
             get :available_errata, :controller => :errata
           end
           collection do
-            get :export_histories
-            get :export_api_status
             get :auto_complete_search
             post :incremental_update
-            post :import
+          end
+        end
+
+        api_resources :content_imports, :only => [] do
+          collection do
+            post :version
+            post :library
           end
         end
 
@@ -187,14 +207,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :gpg_keys, :only => [:index, :show, :create, :update, :destroy] do
-          member do
-            get :content
-            post :content, :action => :set_content
-          end
-          get :auto_complete_search, :on => :collection
-        end
-
         api_resources :host_collections, :only => [:index, :show, :create, :update, :destroy] do
           member do
             post :copy
@@ -340,8 +352,6 @@ Katello::Engine.routes.draw do
             end
           end
 
-          api_resources :gpg_keys, :only => [:index]
-
           api_resources :content_views, :only => [:index, :create]
           api_resources :subscriptions, :only => [:index, :upload, :delete_manifest, :refresh_manifest, :show] do
             collection do
@@ -351,6 +361,14 @@ Katello::Engine.routes.draw do
             end
           end
 
+          api_resources :simple_content_access, only: [] do
+            collection do
+              put :enable
+              put :disable
+              get :eligible
+            end
+          end
+
           api_resources :upstream_subscriptions, only: [:index, :create] do
             collection do
               delete :destroy