katello 3.18.1.1 → 4.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66b5a21f5447c3d2ba6f03aa43a1ddbd958e9c13676b51798229ffeedf6e6b9e
-  data.tar.gz: 0c188e13dc68b845e3d5fdaa5c2a52a370c7d976f0542d624e07a7676d630b61
+  metadata.gz: 25c755b23475d0447099ee99388c1d900ae9815b1e4be88ab5d13afeb7d044d2
+  data.tar.gz: 4482488f5ff9186dfe7f7db25901b2afa00b979c2fbf926ccfc329983a122661
 SHA512:
-  metadata.gz: df5a80b234e5ab2f39a6ef6ac3aa2afc8859e77e4c1719c9dd4e958e75c0dd5c475c9f81ae7867ee65d6c6fc17eaae20fa90b9e025bae14b9ac278fbe1dafb30
-  data.tar.gz: b2d252a12334713a3ce551a7de3b32f1bcdde818707f602b3bfa7779b8493adce51274b70e6acaa90807be0e8cca4ba4fa725b4f3e8c30f307e2075508963c7b
+  metadata.gz: 464106f37ffb3915d1029ea95f9ecdc8d6c985fde7d0a40826dc111aefb1e621c17a79d478ef6538be9f485c35fec13cc1af6ad47a3b30485183a381af71828a
+  data.tar.gz: 1da0019879786addea556e156ae5b187df06170a0718eff50580d4e9bb8579b9c897fd7729c893bf414068d89813a5f9614d799e7b0584852c6c890ffac8660e

data/app/assets/stylesheets/katello/katello.scss

@@ -163,78 +163,6 @@ input:focus {
   @extend .status_exclamation_icon;
 }
 
