foreman_acd 0.9.7 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09ab4e9efcf497cbf601a6aa065f7451d7eeabde67ed6b9f256f74e305ac7fd2'
-  data.tar.gz: 996d0f4628457e47e2afc8304e43ae4deef0ed4b362d4495ab7e26730448cbd1
+  metadata.gz: 3e8dc2917de1aa5ada0252edd2c3fb14615b804f3e39f58d237ef7b97ec52266
+  data.tar.gz: d38e9a064751be62eab34a5537ecce21f288535e42bd96934ac9047b4238630e
 SHA512:
-  metadata.gz: 5c011fa3bf0b15c4c6b1a446f960e9cda7b6b9c72ad89776eb921f698d4312424d59e6a7de26fd9c6f9dab3878beae8606559e54617287217a324df8d1f47b9e
-  data.tar.gz: ae6eaa22a91d8e100f57095165f09dbcb133fc42deb3201d83f3a32d8698ca685a889aae22984434dba6836e3968920fa7de9303d573dd66bb46f5fc0e70baa2
+  metadata.gz: 7e6b683a22c4554d476d5a51908aa00906f0351b5d0e7ca098a2184fd8c209444f3105cb1216156a2f496f51cb032b51c7b96b84df718f5892b7cf4734de5acb
+  data.tar.gz: 0b353179ccc1844bb71864dbf2af3e672563249a780ff8237f96639851fdb2bc14bf505bc0db5f50e96fa5a23fc1133e1f7c0f59fe19a7ec53b07fcdcac92e6d

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/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

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|

data/lib/foreman_acd/plugin.rb

@@ -1,7 +1,7 @@
 # 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"]
 

data/lib/foreman_acd/version.rb

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

data/package.json

@@ -9,12 +9,14 @@
   "devDependencies": {
     "@theforeman/builder": ">= 12.0.1",
     "@theforeman/eslint-plugin-foreman": ">= 12.0.1",
+    "@theforeman/find-foreman": "^13.0.0",
     "@theforeman/test": ">= 12.0.1",
     "@theforeman/vendor-dev": ">= 12.0.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "eslint": "^6.7.2",
+    "eslint-plugin-react": "^7.34.1",
     "jest": "^23.6.0",
     "jest-prop-type-error": "^1.1.0",
     "lodash": "^4.17.11",
@@ -26,11 +28,11 @@
     "table-resolver": "^3.2.0"
   },
   "scripts": {
-    "lint": "tfm-lint --plugin -d *.js,webpack",
-    "lint-fix": "tfm-lint --plugin -d *.js,webpack --fix",
+    "lint": "eslint *.js webpack",
+    "lint-fix": "eslint --fix *.js webpack",
     "stylelint": "stylelint webpack/**/*.scss",
     "stylelint-fix": "stylelint webpack/**/*.scss --fix",
-    "test": "jest --no-cache"
+    "test": "tfm-test --plugin --config jest.config.js"
   },
   "repository": {
     "type": "git",

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