smart_proxy_ansible 3.5.3 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbbc81bb91b3c508c66bf0b2a609d1875638a4fa3263c3a029294c731f19dfca
-  data.tar.gz: f106c29bca9feb9971a6d3ea9ab880ddd3fe15f39abb19d7a1bb8ab98c8ca232
+  metadata.gz: 2a6565b96c81502c1db79c10db9199cf3bb537fd03ed4ba1e9382bb8ca8dc2ad
+  data.tar.gz: c4859eac213669d85ec3a2e0bb23ca137c2d91ac947c3496252f2f0de6e7089c
 SHA512:
-  metadata.gz: a6453b0c14b8b70b036fe7948c3de5c1d9151b6db0b2806e566a82d8a87c6aaeb05106a2eed2e4dc5a3184687c6c27f1abc0ca64b83d26e1141eda37ad055476
-  data.tar.gz: aa09094674c71ae7c2f7b542f2e1173e1f3c682d35edc18e8a408ca40f5f31de3057572a4c20a1d9253efcdb10efe0fca1d6e6cc29291470a1557deed702634d
+  metadata.gz: 5ccf99444a7c7cb1cd7bca0be70e27d6402b25ac52f26a6f96103b5f3b3621bc456a911c88c65cc472c6fdf37f3330394fcc3e2e77177b0a4c02e5a5b1137a21
+  data.tar.gz: f099953775bb621e2219a63ac76c20d1794f6bfbf3b83241e3b5fb33d43e138d90e8f52e3a6024a9cf303cd44b6627b79f92c24a0983414a4da07ec92c7f0b5e

data/lib/smart_proxy_ansible/runner/ansible_runner.rb

@@ -143,13 +143,14 @@ module Proxy::Ansible
         if event['event'] == 'playbook_on_stats'
           failures = event.dig('event_data', 'failures') || {}
           unreachable = event.dig('event_data', 'dark') || {}
+          rescued = event.dig('event_data', 'rescued') || {}
           header, *rows = event['stdout'].strip.lines.map(&:chomp)
           @outputs.keys.select { |key| key.is_a? String }.each do |host|
             line = rows.find { |row| row =~ /#{host}/ }
             publish_data_for(host, [header, line].join("\n"), 'stdout')
 
             # If the task has been rescued, it won't consider a failure
-            if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0 && unreachable[host].to_i <= 0
+            if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0 && unreachable[host].to_i <= 0 && rescued[host].to_i > 0
               publish_exit_status_for(host, 0)
             end
           end
@@ -166,15 +167,10 @@ module Proxy::Ansible
       end
 
       def write_inventory
-        path = File.join(@root, 'inventory', 'hosts')
-        data_path = File.join(@root, 'data')
-        inventory_script = <<~INVENTORY_SCRIPT
-          #!/bin/sh
-          cat #{::Shellwords.escape data_path}
-        INVENTORY_SCRIPT
-        File.write(path, inventory_script)
-        File.write(data_path, JSON.dump(@inventory))
-        File.chmod(0o0755, path)
+        File.open(File.join(@root, 'inventory', 'hosts.json'), 'w') do |file|
+          file.chmod(0o0640)
+          file.write(JSON.dump(@inventory))
+        end
       end
 
       def write_playbook
@@ -251,7 +247,6 @@ module Proxy::Ansible
       # containing all the hosts.
       def rebuild_inventory(input)
         action_inputs = input.values.map { |hash| hash[:input][:action_input] }
-        hostnames = action_inputs.map { |hash| hash[:name] }
         inventories = action_inputs.map { |hash| hash[:ansible_inventory] }
         host_vars = inventories.map { |i| i['_meta']['hostvars'] }.reduce({}) do |acc, hosts|
           hosts.reduce(acc) do |inner_acc, (hostname, vars)|
@@ -260,8 +255,7 @@ module Proxy::Ansible
           end
         end
 
-        { '_meta' => { 'hostvars' => host_vars },
-          'all' => { 'hosts' => hostnames,
+        { 'all' => { 'hosts' => host_vars,
                      'vars' => inventories.first['all']['vars'] } }
       end
 
@@ -285,7 +279,7 @@ module Proxy::Ansible
             'ansible_password' => inventory['ssh_password'] || per_host['ansible_password'],
             'ansible_become_password' => inventory['effective_user_password'] || per_host['ansible_become_password']
           }
-          inventory['_meta']['hostvars'][host].update(new_secrets)
+          inventory['all']['hosts'][host].update(new_secrets)
         end
 
         inventory

data/lib/smart_proxy_ansible/version.rb

@@ -2,6 +2,6 @@ module Proxy
   # Version, this allows the proxy and other plugins know
   # what version of the Ansible plugin is running
   module Ansible
-    VERSION = '3.5.3'
+    VERSION = '3.5.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.5
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake