foreman_scc_manager 2.3.0 → 3.0.0

data/app/controllers/scc_accounts_controller.rb

@@ -33,7 +33,8 @@ class SccAccountsController < ApplicationController
   end
 
   # GET /scc_accounts/1/edit
-  def edit; end
+  def edit
+  end
 
   # POST /scc_accounts/test_connection
   def test_connection
@@ -84,8 +85,8 @@ class SccAccountsController < ApplicationController
 
     if scc_products_to_subscribe.count > 0
       ForemanTasks.async_task(::Actions::BulkAction,
-                              ::Actions::SccManager::SubscribeProduct,
-                              scc_products_to_subscribe)
+        ::Actions::SccManager::SubscribeProduct,
+        scc_products_to_subscribe)
       success _('Task to subscribe products started.')
     else
       warning _('No products selected.')
@@ -114,17 +115,22 @@ class SccAccountsController < ApplicationController
 
   def scc_product_hash(scc_product)
     scc_product_json = scc_product.as_json(:only => [:scc_id, :id, :arch, :version, :product_id, :subscription_valid],
-                                           include: { :scc_repositories => { :only => [:id, :name, :subscription_valid] } })
+      :include => { :scc_repositories => { :only => [:id, :name, :subscription_valid] } })
                                   .merge('name' => scc_product.pretty_name, 'product_category' => scc_product.product_category)
     # find if and which Katello root repository is associated with this SCC product
-    repo_ids_katello = scc_product.product.blank? || scc_product.product.root_repository_ids.blank? ? nil : scc_product.product.root_repository_ids
+    repo_ids_katello = scc_product&.product&.root_repository_ids
     scc_product_json['scc_repositories'].each do |repo|
-      # byebug
       if repo_ids_katello.blank?
-        repo['katello_root_repository_id'] = nil
+        repo['katello_repository_id'] = nil
       else
         repo_ids_scc = scc_product.scc_repositories.find(repo['id']).katello_root_repository_ids
-        repo['katello_root_repository_id'] = repo_ids_scc.blank? ? nil : (repo_ids_scc & repo_ids_katello).first
+        if repo_ids_scc.blank?
+          repo['katello_repository_id'] = nil
+        else
+          # we need to extract the library instance id for the correct repo link in the UI
+          root_repo_id = (repo_ids_scc & repo_ids_katello).first
+          repo['katello_repository_id'] = ::Katello::Repository.where({ root_id: root_repo_id, library_instance: nil }).pick(:id)
+        end
       end
     end
     scc_product_json

data/app/lib/actions/scc_manager/subscribe_product.rb

@@ -17,10 +17,10 @@ module Actions
         sequence do
           if scc_product.product_id.nil?
             product_create_action = plan_action(CreateProduct,
-                                                :product_name => scc_product.pretty_name,
-                                                :product_description => scc_product.pretty_description,
-                                                :organization_id => scc_product.organization.id,
-                                                :gpg_key => scc_product.scc_account.katello_gpg_key_id)
+              :product_name => scc_product.pretty_name,
+              :product_description => scc_product.pretty_description,
+              :organization_id => scc_product.organization.id,
+              :gpg_key => scc_product.scc_account.katello_gpg_key_id)
           end
           katello_repos = {}
           # we need to set the repositories to subscribe to
@@ -48,14 +48,14 @@ module Actions
           scc_repos.each do |repo|
             arch = scc_product.arch || 'noarch'
             repo_create_action = plan_action(CreateRepository,
-                                             :product_id => scc_product.product_id || product_create_action.output[:product_id],
-                                             :uniq_name => repo.uniq_name(scc_product),
-                                             :pretty_repo_name => repo.pretty_name,
-                                             :url => repo.url,
-                                             :token => repo.token,
-                                             :arch => arch,
-                                             :download_policy => scc_product.scc_account.download_policy,
-                                             :mirroring_policy => scc_product.scc_account.mirroring_policy)
+              :product_id => scc_product.product_id || product_create_action.output[:product_id],
+              :uniq_name => repo.uniq_name(scc_product),
+              :pretty_repo_name => repo.pretty_name,
+              :url => repo.url,
+              :token => repo.token,
+              :arch => arch,
+              :download_policy => scc_product.scc_account.download_policy,
+              :mirroring_policy => scc_product.scc_account.mirroring_policy)
             katello_repos[repo.id] = repo_create_action.output[:katello_root_repository_id]
           end
 
@@ -99,8 +99,8 @@ module Actions
         end
         product.description = input[:product_description]
         trigger(::Actions::Katello::Product::Create,
-                product,
-                Organization.find(input[:organization_id])).tap do
+          product,
+          Organization.find(input[:organization_id])).tap do
           output[:product_id] = product.id
         end
       end

data/app/lib/actions/scc_manager/sync_products.rb

@@ -7,16 +7,16 @@ module Actions
         action_subject(scc_account)
         password = encrypt_field(scc_account.password)
         plan_self(id: scc_account.id,
-                  base_url: scc_account.base_url,
-                  login: scc_account.login,
-                  password: password)
+          base_url: scc_account.base_url,
+          login: scc_account.login,
+          password: password)
       end
 
       def run
         products = ::SccManager.get_scc_data(input.fetch(:base_url),
-                                             '/connect/organizations/products',
-                                             input.fetch(:login),
-                                             decrypt_field(input.fetch(:password)))
+          '/connect/organizations/products',
+          input.fetch(:login),
+          decrypt_field(input.fetch(:password)))
         output[:data] = ::SccManager.sanitize_products(products).values
       rescue StandardError => e
         ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Products: #{e}"

data/app/lib/actions/scc_manager/sync_repositories.rb

@@ -7,15 +7,15 @@ module Actions
         action_subject(scc_account)
         password = encrypt_field(scc_account.password)
         plan_self(base_url: scc_account.base_url,
-                  login: scc_account.login,
-                  password: password)
+          login: scc_account.login,
+          password: password)
       end
 
       def run
         output[:data] = ::SccManager.get_scc_data(input[:base_url],
-                                                  '/connect/organizations/repositories',
-                                                  input[:login],
-                                                  decrypt_field(input[:password]))
+          '/connect/organizations/repositories',
+          input[:login],
+          decrypt_field(input[:password]))
       rescue StandardError => e
         ::Foreman::Logging.logger('foreman_scc_manager').error "Error while syncronizing SCC-Repositories: #{e}"
         error! e.to_s

data/app/models/scc_account.rb

@@ -289,7 +289,7 @@ class SccAccount < ApplicationRecord
   def self.download_policy_selection_values
     names = {
       ::Katello::RootRepository::DOWNLOAD_ON_DEMAND => _('On Demand'),
-      ::Katello::RootRepository::DOWNLOAD_IMMEDIATE => _('Immediate')
+      ::Katello::RootRepository::DOWNLOAD_IMMEDIATE => _('Immediate'),
     }
 
     ::Katello::RootRepository::DOWNLOAD_POLICIES.map do |p|
@@ -300,7 +300,7 @@ class SccAccount < ApplicationRecord
   def self.mirroring_policy_selection_values
     names = {
       ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE => _('Additive'),
-      ::Katello::RootRepository::MIRRORING_POLICY_CONTENT => _('Content Only')
+      ::Katello::RootRepository::MIRRORING_POLICY_CONTENT => _('Content Only'),
     }
 
     ::Katello::RootRepository::MIRRORING_POLICIES.map do |p|

data/app/models/scc_product.rb

@@ -13,10 +13,10 @@ class SccProduct < ApplicationRecord
   has_many :scc_extendings, inverse_of: :scc_product, dependent: :destroy
   has_many :scc_extensions, through: :scc_extendings
   has_many :inverse_scc_extendings,
-           inverse_of: :scc_extension,
-           dependent: :destroy,
-           class_name: :SccExtending,
-           foreign_key: :scc_extension_id
+    inverse_of: :scc_extension,
+    dependent: :destroy,
+    class_name: :SccExtending,
+    foreign_key: :scc_extension_id
   has_many :inverse_scc_extensions, through: :inverse_scc_extendings, source: :scc_product
 
   default_scope -> { order(:name) }

data/app/views/api/v2/scc_products/main.json.rabl

@@ -2,4 +2,4 @@
 
 object @scc_product
 extends 'api/v2/scc_products/base'
-attributes :organization_id, :organization_name, :scc_account_id, :name, :arch, :friendly_name, :description, :product_id
+attributes :scc_account_id, :name, :arch, :friendly_name, :description, :product_id

data/db/migrate/20200520281300_fix_scc_permissions.rb

@@ -5,7 +5,7 @@ class FixSccPermissions < ActiveRecord::Migration[5.2]
     :new_scc => :new_scc_accounts,
     :edit_scc => :edit_scc_accounts,
     :delete_scc => :delete_scc_accounts,
-    :sync_scc => :sync_scc_accounts
+    :sync_scc => :sync_scc_accounts,
   }.freeze
 
   def up

data/db/migrate/20210713092440_add_permissions.rb

@@ -1,7 +1,7 @@
 class AddPermissions < ActiveRecord::Migration[6.0]
   PRODUCT_PERMISSION_NAMES = [
     'view_scc_products',
-    'subscribe_scc_products'
+    'subscribe_scc_products',
   ].freeze
 
   def up

data/db/migrate/20220429102717_populate_scc_katello_repositories.rb

@@ -3,6 +3,7 @@ class PopulateSccKatelloRepositories < ActiveRecord::Migration[6.0]
     belongs_to :product, class_name: 'Katello::Product'
     has_and_belongs_to_many :scc_repositories
   end
+
   class SccRepository < ApplicationRecord
     has_many :scc_katello_repositories
     has_many :katello_root_repositories, through: :scc_katello_repositories

data/lib/foreman_scc_manager/engine.rb

@@ -22,8 +22,9 @@ module ForemanSccManager
 
     initializer 'foreman_scc_manager.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_scc_manager do
-        requires_foreman '>= 2.1'
+        requires_foreman '>= 3.7'
         requires_foreman_plugin 'katello', '>= 3.16.0'
+        register_gettext
 
         precompile_assets 'foreman_scc_manager/scc_accounts.js'
 
@@ -32,77 +33,77 @@ module ForemanSccManager
         # Add permissions
         security_block :foreman_scc_manager do
           permission :view_scc_accounts,
-                     { :scc_accounts => [:show, :index, :auto_complete_search],
-                       :'api/v2/scc_accounts' => [:show, :index, :auto_complete_search] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:show, :index, :auto_complete_search],
+              :'api/v2/scc_accounts' => [:show, :index, :auto_complete_search] },
+            :resource_type => 'SccAccount'
 
           permission :use_scc_accounts,
-                     { :scc_accounts => [:bulk_subscribe],
-                       :'api/v2/scc_accounts' => [:bulk_subscribe, :bulk_subscribe_with_repos] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:bulk_subscribe],
+              :'api/v2/scc_accounts' => [:bulk_subscribe, :bulk_subscribe_with_repos] },
+            :resource_type => 'SccAccount'
 
           permission :new_scc_accounts,
-                     { :scc_accounts => [:new, :create],
-                       :'api/v2/scc_accounts' => [:create] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:new, :create],
+              :'api/v2/scc_accounts' => [:create] },
+            :resource_type => 'SccAccount'
 
           permission :edit_scc_accounts,
-                     { :scc_accounts => [:edit, :update],
-                       :'api/v2/scc_accounts' => [:update] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:edit, :update],
+              :'api/v2/scc_accounts' => [:update] },
+            :resource_type => 'SccAccount'
 
           permission :delete_scc_accounts,
-                     { :scc_accounts => [:destroy],
-                       :'api/v2/scc_accounts' => [:destroy] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:destroy],
+              :'api/v2/scc_accounts' => [:destroy] },
+            :resource_type => 'SccAccount'
 
           permission :sync_scc_accounts,
-                     { :scc_accounts => [:sync],
-                       :'api/v2/scc_accounts' => [:sync] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:sync],
+              :'api/v2/scc_accounts' => [:sync] },
+            :resource_type => 'SccAccount'
 
           permission :test_connection_scc_accounts,
-                     { :scc_accounts => [:test_connection],
-                       :'api/v2/scc_accounts' => [:test_connection] },
-                     :resource_type => 'SccAccount'
+            { :scc_accounts => [:test_connection],
+              :'api/v2/scc_accounts' => [:test_connection] },
+            :resource_type => 'SccAccount'
 
           permission :view_scc_products,
-                     { :scc_products => [:index, :show],
-                       :'api/v2/scc_products' => [:index, :show] },
-                     :resource_type => 'SccProduct'
+            { :scc_products => [:index, :show],
+              :'api/v2/scc_products' => [:index, :show] },
+            :resource_type => 'SccProduct'
 
           permission :subscribe_scc_products,
-                     { :scc_products => [:subscribe, :unsubscribe],
-                       :'api/v2/scc_products' => [:subscribe, :unsibscribe] },
-                     :resource_type => 'SccProduct'
+            { :scc_products => [:subscribe, :unsubscribe],
+              :'api/v2/scc_products' => [:subscribe, :unsibscribe] },
+            :resource_type => 'SccProduct'
         end
 
         # Add a new role called 'SccManager' if it doesn't exist
         role 'SccManager',
-             %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts
-                delete_scc_accounts sync_scc_accounts test_connection_scc_accounts
-                view_scc_products subscribe_scc_products],
-             'Role granting permissons to manage SUSE Subscriptions'
+          %i[view_scc_accounts use_scc_accounts new_scc_accounts edit_scc_accounts
+             delete_scc_accounts sync_scc_accounts test_connection_scc_accounts
+             view_scc_products subscribe_scc_products],
+          'Role granting permissons to manage SUSE Subscriptions'
 
         role 'SccViewer',
-             %i[view_scc_accounts use_scc_accounts sync_scc_accounts
-                create_products view_products subscribe_scc_products view_scc_products],
-             'Role granting permissons to view and use SUSE Subscriptions'
+          %i[view_scc_accounts use_scc_accounts sync_scc_accounts
+             create_products view_products subscribe_scc_products view_scc_products],
+          'Role granting permissons to view and use SUSE Subscriptions'
 
         add_all_permissions_to_default_roles
 
         # add menu entry
         menu :top_menu, :scc_manager,
-             url_hash: { controller: :scc_accounts, action: :index },
-             caption: _('SUSE Subscriptions'),
-             parent: :content_menu,
-             after: :red_hat_subscriptions
+          url_hash: { controller: :scc_accounts, action: :index },
+          caption: _('SUSE Subscriptions'),
+          parent: :content_menu,
+          after: :red_hat_subscriptions
       end
     end
 
     initializer 'foreman_scc_manager.register_actions', :before => :finisher_hook do |_app|
       ForemanTasks.dynflow.require!
-      action_paths = %W[#{ForemanSccManager::Engine.root}/app/lib/actions]
+      action_paths = [ForemanSccManager::Engine.root.join('app/lib/actions')]
       ForemanTasks.dynflow.config.eager_load_paths.concat(action_paths)
     end
 
@@ -129,11 +130,5 @@ module ForemanSccManager
         ForemanSccManager::Engine.load_seed
       end
     end
-
-    initializer 'foreman_scc_manager.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../..', __dir__), 'locale')
-      locale_domain = 'foreman_scc_manager'
-      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
-    end
   end
 end

data/lib/foreman_scc_manager/version.rb

@@ -1,3 +1,3 @@
 module ForemanSccManager
-  VERSION = '2.3.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/tasks/rubocop.rake

@@ -9,7 +9,7 @@ begin
     "#{ForemanSccManager::Engine.root}/db/**/*.rb",
     "#{ForemanSccManager::Engine.root}/lib/**/*.rake",
     "#{ForemanSccManager::Engine.root}/lib/**/*.rb",
-    "#{ForemanSccManager::Engine.root}/test/**/*.rb"
+    "#{ForemanSccManager::Engine.root}/test/**/*.rb",
   ]
 
   namespace :foreman_scc_manager do
@@ -27,5 +27,5 @@ begin
     end
   end
 rescue LoadError
-  puts 'Rubocop not loaded.'
+  # 'Rubocop not loaded.'
 end

data/lib/tasks/setup_authentication_token.rake

@@ -23,5 +23,5 @@ begin
     end
   end
 rescue LoadError
-  puts 'Rubocop not loaded.'
+  # 'Rubocop not loaded.'
 end

data/locale/Makefile

@@ -14,6 +14,7 @@ POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
 EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+JSFILES = $(shell find ../app/assets/javascripts/*/locale -name '$(DOMAIN).js')
 
 %.mo: %.po
 	mkdir -p $(shell dirname $@)/LC_MESSAGES
@@ -41,24 +42,21 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-new:
-	tx pull --minimum-perc 50 --all
-
-tx-pull: tx-new $(EDITFILES)
-	tx pull -f
+tx-pull: $(EDITFILES)
+	cd .. && tx pull -f --all
 	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done
 
 tx-update: tx-pull
 	@echo
-	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation
+	@echo then run rake plugin:po_to_json[$(DOMAIN)] from the Foreman installation
+	@echo then run make -C locale mo-files to finish
 	@echo
 
-build-mo-files: $(MOFILES)
-
-mo-files: build-mo-files
-	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) $(JSFILES) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo
 	@echo Changes commited!