smart_proxy_ansible 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 131c5f3a3d6c6f70d8ce1ed672b3f5be31b035d7
-  data.tar.gz: 05f948836fd8463cf9ad1edda37592e64655a94f
+SHA256:
+  metadata.gz: 723f4dc74c428f9eb0d34bda1f492e8b5e49eb2103f16ccb36b279db8dfb3045
+  data.tar.gz: 553c1a6918b5f345d7017fe9ce691bffed6903c7d1e5fdbcbe5905a863e70542
 SHA512:
-  metadata.gz: f087741a49791fbbb5a981945dcac775a751aeed0c430d4fa06cac1f0c27c181f12fbc42621d6c96e4a017d7c4351e45053cace0b0ba03a19d0e4e535fd461a7
-  data.tar.gz: 4addf2e1c458730cea7f9361adbf26b1c9f79136f808a8e52e67ff81a22f911143b9b04c9e004581d00a67cf534251cb2054fde5c9b31387594046bcd92a7e9a
+  metadata.gz: 2bde47200bda54b10495128b81a19f3f6471f1c9142e034537df43e6d8b6badfcf7685a59923d5bc008263231a64d414ab5c6aecb4f0adf3342f3dfb300a35d1
+  data.tar.gz: 6793a645db2e1e1ac75d1136cfa5e10285a2fb6b100d97b7a67613e7e4cac504f0154b398ed066f9ea17cb8f65589a8b76df60fece50764a9bb658c9181d145a

data/README.md

