foreman_scc_manager 5.0.1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5923a02d6b72dbf102333663649e450179368e8b0d6a1566b0d7d213d95109b
-  data.tar.gz: 86fd3c0181f90d5d2c216e10392b5923785424feb8a3b4c11d3a4cf1fe98ba20
+  metadata.gz: 3f0843880bcdc6190c26125ed2d847bae7f1c59dadad31e8db6cd5d0464029e0
+  data.tar.gz: 6ae97fbe01ae019d75d276b991e7d886dfa281f6ff2918c422b6f4217add18f9
 SHA512:
-  metadata.gz: 75a87ef0e985142ddd8613158fe033c0ed2019657384877d405b337d53016d221db3e78d1db3ac87269bb91592d8044e0d60d264303b565e9e584295136c8016
-  data.tar.gz: 35702ad2e304588c68273bab350d12ec1e1c676b02a0767edeaecc75a9cc199c7087bd22970edddad76f10463c0602a957f3e0b647effc81ca3f040958781ced
+  metadata.gz: fd11bc35bb22c25f1361481656f6731173fc13d6b4045ef68f8105541eb0e30dbc81579424284f2c4c3c3dc1a04c8d235568712e607166d7b0b17d2b6e7ac0a3
+  data.tar.gz: 9e29bc421463c59360b5e6bfa31761a06e6d537aeaaf6f7c95e14c882116bf6afbdf5ed8af783e383d93fce65ab3afc6479aab3387c83a393114abe03e4c2d4e

data/app/controllers/api/v2/scc_accounts_controller.rb

@@ -8,6 +8,8 @@ module Api
         resource_id 'scc_accounts'
         api_version 'v2'
         api_base_url '/api/v2'
+        param :location_id, Integer, :show => false
+        param :organization_id, Integer, :show => false
       end
 
       before_action :find_resource, :only => [:show, :update, :destroy, :sync, :bulk_subscribe, :bulk_subscribe_with_repos]

data/app/controllers/api/v2/scc_products_controller.rb

@@ -8,6 +8,8 @@ module Api
         resource_id 'scc_products'
         api_version 'v2'
         api_base_url '/api/v2'
+        param :location_id, Integer, :show => false
+        param :organization_id, Integer, :show => false
       end
 
       before_action :find_resource, :only => [:show, :subscribe]
@@ -24,11 +26,12 @@ module Api
       param :scc_account_id, :identifier_dottable, :required => true
       param :subscribed_only, :bool, :required => false, :desc => N_('Show subscribed products only')
       param_group :search_and_pagination, ::Api::V2::BaseController
+      add_scoped_search_description_for(SccProduct)
 
       def index
-        scope = resource_scope
+        scope = resource_scope_for_index
         scope = scope.where.not(:product_id => nil) if ::Foreman::Cast.to_bool(params[:subscribed_only])
-        @scc_products = scope.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page])
+        @scc_products = scope
       end
 
       api :GET, '/scc_accounts/:scc_account_id/scc_products/:id/', N_('Show an scc_account product')

data/app/controllers/scc_accounts_controller.rb

@@ -2,7 +2,7 @@ class SccAccountsController < ApplicationController
   helper_method :scc_filtered_products
   helper_method :create_nested_product_tree
   before_action :find_organization
-  before_action :find_resource, only: %i[show edit update destroy sync bulk_subscribe]
+  before_action :find_resource, only: %i[show edit update destroy sync]
   before_action :find_available_gpg_keys, only: %i[new edit update create]
   include Foreman::Controller::AutoCompleteSearch
 
@@ -79,26 +79,6 @@ class SccAccountsController < ApplicationController
     redirect_to scc_accounts_path
   end
 
-  def bulk_subscribe
-    scc_products_to_subscribe =
-      @scc_account.scc_products.where(id: scc_bulk_subscribe_params[:scc_subscribe_product_ids])
-
-    if scc_products_to_subscribe.count > 0
-      ForemanTasks.async_task(::Actions::BulkAction,
-        ::Actions::SccManager::SubscribeProduct,
-        scc_products_to_subscribe)
-      success _('Task to subscribe products started.')
-    else
-      warning _('No products selected.')
-    end
-  rescue ::Foreman::Exception => e
-    error _('Failed to add task to queue: %s') % e.to_s
-  rescue ForemanTasks::Lock::LockConflict => e
-    error _('Lock on SCC account already taken: %s') % e.to_s
-  ensure
-    redirect_to scc_accounts_path
-  end
-
   def create_nested_product_tree(scc_products, subscribed_only:)
     if subscribed_only
       scc_products_base = scc_products.where(:product_type => 'base').where.not(:product_id => nil).includes([:scc_extensions])
@@ -184,16 +164,10 @@ class SccAccountsController < ApplicationController
     )
   end
 
-  def scc_bulk_subscribe_params
-    params.require(:scc_account).permit(:scc_subscribe_product_ids => [])
-  end
-
   def action_permission
     case params[:action]
     when 'sync', 'test_connection'
       :sync
-    when 'bulk_subscribe'
-      :use
     else
       super
     end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '5.0.1'.freeze
+  VERSION = '5.0.3'.freeze
 end

data/test/controllers/scc_accounts_controller_test.rb

@@ -139,18 +139,6 @@ class SccAccountsControllerTest < ActionController::TestCase
     assert_redirected_to '/scc_accounts'
   end
 
-  test 'SCC server bulk subscribe products' do
-    stub_custom_request('https://scc.example.com/connect/organizations/repositories')
-
-    account = scc_accounts(:one)
-    product1 = scc_products(:one)
-    product2 = scc_products(:two)
-    account.scc_products = [product1, product2]
-    put :bulk_subscribe, params: { :id => account.id, :scc_account => { :scc_subscribe_product_ids => [product1.id, product2.id] } }, session: set_session_user
-
-    assert_redirected_to '/scc_accounts'
-  end
-
   test 'should delete scc_account' do
     account = scc_accounts(:two)
     assert_difference 'SccAccount.count', -1 do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_scc_manager
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - ATIX AG
 bindir: bin
 cert_chain: []
-date: 2025-08-13 00:00:00.000000000 Z
+date: 2025-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc