foreman_acd 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8c8e8614fcbdfae411b4bfacf225b67fca2d92563615d099e725bc1b4e5173
-  data.tar.gz: 174c0194da550ec6a17fddaa8aa010303f43c75e7358dce359195a5bb9d6077d
+  metadata.gz: 60909ff875d630caeef92444ab88930dddc19cd77dd4efa9fd7ea5a4ec83051c
+  data.tar.gz: 3df06d54fe0037ea0fdfbb7009194c1ebe537191d8bc2617e716bdd924a81425
 SHA512:
-  metadata.gz: 242a5342f85b5d96d358a19be186f91abaa39cf18aacc3f599ee7e891e101266e7681fb7ac4bb6264800a1fdcbb7b9db87bbb13741875cdb8ebbe8c1592d474c
-  data.tar.gz: aeea5eae1cd62e0668fdc166066840f4280ff3ee0db3e9affb9b505863dd61aeecd4d3328dd4212d2d731ae046f01185387c3b0b333a7f13f2a08630a84d9ed4
+  metadata.gz: 7c0a1d085fd5d14737a1c37c12743dae3f4e704f01d7b4c2834879635979e4c2d11784b056f854b018405debe488b056a6659205bd647e6e4590df7f3539e334
+  data.tar.gz: dbb30190d5976d84ef76571596397a1811169cd987c10737bd2dbe02b696c6218adb7c2ba537d9ecbaab32cbecf23c28265556f51d14631917addf84411952ea

data/README.md

@@ -59,26 +59,12 @@ See [Deploying Hosts using Application Centric Deployment](https://docs.theforem
 
 ## Installation
 
-See the [installation](https://theforeman.org/plugins/#2.Installation) chapter of the Foreman plugins documentation on how to install Foreman plugins.
-
-### TL;DR: 
-
-    yum install tfm-rubygem-foreman_acd
-    foreman-maintain service restart
-
-In some cases, you need to manually run
-
-    foreman-rake db:migrate
-    foreman-rake db:seed
+Check out the [Foreman documentation](https://docs.theforeman.org/nightly/Deploying_Hosts_AppCentric/index-katello.html#Installing_ACD_on_Server_application_centric_deployment) on how to install the foreman_acd plugin.
 
 ### Smart Proxy Installation
 
-You will need to install [Smart Proxy ACD](https://github.com/ATIX-AG/smart_proxy_acd), too. 
-
-    yum install tfm-rubygem-smart_proxy_acd tfm-rubygem-smart_proxy_acd_core
-    foreman-maintain service restart
-
-You need to refresh the smart proxy features in *Infrastructure > Smart Proxies > Your Smart-Proxy > Actions > Refresh* after the installation of the Smart Proxy ACD components.
+You need to install [Smart Proxy ACD](https://github.com/ATIX-AG/smart_proxy_acd), too.
+Check out the [Foreman documentation](https://docs.theforeman.org/nightly/Deploying_Hosts_AppCentric/index-katello.html#Installing_ACD_on_Smart_Proxy_application_centric_deployment) on how to install the smart_proxy_acd plugin.
 
 ### Tips
 
@@ -98,7 +84,7 @@ Store it in `/var/lib/foreman/foreman_acd/ansible-playbooks/` so that SELinux is
 ### Application Definition (for Admins)
 
 * Create an Application Definition via *Applications > Application Definitions*.
-* Select the Ansible Playbook you want to use. 
+* Select the Ansible Playbook you want to use.
 * Add new services and specify the host group you want to use.
 * Specify any values a user will be allowed to overwrite.
 You may also set a default value.
@@ -128,7 +114,7 @@ Fork and send a Pull Request. Thank you.
 
 ## Copyright
 
-Copyright (c) 2021 ATIX AG 
+Copyright (c) 2024 ATIX AG
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

data/app/controllers/foreman_acd/ansible_playbooks_controller.rb

@@ -32,7 +32,8 @@ module ForemanAcd
       end
     end
 
-    def edit; end
+    def edit
+    end
 
     def update
       # Move synced repo to new path if ansible_playbook name is changed
@@ -80,7 +81,7 @@ module ForemanAcd
         if sync_params[:git_commit].empty?
           if ForemanAcd.proxy_setting.present?
             err_msg = _('Please set the Git Branch/Tag/Commit. This setting is necessary if a HTTP proxy is used!')
-            raise StandardError.new err_msg
+            raise StandardError, err_msg
           else
             commit = Git.ls_remote(sync_params[:git_url])['head'][:sha]
           end

data/app/controllers/foreman_acd/api/v2/ansible_playbooks_controller.rb

@@ -14,7 +14,8 @@ module ForemanAcd
 
         api :GET, '/ansible_playbooks/:id', N_('Show ansible playbook')
         param :id, :identifier, :required => true
-        def show; end
+        def show
+        end
 
         api :GET, '/ansible_playbooks', N_('List ansible playbooks')
         param_group :search_and_pagination, ::Api::V2::BaseController

data/app/controllers/foreman_acd/api/v2/app_definitions_controller.rb

@@ -11,7 +11,8 @@ module ForemanAcd
 
         api :GET, '/app_definitions/:id', N_('Show application definition')
         param :id, :identifier, :required => true
-        def show; end
+        def show
+        end
 
         api :GET, '/app_definitions', N_('List application definitions')
         param_group :search_and_pagination, ::Api::V2::BaseController

data/app/controllers/foreman_acd/api/v2/app_instances_controller.rb

@@ -13,7 +13,8 @@ module ForemanAcd
         param :id, :identifier, :required => true
         param :organization_id, :identifier, :required => true
         param :location_id, :identifier, :required => true
-        def show; end
+        def show
+        end
 
         api :GET, '/app_instances', N_('List application instances')
         param :organization_id, :identifier, :required => true

data/app/controllers/foreman_acd/app_definitions_controller.rb

@@ -37,14 +37,13 @@ module ForemanAcd
           process_error
         end
       rescue StandardError, ValidationError => e
-        if params[:foreman_acd_app_definition_import].present?
-          AnsiblePlaybook.find(params[:foreman_acd_app_definition][:acd_ansible_playbook_id]).delete if params[:foreman_acd_app_definition][:acd_ansible_playbook_id].present?
-        end
+        AnsiblePlaybook.find(params[:foreman_acd_app_definition][:acd_ansible_playbook_id]).delete if params[:foreman_acd_app_definition_import].present? && params[:foreman_acd_app_definition][:acd_ansible_playbook_id].present?
         redirect_to new_app_definition_path, :flash => { :error => _(e.message) }
       end
     end
 
-    def edit; end
+    def edit
+    end
 
     def update
       if @app_definition.update(app_definition_params)
@@ -132,8 +131,7 @@ module ForemanAcd
       FileUtils.cp_r "#{dir}/#{ansible_playbook['path']}/.", dir_path
       ansible_playbook['path'] = dir_path
       ansible_playbook['name'] = File.basename(dir_path)
-      new_playbook = AnsiblePlaybook.create(ansible_playbook)
-      new_playbook
+      AnsiblePlaybook.create(ansible_playbook)
     rescue StandardError => e
       logger.info("Error while creating AnsiblePlaybook: #{e}")
     end

data/app/controllers/foreman_acd/app_instances_controller.rb

@@ -38,7 +38,8 @@ module ForemanAcd
       end
     end
 
-    def edit; end
+    def edit
+    end
 
     def update
       if @app_instance.update(app_instance_params)
@@ -110,7 +111,7 @@ module ForemanAcd
 
           @app_instance.foreman_hosts.where(:hostname => h['hostname']).
             update(:service => h['service'], :description => h['description'],
-                   :foremanParameters => JSON.dump(h['foremanParameters']), :ansibleParameters => JSON.dump(h['ansibleParameters']))
+              :foremanParameters => JSON.dump(h['foremanParameters']), :ansibleParameters => JSON.dump(h['ansibleParameters']))
 
           updated_host = @app_instance.foreman_hosts.find_by(:hostname => h['hostname'])
 
@@ -118,11 +119,11 @@ module ForemanAcd
           session[:remember_hosts] << updated_host.id if updated_host.updated_at != old_host.updated_at
         else
           @app_instance.foreman_hosts.create(:hostname => h['hostname'],
-                                             :service => h['service'],
-                                             :description => h['description'],
-                                             :is_existing_host => h['isExistingHost'],
-                                             :foremanParameters => JSON.dump(h['foremanParameters']),
-                                             :ansibleParameters => JSON.dump(h['ansibleParameters']))
+            :service => h['service'],
+            :description => h['description'],
+            :is_existing_host => h['isExistingHost'],
+            :foremanParameters => JSON.dump(h['foremanParameters']),
+            :ansibleParameters => JSON.dump(h['ansibleParameters']))
           # Store new hosts for safe deploy
           session[:remember_hosts] << @app_instance.foreman_hosts.find_by(:hostname => h['hostname']).id
         end
@@ -143,7 +144,7 @@ module ForemanAcd
           :description => h.description,
           :isExistingHost => h.is_existing_host,
           :foremanParameters => JSON.parse(h.foremanParameters),
-          :ansibleParameters => JSON.parse(h.ansibleParameters)
+          :ansibleParameters => JSON.parse(h.ansibleParameters),
         }
       end
       hosts_data

data/app/controllers/foreman_acd/concerns/app_instance_mixins.rb

@@ -15,17 +15,17 @@ module ForemanAcd
             :name => foreman_host.hostname,
             :build => nil,
             :hostUrl => nil,
-            :progress_report => foreman_host.last_progress_report.empty? ? [] : JSON.parse(foreman_host.last_progress_report)
+            :progress_report => foreman_host.last_progress_report.empty? ? [] : JSON.parse(foreman_host.last_progress_report),
           }
 
           if foreman_host.host.present?
             a_host.update({
-                            :id => foreman_host.host.id,
-                            :build => foreman_host.host.build,
-                            :hostUrl => host_path(foreman_host.host),
-                            :isExistingHost => foreman_host.is_existing_host,
-                            :powerStatusUrl => power_api_host_path(foreman_host.host)
-                          })
+              :id => foreman_host.host.id,
+              :build => foreman_host.host.build,
+              :hostUrl => host_path(foreman_host.host),
+              :isExistingHost => foreman_host.is_existing_host,
+              :powerStatusUrl => power_api_host_path(foreman_host.host),
+            })
           end
           report_data << OpenStruct.new(a_host)
         end

data/app/controllers/ui_acd_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Controller to create JSON data to be used in react app
-class UiAcdController < ::Api::V2::BaseController
+class UIAcdController < ::Api::V2::BaseController
   include ::ForemanAcd::Concerns::AppInstanceMixins
 
   def app
@@ -62,7 +62,7 @@ class UiAcdController < ::Api::V2::BaseController
     report_data = {
       :hosts => collect_host_report_data(app_instance),
       :deploymentState => app_instance.deployment_state.to_s,
-      :initialConfigureState => app_instance.initial_configure_state.to_s
+      :initialConfigureState => app_instance.initial_configure_state.to_s,
     }
     report_data['initialConfigureJobUrl'] = job_invocation_path(app_instance.initial_configure_job) unless app_instance.initial_configure_job.nil?
 
@@ -71,15 +71,14 @@ class UiAcdController < ::Api::V2::BaseController
 
   def hostname_duplicate?(app_def_id, service_id, hostname)
     app_definition = ForemanAcd::AppDefinition.find(app_def_id)
-    service_data = JSON.parse(app_definition.services).select { |k| k['id'] == service_id }.first
+    service_data = JSON.parse(app_definition.services).find { |k| k['id'] == service_id }
     domain_name = Hostgroup.find(service_data['hostgroup']).domain.name
     validation_hostname = "#{hostname}.#{domain_name}"
 
