katello 4.0.1.1 → 4.1.0.rc2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 943bafeb68534380121b087474c963f223f8073c5d76cb340a3e2d079993c58b
-  data.tar.gz: d9177822addd44a16bfb9c545cf8336f0aebbd17ec480fb8b841a51b4e17da5c
+  metadata.gz: 2b5fdc201af935cf74af29ff64e8b4ac30918984308a428615d4297780bf714e
+  data.tar.gz: df90a5fee570cae2ff2a3b9978fa91062a3d6dc8b1b704460780d6ef4141cc7a
 SHA512:
-  metadata.gz: 61aa94ae8e7b27ca51b9ecf14927ee7dc7962e1376114457ea4dbb141a446dd86f9ed5dbe4576d80b33c6899c593c656c672e88e0dec219633a8869c9f869e34
-  data.tar.gz: f8b1bd7effcb6d477c872461f34e36c88823b2d44fbe09e97c2f5aae7418794d8ad206d9f2094dc2f10df239be29c117bba7361d0fc9b70f5f74e8e0754144dc
+  metadata.gz: 805ab590d81e32061ad21253b114e354189d8fa7379564a6bfa2b5f33215b3ed3715ee6d693b1ee61d709fa66f0fc72536efe1dcc51970b48de7f45390491674
+  data.tar.gz: a268def3988ff20934d0d218562e4b8f980457b5576803e9065a9f7b263a7371690ec510a40afa0719785868b8a3b7c31118e18a443d40ecf1ca002b474f7b99

data/app/assets/javascripts/katello/hosts/host_and_hostgroup_edit.js

@@ -9,12 +9,6 @@ $(document).on('ContentLoad', function(){
     $("#hostgroup_lifecycle_environment_id").change(KT.hosts.environmentChanged);
     $("#host_lifecycle_environment_id").change(KT.hosts.environmentChanged);
 
-    $("#hostgroup_content_view_id").change(KT.hosts.contentViewSelected);
-    $("#host_content_view_id").change(KT.hosts.contentViewSelected);
-    $("#reset_puppet_environment").click(function() {
-        KT.hosts.getPuppetEnvironmentSelect().data('content_puppet_match', 'true');
-        KT.hosts.setDefaultPuppetEnvironment(KT.hosts.getSelectedContentView(), KT.hosts.getSelectedEnvironment());
-    });
     KT.hosts.update_media_enablement();
     KT.hosts.set_media_selection_bindings();
 });
@@ -68,33 +62,6 @@ KT.hosts.signalContentViewFetch = function(fetching) {
     }
 };
 
-
-KT.hosts.contentViewSelected = function() {
-    if (KT.hosts.getPuppetEnvironmentSelect().data('content_puppet_match')) {
-        KT.hosts.setDefaultPuppetEnvironment(KT.hosts.getSelectedContentView(), KT.hosts.getSelectedEnvironment());
-    }
-};
-
-KT.hosts.setDefaultPuppetEnvironment = function(view_id, env_id) {
-    if (view_id && env_id) {
-        $.get('/hosts/puppet_environment_for_content_view', {content_view_id: view_id, lifecycle_environment_id: env_id}, function (data) {
-            var select = KT.hosts.getPuppetEnvironmentSelect();
-            if (data !== null) {
-                select.val(data.id);
-                select.trigger('change');
-            }
-        })
-    }
-};
-
-KT.hosts.getPuppetEnvironmentSelect = function() {
-    var select = $("#host_environment_id").first();
-    if(select.length === 0) {
-        select = $("#hostgroup_environment_id").first();
-    }
-    return select;
-};
-
 KT.hosts.getContentViewSelect2 = function() {
     var select = $("#s2id_host_content_view_id").first();
     if(select.length === 0) {

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

@@ -322,7 +322,7 @@ $container_width: ($static_width/2) - 36;
         position: relative;
         text-align: left;
         bottom: 18px;
-        left: 30px;
+        left: 10px;
       }
       .progress {
         display: inline-block;

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -93,27 +93,21 @@ module Katello
       true
     end
 
-    # Reduce visible repos to include lifecycle env permissions
-    # http://projects.theforeman.org/issues/22914
-    # Also include repositories in lifecycle environments with registry_unauthenticated_pull=true
-    def readable_repositories
-      table_name = Repository.table_name
-      in_unauth_environments = Repository.joins(:environment).where("#{Katello::KTEnvironment.table_name}.registry_unauthenticated_pull" => true).select(:id)
-      Repository.readable.or(Repository.joins(:root).where("#{table_name}.id in (?)", in_unauth_environments))
-    end
-
     def find_readable_repository
       return nil unless params[:repository]
       repository = Repository.docker_type.find_by(container_repository_name: params[:repository])
       if require_user_authorization?(repository)
-        repository = readable_repositories.docker_type.find_by(container_repository_name: params[:repository])
+        repository = Repository.readable_docker_catalog.find_by(container_repository_name: params[:repository])
       end
       repository
     end
 
     def require_user_authorization?(repository = @repository)
       !(params['action'] == 'token' && params['scope'].blank? && params['account'].blank?) &&
-        (!repository || (!repository.environment.registry_unauthenticated_pull && !ssl_client_authorized?(repository.organization.label)))
+        (!repository ||
+          (!repository.archive? &&
+            !repository.environment.registry_unauthenticated_pull &&
+            !ssl_client_authorized?(repository.organization.label)))
     end
 
     def ssl_client_authorized?(org_label)
@@ -331,7 +325,7 @@ module Katello
       params[:per_page] = params[:n] || 25
       params[:search] = params[:q]
 
-      search_results = scoped_search(readable_repositories.docker_type.distinct,
+      search_results = scoped_search(Repository.readable_docker_catalog.distinct,
                                      :container_repository_name, :asc, options)
 
       results = {
@@ -345,7 +339,7 @@ module Katello
     end
 
     def catalog
-      repositories = readable_repositories.docker_type.collect do |repository|
+      repositories = Repository.readable_docker_catalog.collect do |repository|
         repository.container_repository_name
       end
       render json: { repositories: repositories }
@@ -483,7 +477,7 @@ module Katello
       return nil unless scope
 
       scopes = scope.split(':')
-      scopes[2] == 'pull' ? Repository.docker_type.find_by_container_repository_name(scopes[1]) : nil
+      scopes[2] == 'pull' ? Repository.docker_type.non_archived.find_by_container_repository_name(scopes[1]) : nil
     end
 
     def disable_strong_params

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

@@ -242,15 +242,8 @@ module Katello
     #description N_("This service is available for unauthenticated users")
     def server_status
       candlepin_response = Resources::Candlepin::CandlepinPing.ping
-      status = { :managerCapabilities => candlepin_response['managerCapabilities'] + ["combined_reporting"],
-                 :result => candlepin_response['result'],
-                 :rulesSource => candlepin_response['rulesSource'],
-                 :rulesVersion => candlepin_response['rulesVersion'],
-                 :standalone => candlepin_response['standalone'],
-                 :timeUTC => Time.now.getutc,
-                 :version => Katello::VERSION }
-
-      render :json => status
+      candlepin_response[:managerCapabilities] << 'combined_reporting'
+      render :json => candlepin_response
     end
 
     #api :PUT, "/consumers/:id", N_("Update consumer information")

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

@@ -6,7 +6,7 @@ module Katello
     before_action :find_environment, :only => [:index, :create, :update]
     before_action :find_optional_organization, :only => [:index, :create, :show]
     before_action :find_content_view, :only => [:index]
-    before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :available_releases, :product_content,
+    before_action :find_authorized_katello_resource, :only => [:show, :update, :destroy, :available_releases,
                                                                :available_host_collections, :add_host_collections, :remove_host_collections,
                                                                :content_override, :add_subscriptions, :remove_subscriptions,
                                                                :subscriptions]
@@ -141,29 +141,6 @@ module Katello
       respond_for_index :collection => response
     end
 
-    api :GET, "/activation_keys/:id/product_content", N_("Show content available for an activation key")
-    param :id, String, :desc => N_("ID of the activation key"), :required => true
-    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
-    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version")
-    def product_content
-      content_access_mode_all = ::Foreman::Cast.to_bool(params[:content_access_mode_all])
-      content_access_mode_env = ::Foreman::Cast.to_bool(params[:content_access_mode_env])
-
-      content_finder = ProductContentFinder.new(
-          :match_subscription => !content_access_mode_all,
-          :match_environment => content_access_mode_env,
-          :consumable => @activation_key
-      )
-
-      content = content_finder.presenter_with_overrides(@activation_key.content_overrides)
-      response = {
-        :results => content,
-        :total => content.size,
-        :subtotal => content.size
-      }
-      respond_for_index :collection => response
-    end
-
     api :POST, "/activation_keys/:id/host_collections"
     param :id, :number, :desc => N_("ID of the activation key"), :required => true
     param :host_collection_ids, Array, :required => true, :desc => N_("List of host collection IDs to associate with activation key")
@@ -248,6 +225,15 @@ module Katello
       respond_for_show(:resource => @activation_key)
     end
 
+    api :GET, "/activation_keys/:id/product_content", N_("Show content available for an activation key")
+    param :id, String, :desc => N_("ID of the activation key"), :required => true
+    param :content_access_mode_all, :bool, :desc => N_("Get all content available, not just that provided by subscriptions")
+    param :content_access_mode_env, :bool, :desc => N_("Limit content to just that available in the activation key's content view version")
+    def product_content
+      # note this is just there as a place holder for apipie.
+      # The routing would automatically redirect it to repository_sets#index
+    end
+
     def index_relation
       activation_keys = ActivationKey.readable
       activation_keys = activation_keys.where(:name => params[:name]) if params[:name]

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

@@ -39,7 +39,18 @@ module Katello
     end
 
     def deprecate_katello_agent
-      ::Foreman::Deprecation.api_deprecation_warning("Katello-agent is deprecated and will be removed in a future release.")
+      check_katello_agent_not_disabled
+      ::Foreman::Deprecation.api_deprecation_warning("This action uses katello-agent, which is deprecated and will be removed in #{katello_agent_removal_release}.")
+    end
+
+    def check_katello_agent_not_disabled
+      unless ::Katello.with_katello_agent?
+        fail HttpErrors::BadRequest, _("This action uses katello-agent, which is currently disabled. Use remote execution instead.")
+      end
+    end
+
+    def katello_agent_removal_release
+      self.class.katello_agent_removal_release
     end
 
     def full_result_response(collection)
@@ -75,7 +86,8 @@ module Katello
       end
 
       total = scoped_search_total(query, group)
-
+      # If you get an ArgumentError here (wrong number of arguments given)
+      # it's probably because query is an array and not an ActiveRecord::Relation
       query = query.select(:id) if query.respond_to?(:select)
       query = resource.search_for(*search_options).where("#{resource.table_name}.id" => query)
 
@@ -207,7 +219,7 @@ module Katello
     end
 
     def find_host_with_subscriptions(id, permission)
-      @host = resource_finder(::Host::Managed.authorized(permission, ::Host::Managed), id)
+      @host = resource_finder(::Host::Managed.authorized(permission, ::Host::Managed), id&.to_i)
       fail HttpErrors::BadRequest, _("Host has not been registered with subscription-manager") if @host.subscription_facet.nil?
     end
 

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

@@ -49,7 +49,7 @@ module Katello
 
       content = nil
       if filepath
-        content = File.open(filepath, 'rb') { |file| file.read }
+        content = File.read(filepath, mode: 'rb')
       else
         content = params[:content]
       end

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

@@ -1,6 +1,5 @@
 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]
@@ -9,17 +8,17 @@ module Katello
     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 :chunk_size_gb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in gigabytes."), :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,
+      tasks = async_task(Actions::Katello::ContentViewVersion::Export,
                           content_view_version: @version,
                           destination_server: params[:destination_server],
-                          chunk_size: params[:chunk_size_mb],
+                          chunk_size: params[:chunk_size_gb],
                           from_history: @history,
                           fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
 
@@ -29,8 +28,8 @@ module Katello
     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 :chunk_size_gb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in gigabytes."), :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"\
@@ -39,7 +38,7 @@ module Katello
       tasks = async_task(::Actions::Pulp3::Orchestration::ContentViewVersion::ExportLibrary,
                           @organization,
                           destination_server: params[:destination_server],
-                          chunk_size: params[:chunk_size_mb],
+                          chunk_size: params[:chunk_size_gb],
                           from_history: @history,
                           fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
       respond_for_async :resource => tasks
@@ -88,11 +87,5 @@ module Katello
         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

@@ -1,6 +1,5 @@
 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]
 
@@ -27,24 +26,18 @@ module Katello
                                        :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 Katello 4.1.")
-      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 :chunk_size_gb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in gigabytes."), :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,
+      tasks = async_task(::Actions::Katello::ContentViewVersion::Export,
                           content_view_version: @version,
                           destination_server: params[:destination_server],
-                          chunk_size: params[:chunk_size_mb],
+                          chunk_size: params[:chunk_size_gb],
                           fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
       respond_for_async :resource => tasks
     end
@@ -52,15 +45,15 @@ module Katello
     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 :chunk_size_gb, :number, :desc => N_("Split the exported content into archives "\
+                                               "no greater than the specified size in gigabytes."), :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],
+                          chunk_size: params[:chunk_size_gb],
                           fail_on_missing_content: ::Foreman::Cast.to_bool(params[:fail_on_missing_content]))
       respond_for_async :resource => tasks
     end
@@ -78,11 +71,5 @@ module Katello
         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_imports_controller.rb

@@ -1,20 +1,39 @@
 module Katello
   class Api::V2::ContentImportsController < Api::V2::ApiController
-    before_action :find_publishable_content_view, :only => [:version]
+    before_action :find_organization, :only => [:version]
+    before_action :check_authorized, :only => [:version]
+
     before_action :find_importable_organization, :only => [:library]
     before_action :find_default_content_view, :only => [:library]
 
+    api :GET, "/content_imports", N_("List import 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 :organization_id, :number, :desc => N_("Organization identifier"), :required => false
+    param :id, :number, :desc => N_("Content view version import history identifier"), :required => false
+    param :type, ::Katello::ContentViewVersionExportHistory::EXPORT_TYPES,
+                                  :desc => N_("Import Types"),
+                                  :required => false
+    param_group :search, Api::V2::ApiController
+    add_scoped_search_description_for(ContentViewVersionImportHistory)
+    def index
+      history = ContentViewVersionImportHistory.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.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?
+      history = history.where(:import_type => params[:type]) unless params[:type].blank?
+      respond_with_template_collection("index", 'content_view_version_import_histories',
+                                       :collection => scoped_search(history, 'id', 'asc', resource_class: ContentViewVersionImportHistory))
+    end
+
     api :POST, "/content_imports/version", N_("Import a content view version")
-    param :content_view_id, :number, :desc => N_("Content view identifier"), :required => true
+    param :organization_id, :number, :desc => N_("Organization identifier"), :required => true
     param :path, String, :desc => N_("Directory containing the exported Content View Version"), :required => true
     param :metadata, Hash, :desc => N_("Metadata taken from the upstream export history for this Content View Version"), :required => true
     def version
-      if @view.default?
-        fail HttpErrors::BadRequest, _("Cannot use this end point for importing to library. "\
-                                       "If you intented to upload to library, use the library endpoint.")
-      end
-
-      task = async_task(::Actions::Katello::ContentViewVersion::Import, @view, path: params[:path], metadata: metadata_params.to_h)
+      task = async_task(::Actions::Katello::ContentViewVersion::Import, organization: @organization,
+                                                  path: params[:path], metadata: metadata_params.to_h)
       respond_for_async :resource => task
     end
 
@@ -29,9 +48,8 @@ module Katello
 
     private
 
-    def find_publishable_content_view
-      @view = ContentView.publishable.find(params[:content_view_id])
-      throw_resource_not_found(name: 'content_view', id: params[:content_view_id]) if @view.blank?
+    def check_authorized
+      fail HttpErrors::Forbidden, _("Action unauthorized to be performed in this organization.") unless ContentView.importable?
     end
 
     def find_default_content_view
@@ -47,12 +65,17 @@ module Katello
     def metadata_params
       params.require(:metadata).permit(
         :organization,
-        :content_view,
-        :repository_mapping,
+        :repositories,
+        :products,
         :toc,
-        content_view_version: [:major, :minor]
+        :incremental,
+        gpg_keys: {},
+        content_view: [:name, :label, :description],
+        content_view_version: [:major, :minor, :description],
+        from_content_view_version: [:major, :minor]
       ).tap do |nested|
-        nested[:repository_mapping] = params[:metadata].require(:repository_mapping).permit!
+        nested[:repositories] = params[:metadata].require(:repositories).permit!
+        nested[:products] = params[:metadata].require(:products).permit!
       end
     end
   end