foreman_acd 0.9.2.3 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7444a04a97d0c557274185beac9aad2690a7b2387737e48b2932603143fc13bb
-  data.tar.gz: 3cff7fecc5b68fa7f038bff0482e40a7964fbc02375b6b09961ca9ff5a13a457
+  metadata.gz: dbb3f0546eecd696b0236fc7fc5d939e3c9ba4be45de5f63c3c0b510bdd3a43e
+  data.tar.gz: 79a44a598a313b6d9d1883104d5a776e1cf20f43548cc75275bdb68ddc8efc26
 SHA512:
-  metadata.gz: 0aa2b65dc7476d0c1791eceb1c568e6c140562262a4f6f496279da2d6a0b65ad19be14b7e519ebbaf5be3724d2483e1ce0c357ba20d443aa705101632215d97a
-  data.tar.gz: a4d80115ee182a4c9b193afcf43e2ea8a16e4dd715f58120df17d8e5c8c87fb0f2a12dd56883d9f42bdce6298dac074b3a0671fdd9a48f5a6d83ddf940cf3e06
+  metadata.gz: 8b1915e923d8571aeabe098e4f6b3539038608bc66276a1a65733df7b1548c0822aa11217b1c545e19dac1e88436cc7e213275bdb0bd488721497553361f6833
+  data.tar.gz: e0e62775c7fbd2417edd87febdfe13df1457a037b80746e3c019ed7eef67b3c94012b64397317dafc34d56a5258289f2d0088a86338944c90dde2a248f3925be

data/app/controllers/foreman_acd/remote_execution_controller.rb

@@ -10,7 +10,7 @@ module ForemanAcd
       if result.success == true
         @composer = job
       else
-        redirect_to(app_instances_path, :error => _("Coult not create remote execution job to configure the app '%{app_instance}': %{msg}") % {
+        redirect_to(app_instances_path, :error => _("Could not create remote execution job to configure the app '%{app_instance}': %{msg}") % {
           :app_instance => @app_instance, :msg => result.error
         })
       end
@@ -23,7 +23,7 @@ module ForemanAcd
         result, job = init_configuration
 
         unless result.success == true
-          return redirect_to(app_instances_path, :error => _("Coult not create remote execution job to configure the app '%{app_instance}': %{msg}") % {
+          return redirect_to(app_instances_path, :error => _("Could not create remote execution job to configure the app '%{app_instance}': %{msg}") % {
             :app_instance => @app_instance, :msg => result.error
           })
         end

data/app/services/foreman_acd/app_configurator.rb

@@ -36,21 +36,20 @@ module ForemanAcd
         #  proxy which is necessary to connect to the proxy
         proxy_selector = RemoteExecutionProxySelector.new
         hosts.each do |h|
-          begin
-            unless h.host
-              result.success = false
-              result.error = 'App Instance is not deployed'
-              return [result, job]
-            end
-            proxy = proxy_selector.determine_proxy(h.host, 'ACD')
-            result.success = true
-          rescue NoMethodError => e
+          unless h.host
             result.success = false
-            result.error = "#{e}, Install/Update smart-proxies for ACD"
+            result.error = 'App Instance is not deployed'
             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)
           proxy_hosts[proxy.name] = [] unless proxy_hosts.key?(proxy.name)
           proxy_hosts[proxy.name] << h
+          result.success = true
+        rescue StandardError => e
+          result.success = false
+          result.error = "#{e}, Install/Update smart-proxies for ACD"
+          return [result, job]
         end
 
         # TODO: just for testing...
@@ -90,6 +89,7 @@ module ForemanAcd
         result.success = false
         result.error = _('Failed to configure hosts: %{err_msg}' % { :err_msg => e.message })
         logger.error('Failed to configure hosts: %{err_class}: %{err_msg}' % { :err_class => e.class, :err_msg => e.message })
+        logger.error(e.backtrace.join("\n"))
         job = nil
       end
       [result, job]

data/app/services/foreman_acd/inventory_creator.rb

@@ -36,7 +36,7 @@ module ForemanAcd
 
         # in case there is no ansible_user defined, set "root" as default.
         ansible_vars['ansible_user'] = 'root' unless ansible_vars.key?('ansible_user')
-        ansible_vars['ansible_ssh_private_key_file'] = ansible_or_rex_ssh_private_key(foreman_host.host)
+        ansible_vars['ansible_ssh_private_key_file'] = ansible_ssh_private_key(foreman_host.host)
 
         children[ansible_group]['hosts'][foreman_host.host.name] = ansible_vars
       end
@@ -56,13 +56,9 @@ module ForemanAcd
       resolved_value
     end
 
-    def ansible_or_rex_ssh_private_key(host)
+    def ansible_ssh_private_key(host)
       ansible_private_file = host_setting(host, 'ansible_ssh_private_key_file')
-      if !ansible_private_file.empty?
-        ansible_private_file
-      else
-        ForemanRemoteExecutionCore.settings[:ssh_identity_key_file]
-      end
+      ansible_private_file unless ansible_private_file.empty?
     end
 
     def host_setting(host, setting)

data/lib/foreman_acd/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_acd",
-  "version": "0.9.2.3",
+  "version": "0.9.3",
   "description": "foreman application centric deployment",
   "main": "index.js",
   "directories": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_acd
 version: !ruby/object:Gem::Version
-  version: 0.9.2.3
+  version: 0.9.3
 platform: ruby
 authors:
 - ATIX AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop