katello 3.18.0.rc1 → 4.0.0.rc1

data/app/services/katello/smart_proxy_helper.rb

@@ -21,6 +21,15 @@ module Katello
       end
     end
 
+    def clear_smart_proxy_sync_histories(repo_list = [])
+      if repo_list.empty?
+        @smart_proxy.smart_proxy_sync_histories.delete_all
+        return
+      end
+      repo_ids = repo_list.map(&:id)
+      @smart_proxy.smart_proxy_sync_histories.where("repository_id IN (?)", repo_ids).delete_all
+    end
+
     def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
       lifecycle_environment_check(environment, repository)
       if repository

data/app/views/foreman/hosts/_registration.html.erb

@@ -0,0 +1,12 @@
+<div class='form-group'>
+  <label class='col-md-2 control-label'>
+    <%= _('Activation Key(s)') %>
+    <% help = _('Activation key(s) for Subscription Manager. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3.') %>
+    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
+      <span class="pficon pficon-info "></span>
+    </a>
+  </label>
+  <div class='col-md-4'>
+    <%= text_field_tag 'activation_key', params[:activation_key], class: 'form-control' %>
+  </div>
+</div>

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/base.json.rabl

@@ -9,6 +9,7 @@ attributes :version_count
 attributes :latest_version
 attributes :auto_publish
 attributes :solve_dependencies
+attributes :import_only
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s

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/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

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -329,7 +329,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def up
-    if User.where(:login => User::ANONYMOUS_API_ADMIN).first.nil?
+    unless User.unscoped.where(:login => User::ANONYMOUS_API_ADMIN).exists?
       logger.warn("Foreman anonymous admin does not exist, skipping content host migration.")
       return
     end

data/db/migrate/20191204214919_add_content_view_version_counts.rb

@@ -2,6 +2,5 @@ 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/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -1,6 +1,6 @@
 class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
   def up
-    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+    if User.unscoped.where(login: User::ANONYMOUS_ADMIN).exists?
       User.as_anonymous_admin do
         copy_data_from_hostgroup
       end
@@ -46,7 +46,10 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        content_facet.save!
+        unless content_facet.save
+          Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
+          Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
+        end
       end
     end
   end

data/db/migrate/20200929200357_create_katello_smart_proxy_sync_history.rb

@@ -0,0 +1,13 @@
+class CreateKatelloSmartProxySyncHistory < ActiveRecord::Migration[6.0]
+  def change
+    create_table :katello_smart_proxy_sync_history do |t|
+      t.references :smart_proxy, :null => false
+      t.references :repository, :null => false
+      t.datetime :started_at
+      t.datetime :finished_at
+    end
+    add_index "katello_smart_proxy_sync_history", ["smart_proxy_id"], :name => "index_spsh_smart_proxy_id"
+    add_index "katello_smart_proxy_sync_history", ["repository_id"], :name => "index_spsh_repository_id"
+    add_index "katello_smart_proxy_sync_history", [:smart_proxy_id, :repository_id], :unique => true, :name => 'index_spsh_smart_proxy_repository_unique'
+  end
+end

data/db/migrate/20201021150008_add_import_only_to_katello_content_view.rb

@@ -0,0 +1,5 @@
+class AddImportOnlyToKatelloContentView < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_views, :import_only, :boolean, :default => false, :null => false
+  end
+end

data/db/migrate/20201119211133_pulp3_migration_progress.rb

@@ -0,0 +1,9 @@
+class Pulp3MigrationProgress < ActiveRecord::Migration[6.0]
+  def change
+    create_table :katello_content_migration_progresses do |t|
+      t.string :progress_message
+      t.boolean :canceled, null: false, default: false
+      t.string :task_id, null: false, index: {name: 'katello_content_migration_progress_task_id', unique: true }
+    end
+  end
+end

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -0,0 +1,56 @@
+class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
+  class FakeContentViewPuppetModule < Katello::Model
+    self.table_name = 'katello_content_view_puppet_modules'
+  end
+
+  class FakeContentViewPuppetEnvironmentPuppetModule < Katello::Model
+    self.table_name = 'katello_content_view_puppet_environment_puppet_modules'
+  end
+
+  class FakeRepositoryPuppetModule < Katello::Model
+    self.table_name = 'katello_repository_puppet_modules'
+  end
+
+  class FakeContentViewPuppetEnvironment < Katello::Model
+    self.table_name = 'katello_content_view_puppet_environments'
+  end
+  class FakePuppetModule < Katello::Model
+    self.table_name = 'katello_puppet_modules'
+  end
+  class FakeRepositoryOstreeBranch < Katello::Model
+    self.table_name = 'katello_repository_ostree_branches'
+  end
+  class FakeOstreeBranch < Katello::Model
+    self.table_name = 'katello_ostree_branches'
+  end
+
+  def up
+    if Katello::Repository.ostree_type.any? || Katello::Repository.puppet_type.any?
+      User.as_anonymous_admin do
+        FakeContentViewPuppetModule.delete_all
+        FakeContentViewPuppetEnvironmentPuppetModule.delete_all
+        FakeRepositoryPuppetModule.delete_all
+
+        FakeContentViewPuppetEnvironment.delete_all
+        FakePuppetModule.delete_all
+
+        Katello::Repository.puppet_type.delete_all
+
+        FakeRepositoryOstreeBranch.delete_all
+        FakeOstreeBranch.delete_all
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
+        Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
+
+        Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
+          version.content_counts.except!('ostree', 'puppet_module')
+          version.save
+        end
+      end
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end