katello 4.15.1 → 4.16.0.rc1

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

@@ -57,7 +57,7 @@ module Katello
         tasks = [tasks] unless tasks.is_a?(Array)
         version_hrefs = tasks.map { |task| task[:created_resources] }.flatten
         version_hrefs = version_hrefs.select { |href| ::Katello::Pulp3::Repository.version_href?(href) }
-        Rails.logger.error("Got multiple version_hrefs for pulp task: #{tasks}") if version_hrefs.length > 2
+        Rails.logger.debug("Got multiple version_hrefs for pulp task: #{tasks}") if version_hrefs.length > 2
         version_hrefs.last
       end
 
@@ -65,7 +65,7 @@ module Katello
         tasks = [tasks] unless tasks.is_a?(Array)
         publication_hrefs = tasks.map { |task| task[:created_resources] }.flatten
         publication_hrefs = publication_hrefs.select { |href| ::Katello::Pulp3::Repository.publication_href?(href) }
-        Rails.logger.error("Got multiple publication hrefs for pulp task: #{tasks}") if publication_hrefs.length > 2
+        Rails.logger.debug("Got multiple publication hrefs for pulp task: #{tasks}") if publication_hrefs.length > 2
         publication_hrefs.last #return the last href to workaround https://pulp.plan.io/issues/9098
       end
 

data/app/views/foreman/job_templates/bootc_action.erb

@@ -0,0 +1,26 @@
+<%#
+kind: job_template
+name: Bootc Action - Script Default
+model: JobTemplate
+job_category: Bootc
+description_format: 'bootc %{action} %{options} %{target}'
+provider_type: script
+feature: katello_bootc_action
+template_inputs:
+- name: action
+  description: 'The bootc action: upgrade, switch, rollback or status'
+  input_type: user
+  options: "upgrade\nswitch\nrollback\nstatus"
+  required: true
+- name: options
+  description: Additional options for bootc action
+  input_type: user
+  required: false
+- name: target
+  description: Target for bootc switch action
+  input_type: user
+  required: false
+%>
+
+bootc <%= input('action') %> <%= input('options') %> <%= input('target') %>
+subscription-manager facts --update

data/app/views/foreman/job_templates/bootc_rollback.erb

@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Rollback - Script Default
+job_category: Bootc
+description_format: 'bootc rollback'
+feature: katello_bootc_rollback
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, options, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'rollback') %>

data/app/views/foreman/job_templates/bootc_status.erb

@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Status - Script Default
+job_category: Bootc
+description_format: 'bootc status %{options}'
+feature: katello_bootc_status
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'status') %>

data/app/views/foreman/job_templates/bootc_switch.erb

@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Switch - Script Default
+job_category: Bootc
+description_format: 'bootc switch %{options} %{target}'
+feature: katello_bootc_switch
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'switch') %>

data/app/views/foreman/job_templates/bootc_upgrade.erb

@@ -0,0 +1,13 @@
+<%#
+kind: job_template
+name: Bootc Upgrade - Script Default
+job_category: Bootc
+description_format: 'bootc upgrade %{options}'
+feature: katello_bootc_upgrade
+provider_type: script
+foreign_input_sets:
+- template: Bootc Action - Script Default
+  exclude: action, target
+%>
+
+<%= render_template('Bootc Action - Script Default', :action => 'upgrade') %>

data/app/views/foreman/job_templates/flatpak_install.erb

@@ -0,0 +1,23 @@
+<%#
+kind: job_template
+name: Flatpak - Install application on host
+job_category: Katello
+description_format: 'Install Flatpak application %{Application name} on host'
+provider_type: script
+template_inputs:
+- name: Flatpak remote name
+  description: Name of remote to use on host
+  input_type: user
+  required: false
+- name: Application name
+  description: Name of the application to install
+  input_type: user
+  required: true
+%>
+
+<%
+  remote_name = input('Flatpak remote name')
+  app_name = input('Application name')
+%>
+
+sudo dbus-launch flatpak install <%= remote_name %> <%= app_name %> --assumeyes

data/app/views/foreman/job_templates/flatpak_login_action.erb