-    vdata = OpenStruct.new(
+    OpenStruct.new(
       :hostname => hostname,
       :fqdn => validation_hostname,
       :result => Host.find_by(:name => validation_hostname).nil?
     )
-    vdata
   end
 end

data/app/lib/actions/foreman_acd/deploy_all_hosts.rb

@@ -32,7 +32,8 @@ module Actions
         end
       end
 
-      def finalize; end
+      def finalize
+      end
 
       def rescue_strategy
         Dynflow::Action::Rescue::Fail

data/app/lib/actions/foreman_acd/run_configurator.rb

@@ -31,7 +31,8 @@ module Actions
         end
       end
 
-      def finalize; end
+      def finalize
+      end
 
       def rescue_strategy
         Dynflow::Action::Rescue::Fail

data/app/models/concerns/foreman_acd/host_managed_extensions.rb

@@ -13,12 +13,12 @@ module ForemanAcd
         has_many :app_instances, :through => :foreman_hosts, :class_name => 'ForemanAcd::AppInstance'
 
         scoped_search :relation => :app_instances,
-                      :on => :name,
-                      :rename => :acd_app_instance,
-                      :only_explicit => true,
-                      :complete_value => true,
-                      :operators => ['= '],
-                      :ext_method => :find_by_acd_app_instance_name
+          :on => :name,
+          :rename => :acd_app_instance,
+          :only_explicit => true,
+          :complete_value => true,
+          :operators => ['= '],
+          :ext_method => :find_by_acd_app_instance_name
       end
 
       base.singleton_class.prepend ClassMethods

data/app/models/foreman_acd/acd_provider.rb

@@ -20,11 +20,14 @@ module ForemanAcd
         super(template_invocation, host).merge(:name => host.name)
       end
 
-      def ssh_password(_host); end
+      def ssh_password(_host)
+      end
 
-      def ssh_key_passphrase(_host); end
+      def ssh_key_passphrase(_host)
+      end
 
-      def sudo_password(_host); end
+      def sudo_password(_host)
+      end
 
       # Workaround till infrastructure jobs on proxies are possible. See
       # configure in services/foreman_acd/app_configurator.rb for more details.

data/app/models/foreman_acd/ansible_playbook.rb

@@ -48,7 +48,7 @@ module ForemanAcd
       when 'directory' || 'git'
         File.read(File.join(path, playfile))
       else
-        raise NotImplementedError.new "scm_type #{scm_type.inspect} not supported!"
+        raise NotImplementedError, "scm_type #{scm_type.inspect} not supported!"
       end
     end
 

data/app/models/foreman_acd/app_instance.rb

@@ -61,14 +61,13 @@ module ForemanAcd
       return :new if last_deploy_task.nil?
       return :initiated if !last_deploy_task.nil? && last_deploy_task.ended_at.nil?
 
-      state = if all_hosts_deployed?
-                :finished
-              elsif last_deploy_task.ended_at? && last_deploy_task.result != 'success'
-                :failed
-              else
-                :pending
-              end
-      state
+      if all_hosts_deployed?
+        :finished
+      elsif last_deploy_task.ended_at? && last_deploy_task.result != 'success'
+        :failed
+      else
+        :pending
+      end
     end
 
     def initial_configure_job

data/app/services/foreman_acd/app_configurator.rb

@@ -5,6 +5,8 @@ module ForemanAcd
   class AppConfigurator
     delegate :logger, :to => :Rails
 
+    PROXY_NOT_SUPPORTED_LABELS = [:not_available, :not_defined].freeze
+
     def initialize(app_instance)
       @app_instance = app_instance
     end
@@ -42,7 +44,7 @@ module ForemanAcd
             return [result, job]
           end
           proxy = proxy_selector.determine_proxy(h.host, 'ACD')
-          raise StandardError.new('Proxy without ACD feature') if proxy.nil? || [:not_available, :not_defined].include?(proxy)
+          raise StandardError, 'Proxy without ACD feature' if proxy.nil? || PROXY_NOT_SUPPORTED_LABELS.include?(proxy)
           proxy_hosts[proxy.name] = [] unless proxy_hosts.key?(proxy.name)
           proxy_hosts[proxy.name] << h
           result.success = true

data/app/services/foreman_acd/app_deployer.rb

@@ -21,7 +21,7 @@ module ForemanAcd
                       end
 
       foreman_hosts.each do |foreman_host|
-        service_data = services.select { |k| k['id'] == foreman_host.service.to_i }.first
+        service_data = services.find { |k| k['id'] == foreman_host.service.to_i }
 
         # Handle already deployed hosts
         if foreman_host.existing_host?

data/app/services/foreman_acd/inventory_creator.rb

@@ -27,7 +27,7 @@ module ForemanAcd
         end
 
         service_id = foreman_host.service.to_i
-        host_service = services.select { |s| s['id'] == service_id }.first
+        host_service = services.find { |s| s['id'] == service_id }
         ansible_group = host_service['ansibleGroup']
 
         children[ansible_group] = { 'hosts' => {} } unless children.key?(host_service['ansibleGroup'])

data/config/routes.rb

@@ -40,16 +40,16 @@ Rails.application.routes.draw do
 
     match '/remote_execution', :controller => 'foreman_acd/remote_execution', :action => 'create', :via => [:post]
 
-    get 'ui_acd_app/:id', :to => 'ui_acd#app', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_app
-    get 'ui_acd_foreman_data/:id', :to => 'ui_acd#foreman_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_foreman_data
-    get 'ui_acd_ansible_data/:id', :to => 'ui_acd#ansible_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_ansible_data
-    get 'ui_acd_report_data/:id', :to => 'ui_acd#report_data', :constraints => { :id => /[\w\.-]+/ }, :as => :ui_acd_report_data
+    get 'ui_acd_app/:id', :to => 'ui_acd#app', :constraints => { :id => /[\w.-]+/ }, :as => :ui_acd_app
+    get 'ui_acd_foreman_data/:id', :to => 'ui_acd#foreman_data', :constraints => { :id => /[\w.-]+/ }, :as => :ui_acd_foreman_data
+    get 'ui_acd_ansible_data/:id', :to => 'ui_acd#ansible_data', :constraints => { :id => /[\w.-]+/ }, :as => :ui_acd_ansible_data
+    get 'ui_acd_report_data/:id', :to => 'ui_acd#report_data', :constraints => { :id => /[\w.-]+/ }, :as => :ui_acd_report_data
     get 'ui_acd_validate_hostname', :to => 'ui_acd#validate_hostname', :as => :ui_acd_validate_hostname
 
     scope :api, :path => '/api', :defaults => { :format => 'json' } do
       scope '(:apiv)', :defaults => { :apiv => 'v2' },
                        :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
-        constraints(:id => /[\w\.-]+/) do
+        constraints(:id => /[\w.-]+/) do
           resources :app_definitions, :only => [:show, :index], :controller => 'foreman_acd/api/v2/app_definitions', :as => :acd_api_v2_app_definitions
           resources :app_instances, :only => [:show, :index], :controller => 'foreman_acd/api/v2/app_instances', :as => :api_v2_foreman_acd_app_instances
           resources :ansible_playbooks, :only => [:show, :index], :controller => 'foreman_acd/api/v2/ansible_playbooks', :as => :api_v2_foreman_acd_ansible_playbooks do

data/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Add git_url column to ansible_playbook
-class AddGitUrlToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
+class AddGitURLToAnsiblePlaybooks < ActiveRecord::Migration[6.0]
   def change
     add_column :acd_ansible_playbooks, :git_url, :string
   end

data/lib/foreman_acd/engine.rb

@@ -9,14 +9,6 @@ module ForemanAcd
   class Engine < ::Rails::Engine
     engine_name 'foreman_acd'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_acd/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/lib"]
-    config.autoload_paths += Dir["#{config.root}/lib"]
-
     # Add any db migrations
     initializer 'foreman_acd.load_app_instance_data' do |app|
       ForemanAcd::Engine.paths['db/migrate'].existent.each do |path|
@@ -40,8 +32,10 @@ module ForemanAcd
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    initializer 'foreman_acd.register_plugin', :before => :finisher_hook do
-      require 'foreman_acd/plugin'
+    initializer 'foreman_acd.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require 'foreman_acd/plugin'
+      end
     end
 
     initializer 'foreman_acd.register_actions', :before => :finisher_hook do |_app|
@@ -76,7 +70,7 @@ module ForemanAcd
       N_('Run playbook for ACD'),
       {
         :description => N_('Run an Ansible playbook to configure ACD application'),
-        :provided_inputs => %w[application_name playbook_name playbook_path inventory_path]
+        :provided_inputs => %w[application_name playbook_name playbook_path inventory_path],
       }
     )
   end

data/lib/foreman_acd/plugin.rb

@@ -1,130 +1,130 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_acd do
-  requires_foreman '>= 2.1'
+  requires_foreman '>= 3.13'
 
   apipie_documented_controllers ["#{ForemanAcd::Engine.root}/app/controllers/foreman_acd/api/v2/*.rb"]
 
   # Menus
   sub_menu :top_menu, :application, :caption => N_('Applications'), :after => :hosts_menu, :icon => 'pficon pficon-integration' do
     menu :top_menu, :ansible_playbooks,
-         :url_hash => { :controller => :'foreman_acd/ansible_playbooks', :action => :index },
-         :caption => 'Ansible Playbooks'
+      :url_hash => { :controller => :'foreman_acd/ansible_playbooks', :action => :index },
+      :caption => 'Ansible Playbooks'
 
     menu :top_menu, :app_definitions,
-         :url_hash => { :controller => :'foreman_acd/app_definitions', :action => :index },
-         :caption => 'App Definitions'
+      :url_hash => { :controller => :'foreman_acd/app_definitions', :action => :index },
+      :caption => 'App Definitions'
 
     menu :top_menu, :app_instances,
-         :url_hash => { :controller => :'foreman_acd/app_instances', :action => :index },
-         :caption => 'App Instances'
+      :url_hash => { :controller => :'foreman_acd/app_instances', :action => :index },
+      :caption => 'App Instances'
   end
 
   # Add permissions
   security_block :foreman_acd do
     permission :create_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:new, :create],
-                 :'foreman_acd/api/v2/ansible_playbooks' => [:create] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/ansible_playbooks' => [:new, :create],
+        :'foreman_acd/api/v2/ansible_playbooks' => [:create] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :view_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:index, :show, :auto_complete_search],
-                 :'foreman_acd/api/v2/ansible_playbooks' => [:index, :show] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/ansible_playbooks' => [:index, :show, :auto_complete_search],
+        :'foreman_acd/api/v2/ansible_playbooks' => [:index, :show] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :edit_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:update, :edit, :sync_git_repo],
-                 :'foreman_acd/api/v2/ansible_playbooks' => [:update] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/ansible_playbooks' => [:update, :edit, :sync_git_repo],
+        :'foreman_acd/api/v2/ansible_playbooks' => [:update] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :destroy_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:destroy],
-                 :'foreman_acd/api/v2/ansible_playbooks' => [:destroy] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/ansible_playbooks' => [:destroy],
+        :'foreman_acd/api/v2/ansible_playbooks' => [:destroy] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :import_vars_ansible_playbooks,
-               { :'foreman_acd/ansible_playbooks' => [:import_vars],
-                 :'foreman_acd/api/v2/ansible_playbooks' => [:import_vars] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/ansible_playbooks' => [:import_vars],
+        :'foreman_acd/api/v2/ansible_playbooks' => [:import_vars] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :grab_ansible_playbooks,
-               { :'foreman_acd/api/v2/ansible_playbooks' => [:grab] },
-               :resource_type => 'ForemanAcd::AnsiblePlaybook'
+      { :'foreman_acd/api/v2/ansible_playbooks' => [:grab] },
+      :resource_type => 'ForemanAcd::AnsiblePlaybook'
 
     permission :create_app_definitions,
-               { :'foreman_acd/app_definitions' => [:new, :create],
-                 :'foreman_acd/api/v2/app_definitions' => [:create] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:new, :create],
+        :'foreman_acd/api/v2/app_definitions' => [:create] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :view_app_definitions,
-               { :'foreman_acd/app_definitions' => [:index, :show, :auto_complete_search],
-                 :'foreman_acd/api/v2/app_definitions' => [:index, :show] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:index, :show, :auto_complete_search],
+        :'foreman_acd/api/v2/app_definitions' => [:index, :show] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :edit_app_definitions,
-               { :'foreman_acd/app_definitions' => [:update, :edit],
-                 :'foreman_acd/api/v2/app_definitions' => [:update] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:update, :edit],
+        :'foreman_acd/api/v2/app_definitions' => [:update] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :destroy_app_definitions,
-               { :'foreman_acd/app_definitions' => [:destroy],
-                 :'foreman_acd/api/v2/app_definitions' => [:destroy] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:destroy],
+        :'foreman_acd/api/v2/app_definitions' => [:destroy] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :export_app_definitions,
-               { :'foreman_acd/app_definitions' => [:export, :handle_file_upload],
-                 :'foreman_acd/api/v2/app_definitions' => [:export] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:export, :handle_file_upload],
+        :'foreman_acd/api/v2/app_definitions' => [:export] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :import_app_definitions,
-               { :'foreman_acd/app_definitions' => [:import],
-                 :'foreman_acd/api/v2/app_definitions' => [:import] },
-               :resource_type => 'ForemanAcd::AppDefinition'
+      { :'foreman_acd/app_definitions' => [:import],
+        :'foreman_acd/api/v2/app_definitions' => [:import] },
+      :resource_type => 'ForemanAcd::AppDefinition'
 
     permission :create_app_instances,
-               { :'foreman_acd/app_instances' => [:new, :create],
-                 :'foreman_acd/api/v2/app_instances' => [:create] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:new, :create],
+        :'foreman_acd/api/v2/app_instances' => [:create] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :view_app_instances,
-               { :'foreman_acd/app_instances' => [:index, :show, :auto_complete_search],
-                 :'foreman_acd/api/v2/app_instances' => [:index, :show] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:index, :show, :auto_complete_search],
+        :'foreman_acd/api/v2/app_instances' => [:index, :show] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :edit_app_instances,
-               { :'foreman_acd/app_instances' => [:update, :edit],
-                 :'foreman_acd/api/v2/app_instances' => [:update] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:update, :edit],
+        :'foreman_acd/api/v2/app_instances' => [:update] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :destroy_app_instances,
-               { :'foreman_acd/app_instances' => [:destroy, :destroy_with_hosts],
-                 :'foreman_acd/api/v2/app_instances' => [:destroy, :destroy_with_hosts] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:destroy, :destroy_with_hosts],
+        :'foreman_acd/api/v2/app_instances' => [:destroy, :destroy_with_hosts] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :deploy_app_instances,
-               { :'foreman_acd/app_instances' => [:deploy],
-                 :'foreman_acd/api/v2/app_instances' => [:deploy] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:deploy],
+        :'foreman_acd/api/v2/app_instances' => [:deploy] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :report_app_instances,
-               { :'foreman_acd/app_instances' => [:report],
-                 :'foreman_acd/api/v2/app_instances' => [:report] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/app_instances' => [:report],
+        :'foreman_acd/api/v2/app_instances' => [:report] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :new_acd_configure_job,
-               { :'foreman_acd/remote_execution' => [:new] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/remote_execution' => [:new] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :create_acd_configure_job,
-               { :'foreman_acd/remote_execution' => [:create] },
-               :resource_type => 'ForemanAcd::AppInstance'
+      { :'foreman_acd/remote_execution' => [:create] },
+      :resource_type => 'ForemanAcd::AppInstance'
 
     permission :view_ui_acd,
-               { :ui_acd => [:app, :foreman_data, :ansible_data, :validate_hostname, :report_data] }
+      { :ui_acd => [:app, :foreman_data, :ansible_data, :validate_hostname, :report_data] }
 
     permission :acd_foreman_hosts,
-               { :'foreman_acd/app_instances' => [:create, :edit, :update, :deploy, :destroy_with_hosts, :destroy] },
-               :resource_type => 'ForemanAcd::ForemanHost'
+      { :'foreman_acd/app_instances' => [:create, :edit, :update, :deploy, :destroy_with_hosts, :destroy] },
+      :resource_type => 'ForemanAcd::ForemanHost'
   end
 
   # Manager Role

data/lib/foreman_acd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanAcd
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end

data/lib/foreman_acd.rb

@@ -29,8 +29,8 @@ module ForemanAcd
 
     def start_acd_app_configurator(app_instance)
       task = ForemanTasks.delay(::Actions::ForemanAcd::RunConfigurator,
-                                { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
-                                app_instance)
+        { :start_at => Time.zone.now + RUN_CONFIGURATOR_DELAY },
+        app_instance)
       app_instance.update(:initial_configure_task_id => task.id)
     end
   end

data/lib/tasks/foreman_acd_tasks.rake

@@ -13,20 +13,13 @@ namespace :test do
 end
 
 namespace :foreman_acd do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_acd) do |task|
-        task.patterns = ["#{ForemanAcd::Engine.root}/app/**/*.rb",
-                         "#{ForemanAcd::Engine.root}/lib/**/*.rb",
-                         "#{ForemanAcd::Engine.root}/test/**/*.rb"]
-      end
-    rescue StandardError
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_acd'].invoke
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.options = ['--force-exclusion']
+    task.patterns = [ForemanAcd::Engine.root.to_s]
   end
+rescue LoadError
+  puts 'Rubocop not loaded.'
 end
 
 Rake::Task[:test].enhance ['test:foreman_acd']

data/test/controllers/ansible_playbooks_controller_test.rb

@@ -18,8 +18,8 @@ module ForemanAcd
     test 'should destroy ansible playbook' do
       assert_difference('AnsiblePlaybook.count', -1) do
         delete :destroy,
-               :params => { :id => @model.id },
-               :session => set_session_user
+          :params => { :id => @model.id },
+          :session => set_session_user
       end
       assert_redirected_to ansible_playbooks_url
     end

data/test/controllers/app_definitions_controller_test.rb

@@ -18,8 +18,8 @@ module ForemanAcd
     test 'should destroy app definition' do
       assert_difference('AppDefinition.count', -1) do
         delete :destroy,
-               :params => { :id => @model.id },
-               :session => set_session_user
+          :params => { :id => @model.id },
+          :session => set_session_user
       end
       assert_redirected_to app_definitions_url
     end

data/test/controllers/app_instances_controller_test.rb

@@ -24,8 +24,8 @@ module ForemanAcd
     test 'should destroy app instance' do
       assert_difference('AppInstance.count', -1) do
         delete :destroy_with_hosts,
-               :params => { :id => @model.id },
-               :session => set_session_user
+          :params => { :id => @model.id },
+          :session => set_session_user
       end
     end
   end

data/test/controllers/ui_acd_controller_test.rb

@@ -13,7 +13,7 @@ module Katello
 end
 
 # UI Controller tests
-class UiAcdControllerTest < ActionController::TestCase
+class UIAcdControllerTest < ActionController::TestCase
   test 'get app json' do
     app_def = FactoryBot.create(:app_definition)
     get :app, :params => { :id => app_def.id }, :session => set_session_user

data/test/models/acd_provider_test.rb

@@ -10,13 +10,13 @@ module ForemanAcd
 
       it 'returns only strings' do
         provider_names.each do |name|
-          _(name).must_be_kind_of String
+          expect(name).must_be_kind_of String
         end
       end
 
       context 'provider is registetered under :custom symbol' do
         before { AcdProvider.register(:ACD, String) }
-        it { _(provider_names).must_include 'ACD' }
+        it { expect(provider_names).must_include 'ACD' }
       end
     end
 

data/test/models/concerns/host_extensions_test.rb

@@ -14,10 +14,10 @@ module ForemanAcd
       app = FactoryBot.create :app_instance
 
       foreman_host = app.foreman_hosts.create(:hostname => host.name,
-                                              :service => 'DB',
-                                              :description => 'Description',
-                                              :foremanParameters => nil,
-                                              :ansibleParameters => nil)
+        :service => 'DB',
+        :description => 'Description',
+        :foremanParameters => nil,
+        :ansibleParameters => nil)
       foreman_host.host = host
       foreman_host.save
       assert host.deployed_via_acd?

metadata

@@ -1,43 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_acd
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - ATIX AG
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.89.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.89.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: theforeman-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Foreman plugin to provide application centric deployment and self service
   portal
 email:
@@ -364,7 +349,6 @@ homepage: https://www.orcharhino.com
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -382,8 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Foreman plugin to provide application centric deployment and self service
   portal