katello 3.18.0.rc2.1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2182a0ddbcf1ed53431397c9729009032f564090946f26a9c6bd96f12868463
-  data.tar.gz: 835ca2d71f939a363bdae02f2fb96d873d605d066ca79ed9a2c0fe05fab35614
+  metadata.gz: 336a4ba95971459cc367612026947e16d536f4002aa4edbbf1ef2f5c75fc8d79
+  data.tar.gz: bf25590898a3e0485037acb025c7d654c3a98dce1dfb2830f85db8923eb78bdd
 SHA512:
-  metadata.gz: bf9f57c0b833cab0e045286423e25971c652495317aa5acce6e13e99778e802dfac5504928eafda49f58d264b6410738f7c06032323e99a751b0b1c386d55725
-  data.tar.gz: c87c2c678c0c5167b9e743b4b83c1bbdbf89d6649c4635a93e923f37ca2b516afd60839389e52a9164e395cf98d3dfc358b144ac72f20aca74f667f6f40da0ef
+  metadata.gz: 19244df2d07a33451ae52bf787b7cd5d173db7647a90b88535077e27266a14814315d7b31f124c66cad14a41eb27bdbb8e78a2fe06b900b3f931f833b89b89c6
+  data.tar.gz: 753d1c2598e96cdf3ce57c79abe0f997733ea296c29f5ccedafd0502530046a727be430ae87b3d4b3030415f66c9d7801f8222dca6e388c576ca6ad46766cd9b

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/capsule_content_controller.rb

@@ -93,14 +93,14 @@ module Katello
 
     def find_editable_capsule
       @capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
-      unless @capsule&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.pulp_mirror?
         fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
       end
     end
 
     def find_capsule
       @capsule = SmartProxy.unscoped.authorized(:view_capsule_content).find(params[:id])
-      unless @capsule&.has_feature?(SmartProxy::PULP_NODE_FEATURE)
+      unless @capsule&.pulp_mirror?
         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/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

@@ -0,0 +1,98 @@
+module Katello
+  class Api::V2::ContentExportIncrementalsController < Api::V2::ApiController
+    before_action :fail_if_not_pulp3, :only => [:version, :library]
+    before_action :find_exportable_organization, :only => [:library]
+    before_action :find_exportable_content_view_version, :only => [:version]
+    before_action :find_library_export_view, :only => [:library]
+    before_action :find_history, :only => [:version, :library]
+
+    api :POST, "/content_export_incrementals/version", N_("Performs an incremental-export of a content view version.")
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
+                                                 "If not provided the most recent export history will be used."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this version"\
+                                                         " are unexportable. False by default."), :required => false
+    def version
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export,
+                          content_view_version: @version,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          from_history: @history,
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+
+      respond_for_async :resource => tasks
+    end
+
+    api :POST, "/content_export_incrementals/library", N_("Performs an incremental-export of the repositories in library.")
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :from_history_id, :number, :desc => N_("Export history identifier used for incremental export. "\
+                                                 "If not provided the most recent export history will be used."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this organization"\
+                                                         " are unexportable. False by default."), :required => false
+    def library
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::ExportLibrary,
+                          @organization,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          from_history: @history,
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    private
+
+    def find_exportable_content_view_version
+      @version = ContentViewVersion.exportable.find_by_id(params[:id])
+      throw_resource_not_found(name: 'content view version', id: params[:id]) if @version.blank?
+      @view = @version.content_view
+    end
+
+    def find_library_export_view
+      @view = ::Katello::Pulp3::ContentViewVersion::Export.find_library_export_view(destination_server: params[:destination_server],
+                                                                organization: @organization,
+                                                                create_by_default: false)
+      if @view.blank?
+        msg = _("Unable to incrementally export. Do a Full Export on the library content "\
+                "before updating from the latest increment.")
+        fail HttpErrors::BadRequest, msg
+      end
+    end
+
+    def find_history
+      if params[:from_history_id].present?
+        @history = ::Katello::ContentViewVersionExportHistory.find(params[:from_history_id])
+        if @history.blank?
+          throw_resource_not_found(name: 'export history',
+                                   id: params[:from_history_id])
+        end
+      else
+        @history = ::Katello::ContentViewVersionExportHistory.
+                      latest(@view,
+                                          destination_server: params[:destination_server])
+        if @history.blank?
+          msg = _("No existing export history was found to perform an incremental export. A full export must be performed")
+          fail HttpErrors::NotFound, msg
+        end
+      end
+    end
+
+    def find_exportable_organization
+      find_organization
+      unless @organization.can_export_library_content?
+        throw_resource_not_found(name: 'organization', id: params[:organization_id])
+      end
+    end
+
+    def fail_if_not_pulp3
+      unless SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 2 repositories. Use export for Yum repositories")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module Katello
+  class Api::V2::ContentExportsController < Api::V2::ApiController
+    before_action :fail_if_not_pulp3, :only => [:version, :library]
+    before_action :find_exportable_organization, :only => [:library]
+    before_action :find_exportable_content_view_version, :only => [:version]
+
+    api :GET, "/content_exports", N_("List export histories")
+    param :content_view_version_id, :number, :desc => N_("Content view version identifier"), :required => false
+    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => false
+    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
+      history = ContentViewVersionExportHistory.readable
+      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',
+                                       :collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionExportHistory))
+    end
+
+    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.")
+      render json: { api_usable: SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE) }, status: :ok
+    end
+
+    api :POST, "/content_exports/version", N_("Performs a full-export of a content view version.")
+    param :id, :number, :desc => N_("Content view version identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this version"\
+                                                         " are unexportable. False by default."), :required => false
+    def version
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::Export,
+                          content_view_version: @version,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    api :POST, "/content_exports/library", N_("Performs a full-export of the repositories in library.")
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
+    param :destination_server, String, :desc => N_("Destination Server name"), :required => false
+    param :chunk_size_mb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in megabytes."), :required => false
+    param :fail_on_missing_content, :bool, :desc => N_("Fails if any of the repositories belonging to this organization"\
+                                                         " are unexportable. False by default."), :required => false
+    def library
+      tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::ExportLibrary,
+                          @organization,
+                          destination_server: params[:destination_server],
+                          chunk_size: params[:chunk_size_mb],
+                          fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
+      respond_for_async :resource => tasks
+    end
+
+    private
+
+    def find_exportable_content_view_version
+      @version = ContentViewVersion.exportable.find_by_id(params[:id])
+      throw_resource_not_found(name: 'content view version', id: params[:id]) if @version.blank?
+    end
+
+    def find_exportable_organization
+      find_organization
+      unless @organization.can_export_library_content?
+        throw_resource_not_found(name: 'organization', id: params[:organization_id])
+      end
+    end
+
+    def fail_if_not_pulp3
+      unless SmartProxy.pulp_primary.pulp3_repository_type_support?(Katello::Repository::YUM_TYPE)
+        fail HttpErrors::BadRequest, _("Invalid usage for Pulp 2 repositories. Use export for Yum repositories")
+      end
+    end
+  end
+end