katello 3.2.1.1 → 3.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff65266591dd0156050b2e683036aa600f7f8389
-  data.tar.gz: 8ca255841000fd84c6695602c1afc1e39c639325
+  metadata.gz: 83aa0962c7ecb2acca38f0b99e6d3a4fccc8a0fc
+  data.tar.gz: 265738c8590b218ed3eaf3e4fc11b271dc69b1a0
 SHA512:
-  metadata.gz: aafaab2653309b653b2c908e9a911a58604ae73c48164488e6adb150f4b1710b151b7d0c2a4b9fe9772c3f86a0c92c1077eb4095afffcb3dd707cdbdb2f7cbdc
-  data.tar.gz: 6d5e5aaf8807cc8d9ff68b4fa29341cb039061f21f32bfdf79db9b4c2cacd47122622b587e7ea04420349bb977b27c09f7cf03195b4743207466d0d236c77a03
+  metadata.gz: de5e94136ff03c5896eed77576164ebf093468745543c781c3c5a6dc1534f56670e10586540d6e8267072045e4d8432e0493382d79d057cc21dcf1033828e50c
+  data.tar.gz: 66c60ef5dc24b6bd9c9f926d8a932383c96b7f4727c0b9d198b76fb5567d736e5607116782a9751edfe5a38f5e0edd0fca39c8ca35bc23da9069f5808aa86483

data/app/assets/javascripts/katello/common/katello.global.js

@@ -4,7 +4,7 @@ var KT = {};
 //i18n global variable
 var katelloI18n = {};
 
-//Setup underscorejs
+//Setup lodash
 KT.utils = _.noConflict();
 
 _ = KT.utils;

data/app/assets/javascripts/katello/common/vendor.js

@@ -1,4 +1,3 @@
-//= require "bastion/underscore/underscore"
 //= require "jquery.ui.dialog"
 //= require "jquery.ui.sortable"
 //= require "jquery.ui.tabs"

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -9,13 +9,13 @@ module Katello
     around_action :repackage_message
     before_action :find_host, :only => [:consumer_show, :consumer_destroy, :consumer_checkin, :enabled_repos,
                                         :upload_package_profile, :regenerate_identity_certificates, :facts,
-                                        :available_releases, :serials]
+                                        :available_releases, :serials, :upload_tracer_profile]
     before_action :authorize, :only => [:consumer_create, :list_owners, :rhsm_index]
-    before_action :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates]
+    before_action :authorize_client_or_user, :only => [:consumer_show, :upload_package_profile, :regenerate_identity_certificates, :upload_tracer_profile, :facts]
     before_action :authorize_client_or_admin, :only => [:hypervisors_update]
     before_action :authorize_proxy_routes, :only => [:get, :post, :put, :delete]
     before_action :authorize_client, :only => [:consumer_destroy, :consumer_checkin,
-                                               :enabled_repos, :facts, :available_releases]
+                                               :enabled_repos, :available_releases]
 
     before_action :add_candlepin_version_header
 
@@ -138,6 +138,15 @@ module Katello
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
+    api :PUT, "/consumers/:id/tracer", N_("Update services requiring restart")
+    param :traces, Hash, :required => true
+    def upload_tracer_profile
+      User.as_anonymous_admin do
+        @host.import_tracer_profile(params[:traces])
+      end
+      render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
+    end
+
     def available_releases
       render :json => @host.content_facet.try(:available_releases) || []
     end
@@ -236,11 +245,12 @@ module Katello
     #api :GET, "/status", N_("Shows version information")
     #description N_("This service is available for unauthenticated users")
     def server_status
-      status = { :managerCapabilities => Resources::Candlepin::CandlepinPing.ping['managerCapabilities'],
-                 :result => Resources::Candlepin::CandlepinPing.ping['result'],
-                 :rulesSource => Resources::Candlepin::CandlepinPing.ping['rulesSource'],
-                 :rulesVersion => Resources::Candlepin::CandlepinPing.ping['rulesVersion'],
-                 :standalone => Resources::Candlepin::CandlepinPing.ping['standalone'],
+      candlepin_response = Resources::Candlepin::CandlepinPing.ping
+      status = { :managerCapabilities => candlepin_response['managerCapabilities'],
+                 :result => candlepin_response['result'],
+                 :rulesSource => candlepin_response['rulesSource'],
+                 :rulesVersion => candlepin_response['rulesVersion'],
+                 :standalone => candlepin_response['standalone'],
                  :timeUTC => Time.now.getutc,
                  :version => Katello::VERSION }
 
@@ -248,10 +258,8 @@ module Katello
     end
 
     def facts
-      User.as_anonymous_admin do
-        sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
-        update_host_registered_through(@host, request.headers)
-      end
+      sync_task(::Actions::Katello::Host::Update, @host, rhsm_params)
+      update_host_registered_through(@host, request.headers)
       render :json => {:content => _("Facts successfully updated.")}, :status => 200
     end
 

data/app/controllers/katello/api/v2/activation_keys_controller.rb

@@ -24,7 +24,7 @@ module Katello
     param_group :search, Api::V2::ApiController
     def index
       activation_key_includes = [:content_view, :environment, :host_collections, :organization]
-      respond(:collection => scoped_search(index_relation.uniq, :name, :desc, :includes => activation_key_includes))
+      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :includes => activation_key_includes))
     end
 
     api :POST, "/activation_keys", N_("Create an activation key")
@@ -115,7 +115,7 @@ module Katello
       scoped = scoped.where(:organization_id => @activation_key.organization)
       scoped = scoped.where(:name => params[:name]) if params[:name]
 
-      respond_for_index(:collection => scoped_search(scoped, :name, :desc, :resource_class => HostCollection))
+      respond_for_index(:collection => scoped_search(scoped, :name, :asc, :resource_class => HostCollection))
     end
 
     api :GET, "/activation_keys/:id/releases", N_("Show release versions available for an activation key")

data/app/controllers/katello/api/v2/api_controller.rb

@@ -110,8 +110,10 @@ module Katello
 
     def find_organization
       @organization = Organization.current || find_optional_organization
-      fail HttpErrors::NotFound, _("One of parameters [ %s ] required but not specified.") %
-          organization_id_keys.join(", ") if @organization.nil?
+      if @organization.nil?
+        fail HttpErrors::NotFound, _("One of parameters [ %s ] required but not specified.") %
+            organization_id_keys.join(", ")
+      end
       @organization
     end
 

data/app/controllers/katello/api/v2/capsule_content_controller.rb

@@ -9,45 +9,45 @@ module Katello
     before_action :find_optional_organization, :only => [:sync_status]
 
     def_param_group :lifecycle_environments do
-      param :id, Integer, :desc => N_('Id of the capsule'), :required => true
+      param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
       param :organization_id, Integer, :desc => N_('Id of the organization to limit environments on')
     end
 
     def_param_group :update_lifecycle_environments do
-      param :id, Integer, :desc => N_('Id of the capsule'), :required => true
+      param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
       param :environment_id, Integer, :desc => N_('Id of the lifecycle environment'), :required => true
     end
 
-    api :GET, '/capsules/:id/content/lifecycle_environments', N_('List the lifecycle environments attached to the capsule')
+    api :GET, '/capsules/:id/content/lifecycle_environments', N_('List the lifecycle environments attached to the smart proxy')
     param_group :lifecycle_environments
     def lifecycle_environments
       environments = capsule_content.lifecycle_environments(params[:organization_id]).readable
       respond_for_lifecycle_environments_index(environments)
     end
 
-    api :GET, '/capsules/:id/content/available_lifecycle_environments', N_('List the lifecycle environments not attached to the capsule')
+    api :GET, '/capsules/:id/content/available_lifecycle_environments', N_('List the lifecycle environments not attached to the smart proxy')
     param_group :lifecycle_environments
     def available_lifecycle_environments
       environments = capsule_content.available_lifecycle_environments(params[:organization_id]).readable
       respond_for_lifecycle_environments_index(environments)
     end
 
-    api :POST, '/capsules/:id/content/lifecycle_environments', N_('Add lifecycle environments to the capsule')
+    api :POST, '/capsules/:id/content/lifecycle_environments', N_('Add lifecycle environments to the smart proxy')
     param_group :update_lifecycle_environments
     def add_lifecycle_environment
       capsule_content.add_lifecycle_environment(@environment)
       respond_for_lifecycle_environments_index(capsule_content.lifecycle_environments)
     end
 
-    api :DELETE, '/capsules/:id/content/lifecycle_environments/:environment_id', N_('Remove lifecycle environments from the capsule')
+    api :DELETE, '/capsules/:id/content/lifecycle_environments/:environment_id', N_('Remove lifecycle environments from the smart proxy')
     param_group :update_lifecycle_environments
     def remove_lifecycle_environment
       capsule_content.remove_lifecycle_environment(@environment)
       respond_for_lifecycle_environments_index(capsule_content.lifecycle_environments)
     end
 
-    api :POST, '/capsules/:id/content/sync', N_('Synchronize the content to the capsule')
-    param :id, Integer, :desc => N_('Id of the capsule'), :required => true
+    api :POST, '/capsules/:id/content/sync', N_('Synchronize the content to the smart proxy')
+    param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :environment_id, Integer, :desc => N_('Id of the environment to limit the synchronization on')
     def sync
       find_environment if params[:environment_id]
@@ -55,20 +55,20 @@ module Katello
       respond_for_async :resource => task
     end
 
-    api :GET, '/capsules/:id/content/sync', N_('Get current capsule synchronization status')
-    param :id, Integer, :desc => N_('Id of the capsule'), :required => true
+    api :GET, '/capsules/:id/content/sync', N_('Get current smart proxy synchronization status')
+    param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :organization_id, Integer, :desc => N_('Id of the organization to get the status for'), :required => false
     def sync_status
       @capsule_content = capsule_content
       @lifecycle_environments = @capsule_content.lifecycle_environments(@organization)
     end
 
-    api :DELETE, '/capsules/:id/content/sync', N_('Cancel running capsule synchronization.')
-    param :id, Integer, :desc => N_('Id of the capsule'), :required => true
+    api :DELETE, '/capsules/:id/content/sync', N_('Cancel running smart proxy synchronization.')
+    param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     def cancel_sync
       tasks = capsule_content.cancel_sync
       if tasks.empty?
-        render_message _('There\'s no running synchronization for this capsule.')
+        render_message _('There\'s no running synchronization for this smart proxy.')
       else
         render_message _('Trying to cancel the synchronization...')
       end
@@ -88,7 +88,7 @@ module Katello
     def find_capsule
       @capsule = SmartProxy.authorized(:manage_capsule_content).find(params[:id])
       unless @capsule && @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE)
-        fail _("This request may only be performed on a Capsule that has the Pulp Node feature.")
+        fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end
     end
 

data/app/controllers/katello/api/v2/capsules_controller.rb

@@ -4,7 +4,7 @@ module Katello
       api_base_url "/katello/api"
     end
 
-    api :GET, '/capsules', 'List all capsules'
+    api :GET, '/capsules', 'List all smart proxies that have content'
     param_group :search, Api::V2::ApiController
     def index
       @smart_proxies = SmartProxy.with_content.authorized(:view_smart_proxies).includes(:features).
@@ -12,8 +12,8 @@ module Katello
       @total = SmartProxy.with_content.authorized(:view_smart_proxies).includes(:features).count
     end
 
-    api :GET, '/capsules/:id', 'Show the capsule details'
-    param :id, Integer, :desc => 'Id of the capsule', :required => true
+    api :GET, '/capsules/:id', 'Show the smart proxy details'
+    param :id, Integer, :desc => 'Id of the smart proxy', :required => true
     def show
       super
     end

data/app/controllers/katello/api/v2/content_view_components_controller.rb

@@ -0,0 +1,100 @@
+module Katello
+  class Api::V2::ContentViewComponentsController < Api::V2::ApiController
+    before_action :find_composite_content_view
+    before_action :find_content_view_component, :only => [:show, :update]
+
+    wrap_parameters :include => %w(composite_content_view_id content_view_version_id content_view_id latest)
+
+    api :GET, "/content_views/:composite_content_view_id/content_view_components",
+        N_("List components attached to this content view")
+    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    def index
+      respond :collection => index_response
+    end
+
+    def index_response
+      results = @view.content_view_components
+      {
+        :results  => results.uniq,
+        :subtotal => results.count,
+        :total    => results.count
+      }
+    end
+
+    api :PUT, "/content_views/:composite_content_view_id/content_view_components/add",
+                                        N_("Add components to the content view")
+    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :components, Array, :desc => N_("Array of components to add"), :required => true do
+      param :content_view_version_id, :identifier, :desc => N_("identifier of the version of the component content view")
+      param :content_view_id, :identifier,
+            :desc => N_("content view identifier of the component who's latest version is desired")
+      param :latest, :bool, :desc => N_("true if the latest version of the component's content view is desired")
+    end
+    def add_components
+      components = params.require(:components).map do |component|
+        options = {}
+        options[:latest] = ::Foreman::Cast.to_bool(component[:latest]) if component.key?(:latest)
+        options.merge(component.slice(:content_view_version_id, :content_view_id))
+      end
+      @view.add_components(components)
+      @view.save!
+      respond_for_index(:collection => index_response, :template => "index")
+    end
+
+    api :PUT, "/content_views/:composite_content_view_id/content_view_components/remove",
+                                        N_("Remove components from the content view")
+    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :component_ids, Array, :desc => N_("Array of content view component IDs to remove. Identifier of the component association"), :required => true
+    def remove_components
+      @view.remove_components(params.require(:component_ids))
+      @view.save!
+      respond_for_index(:collection => index_response, :template => "index")
+    end
+
+    api :GET, "/content_views/:composite_content_view_id/content_view_components/:id", N_("Show a content view component")
+    param :composite_content_view_id, :number, :desc => N_("composite content view numeric identifier"), :required => true
+    param :id, :identifier, :desc => N_("content view component ID. Identifier of the component association"), :required => true
+    def show
+      respond :resource => @component
+    end
+
+    api :PUT, "/content_views/:composite_content_view_id/content_view_components/:id",
+        N_("Update a component associated with the content view")
+    param :composite_content_view_id, :identifier, :desc => N_("composite content view identifier"), :required => true
+    param :id, :identifier, :desc => N_("content view component ID. Identifier of the component association"), :required => true
+    param :content_view_version_id, :identifier, :desc => N_("identifier of the version of the component content view")
+    param :latest, :bool, :desc => N_("true if the latest version of the components content view is desired")
+    def update
+      cvv_id = component_params[:content_view_version_id]
+      if component_params.key?(:latest) && component_params.key?(:content_view_version_id)
+        latest = ::Foreman::Cast.to_bool(component_params[:latest])
+        if latest && cvv_id.present?
+          fail HttpErrors::UnprocessableEntity,
+              _(" Either select the latest content view or the content view version. Cannot set both.")
+        end
+      end
+      if cvv_id.present?
+        @component.update_attributes!(:content_view_version_id => cvv_id, :latest => false)
+      elsif component_params.key?(:latest)
+        latest = ::Foreman::Cast.to_bool(component_params[:latest])
+        @component.update_attributes!(:content_view_version_id => nil, :latest => latest)
+      end
+      respond :resource => @component
+    end
+
+    private
+
+    def find_composite_content_view
+      @view = ContentView.composite.non_default.find(params[:composite_content_view_id])
+    end
+
+    def find_content_view_component
+      @component = ContentViewComponent.find(params[:id])
+    end
+
+    def component_params
+      attrs = [:latest, :content_view_version_id, :content_view_id]
+      params.require(:content_view_component).permit(*attrs)
+    end
+  end
+end

data/app/controllers/katello/api/v2/content_view_filter_rules_controller.rb

@@ -21,6 +21,7 @@ module Katello
     param :content_view_filter_id, :identifier, :desc => N_("filter identifier"), :required => true
     param :name, [String, Array], :desc => N_("package and package group names")
     param :version, String, :desc => N_("package: version")
+    param :arch, String, :desc => N_("package: architecture")
     param :min_version, String, :desc => N_("package: minimum version")
     param :max_version, String, :desc => N_("package: maximum version")
     param :errata_id, String, :desc => N_("erratum: id")
@@ -38,7 +39,7 @@ module Katello
 
       rules += (rule_params[:errata_ids] || []).map do |errata_id|
         rule_clazz.create!(rule_params.except(:errata_ids)
-          .merge(filter:  @filter, errata_id: errata_id))
+          .merge(filter: @filter, errata_id: errata_id))
       end
 
       if rules.empty?
@@ -117,7 +118,7 @@ module Katello
       end
 
       @rule_params ||= params.fetch(:content_view_filter_rule, {}).
-            permit(:uuid, :version, :min_version, :max_version,
+            permit(:uuid, :version, :min_version, :max_version, :architecture,
                     :errata_id, :start_date, :end_date, :date_type,
                     :types => [], :errata_ids => [], name: [])
     end

data/app/controllers/katello/api/v2/content_view_puppet_modules_controller.rb

@@ -12,7 +12,7 @@ module Katello
     param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     param_group :search, ::Katello::Api::V2::ApiController
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :desc))
+      respond(:collection => scoped_search(index_relation.uniq, :name, :asc))
     end
 
     api :POST, "/content_views/:content_view_id/content_view_puppet_modules",

data/app/controllers/katello/api/v2/content_view_versions_controller.rb

@@ -5,8 +5,9 @@ module Katello
 
     before_action :find_content_view_version, :only => [:show, :promote, :destroy, :export]
     before_action :find_content_view, :except => [:incremental_update]
-    before_action :find_environment, :only => [:promote, :index]
-    before_action :authorize_promotable, :only => [:promote]
+    before_action :find_environment, :only => [:index]
+    before_action :find_environments, :only => [:promote]
+    before_action :validate_promotable, :only => [:promote]
     before_action :authorize_destroy, :only => [:destroy]
     before_action :find_version_environments, :only => [:incremental_update]
     before_action :find_puppet_module, :only => [:index]
@@ -49,11 +50,13 @@ module Katello
     api :POST, "/content_view_versions/:id/promote", N_("Promote a content view version")
     param :id, :identifier, :desc => N_("Content view version identifier"), :required => true
     param :force, :bool, :desc => N_("force content view promotion and bypass lifecycle environment restriction")
-    param :environment_id, :identifier
+    param :environment_id, :identifier, :deprecated => true, :desc => N_("LifeCycle Environment identifier")
+    param :environment_ids, Array, :desc => N_("Identifiers for Lifecycle Environment")
+    param :description, String, :desc => N_("The description for the content view version promotion")
     def promote
       is_force = ::Foreman::Cast.to_bool(params[:force])
       task = async_task(::Actions::Katello::ContentView::Promote,
-                        @version, @environment, is_force)
+                        @version, @environments, is_force, params[:description])
       respond_for_async :resource => task
     end
 
@@ -249,8 +252,18 @@ module Katello
       end
     end
 
-    def authorize_promotable
-      return deny_access unless @environment.promotable_or_removable? && @version.content_view.promotable_or_removable?
+    def find_environments
+      @environments = if params[:environment_id]
+                        ::Foreman::Deprecation.api_deprecation_warning("The parameter environment_id will be removed in Katello 3.4. Please update to use the environment_ids parameter.")
+                        KTEnvironment.where(:id => params[:environment_id])
+                      else
+                        KTEnvironment.where(:id => params[:environment_ids])
+                      end
+    end
+
+    def validate_promotable
+      fail HttpErrors::BadRequest, _("Could not find environments for promotion") if @environments.blank?
+      return deny_access unless @environments.all?(&:promotable_or_removable?) && @version.content_view.promotable_or_removable?
       true
     end
 

data/app/controllers/katello/api/v2/content_views_controller.rb

@@ -32,9 +32,8 @@ module Katello
     param_group :search, Api::V2::ApiController
     def index
       content_view_includes = [:activation_keys, :content_view_puppet_modules, :content_view_versions,
-                               :environments, :organization, :repositories, components: [:content_view, :environments]]
-
-      respond(:collection => scoped_search(index_relation.uniq, :name, :desc, :includes => content_view_includes))
+                               :environments, :organization, :repositories]
+      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :includes => content_view_includes))
     end
 
     def index_relation
@@ -191,7 +190,7 @@ module Katello
     end
 
     def view_params
-      attrs = [:name, :description, {:repository_ids => []}, {:component_ids => []}]
+      attrs = [:name, :description, :force_puppet_environment, {:repository_ids => []}, {:component_ids => []}]
       attrs.push(:label, :composite) if action_name == "create"
       attrs.push(:component_ids, :repository_ids) # For deep_munge; Remove for Rails 5
       params.require(:content_view).permit(*attrs)

data/app/controllers/katello/api/v2/environments_controller.rb

@@ -48,7 +48,7 @@ module Katello
     param :library, [true, false], :desc => N_("set true if you want to see only library environments")
     param :name, String, :desc => N_("filter only environments containing this name")
     def index
-      respond(:collection => scoped_search(index_relation.uniq, :name, :desc, :resource_class => KTEnvironment))
+      respond(:collection => scoped_search(index_relation.uniq, :name, :asc, :resource_class => KTEnvironment))
     end
 
     def index_relation