@@ -0,0 +1,30 @@
+<%#
+kind: job_template
+name: Flatpak - Login to registry via podman
+job_category: Katello
+description_format: 'Login to flatpak registry via podman'
+provider_type: script
+template_inputs:
+- name: Flatpak registry URL
+  description: URL of server/capsule
+  input_type: user
+  required: true
+- name: Username
+  description: Username for container registry login
+  input_type: user
+  required: true
+- name: Password
+  description: Password/Access token for container registry login
+  input_type: user
+  required: true
+  hidden_value: true
+%>
+
+<%
+  server_url = input('Flatpak registry URL')
+  username = input('Username')
+  password = input('Password')
+%>
+
+sudo podman login <%= server_url %> --username <%= username %> --password <%= password %>
+sudo cp /run/containers/0/auth.json /etc/flatpak/oci-auth.json

data/app/views/foreman/job_templates/flatpak_setup.erb

@@ -0,0 +1,27 @@
+<%#
+kind: job_template
+name: Flatpak - Set up remote on host
+job_category: Katello
+description_format: 'Set up Flatpak remote on host'
+provider_type: script
+template_inputs:
+- name: Remote Name
+  description: Remote name for Flatpak
+  input_type: user
+  required: true
+- name: Flatpak registry URL
+  description: URL of server/capsule
+  input_type: user
+  required: true
+foreign_input_sets:
+- template: Flatpak - Login to registry via podman
+  exclude: Flatpak registry URL
+%>
+
+<%
+  remote_name = input('Remote Name')
+  registry_url = input('Flatpak registry URL')
+%>
+
+sudo flatpak remote-add --authenticator-name=org.flatpak.Authenticator.Oci <%= remote_name %> oci+<%= registry_url %>/
+<%= render_template('Flatpak - Login to registry via podman', 'Flatpak registry URL': registry_url) %>

data/app/views/foreman/job_templates/install_errata_by_search_query.erb

@@ -15,7 +15,7 @@ foreign_input_sets:
   exclude: action,package
 %>
 
-<% advisory_ids = @host.advisory_ids(search: input("Errata search query"), check_installable_for_host: false) -%>
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) -%>
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 

data/app/views/foreman/job_templates/install_errata_by_search_query_-_katello_ansible_default.erb

@@ -12,7 +12,7 @@ template_inputs:
   required: false
 %>
 
-<% advisory_ids = @host.advisory_ids(search: input("Errata search query"), check_installable_for_host: false) -%>
+<% advisory_ids = @host.advisory_ids(search: input("Errata search query")) -%>
 <% render_error(N_("No errata matching given search query")) if !input("Errata search query").blank? && advisory_ids.blank? -%>
 # RESOLVED_ERRATA_IDS=<%= advisory_ids.join(',') %>
 

data/app/views/foreman/job_templates/resolve_traces_-_katello_ansible_default.erb

@@ -18,7 +18,7 @@ commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
 <% if reboot -%>
-    - reboot:
+<%= render_template('Power Action - Ansible Default', action: 'restart') %>
 <% else -%>
 <%= render_template(
     'Run Command - Ansible Default',

data/app/views/foreman/job_templates/update_packages_by_search_query_-_katello_ansible_default.erb

@@ -22,7 +22,7 @@ template_inputs:
   versions: input('Selected update versions')
 ) -%>
 <% if package_names.empty? -%>
-<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => '"*"') %>
+<%= render_template('Package Action - Ansible Default', :state => 'latest', :name => '*') %>
 <% else -%>
 ---
 - hosts: all

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

@@ -51,10 +51,6 @@ end
 
 attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version, :purpose_usage, :purpose_role
 
-node :purpose_addons do |key|
-  key.purpose_addons.pluck(:name)
-end
-
 node :permissions do |activation_key|
   {
     :view_activation_keys => activation_key.readable?,

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

@@ -61,7 +61,8 @@ node :lifecycle_environment do |content_facet|
 end
 
 child :content_source => :content_source do
-  attributes :id, :name, :url
+  attributes :id, :name, :url, :registration_host
+  node(:load_balanced) { |content_source| content_source.load_balanced? }
 end
 
 child :kickstart_repository => :kickstart_repository do

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

@@ -13,6 +13,7 @@ attributes :start_date, :if => lambda { |rule| rule.respond_to?(:start_date) &&
 attributes :end_date, :if => lambda { |rule| rule.respond_to?(:end_date) && !rule.end_date.blank? }
 attributes :architecture, :if => lambda { |rule| rule.respond_to?(:architecture) && !rule.architecture.blank? }
 attributes :types, :if => lambda { |rule| rule.respond_to?(:types) && !rule.types.blank? }
+attributes :allow_other_types, :if => lambda { |rule| rule.respond_to?(:allow_other_types) }
 attributes :date_type, :if => lambda { |rule| rule.respond_to?(:date_type) }
 attributes :module_stream_id, :if => lambda { |rule| rule.respond_to?(:module_stream_id) && !rule.module_stream_id.blank? }
 if @resource&.try(:module_stream)

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

@@ -46,10 +46,14 @@ node :permissions do |cvv|
   }
 end
 
+child :content_view_environments => :content_view_environments do
+  attributes :label, :environment_id, :environment_name
+end
+
 extends 'katello/api/v2/common/timestamps'
 
 version = @object || @resource
-child :environments => :environments do
+child :sorted_organization_readable_environments => :environments do
   attributes :id, :name, :label
 
   node :publish_date do |env|

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

@@ -1,6 +1,6 @@
 object @resource
 
-attributes :id, :schema_version, :digest, :manifest_type
+attributes :id, :schema_version, :digest, :manifest_type, :content_type
 attributes :annotations, :labels, :is_bootable, :is_flatpak
 
 child :docker_tags => :tags do

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

@@ -1,6 +1,6 @@
 object @resource
 
-attributes :id, :schema_version, :digest, :manifest_type
+attributes :id, :schema_version, :digest, :manifest_type, :content_type
 attributes :annotations, :labels, :is_bootable, :is_flatpak
 
 child :docker_tags => :tags do

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

@@ -0,0 +1,4 @@
+extends 'katello/api/v2/common/identifier'
+
+attributes :name
+attributes :label, :flatpak_remote_id

data/app/views/katello/api/v2/flatpak_remote_repositories/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/index"
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/flatpak_remote_repositories/base"
+end

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

@@ -0,0 +1,13 @@
+object @resource
+
+extends "katello/api/v2/flatpak_remote_repositories/base"
+
+child :flatpak_remote => :flatpak_remote do
+  attributes :id, :name, :url
+end
+
+if ::Foreman::Cast.to_bool params[:manifests]
+  child :manifests => :manifests do
+    attributes :name, :digest, :tags, :application, :runtime, :flatpak_ref
+  end
+end

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

@@ -0,0 +1,5 @@
+extends 'katello/api/v2/common/identifier'
+extends 'katello/api/v2/common/org_reference'
+
+attributes :name
+attributes :url, :description, :username, :seeded, :registry_url

data/app/views/katello/api/v2/flatpak_remotes/index.json.rabl

@@ -0,0 +1,8 @@
+object false
+
+extends "katello/api/v2/common/index"
+extends 'katello/api/v2/flatpak_remotes/permissions'
+
+child @collection[:results] => :results do
+  extends "katello/api/v2/flatpak_remotes/base"
+end

data/app/views/katello/api/v2/flatpak_remotes/permissions.json.rabl

@@ -0,0 +1,11 @@
+collection @flatpak_remotes
+
+if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
+  user = User.current # current_user is not available here
+  node do
+    node(:can_create) { user.can?("create_flatpak_remotes") }
+    node(:can_edit) { user.can?("edit_flatpak_remotes") }
+    node(:can_delete) { user.can?("destroy_flatpak_remotes") }
+    node(:can_view) { user.can?("view_flatpak_remotes") }
+  end
+end

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

@@ -0,0 +1,3 @@
+object @resource
+
+extends "katello/api/v2/flatpak_remotes/base"

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

@@ -5,14 +5,6 @@ object @resource
 
 attributes :id, :name, :description
 
-node :operatingsystem_family do |resource|
-  resource.operatingsystem&.family
-end
-
-node :operatingsystem_major do |resource|
-  resource.operatingsystem&.major
-end
-
 if @facet
   node :content_view do
     content_view = @facet&.single_content_view

data/app/views/katello/api/v2/hosts/os_attributes.json.rabl

@@ -0,0 +1,13 @@
+object @resource
+
+@resource ||= @object
+
+attributes :id, :name, :description
+
+node :operatingsystem_family do |resource|
+  resource.operatingsystem&.family
+end
+
+node :operatingsystem_major do |resource|
+  resource.operatingsystem&.major
+end

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

@@ -0,0 +1 @@
+node(:content_default_http_proxy) { |sp| sp.content_default_http_proxy? }

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

@@ -4,6 +4,7 @@ extends 'katello/api/v2/common/identifier'
 
 attributes :pulp_id => :backend_identifier
 attributes :relative_path, :container_repository_name, :full_path, :library_instance_id
+attributes :full_gpg_key_path
 attributes :version_href, :remote_href, :publication_href
 attributes :content_counts
 attributes :mirroring_policy

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

@@ -19,6 +19,7 @@ glue(@resource.root) do
   attributes :ssl_ca_cert_id
   attributes :ssl_client_cert_id
   attributes :ssl_client_key_id
+  attributes :sync_dependencies
 
   attributes :product_type
   attributes :upstream_username

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

@@ -3,7 +3,3 @@ attributes :id, :uuid, :last_checkin, :service_level, :release_version, :autohea
 child :user => :user do
   attributes :id, :login
 end
-
-node :purpose_addons do |sub|
-  sub.purpose_addons.pluck(:name)
-end

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

@@ -5,7 +5,7 @@ extends "katello/api/v2/subscriptions/base"
 attributes :arch
 attributes :description
 attributes :support_type
-attributes :roles, :usage, :addons
+attributes :roles, :usage
 attributes :product_host_count
 
 node(:host_count) do |subscription|

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

@@ -23,9 +23,15 @@
              :class => 'form-control',  :name => ks_repo_select_name, :disabled => kickstart_options.empty? %>
 <% end %>
 
-<% content_for(:javascripts) do -%>
-  <script>
+<script>
+  if(window.allJsLoaded){
     KT.hosts.set_media_selection_bindings();
     KT.hosts.update_media_enablement();
-  </script>
-<% end -%>
+  }
+  else {
+  $(document).on('ContentLoad', function(){
+    KT.hosts.set_media_selection_bindings();
+    KT.hosts.update_media_enablement();
+  }); 
+  } 
+</script>

data/app/views/overrides/http_proxies/_update_setting_input.html.erb

@@ -0,0 +1,18 @@
+<div class="clearfix">
+  <div class="form-group ">
+    <label class="col-md-2 control-label" for="http_proxy_content_default_http_proxy">
+      Default content HTTP proxy
+    </label>
+    <div class="col-md-4">
+    <% if @http_proxy.new_record? %>
+      <%= check_box_tag 'http_proxy[content_default_http_proxy]',
+                        '1',
+                        params.dig('http_proxy', 'content_default_http_proxy') == '1',
+                        id: 'content_default_http_proxy' %>
+      Set this proxy as the default for content, updating the 'Default HTTP Proxy' setting.
+    <% else %>
+      <%= @http_proxy.content_default_http_proxy? ? _('Yes') : _('No') %>
+    <% end %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,5 @@
+<% if @taxonomy.is_a?(Organization) %>
+
+  <%= text_f f, :label, :class => 'input-xlarge' %>
+
+<% end %>

data/config/initializers/monkeys.rb

@@ -1,4 +1,3 @@
 #place where monkey patches are required
 require 'monkeys/ar_postgres_evr_t'
-require 'monkeys/fx_sqlite_skip'
 require 'monkeys/remove_hidden_distribution'

data/config/initializers/pagelets.rb

@@ -4,3 +4,9 @@ Pagelets::Manager.with_key "hosts/_form" do |mgr|
     :partial => "overrides/activation_keys/host_environment_select",
     :priority => 80
 end
+
+Pagelets::Manager.with_key "http_proxies/_form" do |mgr|
+  mgr.add_pagelet :main_tab_fields,
+    :partial => "overrides/http_proxies/update_setting_input",
+    :priority => 80
+end

data/config/routes/api/registry.rb

@@ -19,6 +19,7 @@ Katello::Engine.routes.draw do
       match '/v2' => 'registry_proxies#ping', :via => :get
       match '/v1/_ping' => 'registry_proxies#v1_ping', :via => :get
       match '/v1/search' => 'registry_proxies#v1_search', :via => :get
+      match '/index/static' => 'registry_proxies#static_index', :via => :get
     end
   end
 end

data/config/routes/api/v2.rb

@@ -15,6 +15,25 @@ Katello::Engine.routes.draw do
           get :auto_complete_search, :on => :collection
         end
 
+        api_resources :flatpak_remotes, :only => [:index, :show, :create, :update, :destroy] do
+          get :auto_complete_search, :on => :collection
+          member do
+            post :scan
+          end
+          api_resources :flatpak_remote_repositories, :only => [:index, :show]
+        end
+
+        api_resources :flatpak_remote_repositories, :only => [:index, :show] do
+          get :auto_complete_search, :on => :collection
+          member do
+            post :mirror
+          end
+        end
+
+        api_resources :host_bootc_images, :only => [:auto_complete_search] do
+          get :auto_complete_search, :on => :collection
+        end
+
         api_resources :capsules, :only => [:index, :show] do
           member do
             resource :content, :only => [], :controller => 'capsule_content' do
@@ -263,6 +282,8 @@ Katello::Engine.routes.draw do
               get :manifest_history
             end
           end
+          api_resources :flatpak_remotes, :only => [:index, :show]
+          api_resources :flatpak_remote_repositories, :only => [:index, :show]
         end
 
         match "/packages/thindex" => "packages#thindex", :via => :get

data/config/routes/overrides.rb

@@ -59,6 +59,7 @@ Foreman::Application.routes.draw do
 
           collection do
             match '/auto_complete_search' => 'host_autocomplete#auto_complete_search', :via => :get
+            match '/bootc_images' => 'host_bootc_images#bootc_images', :via => :get
             match '/bulk/add_host_collections' => 'hosts_bulk_actions#bulk_add_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put
             match '/bulk/remove_host_collections' => 'hosts_bulk_actions#bulk_remove_host_collections', :via => :put

data/config/routes.rb

@@ -33,6 +33,8 @@ Katello::Engine.routes.draw do
   match '/alternate_content_sources' => 'react#index', :via => [:get]
   match '/alternate_content_sources/*page' => 'react#index', :via => [:get]
 
+  match '/booted_container_images' => 'react#index', :via => [:get]
+
   Katello::RepositoryTypeManager.generic_ui_content_types(false).each do |type|
     get "/#{type.pluralize}", to: redirect("/content/#{type.pluralize}")
     get "/#{type.pluralize}/:page", to: redirect("/content/#{type.pluralize}/%{page}")

data/db/migrate/20190605014649_add_purpose_addons.rb

@@ -12,18 +12,6 @@ class AddPurposeAddons < ActiveRecord::Migration[5.2]
     add_foreign_key :katello_subscription_facet_purpose_addons, :katello_subscription_facets, column: :subscription_facet_id, name: :katello_sub_facet_purpose_addon_facet_id
     add_foreign_key :katello_subscription_facet_purpose_addons, :katello_purpose_addons, column: :purpose_addon_id, name: :katello_sub_facet_purpose_addon_purpose_addon_id
 
-    Katello::Host::SubscriptionFacet.pluck(:id, :purpose_addons).each do |facet|
-      yaml_string = facet[1]
-      next if yaml_string.nil?
-
-      parsed = YAML.parse(yaml_string)
-      addon_names = parsed.root.children.map(&:value)
-      addon_names.each do |addon|
-        purpose_addon = Katello::PurposeAddon.find_or_create_by(name: addon)
-        Katello::SubscriptionFacetPurposeAddon.create(purpose_addon_id: purpose_addon.id, subscription_facet_id: facet[0])
-      end
-    end
-
     remove_column :katello_subscription_facets, :purpose_addons, :text
   end
 end