katello 4.5.1 → 4.8.0.rc2

data/app/services/katello/registration_manager.rb

@@ -4,10 +4,6 @@ module Katello
       private :new
       delegate :propose_existing_hostname, :new_host_from_facts, to: Katello::Host::SubscriptionFacet
 
-      def determine_organization(content_view_environment, activation_key)
-        content_view_environment.try(:environment).try(:organization) || activation_key.try(:organization)
-      end
-
       def determine_host_dmi_uuid(rhsm_params)
         host_uuid = rhsm_params.dig(:facts, 'dmi.system.uuid')
 
@@ -18,17 +14,17 @@ module Katello
         [host_uuid, false]
       end
 
-      def process_registration(rhsm_params, content_view_environment, activation_keys = [])
+      def process_registration(rhsm_params, content_view_environments, activation_keys = [])
         host_name = propose_existing_hostname(rhsm_params[:facts])
         host_uuid, host_uuid_overridden = determine_host_dmi_uuid(rhsm_params)
 
         rhsm_params[:facts]['dmi.system.uuid'] = host_uuid # ensure we find & validate against a potentially overridden UUID
 
-        organization = determine_organization(content_view_environment, activation_keys.first)
+        organization = validate_content_view_environment_org(content_view_environments, activation_keys.first)
 
         hosts = find_existing_hosts(host_name, host_uuid)
 
-        validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden)
+        validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden: host_uuid_overridden)
 
         host = hosts.first || new_host_from_facts(
           rhsm_params[:facts],
@@ -37,7 +33,7 @@ module Katello
         )
         host.organization = organization unless host.organization
 
-        register_host(host, rhsm_params, content_view_environment, activation_keys)
+        register_host(host, rhsm_params, content_view_environments, activation_keys)
 
         if host_uuid_overridden
           host.subscription_facet.update_dmi_uuid_override(host_uuid)
@@ -71,7 +67,19 @@ module Katello
         query
       end
 
-      def validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden = false)
+      def validate_content_view_environment_org(content_view_environments, activation_key)
+        orgs = Set.new([activation_key&.organization])
+        content_view_environments&.each do |cve|
+          orgs << cve&.environment&.organization
+        end
+        orgs.delete(nil)
+        if orgs.size != 1
+          registration_error(_("Content view environments and activation key must all belong to the same organization"))
+        end
+        orgs.first
+      end
+
+      def validate_hosts(hosts, organization, host_name, host_uuid, host_uuid_overridden: false)
         return if hosts.empty?
 
         hosts = hosts.where(organization_id: [organization.id, nil])
@@ -135,40 +143,42 @@ module Katello
           remove_host_artifacts(host)
         elsif organization_destroy
           host.content_facet.try(:destroy!)
-          remove_host_artifacts(host, false)
+          remove_host_artifacts(host, clear_content_facet: false)
         else
           host.content_facet.try(:destroy!)
           destroy_host_record(host.id)
         end
       end
 
-      def register_host(host, consumer_params, content_view_environment, activation_keys = [])
+      def register_host(host, consumer_params, content_view_environments, activation_keys = []) # rubocop:disable Metrics/MethodLength
         new_host = host.new_record?
-
         unless new_host
           host.save!
           unregister_host(host, :unregistering => true)
           host.reload
         end
 
-        unless activation_keys.empty?
-          content_view_environment ||= lookup_content_view_environment(activation_keys)
+        if activation_keys.present?
+          if content_view_environments.blank?
+            content_view_environments = [lookup_content_view_environment(activation_keys)]
+          end
           set_host_collections(host, activation_keys)
         end
-        fail _('Content View and Environment not set for registration.') if content_view_environment.nil?
+        fail _('Content view and environment not set for registration.') if content_view_environments.blank?
 
         host.save! #the host is in foreman db at this point
 
         host_uuid = get_uuid(consumer_params)
         consumer_params[:uuid] = host_uuid
-        host.content_facet = populate_content_facet(host, content_view_environment, host_uuid)
+        host.content_facet = populate_content_facet(host, content_view_environments, host_uuid)
+        host.content_facet.cves_changed = false # prevent backend_update_needed from triggering an update on a nonexistent consumer
         host.subscription_facet = populate_subscription_facet(host, activation_keys, consumer_params, host_uuid)
         host.save! # the host has content and subscription facets at this point
         create_initial_subscription_status(host)
 
         User.as_anonymous_admin do
           begin
-            create_in_candlepin(host, content_view_environment, consumer_params, activation_keys)
+            create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
           rescue StandardError => e
             # we can't call CP here since something bad already happened. Just clean up our DB as best as we can.
             host.subscription_facet.try(:destroy!)
