smart_proxy_ansible 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce925932dfc2ddf578d2ae15b293ee1a223b8808
-  data.tar.gz: 54f6dd7b4d48229be33aef44b7445d8284a7d734
+  metadata.gz: 572320552523c1629bda9d963a16fd07d189f14a
+  data.tar.gz: 92d4fee5cbafedd4fc52b0921ca4f470374837f1
 SHA512:
-  metadata.gz: a88b68d82b25d7baeff478651fdf159c512be92262d2c7c5ed5af5ed204915043ab08dbe3d7b3200a7261226f0ece19f2e803be10d3e25e105caa3f6d46bc97e
-  data.tar.gz: 0c57bf4282a7f4e9699b9108e3e89817a2e2ded17ef448d8d51ae5eeede0a93d8947673d3df034d775fee2238fdb5c2fc40a707c1acc77aa5044953c062c0e97
+  metadata.gz: f9faca4cd728399491dd3a8edba30dc214d710ed237d12c95e5abaed7a58eccdc35ad79a2c894b8eeea1fc1723b2b05ed857eef8add79c102a51e4de2a7cb571
+  data.tar.gz: 3c908550293b98400efb727cd89e5f55537ff6b1616a364c78635dccb7fff8540a19845bba583547d3c637207192d91149a03dde215fa7df1334de8d897b70da

data/lib/smart_proxy_ansible/api.rb

@@ -4,6 +4,8 @@ module Proxy
     # please keep the actual implementation of the endpoints outside
     # of this class.
     class Api < Sinatra::Base
+      include ::Proxy::Log
+
       get '/roles' do
         RolesReader.list_roles.to_json
       end
@@ -11,13 +13,23 @@ module Proxy
       get '/roles/variables' do
         variables = {}
         RolesReader.list_roles.each do |role_name|
-          variables[role_name] = extract_variables(role_name)[role_name]
+          begin
+            variables[role_name] = extract_variables(role_name)[role_name]
+          rescue ReadVariablesException => e
+            # skip what cannot be parsed
+            logger.error e
+          end
         end
         variables.to_json
       end
 
       get '/roles/:role_name/variables' do |role_name|
-        extract_variables(role_name).to_json
+        begin
+          extract_variables(role_name).to_json
+        rescue ReadVariablesException => e
+          logger.error e
+          {}.to_json
+        end
       end
 
       private

data/lib/smart_proxy_ansible/exception.rb

@@ -36,5 +36,6 @@ module Proxy
 
     class ReadConfigFileException < Proxy::Ansible::Exception; end
     class ReadRolesException < Proxy::Ansible::Exception; end
+    class ReadVariablesException < Proxy::Ansible::Exception; end
   end
 end

data/lib/smart_proxy_ansible/variables_extractor.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Proxy
   module Ansible
     # Implements the logic needed to read the roles and associated information
@@ -6,26 +8,16 @@ module Proxy
         def extract_variables(role_path)
           role_files = Dir.glob("#{role_path}/defaults/**/*.yml") +
                        Dir.glob("#{role_path}/defaults/**/*.yaml")
-          # not anything matching item, }}, {{, ansible_hostname or 'if'
-          variables = role_files.map do |role_file|
-            candidates = File.read(role_file)
-                         .scan(/{{(.*?)}}/).select do |param|
-              param.first.scan(/item/) == [] && param.first.scan(/if/) == []
-            end.flatten
-            # Sometimes inside the {{ }} there's a OR condition. In such a case,
-            # let's split and choose possible variables (variables cannot
-            # contain parenthesis)
-
-            candidates.map do |variable|
-              variable.split('|').map(&:strip).select do |var|
-                !var.include?('(') && # variables are not parenthesis
-                !var.include?('[') && # variables are not arrays
-                !var.include?('.') && # variables are not objects
-                !var.include?("'") # variables are not plain strings
-              end
-            end unless candidates.nil?
-          end.compact.flatten.uniq.map(&:strip)
-          variables
+          role_files.flat_map do |role_file|
+            loaded_yaml = {}
+            begin
+              loaded_yaml = YAML.load_file(role_file)
+            rescue Psych::SyntaxError
+              raise ReadVariablesException.new "#{role_file} is not YAML file"
+            end
+            raise ReadVariablesException.new "Could not parse YAML file: #{role_file}" unless loaded_yaml.is_a? Hash
+            loaded_yaml.keys
+          end
         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 = '2.1.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler