foreman_virt_who_configure 0.5.17 → 0.5.19

data/app/models/foreman_virt_who_configure/config.rb

@@ -1,5 +1,5 @@
 module ForemanVirtWhoConfigure
-  class Config < ActiveRecord::Base
+  class Config < ApplicationRecord
     PERMITTED_PARAMS = [
       :interval, :organization_id, :compute_resource_id, :whitelist, :blacklist, :hypervisor_id,
       :hypervisor_type, :hypervisor_server, :hypervisor_username, :hypervisor_password, :debug,
@@ -9,7 +9,7 @@ module ForemanVirtWhoConfigure
       :listing_mode, :filtering_mode, :filter_host_parents, :exclude_host_parents, :kubeconfig_path,
       :prism_flavor, :ahv_internal_debug
     ]
-    audited :except => [ :hypervisor_password, :last_report_at, :out_of_date_at ], :associations => []
+    audited :except => [:hypervisor_password, :last_report_at, :out_of_date_at], :associations => []
     include Authorizable
     validates_lengths_from_database
 
@@ -28,7 +28,7 @@ module ForemanVirtWhoConfigure
       'connection' => N_('Connection')
     }
 
-    HYPERVISOR_IDS = [ 'hostname', 'uuid', 'hwuuid' ]
+    HYPERVISOR_IDS = ['hostname', 'uuid', 'hwuuid']
 
     HYPERVISOR_TYPES = {
       'esx' => 'VMware vSphere / vCenter (esx)',
@@ -70,7 +70,7 @@ module ForemanVirtWhoConfigure
     PRISM_FLAVORS = {
       'central' => N_('Prism Central'),
       'element' => N_('Prism Element')
-    }       
+    }
 
     AHV_VALID_OPTIONS = %w(prism_flavor ahv_internal_debug)
     KUBEVIRT_VALID_OPTIONS = %w(kubeconfig_path)
@@ -84,61 +84,61 @@ module ForemanVirtWhoConfigure
     belongs_to :http_proxy
 
     # service user used by virt-who to report back
-    belongs_to :service_user
+    belongs_to :service_user, :inverse_of => :configs
 
     scoped_search :on => :interval, :complete_value => true
     scoped_search :on => :name
     scoped_search :on => :status, :complete_value => true, :only_explicit => true, :operators => ['= '], :ext_method => :search_by_status
     scoped_search :on => :out_of_date_at, :complete_value => true, :only_explicit => true
     scoped_search :on => :last_report_at, :complete_value => true, :only_explicit => true
-    # TODO add more related objects and attributes
+    # TODO: add more related objects and attributes
 
     # compatibility layer for 1.11 - pre strong params patch
-    if self.respond_to?(:attr_accessible)
+    if respond_to?(:attr_accessible)
       attr_accessible(*PERMITTED_PARAMS)
     end
 
-    after_create :create_service_user
+    after_create :create_or_find_service_user
     after_destroy :destroy_service_user
 
     validates :interval, :hypervisor_type,
-              :satellite_url, :hypervisor_id, :organization_id, :name,
-              :presence => true
+      :satellite_url, :hypervisor_id, :organization_id, :name,
+      :presence => true
     validates :name, :uniqueness => { :scope => :organization_id }
-    validates :hypervisor_password, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
-    validates :hypervisor_username, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
-    validates :hypervisor_server, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
-    validates :kubeconfig_path, :presence => true, :if => Proc.new { |c| c.hypervisor_type == 'kubevirt' }
+    validates :hypervisor_password, :presence => true, :if => proc { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
+    validates :hypervisor_username, :presence => true, :if => proc { |c| c.hypervisor_type != 'kubevirt' }
+    validates :hypervisor_server, :presence => true, :if => proc { |c| c.hypervisor_type != 'kubevirt' }
+    validates :kubeconfig_path, :presence => true, :if => proc { |c| c.hypervisor_type == 'kubevirt' }
     validates :hypervisor_type, :inclusion => HYPERVISOR_TYPES.keys
     validates :hypervisor_id, :inclusion => HYPERVISOR_IDS
     validates :interval, :inclusion => AVAILABLE_INTERVALS.keys.map(&:to_i)
     validates :listing_mode, :inclusion => FILTERING_MODES.keys.map(&:to_i)
-    validates :prism_flavor, :inclusion => {:in => PRISM_FLAVORS.keys, :message => "should be either central or element"}, :if => Proc.new { |c| c.hypervisor_type == 'ahv' }
+    validates :prism_flavor, :inclusion => {:in => PRISM_FLAVORS.keys, :message => "should be either central or element"}, :if => proc { |c| c.hypervisor_type == 'ahv' }
     validate :validates_whitelist_blacklist
-    validate :validates_debug_settings, :if => Proc.new { |c| c.hypervisor_type == 'ahv' }
+    validate :validates_debug_settings, :if => proc { |c| c.hypervisor_type == 'ahv' }
     validate :validates_hypervisor_options
 
     def validates_whitelist_blacklist
       case listing_mode.to_i
         when WHITELIST
           unless whitelist.present? || filter_host_parents.present?
-            [:whitelist, :filter_host_parents].each {|f| errors.add(f, "Filter hosts or Filter host parents is required")}
+            [:whitelist, :filter_host_parents].each { |f| errors.add(f, "Filter hosts or Filter host parents is required") }
           end
         when BLACKLIST
           unless blacklist.present? || exclude_host_parents.present?
-            [:blacklist, :exclude_host_parents].each {|f| errors.add(f, "Exclude hosts or Exclude host parents is required")}
+            [:blacklist, :exclude_host_parents].each { |f| errors.add(f, "Exclude hosts or Exclude host parents is required") }
           end
       end
     end
 
     def validates_debug_settings
       if ahv_internal_debug && !debug
-        errors.add(:ahv_internal_debug, "Enable debugging output is required for Enable AHV debug") 
+        errors.add(:ahv_internal_debug, "Enable debugging output is required for Enable AHV debug")
       end
-    end    
+    end
 
     def validates_hypervisor_options
-      invalid_fields.each { |f| errors.add(f, "Invalid option for hypervisor [#{hypervisor_type}]") if eval(f).present? }
+      invalid_fields.each { |f| errors.add(f, "Invalid option for hypervisor [#{hypervisor_type}]") if send(f).present? }
     end
 
     validates_lengths_from_database
@@ -171,27 +171,35 @@ module ForemanVirtWhoConfigure
       end
     end
 
-    def create_service_user
+    def create_or_find_service_user
+      service_user = ServiceUser.find_by(organization_id: organization_id)
+      if service_user.present?
+        update(service_user_id: service_user.id)
+        return service_user
+      end
+
       User.skip_permission_check do
         password = User.random_password
-        service_user = self.build_service_user
+        service_user = build_service_user(organization_id: organization_id)
         user = service_user.build_user
         user.auth_source = AuthSourceHiddenWithAuthentication.default
         user.password = password
-        user.login = "virt_who_reporter_#{self.id}"
-        user.organizations = [self.organization]
-        user.roles = [Role.where(:name => 'Virt-who Reporter').first]
+        user.login = "virt_who_reporter_#{id}"
+        user.organizations = [organization]
+        user.roles = [Role.find_by(:name => 'Virt-who Reporter')]
         user.valid? # to trigger password hashing
         user.save!(:validate => false)
 
         service_user.encrypted_password = password
         service_user.save!
 
-        self.update_attribute :service_user_id, service_user.id
+        update_attribute :service_user_id, service_user.id
       end
     end
 
     def destroy_service_user
+      return unless service_user.configs.count == 0
+
       User.skip_permission_check do
         # skip validation that prevents hidden user deletion
         user = User.unscoped.find_by_id(service_user.user_id)
@@ -214,11 +222,11 @@ module ForemanVirtWhoConfigure
     # end
 
     def humanized_interval
-      _("every %s hours") % (self.interval / 60)
+      _("every %s hours") % (interval / 60)
     end
 
     def out_of_date?(deadline = DateTime.now.utc)
-      self.out_of_date_at.present? && self.out_of_date_at < deadline
+      out_of_date_at.present? && out_of_date_at < deadline
     end
 
     def step_name(step_key)
@@ -243,24 +251,23 @@ module ForemanVirtWhoConfigure
     end
 
     def virt_who_config_command
-      "hammer virt-who-config deploy --id #{self.id} --organization-id #{self.organization_id}"
+      "hammer virt-who-config deploy --id #{id} --organization-id #{organization_id}"
     end
 
     def virt_who_touch!
       self.last_report_at = DateTime.now.utc
-      self.out_of_date_at = self.last_report_at + self.interval.minutes
-      self.class.skip_permission_check { self.save! }
+      self.out_of_date_at = last_report_at + interval.minutes
+      self.class.skip_permission_check { save! }
     end
 
     def status
-      case
-        when self.last_report_at.nil?
-          :unknown
-        when !self.out_of_date?
-          :ok
-        else
-          # out of date is currently considered ok too, virt-who does not send any report if there's no change on hypervisor
-          :out_of_date
+      if last_report_at.nil?
+        :unknown
+      elsif !out_of_date?
+        :ok
+      else
+        # out of date is currently considered ok too, virt-who does not send any report if there's no change on hypervisor
+        :out_of_date
       end
     end
 

data/app/models/foreman_virt_who_configure/output_generator.rb

@@ -31,7 +31,7 @@ module ForemanVirtWhoConfigure
     end
 
     def error_code(error_name)
-      result = CONFIGURATION_RESULTS.find { |result| result.identifier == error_name.to_s }
+      result = CONFIGURATION_RESULTS.find { |r| r.identifier == error_name.to_s }
       result.try(:code)
     end
 
@@ -51,107 +51,107 @@ module ForemanVirtWhoConfigure
     def virt_who_output(format = nil)
       kubeconfig = config.hypervisor_type == 'kubevirt' ? "\nkubeconfig=#{config.kubeconfig_path}" : ''
       result = ''
-      cr_password_base64 = Base64.strict_encode64("#{cr_password}")
+      cr_password_base64 = Base64.strict_encode64(cr_password.to_s)
       result += "#!/bin/bash\n" if format == :bash_script
-      result += <<EOS
-heading() {
-  echo -e "\\n== $1 =="
-}
-
-step() {
-  step_count=5
-  heading "[$1/$step_count] $2"
-}
-
-version_lte() {
-  [ "$1" = "`echo -e "$1\\n$2" | sort -V | head -n1`" ]
-}
-
-version_lt() {
-  [ "$1" = "$2" ] && return 1 || version_lte $1 $2
-}
-
-verify_minimal_version() {
-  minimal_version=#{MINIMUM_VIRT_WHO_VERSION}
-  installed_version=`rpm -q --queryformat '%{VERSION}' virt-who`
-
-  if version_lt $installed_version $minimal_version; then
-    echo "virt-who $installed_version does not meet minimum requirements, please make sure this host is properly subscribed and has access to katello-host-tools repository, minimal virt-who version is $minimal_version"
-    return 1
-  else
-    return 0
-  fi
-}
-
-result_code=#{error_code(:success)}
-
-compose_install_command() {
-  $1 packages unlock
-  $1 advanced procedure run packages-install --packages virt-who --assumeyes || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
-  $1 packages lock
-}
-
-install_virt_who() {
-  if `rpm -q satellite-maintain > /dev/null`; then
-    compose_install_command satellite-maintain
-  elif `rpm -q rubygem-foreman_maintain > /dev/null`; then
-    compose_install_command foreman-maintain
-  else
-    yum install -y virt-who || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
-  fi
-}
-
-step 1 "Installing virt-who"
-install_virt_who
-
-if verify_minimal_version; then
-  step 2 "Encrypting password"
-  cr_password=$(virt-who-password --password $(echo #{cr_password_base64}|base64 -d) 2> /dev/null)
-  user_password=$(virt-who-password --password '#{service_user_password}' 2> /dev/null)
-
-  step 3 "Creating virt-who configuration"
-  cat > #{config_file_path} << EOF
-### This configuration file is managed via the virt-who configure plugin
-### manual edits will be deleted.
-[#{identifier}]
-type=#{type}
-hypervisor_id=#{hypervisor_id}
-owner=#{owner}
-#{connection_details}#{filtering}
-rhsm_hostname=#{satellite_url}
-rhsm_username=#{service_user_username}
-rhsm_encrypted_password=$user_password
-rhsm_prefix=/rhsm#{kubeconfig}#{ahv_config_options}
-EOF
-  if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_config_file_issue)})); fi
-
-  step 4 "Creating sysconfig virt-who configuration"
-  cat > #{default_config_path} << EOF
-### This configuration file is managed via the virt-who configure plugin
-### manual edits will be deleted.
-[global]
-debug=#{config.debug? ? 1 : 0}
-interval=#{config.interval * 60}#{proxy_strings}
-oneshot=False
-EOF
-  if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_sysconfig_file_issue)})); fi
-
-  step 5 "Enabling and restarting the virt-who service"
-  systemctl enable virt-who || result_code=$(($result_code|#{error_code(:virt_who_systemctl_issue)}))
-  systemctl restart virt-who || result_code=$(($result_code|#{error_code(:virt_who_service_issue)}))
-else
-  result_code=$(($result_code|#{error_code(:virt_who_too_old)}))
-fi
-
-heading "Finished"
-if [ $result_code -ne 0 ]; then
-  echo "There were some errors during configuration:"
-  #{error_handling}
-else
-  echo "Finished successfully"
-fi
-
-EOS
+      result += <<~SCRIPT
+        heading() {
+          echo -e "\\n== $1 =="
+        }
+
+        step() {
+          step_count=5
+          heading "[$1/$step_count] $2"
+        }
+
+        version_lte() {
+          [ "$1" = "`echo -e "$1\\n$2" | sort -V | head -n1`" ]
+        }
+
+        version_lt() {
+          [ "$1" = "$2" ] && return 1 || version_lte $1 $2
+        }
+
+        verify_minimal_version() {
+          minimal_version=#{MINIMUM_VIRT_WHO_VERSION}
+          installed_version=`rpm -q --queryformat '%{VERSION}' virt-who`
+
+          if version_lt $installed_version $minimal_version; then
+            echo "virt-who $installed_version does not meet minimum requirements, please make sure this host is properly subscribed and has access to katello-host-tools repository, minimal virt-who version is $minimal_version"
+            return 1
+          else
+            return 0
+          fi
+        }
+
+        result_code=#{error_code(:success)}
+
+        compose_install_command() {
+          $1 packages unlock
+          $1 advanced procedure run packages-install --packages virt-who --assumeyes || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
+          $1 packages lock
+        }
+
+        install_virt_who() {
+          if `rpm -q satellite-maintain > /dev/null`; then
+            compose_install_command satellite-maintain
+          elif `rpm -q rubygem-foreman_maintain > /dev/null`; then
+            compose_install_command foreman-maintain
+          else
+            yum install -y virt-who || result_code=$(($result_code|#{error_code(:virt_who_installation)}))
+          fi
+        }
+
+        step 1 "Installing virt-who"
+        install_virt_who
+
+        if verify_minimal_version; then
+          step 2 "Encrypting password"
+          cr_password=$(virt-who-password --password $(echo #{cr_password_base64}|base64 -d) 2> /dev/null)
+          user_password=$(virt-who-password --password '#{service_user_password}' 2> /dev/null)
+
+          step 3 "Creating virt-who configuration"
+          cat > #{config_file_path} << EOF
+        ### This configuration file is managed via the virt-who configure plugin
+        ### manual edits will be deleted.
+        [#{identifier}]
+        type=#{type}
+        hypervisor_id=#{hypervisor_id}
+        owner=#{owner}
+        #{connection_details}#{filtering}
+        rhsm_hostname=#{satellite_url}
+        rhsm_username=#{service_user_username}
+        rhsm_encrypted_password=$user_password
+        rhsm_prefix=/rhsm#{kubeconfig}#{ahv_config_options}
+        EOF
+          if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_config_file_issue)})); fi
+
+          step 4 "Creating sysconfig virt-who configuration"
+          cat > #{default_config_path} << EOF
+        ### This configuration file is managed via the virt-who configure plugin
+        ### manual edits will be deleted.
+        [global]
+        debug=#{config.debug? ? 1 : 0}
+        interval=#{config.interval * 60}#{proxy_strings}
+        oneshot=False
+        EOF
+          if [ $? -ne 0 ]; then result_code=$(($result_code|#{error_code(:virt_who_sysconfig_file_issue)})); fi
+
+          step 5 "Enabling and restarting the virt-who service"
+          systemctl enable virt-who || result_code=$(($result_code|#{error_code(:virt_who_systemctl_issue)}))
+          systemctl restart virt-who || result_code=$(($result_code|#{error_code(:virt_who_service_issue)}))
+        else
+          result_code=$(($result_code|#{error_code(:virt_who_too_old)}))
+        fi
+
+        heading "Finished"
+        if [ $result_code -ne 0 ]; then
+          echo "There were some errors during configuration:"
+          #{error_handling}
+        else
+          echo "Finished successfully"
+        fi
+
+      SCRIPT
       result += "exit $result_code\n" if format == :bash_script
       result
     end
@@ -198,7 +198,7 @@ encrypted_password=$cr_password"
     end
 
     def enabled_filters(filter)
-      filter.reject { |_, list| list.blank? }.map { |filter,list| filtering_line_sanitized(filter, list) }.join
+      filter.reject { |_, list| list.blank? }.map { |f, list| filtering_line_sanitized(f, list) }.join
     end
 
     def filtering_line_sanitized(filter, list)
@@ -245,9 +245,9 @@ encrypted_password=$cr_password"
     def cr_password
       case config.hypervisor_type
       when 'libvirt'
-        config.hypervisor_password.blank? ? LIBVIRT_FAKE_PASSWORD : config.hypervisor_password
+        config.hypervisor_password.presence || LIBVIRT_FAKE_PASSWORD
       when 'kubevirt'
-        config.hypervisor_password.blank? ? KUBEVIRT_FAKE_PASSWORD : config.hypervisor_password
+        config.hypervisor_password.presence || KUBEVIRT_FAKE_PASSWORD
       else
         config.hypervisor_password
       end
@@ -289,7 +289,7 @@ encrypted_password=$cr_password"
       output = ''
       output << "\n#{proxy_type}=#{sanitize_proxy(proxy.full_url)}" if proxy.present?
       output << "\nno_proxy=#{sanitize_proxy(no_proxy)}" if no_proxy.present?
-      output << "\nno_proxy=*" if !proxy.present? && !no_proxy.present?
+      output << "\nno_proxy=*" if proxy.blank? && no_proxy.blank?
       output
     end
 

data/app/models/foreman_virt_who_configure/service_user.rb

@@ -1,22 +1,22 @@
 module ForemanVirtWhoConfigure
   # holds the encrypted password for internal user that can be deployed to virt who reporter
-  class ServiceUser < ActiveRecord::Base
+  class ServiceUser < ApplicationRecord
     include Authorizable
     include Encryptable
     encrypts :encrypted_password
 
     belongs_to :user
-    has_one :config
+    has_many :configs, :inverse_of => :service_user
 
     # Foreman 1.11 specifics, can be removed later, otherwise when string does not start with "encrypts" prefix
     # we get 500 when we try to create log message that relies on name method
     def name
-      self.username || self.to_s
+      username || to_s
     end
 
     def username
       User.as_anonymous_admin do
-        self.user.login if self.user
+        user&.login
       end
     end
   end

data/app/services/sso/basic_with_hidden.rb

@@ -6,7 +6,7 @@ module SSO
     end
 
     def current_user
-      User.unscoped.where(:auth_source_id => ForemanVirtWhoConfigure::AuthSourceHiddenWithAuthentication.default.id).find_by_login(self.user)
+      User.unscoped.where(:auth_source_id => ForemanVirtWhoConfigure::AuthSourceHiddenWithAuthentication.default.id).find_by_login(user)
     end
   end
 end

data/config/database.yml.example

@@ -0,0 +1,17 @@
+# For testing and CI
+
+default: &default
+  adapter: postgresql
+  username: <%= ENV['PGUSER'] || 'foreman' %>
+  password: foreman
+  host: <%= ENV['PGHOST'] || 'localhost' %>
+
+test:
+  <<: *default
+  database: foreman-test
+development:
+  <<: *default
+  database: foreman-dev
+production:
+  <<: *default
+  database: foreman-prod

data/db/migrate/20231024171433_add_organization_id_to_service_user.rb

@@ -0,0 +1,22 @@
+class AddOrganizationIdToServiceUser < ActiveRecord::Migration[6.1]
+  def up
+    add_column :foreman_virt_who_configure_service_users, :organization_id, :integer
+
+    ::ForemanVirtWhoConfigure::Config.find_each do |config|
+      service_user = ::ForemanVirtWhoConfigure::ServiceUser.find_by(organization_id: config.organization_id)
+      if service_user.present?
+         config.update_columns(service_user_id: service_user.id)
+         next
+      end
+
+      cfg_service_user = ::ForemanVirtWhoConfigure::ServiceUser.find_by(id: config.service_user_id)
+      cfg_service_user.update_columns(organization_id: config.organization_id)
+    end
+
+    ::ForemanVirtWhoConfigure::ServiceUser.where(organization_id: nil).destroy_all
+  end
+
+  def down
+    remove_column :foreman_virt_who_configure_service_users, :organization_id, :integer
+  end
+end

data/lib/foreman_virt_who_configure/engine.rb

@@ -45,7 +45,7 @@ module ForemanVirtWhoConfigure
                                                  :'foreman_virt_who_configure/api/v2/configs' => [:destroy] }, permission_options
         end
 
-        reporter_permissions = [ :create_hosts, :edit_hosts, :view_lifecycle_environments, :my_organizations ]
+        reporter_permissions = [:create_hosts, :edit_hosts, :view_lifecycle_environments, :my_organizations]
         begin
           if Permission.where(:name => ['create_content_hosts', 'edit_content_hosts']).count > 0
             # old Katello permissions detected (6.2 era)
@@ -61,19 +61,19 @@ module ForemanVirtWhoConfigure
           # could not configure role, some permissions are missing
         end
 
-        role 'Virt-who Manager',  [ :view_virt_who_config, :create_virt_who_config, :edit_virt_who_config, :destroy_virt_who_config ], 'Role granting all permissions to manage virt-who configurations, user needs this role to create, delete or update configurations.'
+        role 'Virt-who Manager', [:view_virt_who_config, :create_virt_who_config, :edit_virt_who_config, :destroy_virt_who_config], 'Role granting all permissions to manage virt-who configurations, user needs this role to create, delete or update configurations.'
 
-        role 'Virt-who Viewer',  [ :view_virt_who_config ], 'Role granting permissions to see all configurations including their configuration scripts, which means viewers could still deploy the virt-who instances for existing virt-who configurations.'
+        role 'Virt-who Viewer', [:view_virt_who_config], 'Role granting permissions to see all configurations including their configuration scripts, which means viewers could still deploy the virt-who instances for existing virt-who configurations.'
 
         # Available since Foreman 1.15
         add_all_permissions_to_default_roles if respond_to?(:add_all_permissions_to_default_roles)
 
         # add menu entry
         menu :top_menu, :virt_who_configs,
-             url_hash: { controller: 'foreman_virt_who_configure/configs', action: :index },
-             caption: N_('Virt-who configurations'),
-             parent: :infrastructure_menu,
-             after: :compute_resources
+          url_hash: { controller: 'foreman_virt_who_configure/configs', action: :index },
+          caption: N_('Virt-who configurations'),
+          parent: :infrastructure_menu,
+          after: :compute_resources
 
         # add dashboard widget
         widget 'foreman_virt_who_configs_status_widget', :name => N_('Virt-who Configs Status'), sizex: 6, sizey: 1
@@ -103,7 +103,7 @@ module ForemanVirtWhoConfigure
     # Include concerns in this config.to_prepare block
     config.to_prepare do
       SSO::METHODS.unshift SSO::BasicWithHidden
-      ::Organization.send :include, VirtWhoTaxonomyExtensions
+      ::Organization.include VirtWhoTaxonomyExtensions
     end
 
     rake_tasks do
@@ -111,12 +111,6 @@ module ForemanVirtWhoConfigure
         ForemanVirtWhoConfigure::Engine.load_seed
       end
     end
-
-    initializer 'foreman_virt_who_configure.register_gettext', after: :load_config_initializers do |_app|
-      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
-      locale_domain = 'foreman_virt_who_configure'
-      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
-    end
   end
 
   def self.with_katello?

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.17'.freeze
+  VERSION = '0.5.19'.freeze
 end

data/locale/Makefile

@@ -6,14 +6,15 @@
 # make tx-update - download and merge translations from Transifex
 # make clean - clean everything
 #
-DOMAIN = foreman_virt_who_configure
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+DOMAIN = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).name')
+VERSION = $(shell ruby -rrubygems -e 'puts Gem::Specification::load(Dir.glob("../*.gemspec")[0]).version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
 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
@@ -42,18 +43,20 @@ uniq-po:
 	done
 
 tx-pull: $(EDITFILES)
-	tx pull -f
+	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
 
 mo-files: $(MOFILES)
-	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git add $(POFILES) $(POTFILE) $(JSFILES) ../locale/*/LC_MESSAGES
 	git commit -m "i18n - pulling from tx"
 	@echo
 	@echo Changes commited!