smart_proxy_acd_core 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab65b2e5c4dfc4a353ecfba363510d52c885442c372956d2f6b35c796753c58c
-  data.tar.gz: f04b97ab4e74bb1ae449036f20bff594e45fe1c6708eb2dbaf058a229efecceb
+  metadata.gz: 215b06ad56d650035cdc4079ee6fcad40333f619366e9be8d4bc8c9451b9a207
+  data.tar.gz: 295fd6ae912f62f4dddc0e59fda3afb9b72c9e059df33dd7fc46878185b07996
 SHA512:
-  metadata.gz: 2aed9d7ec66263cda317232f013f3c5bd3cf78f5197867a6c2cf8a874265c17798ee9b1fa1bc6aa8c89f61035e56e26441a5120d1be1fb703816d268b852c3d7
-  data.tar.gz: 0bbf786b41d8de45b19c3083df9d8ddc057fb5239ac4f2c4c8623075e61c72f7f04346f991b17dd9f1950eebbfa44576ff3c144b05a9aef8e02883e33269f79e
+  metadata.gz: 6812cf3394f08d4d184841043ea653e7fe1bd4d59c39b7726c356667061975af4262383f9dc0d3d577093c65da44f849281d4f547f7b70003ba13465cdfdb6a5
+  data.tar.gz: e5bab31f198a74744bab097dac0426928855e7d38e77248b72dea2b81c1d9426593a344e9103e6e85308ae2a637bad3ccbcc9cdffa0bb153ab8e765a07affaad

data/lib/smart_proxy_acd_core/acd_runner.rb

@@ -3,13 +3,14 @@ require 'tempfile'
 require 'rest-client'
 require 'tmpdir'
 
+# rubocop:disable ClassLength
+
 module SmartProxyAcdCore
   # Implements the AcdRunner to be used by foreman_remote_execution
   class AcdRunner < ForemanTasksCore::Runner::CommandRunner
     DEFAULT_REFRESH_INTERVAL = 1
 
     class << self
-
       def parse_dynflow_settings(path)
         return @dynflow_settings if defined? @dynflow_settings
         if File.exist?(path)
@@ -52,8 +53,8 @@ module SmartProxyAcdCore
 
     def get_playbook(playbook_id)
       logger.debug("Get playbook with id #{playbook_id}")
-      response = playbook_resource(playbook_id).get()
-      if response.code.to_s != "200"
+      response = playbook_resource(playbook_id).get
+      if response.code.to_s != '200'
         raise "Failed performing callback to Foreman server: #{response.code} #{response.body}"
       end
       tmp_file = Tempfile.new.path
@@ -68,17 +69,17 @@ module SmartProxyAcdCore
     end
 
     def store_playbook
-      logger.debug("Unpack ansible playbook")
+      logger.debug('Unpack ansible playbook')
       dir = Dir.mktmpdir
-      raise "Could not create temporary directory to run ansible playbook" if dir.nil? || !Dir.exists?(dir)
+      raise 'Could not create temporary directory to run ansible playbook' if dir.nil? || !Dir.exist?(dir)
       command = "base64 -d #{@playbook_tmp_base64_file} | tar xz -C #{dir}"
       system(command)
       @playbook_tmp_dir = dir
     end
 
     def cleanup
-      File.unlink(@playbook_tmp_base64_file) if File.exists?(@playbook_tmp_base64_file)
-      FileUtils.rm_rf(@playbook_tmp_dir) if Dir.exists?(@playbook_tmp_dir)
+      File.unlink(@playbook_tmp_base64_file) if File.exist?(@playbook_tmp_base64_file)
+      FileUtils.rm_rf(@playbook_tmp_dir) if Dir.exist?(@playbook_tmp_dir)
     end
 
     def start
@@ -89,13 +90,13 @@ module SmartProxyAcdCore
       store_playbook
 
       @playbook_path = File.join(@playbook_tmp_dir, @playbook_file)
-      raise "Could not run playbook: playbook file #{@playbook_file} not found in playbook dir #{@playbook_tmp_dir}" unless File.exists?(@playbook_path)
+      raise "Could not run playbook: playbook file #{@playbook_file} not found in playbook dir #{@playbook_tmp_dir}" unless File.exist?(@playbook_path)
 
-      publish_data("Write temporary inventory", 'stdout')
+      publish_data('Write temporary inventory', 'stdout')
       write_inventory
 
       command = generate_command
-      logger.debug("Running command '#{command.join(' ')}'")
+      logger.debug("Running command #{command.join(' ')}")
       initialize_command(*command)
     end
 
@@ -113,7 +114,7 @@ module SmartProxyAcdCore
     private
 
     def parse_acd_job
-      @acd_job = YAML.load(@options['script'])
+      @acd_job = YAML.safe_load(@options['script'])
       @application_name = @acd_job['application_name']
       @playbook_id = @acd_job['playbook_id']
       @playbook_file = @acd_job['playbook_file']
@@ -131,25 +132,49 @@ module SmartProxyAcdCore
     end
 
     def environment
-      env={}
+      env = {}
       env['ANSIBLE_CALLBACK_WHITELIST'] = ''
       env['ANSIBLE_LOAD_CALLBACK_PLUGINS'] = '0'
       env
     end
 
+    def setup_verbosity
+      verbosity = ''
+      if @acd_job['verbose']
+        verbosity_level = @acd_job['verbose'].split(' ').first.to_i
+        if verbosity_level.positive?
+          verbosity = '-'
+          verbosity_level.times do
+            verbosity += 'v'
+          end
+        end
+      end
+      verbosity
+    end
+
+    def valid_tags(tag)
+      re = /^\w+(\s*,\s*\w+)*$/
+      return true if @acd_job[tag] && @acd_job[tag].match?(re)
+    end
+
     def generate_command
       logger.debug("Generate command with #{@inventory_path} to run #{@playbook_id} with path #{@playbook_path}")
       command = [environment]
-      command << "ansible-playbook"
-      command << "-i"
+      command << 'ansible-playbook'
+      command << '-i'
       command << @inventory_path
-      command << "-v" if @acd_job['verbose'] == true
-      if @acd_job.has_key?('extra_vars') && !@acd_job['extra_vars'].nil? && !@acd_job['extra_vars'].empty?
-        command << "--extra-vars"
+      verbose = setup_verbosity
+      command << verbose unless verbose.empty?
+      command << "--tags '#{@acd_job['tags']}'" if valid_tags('tags')
+      command << "--skip-tags '#{@acd_job['skip_tags']}'" if valid_tags('skip_tags')
+      if @acd_job.key?('extra_vars') && !@acd_job['extra_vars'].nil? && !@acd_job['extra_vars'].empty?
+        command << '--extra-vars'
         command << "'#{@acd_job['extra_vars']}'"
       end
-      command << "#{@playbook_path}"
+      command << @playbook_path.to_s
       command
     end
   end
 end
+
+# rubocop:enable ClassLength

data/lib/smart_proxy_acd_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyAcdCore
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_acd_core
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Bernhard suttner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core