-/* BUTTONS */
-input[type='submit'], button, .button {
-  font-size: 10px;
-  display: inline-block;
-  vertical-align: bottom;
-  background: -moz-linear-gradient(top, #f9f9f9, #f0f0f0, #e5e5e5, #e9e9e9);
-  background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), color-stop(0.9, #e5e5e5), to(#e9e9e9));
-  box-shadow: none;
-  border: 1px solid darken($stroke_color, 20%);
-  color: #221e1f;
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 5px;
-  text-shadow: 0 1px 0 rgba($white_color, 1);
-  min-height: 14px;
-  .nomargin {
-    margin: 0;
-  }
-  &:hover {
-    background: -moz-linear-gradient(top, $white_color, $white_color, #cfcfcf);
-    background: -webkit-gradient(linear, left top, left bottom, from($white_color), color-stop(0.6, $white_color), to(#cfcfcf));
-    box-shadow: 0 1px 2px rgba(0,0,0,0.5);
-    text-decoration: none;
-    color: black;
-  }
-  &:active {
-    background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
-    background: -webkit-gradient(linear, left top, left bottom, from(#c2c3c0), to(#e4e5e4));
-    box-shadow: none;
-    text-decoration: none;
-  }
-  &:focus {
-    text-decoration: none;
-    color: #000;
-    border-width: 2px;
-  }
-  &.dialogbutton {
-    float: right;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.formbutton {
-    display: inline-block;
-    margin-left: 3px;
-    margin: 40px 4px 4px;
-  }
-  &.actionlink {
-    margin: 40px 0 0;
-  }
-  &.disabled, &[disabled] {
-    cursor: default;
-    background: transparent;
-    opacity: 0.4;
-
-    &:hover {
-      background: transparent;
-      box-shadow: none;
-    }
-  }
-  &.iconbutton {
-    display: inline-block;
-  }
-  &.tiny {
-    padding: 4px;
-    margin: 0;
-    &:active, &:focus {
-      margin: 0;
-      padding: 3px;
-    }
-  }
-}
-
 table {
   border-collapse: collapse;
   border: 1px solid $stroke_color;

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

@@ -4,8 +4,6 @@ module Katello
     include ForemanTasks::Triggers
     include AbstractController::Callbacks
 
-    before_action :deprecated, only: :deb_package_profile
-
     skip_before_action :authorize, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
     before_action :find_host, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
     before_action :authorize_client_or_user, :only => [:upload_package_profile, :upload_profiles, :deb_package_profile]
@@ -31,19 +29,6 @@ module Katello
       render :json => Resources::Candlepin::Consumer.get(@host.subscription_facet.uuid)
     end
 
-    api :PUT, "/systems/:id/deb_package_profile", N_("Update installed deb packages")
-    param :deb_package_profile, Hash, :required => true do
-      param :deb_packages, Array, :required => true do
-        param :name, String, :required => true
-        param :architecture, String, :required => true
-        param :version, String, :required => true
-      end
-    end
-    param :id, String, :desc => N_("UUID of the system"), :required => true
-    def deb_package_profile
-      upload_profiles
-    end
-
     def find_host(uuid = nil)
       params = request.path_parameters
       uuid ||= params[:id]
@@ -65,9 +50,5 @@ module Katello
       authorized = (User.current.uuid == @host.subscription_facet.uuid) if @host && User.consumer?
       authorized
     end
-
-    def deprecated
-      ::Foreman::Deprecation.api_deprecation_warning("it will be removed in Katello 4.0. Please use /consumers/:id/profiles instead.")
-    end
   end
 end

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

@@ -41,8 +41,6 @@ module Katello
             body_json['displayMessage'] = body_json['message']
           end
           response.body = body_json.to_s
-
-        # rubocop:disable Lint/SuppressedException
         rescue JSON::ParserError
           # Not a json response, leave as-is
         end
@@ -370,7 +368,7 @@ module Katello
 
       if (ak_names = params[:activation_keys])
         fail HttpErrors::NotFound, _("Organization not found") if organization.nil?
-        ak_names        = ak_names.split(",")
+        ak_names        = ak_names.split(",").uniq.compact
         activation_keys = ak_names.map do |ak_name|
           activation_key = organization.activation_keys.find_by(:name => ak_name)
           fail HttpErrors::NotFound, _("Couldn't find activation key '%s'") % ak_name unless activation_key

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

@@ -39,8 +39,7 @@ module Katello
     end
 
     def deprecate_katello_agent
-      ::Foreman::Deprecation.api_deprecation_warning("Remote actions using katello-agent are deprecated and will be removed in Katello 4.0.  " \
-                                                         "You may consider switching to Remote Execution.")
+      ::Foreman::Deprecation.api_deprecation_warning("Katello-agent is deprecated and will be removed in a future release.")
     end
 
     def full_result_response(collection)

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

@@ -10,9 +10,9 @@ module Katello
     end
 
     def_param_group :content_credential do
-      param :name, :identifier, :action_aware => true, :required => true, :desc => N_("identifier of the content credential")
-      param :content_type, String, :action_aware => true, :required => true, :desc => N_("type of content")
-      param :content, String, :action_aware => true, :required => true, :desc => N_("public key block in DER encoding or certificate content")
+      param :name, :identifier, :action_aware => true, :required => true, :desc => N_('Name of the Content Credential')
+      param :content_type, String, :action_aware => true, :required => true, :desc => N_('Type of content: "cert", "gpg_key"')
+      param :content, String, :action_aware => true, :required => true, :desc => N_('Public key block in DER encoding or certificate content')
     end
 
     resource_description do
@@ -22,13 +22,13 @@ module Katello
         Content Credentials are used to store credentials like GPG Keys and Certificates for the authentication
         to Products / Repositories.
       DESC
-      api_version "v2"
+      api_version 'v2'
     end
 
-    api :GET, "/content_credentials", N_("List content credentials")
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
-    param :name, String, :desc => N_("name of the Content Credential"), :required => false
-    param :content_type, String, :desc => N_("type of content"), :required => false
+    api :GET, "/content_credentials", N_('List Content Credentials')
+    param :organization_id, :number, :desc => N_('Organization identifier'), :required => true
+    param :name, String, :desc => N_('Name of the Content Credential'), :required => false
+    param :content_type, String, :desc => N_('Type of content'), :required => false
     param_group :search, Api::V2::ApiController
     def index
       respond(:collection => scoped_search(index_relation.distinct, :name, :asc))
@@ -41,15 +41,15 @@ module Katello
       query
     end
 
-    api :POST, "/content_credentials", N_("Create a content credential")
-    param :organization_id, :number, :desc => N_("organization identifier"), :required => true
+    api :POST, "/content_credentials", N_('Create a Content Credential')
+    param :organization_id, :number, :desc => N_('Organization identifier'), :required => true
     param_group :content_credential, :as => :create
     def create
       filepath = params.try(:[], :file_path).try(:path)
 
       content = nil
       if filepath
-        content = File.open(filepath, "rb") { |file| file.read }
+        content = File.open(filepath, 'rb') { |file| file.read }
       else
         content = params[:content]
       end
@@ -58,45 +58,45 @@ module Katello
       respond_for_create(:resource => content_credential)
     end
 
-    api :GET, "/content_credentials/:id", N_("Show a content credential")
-    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    api :GET, "/content_credentials/:id", N_('Show a Content Credential')
+    param :id, :number, :desc => N_('Content Credential numeric identifier'), :required => true
     def show
       respond_for_show(:resource => @content_credential)
     end
 
-    api :PUT, "/content_credentials/:id", N_("Update a content credential")
-    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    api :PUT, "/content_credentials/:id", N_('Update a Content Credential')
+    param :id, :number, :desc => N_('Content Credential ID'), :required => true
     param_group :content_credential
     def update
       sync_task(::Actions::Katello::GpgKey::Update, @content_credential, content_credential_params.to_h)
       respond_for_show(:resource => @content_credential)
     end
 
-    api :DELETE, "/content_credentials/:id", N_("Destroy a content credential")
-    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
+    api :DELETE, "/content_credentials/:id", N_('Destroy a Content Credential')
+    param :id, :number, :desc => N_('Content Credential ID'), :required => true
     def destroy
       @content_credential.destroy
       respond_for_destroy
     end
 
-    api :GET, "/content_credentials/:id/content", N_("Return the content of a content credential, used directly by yum")
+    api :GET, "/content_credentials/:id/content", N_('Return the content of a Content Credential, used directly by yum')
     param :id, :number, :required => true
     def content
       render(:plain => @content_credential.content, :layout => false)
     end
 
-    api :POST, "/content_credentials/:id/content", N_("Upload content credential contents")
-    param :id, :number, :desc => N_("content credential numeric identifier"), :required => true
-    param :content, File, :desc => N_("file contents"), :required => true
+    api :POST, "/content_credentials/:id/content", N_('Upload Content Credential contents')
+    param :id, :number, :desc => N_('Content Credential ID'), :required => true
+    param :content, File, :desc => N_('File contents'), :required => true
     def set_content
       filepath = params.try(:[], :content).try(:path)
 
       if filepath
-        content = File.open(filepath, "rb") { |file| file.read }
+        content = File.open(filepath, 'rb') { |file| file.read }
         @content_credential.update!(:content => content)
-        render :json => {:status => "success"}
+        render :json => {:status => 'success'}
       else
-        fail HttpErrors::BadRequest, _("No file uploaded")
+        fail HttpErrors::BadRequest, _('No file uploaded')
       end
     end
 

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

@@ -58,7 +58,7 @@ module Katello
                                                                 organization: @organization,
                                                                 create_by_default: false)
       if @view.blank?
-        msg = _("Unable to incrementally export. Do a Full Export the library content "\
+        msg = _("Unable to incrementally export. Do a Full Export on the library content "\
                 "before updating from the latest increment.")
         fail HttpErrors::BadRequest, msg
       end

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

@@ -10,6 +10,9 @@ module Katello
     param :destination_server, String, :desc => N_("Destination Server name"), :required => false
     param :organization_id, :number, :desc => N_("Organization identifier"), :required => false
     param :id, :number, :desc => N_("Content view version export history identifier"), :required => false
+    param :type, ::Katello::ContentViewVersionExportHistory::EXPORT_TYPES,
+                                  :desc => N_("Export Types"),
+                                  :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ContentViewVersionExportHistory)
     def index
@@ -17,6 +20,7 @@ module Katello
       history = history.where(:id => params[:id]) unless params[:id].blank?
       history = history.where(:content_view_version_id => params[:content_view_version_id]) unless params[:content_view_version_id].blank?
       history = history.where(:destination_server => params[:destination_server]) unless params[:destination_server].blank?
+      history = history.where(:export_type => params[:type]) unless params[:type].blank?
       history = history.with_organization_id(params[:organization_id]) unless params[:organization_id].blank?
       history = history.with_content_view_id(params[:content_view_id]) unless params[:content_view_id].blank?
       respond_with_template_collection("index", 'content_view_version_export_histories',
@@ -25,7 +29,7 @@ module Katello
 
     api :GET, "/content_exports/api_status", N_("true if the export api is pulp3 ready and usable. This API is intended for use by hammer-cli only.")
     def api_status
-      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in a future version of Katello.")
+      ::Foreman::Deprecation.api_deprecation_warning("/content_exports/api_status is being deprecated and will be removed in Katello 4.1.")
       render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
     end
 

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

@@ -73,7 +73,7 @@ module Katello
       respond :resource => @filter
     end
 
-    api :delefind_filterte, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
+    api :delete, "/content_views/:content_view_id/filters/:id", N_("delete a filter")
     api :delete, "/content_view_filters/:id", N_("delete a filter")
     param :content_view_id, :number, :desc => N_("content view identifier")
     param :id, :number, :desc => N_("filter identifier"), :required => true

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

@@ -9,7 +9,7 @@ module Katello
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("uuid of the puppet module"), :deprecated => true
+    param :uuid, String, :desc => N_("uuid of the puppet module")
     param_group :search, ::Katello::Api::V2::ApiController
     add_scoped_search_description_for(ContentViewPuppetModule)
     def index
@@ -22,7 +22,7 @@ module Katello
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
     param :id, String, :desc => N_("the id of the puppet module to associate")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def create
       params[:content_view_puppet_module][:uuid] ||= PuppetModule.find(params[:id]).try(:pulp_id) if params[:id]
       respond resource: ContentViewPuppetModule.create!(puppet_module_params.merge(content_view: @view))
@@ -41,7 +41,7 @@ module Katello
     param :id, :number, :desc => N_("puppet module ID"), :required => true
     param :name, String, :desc => N_("name of the puppet module")
     param :author, String, :desc => N_("author of the puppet module")
-    param :uuid, String, :desc => N_("the uuid of the puppet module to associate"), :deprecated => true
+    param :uuid, String, :desc => N_("the uuid of the puppet module to associate")
     def update
       @puppet_module.update!(puppet_module_params)
       respond :resource => @puppet_module

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

@@ -95,7 +95,7 @@ module Katello
         fail HttpErrors::BadRequest, _("Invalid usage for Pulp 3 repositories. "\
                                        "Use hammer content-export for Yum repositories")
       end
-      ::Foreman::Deprecation.api_deprecation_warning("Export is being deprecated and will be removed in a future version of Katello. Use hammer content-view version export instead.")
+      ::Foreman::Deprecation.api_deprecation_warning("Pulp 2 export is deprecated and will not work as of Katello 4.0. To export using Pulp 3, use hammer content-export version.")
       if params[:export_to_iso].blank? && params[:iso_mb_size].present?
         fail HttpErrors::BadRequest, _("ISO export must be enabled when specifying ISO size")
       end

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

@@ -190,8 +190,8 @@ module Katello
 
     api :PUT, "/content_views/:id/remove", N_("Remove versions and/or environments from a content view and reassign systems and keys")
     param :id, :number, :desc => N_("content view numeric identifier"), :required => true
-    param :environment_ids, :number, :desc => N_("environment numeric identifiers to be removed")
-    param :content_view_version_ids, :number, :desc => N_("content view version identifiers to be deleted")
+    param :environment_ids, Array, of: :number, :desc => N_("environment numeric identifiers to be removed")
+    param :content_view_version_ids, Array, of: :number, :desc => N_("content view version identifiers to be deleted")
     param :system_content_view_id, :number, :desc => N_("content view to reassign orphaned systems to")
     param :system_environment_id, :number, :desc => N_("environment to reassign orphaned systems to")
     param :key_content_view_id, :number, :desc => N_("content view to reassign orphaned activation keys to")

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

@@ -62,7 +62,7 @@ module Katello
       collection
     end
 
-    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update"), :deprecated => true
+    api :GET, "/content_view_versions/:id/available_errata", N_("Return errata that can be added to the Content View Version via an Incremental Update. Will be removed in Katello 4.1."), :deprecated => true
     param :id, :number, :desc => N_("Content View Version identifier"), :required => true
     param :organization_id, :number, :desc => N_("Organization identifier")
     param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")

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

@@ -51,11 +51,11 @@ module Katello
 
     api :PUT, "/hosts/:host_id/errata/apply", N_("Schedule errata for installation")
     param :host_id, :number, :desc => N_("Host ID"), :required => true
-    param :errata_ids, Array, :desc => N_("List of Errata ids to install"), :required => false, :deprecated => true
+    param :errata_ids, Array, :desc => N_("List of Errata ids to install. Will be removed in Katello 4.1."), :required => false, :deprecated => true
 
     param_group :bulk_errata_ids
     def apply
-      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, @errata_ids)
+      task = async_task(::Actions::Katello::Host::Erratum::Install, @host, content: @errata_ids)
       respond_for_async :resource => task
     end
 

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

@@ -33,14 +33,14 @@ module Katello
     def install
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Install, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Install, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Install, @host, content: groups)
         respond_for_async :resource => task
       end
     end
@@ -51,7 +51,7 @@ module Katello
     def upgrade
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Update, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Update, @host, content: packages)
         respond_for_async :resource => task
       end
     end
@@ -59,7 +59,7 @@ module Katello
     api :PUT, "/hosts/:host_id/packages/upgrade_all", N_("Update packages remotely")
     param :host_id, :number, :required => true, :desc => N_("ID of the host")
     def upgrade_all
-      task = async_task(::Actions::Katello::Host::Package::Update, @host, [])
+      task = async_task(::Actions::Katello::Host::Package::Update, @host, content: [])
       respond_for_async :resource => task
     end
 
@@ -69,14 +69,14 @@ module Katello
     def remove
       if params[:packages]
         packages = validate_package_list_format(params[:packages])
-        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, packages)
+        task     = async_task(::Actions::Katello::Host::Package::Remove, @host, content: packages)
         respond_for_async :resource => task
         return
       end
 
       if params[:groups]
         groups = extract_group_names(params[:groups])
-        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, groups)
+        task   = async_task(::Actions::Katello::Host::PackageGroup::Remove, @host, content: groups)
         respond_for_async :resource => task
       end
     end

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

@@ -42,9 +42,8 @@ module Katello
     def index_response(reload_host = false)
       # Host needs to be reloaded because of lazy accessor
       @host.reload if reload_host
-      entitlements = @host.subscription_facet.candlepin_consumer.entitlements
-      subscriptions = entitlements.map { |entitlement| ::Katello::HostSubscriptionPresenter.new(entitlement) }
-      full_result_response(subscriptions)
+      presenter = ::Katello::HostSubscriptionsPresenter.new(@host)
+      full_result_response(presenter.subscriptions)
     end
 
     api :PUT, "/hosts/:host_id/subscriptions/auto_attach", N_("Trigger an auto-attach of subscriptions")