choria-colt 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e76e667917bf1958b48d45148712fa5e0d6f2c15280bbbda0d4899b0537e9f8
-  data.tar.gz: 17637d3bf6738bef6c28a282aabb1c4ac7680e4b2e8a6f0fe873a27b59079cc1
+  metadata.gz: e86ae8b9274433cf146d571d2a7466a2c7c131e826ec5e4a8df9540d37f7994d
+  data.tar.gz: 9e4717f11b4f1f3f93c555818b9281e0118ac59a4bbf7b2573d6a85ed6e74fd9
 SHA512:
-  metadata.gz: bacccbdfd46669936f1271d05e4fdceae1864e07ae7f14b260f6de3ec2ed1e90d0c3270f57ea3faaa424b267eab59e1460abcdf4262feec421c6ea510bc811d5
-  data.tar.gz: ad8aaf32f6f71f349d04955cb795c0439c4ecd30103f290da82b3ce7037c6dce330b7e89123a416c120b61bc194c754debfb97412e6e200af8d53264aaba169c
+  metadata.gz: 3754982bc70a01d44fc4115c76693f67201d5a618d2f61b229d9b3408bea3ff2c2ac187ea5c0bd55fdbf8ca391c668f09086339ab366a85f93100c0ac1bd8973
+  data.tar.gz: c1a1dd4eaf6287d28d09baa7f45ff7ab297ffff5a8bd78d519d9a814dfcab74512d6f300fe6696789d1687e1a9f04aa021f90531a98143e263fae4d3a8d53688

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.7.0](https://github.com/opus-codium/choria-colt/tree/v0.7.0) (2022-09-26)
+
+[Full Changelog](https://github.com/opus-codium/choria-colt/compare/v0.6.0...v0.7.0)
+
+**Fixed bugs:**
+
+- Task: Fix IDs array processing [\#30](https://github.com/opus-codium/choria-colt/pull/30) ([neomilium](https://github.com/neomilium))
+
+**Merged pull requests:**
+
+- Use ActiveSuport::Cache instead our own Cache mecanism for tasks metadata [\#31](https://github.com/opus-codium/choria-colt/pull/31) ([neomilium](https://github.com/neomilium))
+- Improve robustness when nodes are unhealthy [\#29](https://github.com/opus-codium/choria-colt/pull/29) ([neomilium](https://github.com/neomilium))
+
 ## [v0.6.0](https://github.com/opus-codium/choria-colt/tree/v0.6.0) (2022-05-16)
 
 [Full Changelog](https://github.com/opus-codium/choria-colt/compare/v0.5.1...v0.6.0)

data/lib/choria/colt/cli.rb

@@ -68,10 +68,9 @@ module Choria
                default: 'production'
         def show(*tasks_names)
           environment = options['environment']
-          cache_directory = File.expand_path('.cache/colt/tasks')
-          FileUtils.mkdir_p cache_directory
-          cache = Cache.new(path: File.join(cache_directory, "#{environment}.yaml"))
 
+          require 'active_support/cache/file_store'
+          cache = ActiveSupport::Cache::FileStore.new File.expand_path('~/.cache/colt/tasks')
           tasks = colt.tasks(environment: environment, cache: cache)
 
           if tasks_names.empty?

data/lib/choria/colt/data_structurer.rb

@@ -4,14 +4,25 @@ module Choria
       def self.structure(res) # rubocop:disable Metrics/AbcSize
         return res unless [0, 1].include? res[:statuscode]
 
+        # If data is empty, status message is an RPC error
+        if res[:data].empty?
+          res[:result] = {
+            _error: {
+              kind: 'choria/rpc',
+              msg: res[:statusmsg],
+            },
+          }
+          return res
+        end
+
         # data.stdout seems to always be JSON, so parse it once.
-        res[:result] = JSON.parse res[:data][:stdout]
+        res[:result] = JSON.parse res[:data][:stdout] unless res.dig(:data, :stdout).nil?
         res[:data].delete :stdout
 
         # On one side, data.stderr is filled by the remote execution stderr.
         # On the other side, error description is in JSON (ie. '_error')
         # So merge data.stderr in '_error'.'details'
-        unless res[:data][:stderr].empty?
+        unless res.dig(:data, :stderr).nil? || res[:data][:stderr].empty?
           raise NotImplementedError, 'What to do when res[:data][:stderr] contains something?' if res[:result]['_error'].empty?
 
           res[:result]['_error']['details'].merge!({ 'stderr' => res[:data][:stderr].split("\n") })
@@ -19,7 +30,7 @@ module Choria
         res[:data].delete :stderr
 
         # Convert '_output' (ie. stdout) lines into array
-        res[:result]['_output'] = res[:result]['_output'].split("\n") unless res[:result]['_output'].nil?
+        res[:result]['_output'] = res[:result]['_output'].split("\n") unless res.dig(:result, '_output').nil?
 
         res
       end

data/lib/choria/colt/version.rb

@@ -2,6 +2,6 @@
 
 module Choria
   class Colt
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

data/lib/choria/colt.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'choria/colt/cache'
 require 'choria/colt/version'
 require 'choria/orchestrator'
 require 'choria/orchestrator/task'
 
 require 'logger'
 
+require 'active_support/cache/memory_store'
+
 module Choria
   class Colt
     class Error < StandardError; end
@@ -45,32 +46,30 @@ module Choria
       raise
     end
 
-    def tasks(environment:, cache: nil)
+    def tasks(environment:, cache: nil, force_cache_refresh: false)
+      cache ||= ActiveSupport::Cache::MemoryStore.new
+
       tasks_names = orchestrator.tasks_support.tasks(environment).map do |task|
         task['name']
       end
 
-      return tasks_metadata(tasks_names, environment) if cache.nil?
-
-      cached_tasks = cache.load
-      return cached_tasks if cache.clean? && cached_tasks.keys.sort == tasks_names.sort
-
-      updated_tasks = tasks_metadata(tasks_names, environment)
-      cache.save updated_tasks
-
-      updated_tasks
+      tasks_names.map do |task_name|
+        metadata = cache.fetch(task_name, force: force_cache_refresh) do
+          task_metadata(task_name, environment)
+        end
+        [task_name, metadata]
+      end.to_h
     end
 
     private
 
-    def tasks_metadata(tasks, environment)
-      logger.info "Fetching metadata for tasks (environment: '#{environment}')"
+    def task_metadata(name, environment)
+      logger.debug "Fetching metadata for task '#{name}' (environment: '#{environment}')"
 
-      tasks.map do |task|
-        logger.debug "Fetching metadata for task '#{task}' (environment: '#{environment}')"
-        metadata = orchestrator.tasks_support.task_metadata(task, environment)
-        [task, metadata]
-      end.to_h
+      # FIXME: Remove this workaround when the Puppet bug is fixed
+      return { 'metadata' => { 'private' => true } } if ['application::utils'].include? name
+
+      orchestrator.tasks_support.task_metadata(name, environment)
     end
   end
 end

data/lib/choria/orchestrator/task.rb

@@ -103,6 +103,7 @@ module Choria
         end
         raise NoNodesLeftError, "No nodes left to continue after 'run_no_wait' action" if @pending_targets.empty?
 
+        task_ids.compact!
         task_ids.uniq!
         raise NotImplementedError, "Multiple task IDs: #{task_ids}" unless task_ids.count == 1
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-colt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Romuald Conty
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -210,7 +210,6 @@ files:
 - choria-colt.gemspec
 - exe/colt
 - lib/choria/colt.rb
-- lib/choria/colt/cache.rb
 - lib/choria/colt/cli.rb
 - lib/choria/colt/cli/formatter.rb
 - lib/choria/colt/cli/thor.rb

data/lib/choria/colt/cache.rb

@@ -1,33 +0,0 @@
-require 'yaml'
-
-module Choria
-  class Colt
-    class Cache
-      def initialize(path:, force_refresh: false)
-        @path = path
-        @data = YAML.safe_load File.read(@path)
-        @clean = true unless force_refresh
-      rescue Errno::ENOENT
-        @clean = false
-      end
-
-      def dirty?
-        !clean?
-      end
-
-      def clean?
-        @clean
-      end
-
-      def load
-        @data
-      end
-
-      def save(data)
-        @data = data
-        File.write @path, data.to_yaml
-        @clean = true
-      end
-    end
-  end
-end