@@ -2,6 +2,10 @@
 
 Proxy plugin to make [foreman_ansible](https://github.com/theforeman/foreman_ansible) actions run in the proxy
 
+## Compatibility
+
+This plugin requires at least Foreman Proxy 2.3.
+
 ## Installation (in development)
 
 ### Prerequisites

data/lib/smart_proxy_ansible/api.rb

@@ -13,34 +13,37 @@ module Proxy
       get '/roles/variables' do
         variables = {}
         RolesReader.list_roles.each do |role_name|
-          begin
-            variables[role_name] = extract_variables(role_name)[role_name]
-          rescue ReadVariablesException => e
-            # skip what cannot be parsed
-            logger.error e
-          end
+          variables.merge!(extract_variables(role_name))
+        rescue ReadVariablesException => e
+          # skip what cannot be parsed
+          logger.error e
         end
         variables.to_json
       end
 
       get '/roles/:role_name/variables' do |role_name|
-        begin
-          extract_variables(role_name).to_json
-        rescue ReadVariablesException => e
-          logger.error e
-          {}.to_json
-        end
+        extract_variables(role_name).to_json
+      rescue ReadVariablesException => e
+        logger.error e
+        {}.to_json
       end
 
       private
 
       def extract_variables(role_name)
         variables = {}
-        RolesReader.roles_path.split(':').each do |path|
-          role_path = "#{path}/#{role_name}"
-          if File.directory?(role_path)
+        role_name_parts = role_name.split('.')
+        if role_name_parts.count == 3
+          RolesReader.collections_paths.split(':').each do |path|
             variables[role_name] ||= VariablesExtractor
-                                     .extract_variables(role_path)
+                                   .extract_variables("#{path}/ansible_collections/#{role_name_parts[0]}/#{role_name_parts[1]}/roles/#{role_name_parts[2]}")
+          end
+        else
+          RolesReader.roles_path.split(':').each do |path|
+            role_path = "#{path}/#{role_name}"
+            if File.directory?(role_path)
+              variables[role_name] ||= VariablesExtractor.extract_variables(role_path)
+            end
           end
         end
         variables

data/lib/smart_proxy_ansible/plugin.rb

@@ -2,11 +2,7 @@ module Proxy
   module Ansible
     # Calls for the smart-proxy API to register the plugin
     class Plugin < Proxy::Plugin
-      http_rackup_path File.expand_path('http_config.ru',
-                                        File.expand_path('../', __FILE__))
-      https_rackup_path File.expand_path('http_config.ru',
-                                         File.expand_path('../', __FILE__))
-
+      rackup_path File.expand_path('http_config.ru', __dir__)
       settings_file 'ansible.yml'
       plugin :ansible, Proxy::Ansible::VERSION
 

data/lib/smart_proxy_ansible/roles_reader.rb

@@ -7,18 +7,31 @@ module Proxy
       class << self
         DEFAULT_CONFIG_FILE = '/etc/ansible/ansible.cfg'.freeze
         DEFAULT_ROLES_PATH = '/etc/ansible/roles:/usr/share/ansible/roles'.freeze
+        DEFAULT_COLLECTIONS_PATHS = '/etc/ansible/collections:/usr/share/ansible/collections'.freeze
 
         def list_roles
-          roles_path.split(':').map { |path| read_roles(path) }.flatten
+          roles = roles_path.split(':').map { |path| read_roles(path) }.flatten
+          collection_roles = collections_paths.split(':').map { |path| read_collection_roles(path) }.flatten
+          roles + collection_roles
         end
 
-        def roles_path(roles_line = roles_path_from_config)
-          # Default to /etc/ansible/roles if none found
-          return DEFAULT_ROLES_PATH if roles_line.empty?
-          roles_path_key = roles_line.first.split('=').first.strip
-          # In case of commented roles_path key "#roles_path", return default
-          return DEFAULT_ROLES_PATH unless roles_path_key == 'roles_path'
-          roles_line.first.split('=').last.strip
+        def roles_path
+          config_path(path_from_config('roles_path'), DEFAULT_ROLES_PATH)
+        end
+
+        def collections_paths
+          config_path(path_from_config('collections_paths'), DEFAULT_COLLECTIONS_PATHS)
+        end
+
+        def config_path(config_line, default)
+          # Default to /etc/ansible/roles if config_line is empty
+          return default if config_line.empty?
+
+          config_line_key = config_line.first.split('=').first.strip
+          # In case of commented roles_path key "#roles_path" or #collections_paths, return default
+          return default if ['#roles_path', '#collections_paths'].include?(config_line_key)
+
+          config_line.first.split('=').last.strip
         end
 
         def logger
@@ -34,30 +47,43 @@ module Proxy
         private
 
         def read_roles(roles_path)
-          rescue_and_raise_file_exception ReadRolesException,
-                                          roles_path, 'roles' do
-            Dir.glob("#{roles_path}/*").map do |path|
-              path.split('/').last
-            end
+          glob_path("#{roles_path}/*").map do |path|
+            path.split('/').last
           end
+        rescue Errno::ENOENT, Errno::EACCES => e
+          logger.debug(e.backtrace)
+          message = "Could not read Ansible roles #{roles_path} - #{e.message}"
+          raise ReadRolesException.new(message), message
+        end
+
+        def glob_path(path)
+          Dir.glob path
+
         end
 
-        def roles_path_from_config
-          rescue_and_raise_file_exception ReadConfigFileException,
-                                          DEFAULT_CONFIG_FILE, 'config file' do
-            File.readlines(DEFAULT_CONFIG_FILE).select do |line|
-              line =~ /^\s*roles_path/
-            end
+        def read_collection_roles(collections_path)
+          Dir.glob("#{collections_path}/ansible_collections/*/*/roles/*").map do |path|
+            parts = path.split('/')
+            role = parts.pop
+            parts.pop
+            collection = parts.pop
+            author = parts.pop
+            "#{author}.#{collection}.#{role}"
           end
+        rescue Errno::ENOENT, Errno::EACCES => e
+          logger.debug(e.backtrace)
+          message = "Could not read Ansible roles #{collections_path} - #{e.message}"
+          raise ReadRolesException.new(message), message
         end
 
-        def rescue_and_raise_file_exception(exception, path, type)
-          yield
+        def path_from_config(config_key)
+          File.readlines(DEFAULT_CONFIG_FILE).select do |line|
+            line =~ /^\s*#{config_key}/
+          end
         rescue Errno::ENOENT, Errno::EACCES => e
           logger.debug(e.backtrace)
-          exception_message = "Could not read Ansible #{type} "\
-            "#{path} - #{e.message}"
-          raise exception.new(exception_message), exception_message
+          message = "Could not read Ansible config file #{DEFAULT_CONFIG_FILE} - #{e.message}"
+          raise ReadConfigFileException.new(message), message
         end
       end
     end

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.0.1'
+    VERSION = '3.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -81,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.32.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -149,8 +121,7 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- bin/json_inventory.sh
-- bundler.plugins.d/smart_proxy_ansible.rb
+- bundler.d/ansible.rb
 - lib/smart_proxy_ansible.rb
 - lib/smart_proxy_ansible/api.rb
 - lib/smart_proxy_ansible/exception.rb
@@ -172,15 +143,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Smart-Proxy Ansible plugin

data/bin/json_inventory.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-# An inventory script to load the inventory from JSON file.
-#
-
-if [ -z "$JSON_INVENTORY_FILE" ]; then
-   echo "JSON_INVENTORY_FILE not specified"
-   exit 1
-fi
-
-cat $JSON_INVENTORY_FILE