@@ -185,8 +195,7 @@ module Katello
         User.as_anonymous_admin do
           ping_results = Katello::Ping.ping
         end
-        candlepin_ok = ping_results[:services][:candlepin][:status] == "ok"
-        candlepin_ok
+        ping_results[:services][:candlepin][:status] == "ok"
       end
 
       private
@@ -199,6 +208,11 @@ module Katello
       end
 
       def get_uuid(params)
+        if params.key?(:uuid)
+          Rails.logger.info "assigning existing uuid #{params[:uuid]}"
+        else
+          Rails.logger.info "generating new uuid"
+        end
         params.key?(:uuid) ? params[:uuid] : SecureRandom.uuid
       end
 
@@ -211,11 +225,17 @@ module Katello
         host.subscription_facet.update_subscription_status(::Katello::SubscriptionStatus::UNKNOWN)
       end
 
-      def create_in_candlepin(host, content_view_environment, consumer_params, activation_keys)
+      def create_in_candlepin(host, content_view_environments, consumer_params, activation_keys)
         # if CP fails, nothing to clean up yet w.r.t. backend services
-        cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environment.cp_id, consumer_params, activation_keys.map(&:cp_name))
+        cp_create = ::Katello::Resources::Candlepin::Consumer.create(content_view_environments.map(&:cp_id), consumer_params, activation_keys.map(&:cp_name), host.organization)
         ::Katello::Host::SubscriptionFacet.update_facts(host, consumer_params[:facts]) unless consumer_params[:facts].blank?
-        cp_create[:uuid]
+        uuid = cp_create[:uuid]
+        if uuid.present? && uuid != host.subscription_facet.uuid
+          Rails.logger.info(_("Candlepin returned different consumer uuid than requested (%s), updating uuid in subscription_facet.") % uuid)
+          host.subscription_facet.uuid = uuid
+          host.subscription_facet.save!
+        end
+        uuid
       end
 
       def finalize_registration(host)
@@ -271,10 +291,9 @@ module Katello
         end
       end
 
-      def populate_content_facet(host, content_view_environment, uuid)
+      def populate_content_facet(host, content_view_environments, uuid)
         content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
-        content_facet.content_view = content_view_environment.content_view
-        content_facet.lifecycle_environment = content_view_environment.environment
+        content_facet.content_view_environments = content_view_environments
         content_facet.uuid = uuid
         content_facet.save!
         content_facet
@@ -291,11 +310,12 @@ module Katello
         subscription_facet
       end
 
-      def remove_host_artifacts(host, clear_content_facet = true)
+      def remove_host_artifacts(host, clear_content_facet: true)
         if host.content_facet && clear_content_facet
           host.content_facet.bound_repositories = []
           host.content_facet.applicable_errata = []
           host.content_facet.uuid = nil
+          host.content_facet.content_view_environments = []
           host.content_facet.save!
           host.content_facet.calculate_and_import_applicability
         end

data/app/services/katello/repository_type.rb

@@ -72,12 +72,7 @@ module Katello
     end
 
     def content_types_to_index
-      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
-        @content_types.select { |type| type.index }
-      end
+      @content_types.select { |type| type.index }
     end
 
     def default_managed_content_type(label = nil)
@@ -146,7 +141,7 @@ module Katello
 
     class ContentType
       attr_accessor :model_class, :priority, :pulp3_service_class, :index, :uploadable, :removable, :mutable,
-                    :primary_content, :index_on_pulp3, :generic_browser, :content_type, :repository_import_on_upload,
+                    :primary_content, :generic_browser, :content_type, :repository_import_on_upload,
                     :test_upload_path
 
       def initialize(options)
@@ -155,7 +150,6 @@ module Katello
         self.priority = options[:priority] || 99
         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
         self.primary_content = options[:primary_content] || false
@@ -174,7 +168,9 @@ module Katello
           label: label,
           generic_browser: generic_browser,
           generic: false,
-          removable: removable
+          removable: removable,
+          uploadable: uploadable,
+          indexed: index
         }
       end
 
@@ -230,7 +226,7 @@ module Katello
     end
 
     class GenericRemoteOption
-      attr_accessor :name, :title, :type, :description, :input_type, :delimiter
+      attr_accessor :name, :title, :type, :description, :input_type, :delimiter, :default
 
       def initialize(options)
         self.name = options[:name]
@@ -239,6 +235,7 @@ module Katello
         self.description = options[:description]
         self.input_type = options[:input_type]
         self.delimiter = options[:delimiter]
+        self.default = options[:default]
       end
     end
 

data/app/services/katello/repository_type_manager.rb

@@ -139,9 +139,10 @@ module Katello
         enabled_repository_types[katello_label]
       end
 
-      def find_content_type(katello_label)
+      def find_content_type(katello_label, indexable = false)
         enabled_repository_types.values.each do |repo_type|
-          repo_type.content_types.each do |content_type|
+          content_types = indexable ? repo_type.content_types_to_index : repo_type.content_types
+          content_types.each do |content_type|
             return content_type if content_type.label == katello_label.to_s
           end
         end
@@ -167,7 +168,7 @@ module Katello
       def check_content_matches_repo_type!(repository, content_type)
         repo_content_types = repository.repository_type.content_types.collect { |type| type.label }
         unless repo_content_types.include?(content_type)
-          fail _("Content type %{content_type} is incompatible with repositories of type %{repo_type}") %
+          fail HttpErrors::BadRequest, _("Content type %{content_type} is incompatible with repositories of type %{repo_type}") %
                  { content_type: content_type, repo_type: repository.content_type }
         end
       end

data/app/services/katello/simple_package.rb

@@ -0,0 +1,22 @@
+module Katello
+  class SimplePackage
+    # {"epoch", "name", "arch", "version", "vendor", "release"}
+    attr_accessor :vendor, :arch, :epoch, :version, :release, :name
+
+    def initialize(params = {})
+      params.each_pair { |k, v| instance_variable_set("@#{k}", v) unless v.nil? }
+    end
+
+    def nvra
+      "#{@name}-#{@version}-#{@release}.#{@arch}"
+    end
+
+    def nvrea
+      if epoch.nil? || epoch.to_s == "0"
+        nvra
+      else
+        "#{@name}-#{@epoch}:#{@version}-#{@release}.#{@arch}"
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 </h4>
 
 <% organizations = Organization.current.present? ? [Organization.current] : User.current.allowed_organizations %>
-<% histories = Katello::ContentViewHistory.includes(:content_view_version => [:content_view]).includes(:task, :environment).in_organizations(organizations) %>
+<% histories = Katello::ContentViewHistory.includes(:content_view_version => [:content_view]).includes(:task, :environment).in_organizations(organizations).where("#{Katello::ContentView.table_name}.generated_for" => :none) %>
 <% histories = histories.readable.limit(6) %>
 
 <% if histories.empty? %>

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

@@ -10,3 +10,9 @@ feature: katello_change_content_source
 #!/bin/sh
 
 <%= change_content_source(@host, foreman_server_ca_cert) %>
+
+if [ -f /etc/yggdrasil/config.toml ]; then
+  cp /etc/yggdrasil/config.toml /etc/yggdrasil/config.toml.bak
+  export YGGDRASIL_RESTART_DELAY=10
+  <%= snippet 'remote_execution_pull_setup' %>
+fi

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

@@ -10,10 +10,16 @@ template_inputs:
   description: Filter criteria for packages to be updated.
   input_type: user
   required: false
+- name: Selected update versions
+  description: JSON string of selected package versions to be updated, in the format [ nvra ]. Leave blank to upgrade to latest available version.
+  input_type: user
+  required: false
+  value_type: plain
 %>
 <% package_names = @host.package_names_for_job_template(
   action: 'update',
-  search: input('Packages search query')
+  search: input('Packages search query'),
+  versions: input('Selected update versions')
 ) -%>
 
 <%= render_template('Package Action - Script Default', :action => 'update', :package => package_names.join(' ')) %>

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

@@ -19,7 +19,7 @@
   </div>
 
   <br>
-  <div ng-hide="syncStatus.unsyncable_content_types.length == 0">
+  <div ng-hide="syncStatus === undefined || syncStatus.unsyncable_content_types.length == 0">
     <span translate>
       Pulp plugin missing for synchronizable content types: <b>{{ syncStatus.unsyncable_content_types.join(", ") }}.</b><br />
       Repositories containing these content types will not be synced.
@@ -56,6 +56,7 @@
         <a ng-click="reclaimSpace()" ng-hide="syncStatus.download_policy != 'on_demand'">
           <span translate><strong>Reclaim Space</strong></span>
           <p translate> Delete cached content units from an "On Demand" Smart Proxy.</p>
+          <p translate> Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.</p>
         </a>
       </li>
     </ul>

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

@@ -3,6 +3,7 @@
   <p translate>
     <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
     Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+    Storage used by deleted repositories will be reclaimed during the next orphan cleanup run.
   </p>
   <div class="button">
     <button class="btn btn-default" type="button" id="reclaimSpaceButton" ng-click="reclaimSpace()" translate>

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

@@ -1,11 +1,11 @@
 <% if @smart_proxy.pulp_mirror? -%>
   <div ng-controller="CapsuleContentController">
-    <%= render :file => 'smart_proxies/show' %>
+    <%= render :template => 'smart_proxies/show' %>
   </div>
 <% elsif @smart_proxy.pulp_primary? -%>
   <div ng-controller="PulpPrimaryController">
-    <%= render :file => 'smart_proxies/show' %>
+    <%= render :template => 'smart_proxies/show' %>
   </div>
 <% else -%>
-  <%= render :file => 'smart_proxies/show' %>
+  <%= render :template => 'smart_proxies/show' %>
 <% end -%>

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

@@ -1,8 +1,23 @@
-object @resource
-
 extends 'katello/api/v2/common/identifier'
 
-attributes :name, :base_url, :subpaths, :content_type, :alternate_content_source_type, :smart_proxies, :upstream_username, :last_refreshed
+if @object.respond_to?(:alternate_content_source_type)
+  if @object.custom? || @object.rhui?
+    attributes :name, :alternate_content_source_type, :content_type, :base_url, :subpaths, :upstream_username, :smart_proxies, :verify_ssl, :use_http_proxies
+    child :ssl_ca_cert => :ssl_ca_cert do |_object|
+      attributes :id, :name
+    end
+
+    child :ssl_client_cert => :ssl_client_cert do |_object|
+      attributes :id, :name
+    end
+
+    child :ssl_client_key => :ssl_client_key do |_object|
+      attributes :id, :name
+    end
+  elsif @object.simplified?
+    attributes :name, :alternate_content_source_type, :content_type, :products, :smart_proxies, :use_http_proxies
+  end
+end
 
 child :latest_dynflow_refresh_task => :last_refresh do |_object|
   attributes :id, :username, :started_at, :ended_at, :state, :result, :progress
@@ -13,7 +28,7 @@ child :latest_dynflow_refresh_task => :last_refresh do |_object|
   end
 end
 
-if params.key?(:include_permissions)
+if ::Foreman::Cast.to_bool(params.fetch(:include_permissions, false))
   node :permissions do |alternate_content_source|
     {
       :view_alternate_content_sources => alternate_content_source.readable?,

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

@@ -1,6 +1,7 @@
 object false
 
 extends "katello/api/v2/common/index"
+extends 'katello/api/v2/alternate_content_sources/permissions'
 
 child @collection[:results] => :results do
   extends "katello/api/v2/alternate_content_sources/base"

data/app/views/katello/api/v2/alternate_content_sources/permissions.rabl

@@ -0,0 +1,11 @@
+collection @alternate_content_sources
+
+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_alternate_content_sources") }
+    node(:can_edit) { user.can?("edit_alternate_content_sources") }
+    node(:can_delete) { user.can?("destroy_alternate_content_sources") }
+    node(:can_view) { user.can?("view_alternate_content_sources") }
+  end
+end

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

@@ -1,3 +1,23 @@
 object @resource
 
 extends "katello/api/v2/alternate_content_sources/base"
+
+if @resource.respond_to?(:simplified?)
+  if @resource.simplified?
+    node :products do |acs|
+      acs.products.map do |product|
+        { id: product.id, organization_id: product.organization.id, name: product.name, label: product.label }
+      end
+    end
+  else
+    node :upstream_password_exists do |_acs|
+      @resource.upstream_password.present?
+    end
+  end
+end
+
+node :smart_proxies do |acs|
+  acs.smart_proxies.map do |smart_proxy|
+    { id: smart_proxy.id, name: smart_proxy.name, url: smart_proxy.url, download_policy: smart_proxy.download_policy }
+  end
+end

data/app/views/katello/api/v2/ansible_collections/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/ansible_collections/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

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

@@ -32,7 +32,7 @@ child @lifecycle_environments => :lifecycle_environments do
     end
 
     node :content_views do |env|
-      env.content_views.not_generated_for_repository.map do |content_view|
+      env.content_views.ignore_generated.map do |content_view|
         attributes = {
           :id => content_view.id,
           :label => content_view.label,

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

@@ -31,6 +31,18 @@ child :root_repositories => :gpg_key_repos do
   end
 end
 
+child :ssl_ca_alternate_content_sources => :ssl_ca_alternate_content_sources do
+  attributes :id, :name
+end
+
+child :ssl_client_alternate_content_sources => :ssl_client_alternate_content_sources do
+  attributes :id, :name
+end
+
+child :ssl_client_key_alternate_content_sources => :ssl_client_key_alternate_content_sources do
+  attributes :id, :name
+end
+
 child :ssl_ca_products => :ssl_ca_products do
   attributes :id, :cp_id, :name
   node :repository_count do |product|

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

@@ -10,11 +10,32 @@ attributes :applicable_rpm_count => :applicable_package_count
 attributes :upgradable_rpm_count => :upgradable_package_count
 attributes :applicable_module_stream_count, :upgradable_module_stream_count
 
-child :content_view => :content_view do
+node :content_view do |content_facet|
+  content_view = content_facet.single_content_view
+  if content_view.present?
+    {
+      :id => content_view.id,
+      :name => content_view.name,
+      :composite => content_view.composite?
+    }
+  end
+end
+
+node :lifecycle_environment do |content_facet|
+  lifecycle_environment = content_facet.single_lifecycle_environment
+  if lifecycle_environment.present?
+    {
+      :id => lifecycle_environment.id,
+      :name => lifecycle_environment.name
+    }
+  end
+end
+
+child :content_views => :content_views do
   attributes :id, :name, :composite
 end
 
-child :lifecycle_environment => :lifecycle_environment do
+child :lifecycle_environments => :lifecycle_environments do
   attributes :id, :name
 end
 

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

@@ -2,20 +2,23 @@ child :content_facet => :content_facet_attributes do
   extends 'katello/api/v2/content_facet/base'
 
   node do |content_facet|
-    version = content_facet.content_view_version
-    {
-      :content_view_version => version.version,
-      :content_view_version_id => version.id,
-      :content_view_version_latest => version.latest?
-    }
+    content_facet.single_content_view # just so Rails gives a warning and we remember to fix this
+    version = content_facet.content_view_environments.first&.content_view_version
+    if version.present?
+      {
+        :content_view_version => version.version,
+        :content_view_version_id => version.id,
+        :content_view_version_latest => version.latest?
+      }
+    end
   end
 
   node :content_view_default? do |content_facet|
-    content_facet.content_view.default?
+    content_facet.single_content_view&.default? || false
   end
 
   node :lifecycle_environment_library? do |content_facet|
-    content_facet.lifecycle_environment.library?
+    content_facet.single_lifecycle_environment&.library? || false
   end
 
   node :katello_agent_installed do |content_facet|

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

@@ -47,6 +47,11 @@ node :rules do |filter|
       partial('katello/api/v2/content_view_filter_rules/show', :object => rule)
     end
 
+  elsif filter.respond_to?(:deb_rules)
+    filter.deb_rules.map do |rule|
+      partial('katello/api/v2/content_view_filter_rules/show', :object => rule)
+    end
+
   else
     []
   end

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

@@ -44,7 +44,7 @@ node :environments do |cv|
       label: env.label,
       name: env.label,
       activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
-      hosts: cv&.hosts&.in_environment(env)&.ids,
+      hosts: cv&.hosts&.in_environments([env])&.ids,
       permissions: {readable: env.readable?}
     }
   end

data/app/views/katello/api/v2/content_views/permissions.rabl

@@ -4,5 +4,6 @@ if params.key?(:include_permissions)
   user = User.current # current_user is not available here
   node do
     node(:can_create) { user.can?("create_content_views") }
+    node(:can_view) { user.can?("view_content_views") }
   end
 end

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

@@ -2,5 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :nvrea, :nvra
-attributes :upgradable_version
+attributes :upgradable_versions
 attributes :rpm_id

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

@@ -1,7 +1,27 @@
 object @resource
 
 @resource ||= @object
+@facet = @resource.content_facet
 
 attributes :id, :name, :description
-attributes :content_view, :content_view_id
-attributes :lifecycle_environment => :environment
+if @facet
+  node :content_view do
+    content_view = @facet&.single_content_view
+    if content_view.present?
+      {
+        :id => content_view.id,
+        :name => content_view.name,
+        :composite => content_view.composite?
+      }
+    end
+  end
+  node :lifecycle_environment do
+    lifecycle_environment = @facet&.single_lifecycle_environment
+    if lifecycle_environment.present?
+      {
+        :id => lifecycle_environment.id,
+        :name => lifecycle_environment.name
+      }
+    end
+  end
+end

data/app/views/katello/api/v2/module_streams/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/module_streams/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

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

@@ -6,6 +6,13 @@ child :artifacts => :artifacts do
   attributes :id, :name
 end
 
+child :profiles => :profiles do
+  attributes :id, :name
+  child :rpms => :rpms do
+    attributes :id, :name
+  end
+end
+
 child :library_repositories => :repositories do
   attributes :id, :name
   glue :product do