smart_proxy_ansible 3.5.4 → 3.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeca31386ddf249d6cbce37e14bac2be1217132e9d7700595d1a98bfce4f9edb
-  data.tar.gz: d46c8e35fe05c3d2808226eda74a14b26cf77a5bfcc66f494d6e680f21893173
+  metadata.gz: cdb206292fd57f3df0b026850f14e36a171ab612441a07eabda038564ed9882e
+  data.tar.gz: f81ec06c89616f468f8e0b2e91337604ac53083813afb78ac0428b81c2c3fab8
 SHA512:
-  metadata.gz: a64fc645a04b2348cb94e9975a059ff72d053de4c0f95d256f10c2219eb68f691fb0abdcb1d08d2893467cd607ab49cd474a1f1c633718c8ef6c46c256c2a6ca
-  data.tar.gz: e093cc229af6dffb46ead2c4d7118d53e87d3a78ab67d1d5256130b95ae95b9beccb89186d95365e789abcbc99df67d661b1cc4a6d90dd4e90ffa3ec571b24bc
+  metadata.gz: c43173334f7e61412176729557b0d259c9f5a4c1be8e1e13d41c0a5fecc77ad2c4a3768b3d43dcd41db53ce46fbf5b5cf81328ebdaa3045fb083d4bff44ea835
+  data.tar.gz: de9b416be34c2a2f6abf0b9ef1747911356fdb770cfa3ea90ee37dc409b78f9b168477c3656327ecbfa412ddfe335e1043b9510c4260b58d5e50370df5eb8f6a

data/lib/smart_proxy_ansible/runner/ansible_runner.rb

@@ -167,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
@@ -252,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)|
@@ -261,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
 
@@ -283,10 +276,10 @@ module Proxy::Ansible
           per_host = secrets['per-host'][host]
 
           new_secrets = {
-            'ansible_password' => inventory['ssh_password'] || per_host['ansible_password'],
-            'ansible_become_password' => inventory['effective_user_password'] || per_host['ansible_become_password']
+            'ansible_password' => secrets['ssh_password'] || per_host['ansible_password'],
+            'ansible_become_password' => secrets['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.4'
+    VERSION = '3.5.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.6
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2024-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Smart-Proxy Ansible plugin