katello 4.14.1 → 4.15.0.rc2

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

@@ -92,7 +92,7 @@ module Katello
       def distribution_options(path, options = {})
         ret = {
           base_path: path,
-          name: "#{backend_object_name}"
+          name: "#{backend_object_name}",
         }
         ret[:content_guard] = repo.unprotected ? nil : content_guard_href
         ret[:publication] = options[:publication] if options.key? :publication
@@ -145,7 +145,7 @@ module Katello
           connect_timeout: Setting[:sync_connect_timeout_v2],
           sock_connect_timeout: Setting[:sync_sock_connect_timeout],
           sock_read_timeout: Setting[:sync_sock_read_timeout],
-          rate_limit: Setting[:download_rate_limit]
+          rate_limit: Setting[:download_rate_limit],
         }
         remote_options.merge!({download_concurrency: repo.download_concurrency}) if repo.download_concurrency
         remote_options.merge!(ssl_remote_options)
@@ -157,7 +157,7 @@ module Katello
           client_cert: ueber_cert[:cert],
           client_key: ueber_cert[:key],
           ca_cert: ::Cert::Certs.ca_cert,
-          tls_validation: true
+          tls_validation: true,
         }
       end
 

data/app/services/katello/registration_manager.rb

@@ -154,19 +154,24 @@ module Katello
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def register_host(host, consumer_params, content_view_environments, activation_keys = [])
         new_host = host.new_record?
         unless new_host
           host.save!
           # Keep the kickstart repository ID so the host's Medium isn't unset
           # Important for registering a host during provisioning
-          unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          begin
+            unregister_host(host, :unregistering => true, :keep_kickstart_repository => true)
+          rescue RestClient::Gone
+            Rails.logger.debug("Host %s has been removed in preparation for reregistration" % host&.name)
+          end
           host.reload
         end
 
         if activation_keys.present?
           if content_view_environments.blank?
-            content_view_environments = [lookup_content_view_environment(activation_keys)]
+            content_view_environments = lookup_content_view_environments(activation_keys)
           end
           set_host_collections(host, activation_keys)
         end
@@ -194,6 +199,7 @@ module Katello
           finalize_registration(host)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def check_registration_services
         ping_results = {}
@@ -246,7 +252,7 @@ module Katello
         host.subscription_facet.save!
         host.refresh_statuses([
                                 ::Katello::ErrataStatus,
-                                ::Katello::RhelLifecycleStatus
+                                ::Katello::RhelLifecycleStatus,
                               ])
       end
 
@@ -264,12 +270,23 @@ module Katello
         host.host_collection_ids = host_collection_ids
       end
 
-      def lookup_content_view_environment(activation_keys)
+      def lookup_content_view_environments(activation_keys)
+        # If the setting is on, we combine all CVEs from all AKs
+        if Setting['allow_multiple_content_views']
+          cves = activation_keys.map do |act_key|
+            act_key.content_view_environments
+          end
+          cves = cves.flatten.uniq
+          fail _('At least one activation key must have a lifecycle environment and content view assigned to it') if cves.blank?
+          return cves
+        end
+
+        # If the setting is off, we stick with the previous behavior (the last AK with a valid cv/lce wins).
         activation_key = activation_keys.reverse.detect do |act_key|
-          act_key.environment && act_key.content_view
+          act_key.content_view_environments.any?
         end
         if activation_key
-          ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment).first
+          ::Katello::ContentViewEnvironment.where(:content_view_id => activation_key.content_view, :environment_id => activation_key.environment)
         else
           fail _('At least one activation key must have a lifecycle environment and content view assigned to it')
         end

data/app/services/katello/repository_type.rb

@@ -123,7 +123,7 @@ module Katello
         :generic_remote_options => translated_generic_remote_options,
         :import_attributes => translated_import_attributes,
         :url_description => _(@url_description),
-        :content_types => content_types.as_json
+        :content_types => content_types.as_json,
       }
     end
 
@@ -170,7 +170,7 @@ module Katello
           generic: false,
           removable: removable,
           uploadable: uploadable,
-          indexed: index
+          indexed: index,
         }
       end
 
@@ -220,7 +220,7 @@ module Katello
             :generic => true,
             :pluralized_label => content_type.pluralize,
             :pluralized_name => pluralized_name,
-            :details_columns => details_columns
+            :details_columns => details_columns,
           }
         )
       end

data/app/services/katello/smart_proxy_helper.rb

@@ -47,9 +47,9 @@ module Katello
 
     def repositories_available_to_capsule(environments = nil, content_view = nil)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
-      yum_repos = Katello::Repository.in_environment(environments)
-      yum_repos = yum_repos.in_content_views([content_view]) if content_view
-      yum_repos.smart_proxy_syncable
+      repos = Katello::Repository.in_environment(environments)
+      repos = repos.in_content_views([content_view]) if content_view
+      repos.smart_proxy_syncable
     end
 
     def unsyncable_content_types

data/app/services/katello/ui_notifications/content_view/delete_latest_version_failure.rb

@@ -1,7 +1,7 @@
 module Katello
   module UINotifications
     module ContentView
-      class DelelteLatestVersionFailure < ::UINotifications::Base
+      class DeleteLatestVersionFailure < ::UINotifications::Base
         private
 
         def create

data/app/services/katello/ui_notifications/subscriptions/expire_soon.rb

@@ -48,9 +48,9 @@ module Katello
                 {
                   :href => "/subscriptions?search=expires<\"#{Setting[:expire_soon_days]} days from now\"",
                   :title => _('Subscriptions'),
-                  :external => true
-                }
-              ]
+                  :external => true,
+                },
+              ],
             }
           end
 

data/app/services/katello/ui_notifications/subscriptions/manifest_expire_soon_warning.rb

@@ -58,9 +58,9 @@ module Katello
                 {
                   :href => "/subscriptions",
                   :title => _('Subscriptions'),
-                  :external => false
-                }
-              ]
+                  :external => false,
+                },
+              ],
             }
           end
 

data/app/services/katello/ui_notifications/task_notification.rb

@@ -16,8 +16,8 @@ module Katello
           :links => [
             {
               :path_method => :foreman_tasks_task_path,
-              :title => _('Task detail')
-            }
+              :title => _('Task detail'),
+            },
           ]
         ).actions
       end

data/app/services/katello/upstream_connection_checker.rb

@@ -5,7 +5,7 @@ module Katello
       Katello::Errors::ManifestExpired,
       Katello::Errors::UpstreamConsumerGone,
       Katello::Errors::UpstreamConsumerNotFound,
-      Katello::Errors::NoManifestImported
+      Katello::Errors::NoManifestImported,
     ].freeze
 
     def initialize(organization)

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

@@ -19,10 +19,17 @@ reboot = commands.delete('reboot')
 <% if reboot -%>
 shutdown -r +1
 <% else -%>
-<%= commands.join("\n") %>
+RETVAL=0
+<% commands.each do |command| -%>
+<%= command %>
+if [ $? -ne 0 ]; then
+  RETVAL=1
+fi
+<% end -%>
 RUN_TRACER_CMD='katello-tracer-upload'
 if [ "$(id -u)" -ne 0 ]; then
   RUN_TRACER_CMD='sudo katello-tracer-upload'
 fi
 $RUN_TRACER_CMD
+exit $RETVAL
 <% end %>

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

@@ -17,10 +17,11 @@ kind: job_template
 commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
+<% if reboot -%>
+    - reboot:
+<% else -%>
 <%= render_template(
     'Run Command - Ansible Default',
     :command => (commands.push('katello-tracer-upload')).join("\n")
 ) %>
-<% if reboot %>
-    - reboot:
-<% end %>
+<% end -%>

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

@@ -16,8 +16,16 @@ template_inputs:
 commands = input(:helper).split(',').map { |split| split.strip }
 reboot = commands.delete('reboot')
 -%>
-<%= commands.join("\n") %>
-katello-tracer-upload
 <% if reboot -%>
 <%= render_template('Power Action - Script Default', action: 'restart') %>
-<% end %>
+<% else -%>
+RETVAL=0
+<% commands.each do |command| -%>
+<%= command %>
+if [ $? -ne 0 ]; then
+  RETVAL=1
+fi
+<% end -%>
+katello-tracer-upload
+<% end -%>
+exit $RETVAL

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

@@ -18,10 +18,11 @@ kind: job_template
 commands = input(:helper).split(',').map { |split| split.strip }
 reboot = commands.delete('reboot')
 -%>
+<% if reboot -%>
+    - reboot:
+<% else -%>
 <%= render_template(
     'Run Command - Ansible Default',
     :command => (commands.push('katello-tracer-upload')).join("\n")
 ) %>
-<% if reboot %>
-    - reboot:
-<% end %>
+<% end -%>

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

@@ -1,18 +1,53 @@
 extends 'katello/api/v2/common/org_reference'
 extends 'katello/api/v2/common/timestamps'
 
-attributes :id, :name, :description, :unlimited_hosts, :auto_attach
+attributes :id, :name, :description, :unlimited_hosts, :auto_attach, :content_view_environment_labels
 
-attributes :content_view_id
+node :multi_content_view_environment do |ak|
+  ak.multi_content_view_environment?
+end
 
-child :content_view => :content_view do
-  attributes :id, :name
+child :content_view_environments => :content_view_environments do
+  node :content_view do |cve|
+    {
+      id: cve.content_view&.id,
+      name: cve.content_view&.name,
+      composite: cve.content_view&.composite,
+      content_view_version: cve.content_view_version&.version,
+      content_view_version_id: cve.content_view_version&.id,
+      content_view_version_latest: cve.content_view_version&.latest?,
+      content_view_default: cve.content_view&.default?,
+      content_view_environment_id: cve.id,
+    }
+  end
+  node :lifecycle_environment do |cve|
+    {
+      id: cve.lifecycle_environment&.id,
+      name: cve.lifecycle_environment&.name,
+      lifecycle_environment_library: cve.lifecycle_environment&.library?,
+    }
+  end
+  node :label do |cve|
+    cve.label
+  end
+end
+
+# single cv/lce for backward compatibility
+node :content_view_id do |ak|
+  ak.single_content_view&.id
+end
+
+node :content_view do |ak|
+  ak.single_content_view&.slice(:id, :name)
+end
+
+node :environment_id do |ak|
+  ak.single_lifecycle_environment&.id
 end
 
-child :environment => :environment do
-  attributes :name, :id
+node :environment do |ak|
+  ak.single_lifecycle_environment&.slice(:id, :name)
 end
-attributes :environment_id
 
 attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version, :purpose_usage, :purpose_role
 
@@ -24,7 +59,7 @@ node :permissions do |activation_key|
   {
     :view_activation_keys => activation_key.readable?,
     :edit_activation_keys => activation_key.editable?,
-    :destroy_activation_keys => activation_key.deletable?
+    :destroy_activation_keys => activation_key.deletable?,
   }
 end
 

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

@@ -33,7 +33,7 @@ if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
     {
       :view_alternate_content_sources => alternate_content_source.readable?,
       :edit_alternate_content_sources => alternate_content_source.editable?,
-      :destroy_alternate_content_sources => alternate_content_source.deletable?
+      :destroy_alternate_content_sources => alternate_content_source.deletable?,
     }
   end
 end

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

@@ -45,7 +45,7 @@ child @lifecycle_environments => :lifecycle_environments do
       :id => last_env_sync_task&.id,
       :started_at => last_env_sync_task&.started_at,
       :result => last_env_sync_task&.result,
-      :last_sync_words => last_env_sync_task.try(:started_at) ? time_ago_in_words(Time.parse(last_env_sync_task.started_at.to_s)) : nil
+      :last_sync_words => last_env_sync_task.try(:started_at) ? time_ago_in_words(Time.parse(last_env_sync_task.started_at.to_s)) : nil,
     }
     attributes
   end
@@ -53,7 +53,7 @@ child @lifecycle_environments => :lifecycle_environments do
   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
+        :content_views => env.content_views.non_default.count,
       }
     end
 
@@ -71,7 +71,7 @@ child @lifecycle_environments => :lifecycle_environments do
           :default => content_view.default,
           :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
           :counts => {
-            :repositories => ::Katello::ContentViewVersion.in_environment(env).find_by(:content_view => content_view)&.archived_repos&.count
+            :repositories => ::Katello::ContentViewVersion.in_environment(env).find_by(:content_view => content_view)&.archived_repos&.count,
           },
           :repositories => ::Katello::ContentViewVersion.in_environment(env)&.find_by(:content_view => content_view)&.archived_repos&.map do |repo|
                              {
@@ -79,9 +79,9 @@ child @lifecycle_environments => :lifecycle_environments do
                                :name => repo.name,
                                :library_id => repo.library_instance_id,
                                :product_id => repo.product_id,
-                               :content_type => repo.content_type
+                               :content_type => repo.content_type,
                              }
-                           end
+                           end,
         }
         attributes
       end

data/app/views/katello/api/v2/common/_metadata.json.rabl

@@ -10,6 +10,6 @@ node(:search)   { params[:search] }
 node(:sort) do
   {
     :by => params[:sort_by],
-    :order => params[:sort_order]
+    :order => params[:sort_order],
   }
 end

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

@@ -116,6 +116,6 @@ node :permissions do |content_credential|
   {
     :view_content_credenials => content_credential.readable?,
     :edit_content_credenials => content_credential.editable?,
-    :destroy_content_credenials => content_credential.deletable?
+    :destroy_content_credenials => content_credential.deletable?,
   }
 end

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

@@ -17,21 +17,27 @@ child :content_view_environments => :content_view_environments do
       content_view_version: cve.content_view_version&.version,
       content_view_version_id: cve.content_view_version&.id,
       content_view_version_latest: cve.content_view_version&.latest?,
-      content_view_default: cve.content_view&.default?
+      content_view_default: cve.content_view&.default?,
     }
   end
   node :lifecycle_environment do |cve|
     {
       id: cve.lifecycle_environment&.id,
       name: cve.lifecycle_environment&.name,
-      lifecycle_environment_library: cve.lifecycle_environment&.library?
+      lifecycle_environment_library: cve.lifecycle_environment&.library?,
     }
   end
-  node :candlepin_name do |cve|
-    cve.candlepin_name
+  node :label do |cve|
+    cve.label
   end
 end
 
+attributes :content_view_environment_labels
+
+node :multi_content_view_environment do |content_facet|
+  content_facet.multi_content_view_environment?
+end
+
 # single cv/lce for backward compatibility
 node :content_view do |content_facet|
   content_view = content_facet.single_content_view
@@ -39,7 +45,7 @@ node :content_view do |content_facet|
     {
       :id => content_view.id,
       :name => content_view.name,
-      :composite => content_view.composite?
+      :composite => content_view.composite?,
     }
   end
 end
@@ -49,7 +55,7 @@ node :lifecycle_environment do |content_facet|
   if lifecycle_environment.present?
     {
       :id => lifecycle_environment.id,
-      :name => lifecycle_environment.name
+      :name => lifecycle_environment.name,
     }
   end
 end
@@ -61,3 +67,6 @@ end
 child :kickstart_repository => :kickstart_repository do
   attributes :id, :name
 end
+
+attributes :bootc_booted_image, :bootc_booted_digest, :bootc_available_image, :bootc_available_digest,
+           :bootc_staged_image, :bootc_staged_digest, :bootc_rollback_image, :bootc_rollback_digest

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

@@ -8,7 +8,7 @@ child :content_facet => :content_facet_attributes do
       {
         :content_view_version => version.version,
         :content_view_version_id => version.id,
-        :content_view_version_latest => version.latest?
+        :content_view_version_latest => version.latest?,
       }
     end
   end

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

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

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

@@ -0,0 +1,33 @@
+object @resource
+extends 'katello/api/v2/common/identifier'
+
+extends 'katello/api/v2/common/timestamps'
+attributes :default_environment? => :default
+
+child :organization => :organization do
+  attributes :name, :label, :id
+end
+
+node :content_view do |cve|
+  cve.content_view&.slice(:id, :name, :label, :default)
+end
+
+node :lifecycle_environment do |cve|
+  cve.environment&.slice(:id, :name, :label, :library)
+end
+
+node :environment do |cve|
+  cve.environment&.slice(:id, :name, :label, :library)
+end
+
+child :activation_keys => :activation_keys do
+  attributes :id, :name, :label
+end
+
+node :activation_keys_count do |cve|
+  cve.activation_keys.count
+end
+
+node :hosts_count do |cve|
+  cve.hosts.count
+end

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

@@ -20,7 +20,7 @@ if @resource&.try(:module_stream)
     {
       :module_stream_id => rule.module_stream.id,
       :module_stream_name => rule.module_stream.name,
-      :module_stream_stream => rule.module_stream.stream
+      :module_stream_stream => rule.module_stream.stream,
     }
   end
 end

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

@@ -20,7 +20,7 @@ child :content_view => :content_view do
         :package => repo.rpms.count,
         :package_group => repo.package_groups.count,
         :erratum => repo.errata.count,
-        :module_stream => repo.module_streams.count
+        :module_stream => repo.module_streams.count,
       }
     end
   end

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

@@ -42,7 +42,7 @@ end
 
 node :permissions do |cvv|
   {
-    :deletable => cvv.removable?
+    :deletable => cvv.removable?,
   }
 end
 
@@ -61,7 +61,7 @@ child :environments => :environments do
       :readable => env.readable?,
       :promotable_or_removable => env.promotable_or_removable?,
       :all_hosts_editable => version.all_hosts_editable?(env),
-      :all_keys_editable => Katello::ActivationKey.all_editable?(version.content_view_id, env.id)
+      :all_keys_editable => Katello::ActivationKey.all_editable?(version.content_view_id, env.id),
     }
   end
 
@@ -70,7 +70,7 @@ child :environments => :environments do
   end
 
   node :activation_key_count do |env|
-    Katello::ActivationKey.where(:environment_id => env.id).where(:content_view_id => version.content_view_id).count
+    Katello::ActivationKey.with_content_views(version.content_view).with_environments(env).count
   end
 end
 

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

@@ -45,9 +45,9 @@ node :environments do |cv|
       id: env.id,
       label: env.label,
       name: env.name,
-      activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
+      activation_keys: cv&.activation_keys&.in_environments([env])&.ids,
       hosts: cv&.hosts&.in_environments([env])&.ids,
-      permissions: {readable: env.readable?}
+      permissions: {readable: env.readable?},
     }
   end
 end
@@ -82,7 +82,7 @@ if params.key?(:include_permissions)
       :edit_content_views => cv.editable?,
       :destroy_content_views => cv.deletable?,
       :publish_content_views => cv.publishable?,
-      :promote_or_remove_content_views => cv.promotable_or_removable?
+      :promote_or_remove_content_views => cv.promotable_or_removable?,
     }
   end
 end

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

@@ -16,7 +16,7 @@ child :duplicate_repositories_to_publish => :duplicate_repositories_to_publish d
     @resource.components_with_repo(repo).map do |component|
       {
         :content_view_name => component.content_view.name,
-        :content_view_version => component.version
+        :content_view_version => component.version,
       }
     end
   end

data/app/views/katello/api/v2/debs/backend.json.rabl

@@ -0,0 +1,7 @@
+attributes :depends
+attributes :pre_depends
+attributes :recommends
+attributes :suggests
+attributes :enhances
+attributes :breaks
+attributes :conflicts

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

@@ -11,6 +11,10 @@ attributes :nav
 attributes :nva
 attributes :pulp_id
 attributes :pulp_id => :uuid
+attributes :section
+attributes :maintainer
+attributes :homepage
+attributes :installed_size
 
 node(:hosts_available_count) { |m| m.hosts_available(params[:organization_id]).count }
 node(:hosts_applicable_count) { |m| m.hosts_applicable(params[:organization_id]).count }

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

@@ -1,3 +1,5 @@
 object @resource
 
 extends "katello/api/v2/debs/base"
+extends "katello/api/v2/debs/backend",
+  :object => SmartProxy.pulp_primary!.content_service("deb").new(@resource.pulp_id)

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

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

data/app/views/katello/api/v2/docker_tags/_base.json.rabl

@@ -24,7 +24,7 @@ if @organization
       attributes = {
         :id => repo.id,
         :name => repo.name,
-        :full_path => repo.full_path
+        :full_path => repo.full_path,
       }
       attributes
     end
@@ -34,7 +34,7 @@ if @organization
     product = first_repo&.product
     attributes = {
       :id => product&.id,
-      :name => product&.name
+      :name => product&.name,
     }
     attributes
   end